X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep203.php;h=c276188f8a6d0befbcb2cab9f91cb57c31c0fb85;hb=4a4ad9da800763d6ac61c8458a3c8bbc53f2436f;hp=8c4b2aed14a76d8c196a82edef2754e23fcce45f;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git diff --git a/reporting/rep203.php b/reporting/rep203.php index 8c4b2aed..c276188f 100644 --- a/reporting/rep203.php +++ b/reporting/rep203.php @@ -1,5 +1,14 @@ . +***********************************************************************/ $page_security = 2; // ---------------------------------------------------------------- // $ Revision: 2.0 $ @@ -7,35 +16,36 @@ $page_security = 2; // date_: 2005-05-19 // Title: Payment Report // ---------------------------------------------------------------- -$path_to_root="../"; +$path_to_root=".."; -include_once($path_to_root . "includes/session.inc"); -include_once($path_to_root . "includes/date_functions.inc"); -include_once($path_to_root . "includes/data_checks.inc"); -include_once($path_to_root . "gl/includes/gl_db.inc"); +include_once($path_to_root . "/includes/session.inc"); +include_once($path_to_root . "/includes/date_functions.inc"); +include_once($path_to_root . "/includes/data_checks.inc"); +include_once($path_to_root . "/gl/includes/gl_db.inc"); //---------------------------------------------------------------------------------------------------- -// trial_inquiry_controls(); print_payment_report(); function getTransactions($supplier, $date) { $date = date2sql($date); - + $sql = "SELECT ".TB_PREF."sys_types.type_name, ".TB_PREF."supp_trans.supp_reference, + ".TB_PREF."supp_trans.tran_date, ".TB_PREF."supp_trans.due_date, ".TB_PREF."supp_trans.trans_no, ".TB_PREF."supp_trans.type, - (".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst - ".TB_PREF."supp_trans.alloc) AS Balance, - (".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst ) AS TranTotal + ".TB_PREF."supp_trans.rate, + (ABS(".TB_PREF."supp_trans.ov_amount) + ABS(".TB_PREF."supp_trans.ov_gst) - ".TB_PREF."supp_trans.alloc) AS Balance, + (ABS(".TB_PREF."supp_trans.ov_amount) + ABS(".TB_PREF."supp_trans.ov_gst) ) AS TranTotal FROM ".TB_PREF."supp_trans, ".TB_PREF."sys_types WHERE ".TB_PREF."sys_types.type_id = ".TB_PREF."supp_trans.type AND ".TB_PREF."supp_trans.supplier_id = '" . $supplier . "' - AND ".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst - ".TB_PREF."supp_trans.alloc != 0 - AND ".TB_PREF."supp_trans.due_date <='" . $date . "' + AND ABS(".TB_PREF."supp_trans.ov_amount) + ABS(".TB_PREF."supp_trans.ov_gst) - ".TB_PREF."supp_trans.alloc != 0 + AND ".TB_PREF."supp_trans.tran_date <='" . $date . "' ORDER BY ".TB_PREF."supp_trans.type, ".TB_PREF."supp_trans.trans_no"; @@ -48,19 +58,21 @@ 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']; - $tosupp = $_POST['PARAM_2']; - $currency = $_POST['PARAM_3']; - $comments = $_POST['PARAM_4']; - - if ($fromsupp == null) - $fromsupp = 0; - if ($tosupp == null) - $tosupp = 0; - + $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'); + else + $from = get_supplier_name($fromsupp); + $dec = user_price_dec(); if ($currency == reserved_words::get_all()) @@ -80,68 +92,77 @@ function print_payment_report() $params = array( 0 => $comments, 1 => array('text' => _('End Date'), 'from' => $to, 'to' => ''), - 2 => array('text' => _('Supplier'), 'from' => get_supplier_name($fromsupp), - 'to' => get_supplier_name($tosupp)), + 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); $rep->Header(); $total = array(); - $grandtotal = array(); + $grandtotal = array(0,0); $sql = "SELECT supplier_id, supp_name AS name, curr_code, ".TB_PREF."payment_terms.terms FROM ".TB_PREF."suppliers, ".TB_PREF."payment_terms - WHERE supplier_id>=$fromsupp AND supplier_id<=$tosupp AND ".TB_PREF."suppliers.payment_terms = ".TB_PREF."payment_terms.terms_indicator + WHERE "; + if ($fromsupp != reserved_words::get_all_numeric()) + $sql .= "supplier_id=$fromsupp AND "; + $sql .= "".TB_PREF."suppliers.payment_terms = ".TB_PREF."payment_terms.terms_indicator ORDER BY supp_name"; $result = db_query($sql, "The customers could not be retrieved"); - - while ($myrow=db_fetch($result)) + + while ($myrow=db_fetch($result)) { if (!$convert && $currency != $myrow['curr_code']) continue; $rep->fontSize += 2; $rep->TextCol(0, 6, $myrow['name'] . " - " . $myrow['terms']); if ($convert) - { - $rate = get_exchange_rate_from_home_currency($myrow['curr_code'], $to); $rep->TextCol(6, 7, $myrow['curr_code']); - } - else - $rate = 1.0; $rep->fontSize -= 2; $rep->NewLine(1, 2); $res = getTransactions($myrow['supplier_id'], $to); if (db_num_rows($res)==0) continue; $rep->Line($rep->row + 4); - $total[0] = $total[1] = $total[2] = $total[3] = 0.0; + $total[0] = $total[1] = 0.0; while ($trans=db_fetch($res)) { + if ($convert) + $rate = $trans['rate']; + else + $rate = 1.0; $rep->NewLine(1, 2); $rep->TextCol(0, 1, $trans['type_name']); $rep->TextCol(1, 2, $trans['supp_reference']); - $rep->TextCol(2, 3, sql2date($trans['due_date'])); - $item[0] = Abs($trans['TranTotal']) * $rate; - $rep->TextCol(6, 7, number_format2($item[0], $dec)); + if ($trans['type'] == 20) + $rep->DateCol(2, 3, $trans['due_date'], true); + else + $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->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]; $grandtotal[$i] += $item[$i]; - } + } } $rep->Line($rep->row - 8); $rep->NewLine(2); $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); $rep->NewLine(2); } @@ -149,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(); }