Changed Customer Balance and Supplier Balance to period select with Open Balance

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 75df47c18fd237392fca7d9032ee822484ea4d73..398a1b4af38f69f50eb577f8d42e18051e246a49 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,12 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+01-May-2009 Joe Hunt
+! Changed Customer Balance and Supplier Balance to period select with Open Balance
+$ /reporting/reports_main.php
+  /reporting/rep101.php
+  /reporting/rep201.php
+  
 30-Apr-2009 Janusz Dobrowolski
 ! Merged changes from main trunk  2.1.1-2.1.2 (see below)
 

diff --git a/reporting/rep101.php b/reporting/rep101.php
index d8ad7d6482609716822809baf196877370b5aefd..82c48c5af8b5f8774721e63da9eaeec0d04ad543 100644 (file)
--- a/reporting/rep101.php
+++ b/reporting/rep101.php
@@ -29,19 +29,43 @@ include_once($path_to_root . "/gl/includes/gl_db.inc");
 // trial_inquiry_controls();
 print_customer_balances();
 
-function get_transactions($debtorno, $date)
+function get_open_balance($debtorno, $to)
 {
-       $date = date2sql($date);
+       $to = date2sql($to);
+
+    $sql = "SELECT SUM(IF(".TB_PREF."debtor_trans.type = 10, (".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + 
+       ".TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_discount) * rate, 0)) AS charges,
+       SUM(IF(".TB_PREF."debtor_trans.type <> 10, (".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + 
+       ".TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_discount) * rate * -1, 0)) AS credits,
+               SUM(".TB_PREF."debtor_trans.alloc * rate) AS Allocated,
+               SUM(IF(".TB_PREF."debtor_trans.type = 10, (".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + 
+       ".TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_discount - ".TB_PREF."debtor_trans.alloc) * rate, 
+       ((".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight + 
+       ".TB_PREF."debtor_trans.ov_discount) * -1 + ".TB_PREF."debtor_trans.alloc) * rate)) AS OutStanding
+               FROM ".TB_PREF."debtor_trans
+       WHERE ".TB_PREF."debtor_trans.tran_date < '$to'
+               AND ".TB_PREF."debtor_trans.debtor_no = '$debtorno'
+               AND ".TB_PREF."debtor_trans.type <> 13 GROUP BY '$debtorno'";
+
+    $result = db_query($sql,"No transactions were returned");
+    return db_fetch($result);
+}
+
+function get_transactions($debtorno, $from, $to)
+{
+       $from = date2sql($from);
+       $to = date2sql($to);
 
     $sql = "SELECT ".TB_PREF."debtor_trans.*, ".TB_PREF."sys_types.type_name,
                (".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
+               AND ".TB_PREF."debtor_trans.due_date < '$to') AS OverDue
        FROM ".TB_PREF."debtor_trans, ".TB_PREF."sys_types
-       WHERE ".TB_PREF."debtor_trans.tran_date <= '$date'
-       AND ".TB_PREF."debtor_trans.debtor_no = '$debtorno'
-       AND ".TB_PREF."debtor_trans.type != 13
+       WHERE ".TB_PREF."debtor_trans.tran_date >= '$from'
+               AND ".TB_PREF."debtor_trans.tran_date <= '$to'
+               AND ".TB_PREF."debtor_trans.debtor_no = '$debtorno'
+               AND ".TB_PREF."debtor_trans.type <> 13
        AND ".TB_PREF."debtor_trans.type = ".TB_PREF."sys_types.type_id
        ORDER BY ".TB_PREF."debtor_trans.tran_date";
 
@@ -54,20 +78,21 @@ function print_customer_balances()
 {
     global $path_to_root;
 
-    $to = $_POST['PARAM_0'];
-    $fromcust = $_POST['PARAM_1'];
-    $currency = $_POST['PARAM_2'];
-    $comments = $_POST['PARAM_3'];
-       $destination = $_POST['PARAM_4'];
+    $from = $_POST['PARAM_0'];
+    $to = $_POST['PARAM_1'];
+    $fromcust = $_POST['PARAM_2'];
+    $currency = $_POST['PARAM_3'];
+    $comments = $_POST['PARAM_4'];
+       $destination = $_POST['PARAM_5'];
        if ($destination)
                include_once($path_to_root . "/reporting/includes/excel_report.inc");
        else
                include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
        if ($fromcust == reserved_words::get_all_numeric())
-               $from = _('All');
+               $cust = _('All');
        else
-               $from = get_customer_name($fromcust);
+               $cust = get_customer_name($fromcust);
     $dec = user_price_dec();
 
        if ($currency == reserved_words::get_all())
@@ -86,8 +111,8 @@ function print_customer_balances()
        $aligns = array('left', 'left', 'left', 'left', 'right', 'right', 'right', 'right');
 
     $params =   array(         0 => $comments,
-                                   1 => array('text' => _('End Date'), 'from' => $to,          'to' => ''),
-                                   2 => array('text' => _('Customer'), 'from' => $from,        'to' => ''),
+                                   1 => array('text' => _('Period'), 'from' => $from,          'to' => $to),
+                                   2 => array('text' => _('Customer'), 'from' => $cust,        'to' => ''),
                                    3 => array('text' => _('Currency'), 'from' => $currency, 'to' => ''));
 
     $rep = new FrontReport(_('Customer Balances'), "CustomerBalances", user_pagesize());
@@ -109,16 +134,32 @@ function print_customer_balances()
                if (!$convert && $currency != $myrow['curr_code'])
                        continue;
                $rep->fontSize += 2;
-               $rep->TextCol(0, 3, $myrow['name']);
+               $rep->TextCol(0, 2, $myrow['name']);
                if ($convert)
-                       $rep->TextCol(3, 4,     $myrow['curr_code']);
+                       $rep->TextCol(2, 3,     $myrow['curr_code']);
                $rep->fontSize -= 2;
+               $bal = get_open_balance($myrow['debtor_no'], $from);
+               $init[0] = $init[1] = 0.0;
+               $rep->TextCol(3, 4,     _("Open Balance"));
+               $init[0] = round2(abs($bal['charges']), $dec);
+               $rep->AmountCol(4, 5, $init[0], $dec);
+               $init[1] = round2(Abs($bal['credits']), $dec);
+               $rep->AmountCol(5, 6, $init[1], $dec);
+               $init[2] = round2($bal['Allocated'], $dec);
+               $rep->AmountCol(6, 7, $init[2], $dec);
+               $init[3] = round2($bal['OutStanding'], $dec);;
+               $rep->AmountCol(7, 8, $init[3], $dec);
+               $total = array(0,0,0,0);
+               for ($i = 0; $i < 4; $i++)
+               {
+                       $total[$i] += $init[$i];
+                       $grandtotal[$i] += $init[$i];
+               }
                $rep->NewLine(1, 2);
-               $res = get_transactions($myrow['debtor_no'], $to);
+               $res = get_transactions($myrow['debtor_no'], $from, $to);
                if (db_num_rows($res)==0)
                        continue;
                $rep->Line($rep->row + 4);
-               $total = array(0,0,0,0);
                while ($trans = db_fetch($res))
                {
                        $rep->NewLine(1, 2);

diff --git a/reporting/rep201.php b/reporting/rep201.php
index 380af70de90695a291a7237e9ec257671aeb3605..9ff6a0c67cb9df122e10a23ab7018020cd7ffffc 100644 (file)
--- a/reporting/rep201.php
+++ b/reporting/rep201.php
@@ -27,17 +27,38 @@ include_once($path_to_root . "/gl/includes/gl_db.inc");
 
 print_supplier_balances();
 
-function getTransactions($supplier_id, $date)
+function get_open_balance($supplier_id, $to)
 {
-       $date = date2sql($date);
+       $to = date2sql($to);
+
+    $sql = "SELECT SUM(IF(".TB_PREF."supp_trans.type = 20, (".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + 
+       ".TB_PREF."supp_trans.ov_discount) * rate, 0)) AS charges,
+       SUM(IF(".TB_PREF."supp_trans.type <> 20, (".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + 
+       ".TB_PREF."supp_trans.ov_discount) * rate, 0)) AS credits,
+               SUM(".TB_PREF."supp_trans.alloc * rate) AS Allocated,
+               SUM((".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + 
+       ".TB_PREF."supp_trans.ov_discount - ".TB_PREF."supp_trans.alloc) * rate) AS OutStanding
+               FROM ".TB_PREF."supp_trans
+       WHERE ".TB_PREF."supp_trans.tran_date < '$to'
+               AND ".TB_PREF."supp_trans.supplier_id = '$supplier_id' GROUP BY supplier_id";
+
+    $result = db_query($sql,"No transactions were returned");
+    return db_fetch($result);
+}
+
+function getTransactions($supplier_id, $from, $to)
+{
+       $from = date2sql($from);
+       $to = date2sql($to);
 
     $sql = "SELECT ".TB_PREF."supp_trans.*, ".TB_PREF."sys_types.type_name,
                                (".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + ".TB_PREF."supp_trans.ov_discount)
                                AS TotalAmount, ".TB_PREF."supp_trans.alloc AS Allocated,
                                ((".TB_PREF."supp_trans.type = 20)
-                                       AND ".TB_PREF."supp_trans.due_date < '$date') AS OverDue
+                                       AND ".TB_PREF."supp_trans.due_date < '$to') AS OverDue
                        FROM ".TB_PREF."supp_trans, ".TB_PREF."sys_types
-                       WHERE ".TB_PREF."supp_trans.tran_date <= '$date' AND ".TB_PREF."supp_trans.supplier_id = '$supplier_id'
+                       WHERE ".TB_PREF."supp_trans.tran_date >= '$from' AND ".TB_PREF."supp_trans.tran_date <= '$to' 
+                       AND ".TB_PREF."supp_trans.supplier_id = '$supplier_id'
                                AND ".TB_PREF."supp_trans.type = ".TB_PREF."sys_types.type_id
                                ORDER BY ".TB_PREF."supp_trans.tran_date";
 
@@ -52,20 +73,21 @@ function print_supplier_balances()
 {
     global $path_to_root;
 
-    $to = $_POST['PARAM_0'];
-    $fromsupp = $_POST['PARAM_1'];
-    $currency = $_POST['PARAM_2'];
-    $comments = $_POST['PARAM_3'];
-       $destination = $_POST['PARAM_4'];
+    $from = $_POST['PARAM_0'];
+    $to = $_POST['PARAM_1'];
+    $fromsupp = $_POST['PARAM_2'];
+    $currency = $_POST['PARAM_3'];
+    $comments = $_POST['PARAM_4'];
+       $destination = $_POST['PARAM_5'];
        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');
+               $supp = _('All');
        else
-               $from = get_supplier_name($fromsupp);
+               $supp = get_supplier_name($fromsupp);
     $dec = user_price_dec();
 
        if ($currency == reserved_words::get_all())
@@ -84,8 +106,8 @@ function print_supplier_balances()
        $aligns = array('left', 'left', 'left', 'left', 'right', 'right', 'right', 'right');
 
     $params =   array(         0 => $comments,
-                                   1 => array('text' => _('End Date'), 'from' => $to, 'to' => ''),
-                                   2 => array('text' => _('Supplier'), 'from' => $from, 'to' => ''),
+                                   1 => array('text' => _('Period'), 'from' => $from, 'to' => $to),
+                                   2 => array('text' => _('Supplier'), 'from' => $supp, 'to' => ''),
                                    3 => array(  'text' => _('Currency'),'from' => $currency, 'to' => ''));
 
     $rep = new FrontReport(_('Supplier Balances'), "SupplierBalances", user_pagesize());
@@ -108,16 +130,32 @@ function print_supplier_balances()
                if (!$convert && $currency != $myrow['curr_code'])
                        continue;
                $rep->fontSize += 2;
-               $rep->TextCol(0, 3, $myrow['name']);
+               $rep->TextCol(0, 2, $myrow['name']);
                if ($convert)
-                       $rep->TextCol(3, 4,     $myrow['curr_code']);
+                       $rep->TextCol(2, 3,     $myrow['curr_code']);
                $rep->fontSize -= 2;
+               $bal = get_open_balance($myrow['supplier_id'], $from);
+               $init[0] = $init[1] = 0.0;
+               $rep->TextCol(3, 4,     _("Open Balance"));
+               $init[0] = round2(abs($bal['charges']), $dec);
+               $rep->AmountCol(4, 5, $init[0], $dec);
+               $init[1] = round2(Abs($bal['credits']), $dec);
+               $rep->AmountCol(5, 6, $init[1], $dec);
+               $init[2] = round2($bal['Allocated'], $dec);
+               $rep->AmountCol(6, 7, $init[2], $dec);
+               $init[3] = round2($bal['OutStanding'], $dec);;
+               $rep->AmountCol(7, 8, $init[3], $dec);
+               $total = array(0,0,0,0);
+               for ($i = 0; $i < 4; $i++)
+               {
+                       $total[$i] += $init[$i];
+                       $grandtotal[$i] += $init[$i];
+               }
                $rep->NewLine(1, 2);
-               $res = getTransactions($myrow['supplier_id'], $to);
+               $res = getTransactions($myrow['supplier_id'], $from, $to);
                if (db_num_rows($res)==0)
                        continue;
                $rep->Line($rep->row + 4);
-               $total[0] = $total[1] = $total[2] = $total[3] = 0.0;
                while ($trans=db_fetch($res))
                {
                        $rep->NewLine(1, 2);

diff --git a/reporting/reports_main.php b/reporting/reports_main.php
index 9eff484c08b228e1f33b0a0c70305600f34964cf..d2ac0bc2e6504071cb492ab8513261365bbe94b0 100644 (file)
--- a/reporting/reports_main.php
+++ b/reporting/reports_main.php
@@ -28,7 +28,8 @@ $dim = get_company_pref('use_dimension');
 
 $reports->addReportClass(_('Customer'));
 $reports->addReport(_('Customer'),101,_('Customer &Balances'),
-       array(  new ReportParam(_('End Date'),'DATE'),
+       array(  new ReportParam(_('Start Date'),'DATEBEGIN'),
+                       new ReportParam(_('End Date'),'DATEENDM'),
                        new ReportParam(_('Customer'),'CUSTOMERS_NO_FILTER'),
                        new ReportParam(_('Currency Filter'),'CURRENCY'),
                        new ReportParam(_('Comments'),'TEXTBOX'),
@@ -101,7 +102,8 @@ $reports->addReport(_('Customer'),109,_('&Print Sales Orders'),
 
 $reports->addReportClass(_('Supplier'));
 $reports->addReport(_('Supplier'),201,_('Supplier &Balances'),
-       array(  new ReportParam(_('End Date'),'DATE'),
+       array(  new ReportParam(_('Start Date'),'DATEBEGIN'),
+                       new ReportParam(_('End Date'),'DATEENDM'),
                        new ReportParam(_('Supplier'),'SUPPLIERS_NO_FILTER'),
                        new ReportParam(_('Currency Filter'),'CURRENCY'),
                        new ReportParam(_('Comments'),'TEXTBOX'),