Changed Report Statements to accept selector Outstanding Only

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 7d7b51a873c6e19d513c67d3a48d0d04094ad8d6..8b2325306e765c226d19d285e4cfa2496cbecd05 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,11 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+21-Jul-2010 Joe Hunt
+! Changed Report Statements to accept selector Outstanding Only
+$ /reporting/reports_main.php
+  /reporting/rep108.php
+  
 19-Jul-2010 Joe Hunt
 + Added Revenue / Cost Accruals to be included in core FA
 $ /applications/generalledger.php

diff --git a/reporting/rep108.php b/reporting/rep108.php
index 55e6e0e3b6c611603e4d44fb04fa4aa7acc27d21..5becd70482eea435882aea990d4cd04ca730d967 100644 (file)
--- a/reporting/rep108.php
+++ b/reporting/rep108.php
@@ -1,12 +1,12 @@
 <?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
-       Released under the terms of the GNU General Public License, GPL, 
-       as published by the Free Software Foundation, either version 3 
+       Released under the terms of the GNU General Public License, GPL,
+       as published by the Free Software Foundation, either version 3
        of the License, or (at your option) any later version.
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 $page_security = 'SA_CUSTSTATREP';
@@ -30,10 +30,10 @@ print_statements();
 
 //----------------------------------------------------------------------------------------------------
 
-function getTransactions($debtorno, $date)
+function getTransactions($debtorno, $date, $outstanding)
 {
     $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_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)
                                AS TotalAmount, ".TB_PREF."debtor_trans.alloc AS Allocated,
                                ((".TB_PREF."debtor_trans.type = ".ST_SALESINVOICE.")
@@ -41,9 +41,12 @@ function getTransactions($debtorno, $date)
                        FROM ".TB_PREF."debtor_trans
                        WHERE ".TB_PREF."debtor_trans.tran_date <= '$date' AND ".TB_PREF."debtor_trans.debtor_no = ".db_escape($debtorno)."
                                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
-                               ORDER BY ".TB_PREF."debtor_trans.tran_date";
+                               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)
+               $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";
 
     return db_query($sql,"No transactions were returned");
 }
@@ -58,8 +61,9 @@ function print_statements()
 
        $customer = $_POST['PARAM_0'];
        $currency = $_POST['PARAM_1'];
-       $email = $_POST['PARAM_2'];
-       $comments = $_POST['PARAM_3'];
+       $outstanding = $_POST['PARAM_2'];
+       $email = $_POST['PARAM_3'];
+       $comments = $_POST['PARAM_4'];
 
        $dec = user_price_dec();
 
@@ -84,7 +88,7 @@ function print_statements()
                $rep->Info($params, $cols, null, $aligns);
        }
 
-       $sql = "SELECT debtor_no, name AS DebtorName, address, tax_id, email, curr_code, curdate() AS tran_date FROM ".TB_PREF."debtors_master";
+       $sql = "SELECT debtor_no, name AS DebtorName, address, tax_id, curr_code, curdate() AS tran_date FROM ".TB_PREF."debtors_master";
        if ($customer != ALL_NUMERIC)
                $sql .= " WHERE debtor_no = ".db_escape($customer);
        else
@@ -97,7 +101,7 @@ function print_statements()
 
                $myrow['order_'] = "";
 
-               $TransResult = getTransactions($myrow['debtor_no'], $date);
+               $TransResult = getTransactions($myrow['debtor_no'], $date, $outstanding);
                $baccount = get_default_bank_account($myrow['curr_code']);
                $params['bankaccount'] = $baccount['id'];
                if (db_num_rows($TransResult) == 0)

diff --git a/reporting/reports_main.php b/reporting/reports_main.php
index d60dfe2abb24c480d18d7799c3f1a3831cdc6d1f..635505c3467b3db880a8297af94fb7b66f202c75 100644 (file)
--- a/reporting/reports_main.php
+++ b/reporting/reports_main.php
@@ -1,12 +1,12 @@
 <?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
-       Released under the terms of the GNU General Public License, GPL, 
-       as published by the Free Software Foundation, either version 3 
+       Released under the terms of the GNU General Public License, GPL,
+       as published by the Free Software Foundation, either version 3
        of the License, or (at your option) any later version.
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 $path_to_root="..";
@@ -90,6 +90,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',
                        _('Email Customers') => 'YES_NO',
                        _('Comments') => 'TEXTBOX'));
 $reports->addReport(RC_CUSTOMER, 109, _('&Print Sales Orders'),