projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed supplier payment view link.
[fa-stable.git]
/
reporting
/
rep702.php
diff --git
a/reporting/rep702.php
b/reporting/rep702.php
index bd3434b10d68ca2d05493f3e476cd3c9a0aaede2..2600df6ba3f02fced02f9598cc88050603b15b1d 100644
(file)
--- a/
reporting/rep702.php
+++ b/
reporting/rep702.php
@@
-26,7
+26,6
@@
include_once($path_to_root . "/includes/ui/ui_view.inc");
//----------------------------------------------------------------------------------------------------
//----------------------------------------------------------------------------------------------------
-// trial_inquiry_controls();
print_list_of_journal_entries();
//----------------------------------------------------------------------------------------------------
print_list_of_journal_entries();
//----------------------------------------------------------------------------------------------------
@@
-35,12
+34,16
@@
function print_list_of_journal_entries()
{
global $path_to_root;
{
global $path_to_root;
- include_once($path_to_root . "/reporting/includes/pdf_report.inc");
-
$from = $_POST['PARAM_0'];
$to = $_POST['PARAM_1'];
$systype = $_POST['PARAM_2'];
$comments = $_POST['PARAM_3'];
$from = $_POST['PARAM_0'];
$to = $_POST['PARAM_1'];
$systype = $_POST['PARAM_2'];
$comments = $_POST['PARAM_3'];
+ $destination = $_POST['PARAM_4'];
+ if ($destination)
+ include_once($path_to_root . "/reporting/includes/excel_report.inc");
+ else
+ include_once($path_to_root . "/reporting/includes/pdf_report.inc");
+
$dec = user_price_dec();
$cols = array(0, 100, 240, 300, 400, 460, 520, 580);
$dec = user_price_dec();
$cols = array(0, 100, 240, 300, 400, 460, 520, 580);
@@
-55,7
+58,7
@@
function print_list_of_journal_entries()
2 => array('text' => _('Type'), 'from' => systypes::name($systype),
'to' => ''));
2 => array('text' => _('Type'), 'from' => systypes::name($systype),
'to' => ''));
- $rep = new FrontReport(_('List of Journal Entries'), "JournalEntries
.pdf
", user_pagesize());
+ $rep = new FrontReport(_('List of Journal Entries'), "JournalEntries", user_pagesize());
$rep->Font();
$rep->Info($params, $cols, $headers, $aligns);
$rep->Font();
$rep->Info($params, $cols, $headers, $aligns);
@@
-66,10
+69,10
@@
function print_list_of_journal_entries()
$trans = get_gl_transactions($from, $to, -1, null, 0, 0, $systype);
$trans = get_gl_transactions($from, $to, -1, null, 0, 0, $systype);
- $typeno = 0;
+ $typeno =
$type =
0;
while ($myrow=db_fetch($trans))
{
while ($myrow=db_fetch($trans))
{
- if ($typeno != $myrow['type_no'])
+ if ($type
!= $myrow['type'] || $type
no != $myrow['type_no'])
{
if ($typeno != 0)
{
{
if ($typeno != 0)
{
@@
-77,9
+80,10
@@
function print_list_of_journal_entries()
$rep->NewLine();
}
$typeno = $myrow['type_no'];
$rep->NewLine();
}
$typeno = $myrow['type_no'];
+ $type = $myrow['type'];
$TransName = systypes::name($myrow['type']);
$rep->TextCol(0, 2, $TransName . " # " . $myrow['type_no']);
$TransName = systypes::name($myrow['type']);
$rep->TextCol(0, 2, $TransName . " # " . $myrow['type_no']);
- $rep->
TextCol(2, 3, sql2date($myrow['tran_date'])
);
+ $rep->
DateCol(2, 3, $myrow['tran_date'], true
);
$coms = payment_person_types::person_name($myrow["person_type_id"],$myrow["person_id"]);
$memo = get_comments_string($myrow['type'], $myrow['type_no']);
if ($memo != '')
$coms = payment_person_types::person_name($myrow["person_type_id"],$myrow["person_id"]);
$memo = get_comments_string($myrow['type'], $myrow['type_no']);
if ($memo != '')
@@
-96,9
+100,9
@@
function print_list_of_journal_entries()
$rep->TextCol(2, 3, $dim_str);
$rep->TextCol(3, 4, $myrow['memo_']);
if ($myrow['amount'] > 0.0)
$rep->TextCol(2, 3, $dim_str);
$rep->TextCol(3, 4, $myrow['memo_']);
if ($myrow['amount'] > 0.0)
- $rep->
TextCol(4, 5, number_format2(abs($myrow['amount']), $dec)
);
+ $rep->
AmountCol(4, 5, abs($myrow['amount']), $dec
);
else
else
- $rep->
TextCol(5, 6, number_format2(abs($myrow['amount']), $dec)
);
+ $rep->
AmountCol(5, 6, abs($myrow['amount']), $dec
);
$rep->NewLine(1, 2);
}
$rep->Line($rep->row + 4);
$rep->NewLine(1, 2);
}
$rep->Line($rep->row + 4);