X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep108.php;h=b5232a1286584e3435d072f050180722360d2bc0;hb=11e485e4a7c5f12c9424713b7330815a9cc5e4ae;hp=0f180dffe03ea770bcf7691c3cd093a02dc2f13b;hpb=a5242af68e65661edb7175412444dce536a7f311;p=fa-stable.git diff --git a/reporting/rep108.php b/reporting/rep108.php index 0f180dff..b5232a12 100644 --- a/reporting/rep108.php +++ b/reporting/rep108.php @@ -9,7 +9,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; +$page_security = 'SA_CUSTSTATREP'; // ---------------------------------------------------------------- // $ Revision: 2.0 $ // Creator: Joe Hunt @@ -25,21 +25,19 @@ include_once($path_to_root . "/sales/includes/sales_db.inc"); //---------------------------------------------------------------------------------------------------- -// trial_inquiry_controls(); print_statements(); //---------------------------------------------------------------------------------------------------- function getTransactions($debtorno, $date) { - $sql = "SELECT ".TB_PREF."debtor_trans.*, ".TB_PREF."sys_types.type_name, + $sql = "SELECT ".TB_PREF."debtor_trans.*, (".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_discount) AS TotalAmount, ".TB_PREF."debtor_trans.alloc AS Allocated, ((".TB_PREF."debtor_trans.type = 10) AND ".TB_PREF."debtor_trans.due_date < '$date') AS OverDue - FROM ".TB_PREF."debtor_trans, ".TB_PREF."sys_types + FROM ".TB_PREF."debtor_trans WHERE ".TB_PREF."debtor_trans.tran_date <= '$date' AND ".TB_PREF."debtor_trans.debtor_no = '$debtorno' - AND ".TB_PREF."debtor_trans.type = ".TB_PREF."sys_types.type_id AND ".TB_PREF."debtor_trans.type <> 13 ORDER BY ".TB_PREF."debtor_trans.tran_date"; @@ -79,7 +77,7 @@ function print_statements() if ($email == 0) { - $rep = new FrontReport(_('STATEMENT'), "StatementBulk.pdf", user_pagesize()); + $rep = new FrontReport(_('STATEMENT'), "StatementBulk", user_pagesize()); $rep->currency = $cur; $rep->Font(); $rep->Info($params, $cols, null, $aligns); @@ -132,7 +130,7 @@ function print_statements() $DisplayAlloc = number_format2($myrow2["Allocated"],$dec); $DisplayNet = number_format2($myrow2["TotalAmount"] - $myrow2["Allocated"],$dec); - $rep->TextCol(0, 1, $myrow2['type_name'], -2); + $rep->TextCol(0, 1, systypes::name($myrow2['type']), -2); $rep->TextCol(1, 2, $myrow2['reference'], -2); $rep->TextCol(2, 3, sql2date($myrow2['tran_date']), -2); if ($myrow2['type'] == 10)