X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep203.php;h=c276188f8a6d0befbcb2cab9f91cb57c31c0fb85;hb=5dec41f0d87e407e1c9ffcb8eb63b92e4e471a9b;hp=b483f6556630e220af240dc49e3126d5542fbb67;hpb=a5242af68e65661edb7175412444dce536a7f311;p=fa-stable.git diff --git a/reporting/rep203.php b/reporting/rep203.php index b483f655..c276188f 100644 --- a/reporting/rep203.php +++ b/reporting/rep203.php @@ -25,7 +25,6 @@ include_once($path_to_root . "/gl/includes/gl_db.inc"); //---------------------------------------------------------------------------------------------------- -// trial_inquiry_controls(); print_payment_report(); function getTransactions($supplier, $date) @@ -59,12 +58,15 @@ function print_payment_report() { global $path_to_root; - include_once($path_to_root . "/reporting/includes/pdf_report.inc"); - $to = $_POST['PARAM_0']; $fromsupp = $_POST['PARAM_1']; $currency = $_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"); if ($fromsupp == reserved_words::get_all_numeric()) $from = _('All'); @@ -93,7 +95,7 @@ function print_payment_report() 2 => array('text' => _('Supplier'), 'from' => $from, 'to' => ''), 3 => array( 'text' => _('Currency'),'from' => $currency, 'to' => '')); - $rep = new FrontReport(_('Payment Report'), "PaymentReport.pdf", user_pagesize()); + $rep = new FrontReport(_('Payment Report'), "PaymentReport", user_pagesize()); $rep->Font(); $rep->Info($params, $cols, $headers, $aligns); @@ -135,18 +137,18 @@ function print_payment_report() $rep->TextCol(0, 1, $trans['type_name']); $rep->TextCol(1, 2, $trans['supp_reference']); if ($trans['type'] == 20) - $rep->TextCol(2, 3, sql2date($trans['due_date'])); + $rep->DateCol(2, 3, $trans['due_date'], true); else - $rep->TextCol(2, 3, sql2date($trans['tran_date'])); + $rep->DateCol(2, 3, $trans['tran_date'], true); if ($trans['type'] != 20) { $trans['TranTotal'] = -$trans['TranTotal']; $trans['Balance'] = -$trans['Balance']; } $item[0] = $trans['TranTotal'] * $rate; - $rep->TextCol(6, 7, number_format2($item[0], $dec)); + $rep->AmountCol(6, 7, $item[0], $dec); $item[1] = $trans['Balance'] * $rate; - $rep->TextCol(7, 8, number_format2($item[1], $dec)); + $rep->AmountCol(7, 8, $item[1], $dec); for ($i = 0; $i < 2; $i++) { $total[$i] += $item[$i]; @@ -158,7 +160,7 @@ function print_payment_report() $rep->TextCol(0, 3, _('Total')); for ($i = 0; $i < 2; $i++) { - $rep->TextCol($i + 6, $i + 7, number_format2($total[$i], $dec)); + $rep->AmountCol($i + 6, $i + 7, $total[$i], $dec); $total[$i] = 0.0; } $rep->Line($rep->row - 4); @@ -168,8 +170,9 @@ function print_payment_report() $rep->TextCol(0, 3, _('Grand Total')); $rep->fontSize -= 2; for ($i = 0; $i < 2; $i++) - $rep->TextCol($i + 6, $i + 7,number_format2($grandtotal[$i], $dec)); + $rep->AmountCol($i + 6, $i + 7,$grandtotal[$i], $dec); $rep->Line($rep->row - 4); + $rep->NewLine(); $rep->End(); }