Changed Print Statements to follow aged customer/supplier list in presentation

diff --git a/reporting/rep108.php b/reporting/rep108.php
index b78f5596d57c0576b953c5f4b845b7e3a6c34da7..e40e29c010287567e6f2553f47dd5fe1658343ee 100644 (file)
--- a/reporting/rep108.php
+++ b/reporting/rep108.php
@@ -30,7 +30,7 @@ print_statements();
 
 //----------------------------------------------------------------------------------------------------
 
-function getTransactions($debtorno, $date, $outstanding)
+function getTransactions($debtorno, $date, $show_also_allocated)
 {
     $sql = "SELECT ".TB_PREF."debtor_trans.*,
                                (".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight +
@@ -43,7 +43,7 @@ function getTransactions($debtorno, $date, $outstanding)
                                AND ".TB_PREF."debtor_trans.type <> ".ST_CUSTDELIVERY."
                                AND (".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight +
                                ".TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount) != 0";
-       if ($outstanding)
+       if (!$show_also_allocated)
                $sql .= " AND ABS(".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight +
                                ".TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount) - alloc <> 0";
        $sql .= " ORDER BY ".TB_PREF."debtor_trans.tran_date";
@@ -61,7 +61,7 @@ function print_statements()
 
        $customer = $_POST['PARAM_0'];
        $currency = $_POST['PARAM_1'];
-       $outstanding = $_POST['PARAM_2'];
+       $show_also_allocated = $_POST['PARAM_2'];
        $email = $_POST['PARAM_3'];
        $comments = $_POST['PARAM_4'];
 
@@ -101,7 +101,7 @@ function print_statements()
 
                $myrow['order_'] = "";
 
-               $TransResult = getTransactions($myrow['debtor_no'], $date, $outstanding);
+               $TransResult = getTransactions($myrow['debtor_no'], $date, $show_also_allocated);
                $baccount = get_default_bank_account($myrow['curr_code']);
                $params['bankaccount'] = $baccount['id'];
                if (db_num_rows($TransResult) == 0)
@@ -152,7 +152,7 @@ function print_statements()
                $nowdue = "1-" . $PastDueDays1 . " " . $doc_Days;
                $pastdue1 = $PastDueDays1 + 1 . "-" . $PastDueDays2 . " " . $doc_Days;
                $pastdue2 = $doc_Over . " " . $PastDueDays2 . " " . $doc_Days;
-               $CustomerRecord = get_customer_details($myrow['debtor_no']);
+               $CustomerRecord = get_customer_details($myrow['debtor_no'], null, $show_also_allocated);
                $str = array($doc_Current, $nowdue, $pastdue1, $pastdue2, $doc_Total_Balance);
                $str2 = array(number_format2(($CustomerRecord["Balance"] - $CustomerRecord["Due"]),$dec),
                        number_format2(($CustomerRecord["Due"]-$CustomerRecord["Overdue1"]),$dec),

diff --git a/reporting/reports_main.php b/reporting/reports_main.php
index ff4944ecc139d810295ae329513a2820e44aa1e4..75a6550941cd42172a73e4578c4860732725896f 100644 (file)
--- a/reporting/reports_main.php
+++ b/reporting/reports_main.php
@@ -107,7 +107,7 @@ $reports->addReport(RC_CUSTOMER, 110, _('Print &Deliveries'),
 $reports->addReport(RC_CUSTOMER, 108, _('Print &Statements'),
        array(  _('Customer') => 'CUSTOMERS_NO_FILTER',
                        _('Currency Filter') => 'CURRENCY',
-                       _('Show Outstanding Only') => 'YES_NO',
+                       _('Show Also Allocated') => 'YES_NO',
                        _('Email Customers') => 'YES_NO',
                        _('Comments') => 'TEXTBOX'));
 $reports->addReport(RC_CUSTOMER, 109, _('&Print Sales Orders'),