X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep203.php;h=3ad684adc96085c7afd7b27bdb3a8c530d900437;hb=11e485e4a7c5f12c9424713b7330815a9cc5e4ae;hp=c276188f8a6d0befbcb2cab9f91cb57c31c0fb85;hpb=ad96cd0abbfd826592b851b8e0cb6d89e450fdf4;p=fa-stable.git diff --git a/reporting/rep203.php b/reporting/rep203.php index c276188f..3ad684ad 100644 --- a/reporting/rep203.php +++ b/reporting/rep203.php @@ -9,7 +9,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; +$page_security = 'SA_SUPPPAYMREP'; // ---------------------------------------------------------------- // $ Revision: 2.0 $ // Creator: Joe Hunt @@ -31,8 +31,7 @@ function getTransactions($supplier, $date) { $date = date2sql($date); - $sql = "SELECT ".TB_PREF."sys_types.type_name, - ".TB_PREF."supp_trans.supp_reference, + $sql = "SELECT ".TB_PREF."supp_trans.supp_reference, ".TB_PREF."supp_trans.tran_date, ".TB_PREF."supp_trans.due_date, ".TB_PREF."supp_trans.trans_no, @@ -40,10 +39,8 @@ function getTransactions($supplier, $date) ".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 . "' + FROM ".TB_PREF."supp_trans + WHERE ".TB_PREF."supp_trans.supplier_id = '" . $supplier . "' 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, @@ -134,7 +131,7 @@ function print_payment_report() else $rate = 1.0; $rep->NewLine(1, 2); - $rep->TextCol(0, 1, $trans['type_name']); + $rep->TextCol(0, 1, systypes::name($trans['type'])); $rep->TextCol(1, 2, $trans['supp_reference']); if ($trans['type'] == 20) $rep->DateCol(2, 3, $trans['due_date'], true);