Small adjustments to Bank Statement and GL Transactions Reports

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index e2eff5d35a3e2994f1fcea4346fd5be91f23fc22..cbb0df69a4eb3e748d39765bc184303c5ebaced6 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,13 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+22-Jan-2010 Tom Hallman/Joe Hunt
+! Small adjustments to Bank Statements and GL Transactions Reports
+$ /reporting/rep601.php
+  /reporting/rep704.php
+! Layout fix for Report Selectors in when running in Windows OS.
+$ /reporting/includes/reports_classes.inc
+
 20-Jan-2010 Joe Hunt
 ! Put a heavy warning on marking the checkbox 'Allow Negative Inventory'.
 $ /admin/gl_setup.php

diff --git a/reporting/includes/reports_classes.inc b/reporting/includes/reports_classes.inc
index cde5447ddb11c44177cb8fdd5f84402a077f95bd..d26fd2ad044157c7a089f7c831b63c4f28f0eb38 100644 (file)
--- a/reporting/includes/reports_classes.inc
+++ b/reporting/includes/reports_classes.inc
@@ -64,10 +64,9 @@ class BoxReports
        
                                        $st_params = "<table border=0><tr><td>\n"
                                                . "<form method='POST' action='$action' target='_blank'>\n";
-                                       $st_params .= hidden('REP_ID', $report->id, false);
                                        $st_params .= submit('Rep'.$report->id,  
                                                _("Display: ") . access_string($report->name, true),
-                                               false, '', $pdf_debug ? false : 'default') . '<br><br>';
+                                               false, '', $pdf_debug ? false : 'default') . hidden('REP_ID', $report->id, false).'<br><br>';
                                        $st_params .= $this->getOptions($report->get_controls());
                                        $st_params .= "\n</form></td></tr></table>\n";
                                        set_focus('Rep'.$report->id);

diff --git a/reporting/rep601.php b/reporting/rep601.php
index 893c8d9d29daae54f64af6ab9c263d1c469d1382..7e443fb29b0cebacee938e6054a06ef1fbd0aac9 100644 (file)
--- a/reporting/rep601.php
+++ b/reporting/rep601.php
@@ -106,6 +106,10 @@ function print_bank_transactions()
                $rep->NewLine(2);
                if ($rows > 0)
                {
+                       // Keep a running total as we loop through
+                       // the transactions.
+                       $total_debit = $total_credit = 0;                       
+                       
                        while ($myrow=db_fetch($trans))
                        {
                                $total += $myrow['amount'];
@@ -116,9 +120,15 @@ function print_bank_transactions()
                                $rep->DateCol(3, 4,     $myrow["trans_date"], true);
                                $rep->TextCol(4, 5,     payment_person_name($myrow["person_type_id"],$myrow["person_id"], false));
                                if ($myrow['amount'] > 0.0)
+                               {
                                        $rep->AmountCol(5, 6, abs($myrow['amount']), $dec);
+                                       $total_debit += abs($myrow['amount']);
+                               }
                                else
+                               {
                                        $rep->AmountCol(6, 7, abs($myrow['amount']), $dec);
+                                       $total_credit += abs($myrow['amount']);
+                               }
                                $rep->AmountCol(7, 8, $total, $dec);
                                $rep->NewLine();
                                if ($rep->row < $rep->bottomMargin + $rep->lineHeight)
@@ -129,6 +139,13 @@ function print_bank_transactions()
                        }
                        $rep->NewLine();
                }
+               
+               // Print totals for the debit and credit columns.
+               $rep->TextCol(3, 5, _("Total Debit / Credit"));
+               $rep->AmountCol(5, 6, $total_debit, $dec);
+               $rep->AmountCol(6, 7, $total_credit, $dec);
+               $rep->NewLine(2);
+
                $rep->Font('bold');
                $rep->TextCol(3, 5,     _("Ending Balance"));
                if ($total > 0.0)
@@ -138,6 +155,14 @@ function print_bank_transactions()
                $rep->Font();
                $rep->Line($rep->row - $rep->lineHeight + 4);
                $rep->NewLine(2, 1);
+               
+               // Print the difference between starting and ending balances.
+               $net_change = ($total - $prev_balance); 
+               $rep->TextCol(3, 5, _("Net Change"));
+               if ($total > 0.0)
+                       $rep->AmountCol(5, 6, $net_change, $dec, 0, 0, 0, 0, null, 1, True);
+               else
+                       $rep->AmountCol(6, 7, $net_change, $dec, 0, 0, 0, 0, null, 1, True);
        }
        $rep->End();
 }

diff --git a/reporting/rep704.php b/reporting/rep704.php
index 8986237d2ebc4f18cb32594b1f46bd413e005a9c..b6b12c38cf9204a65d29038435abb3eb5315375a 100644 (file)
--- a/reporting/rep704.php
+++ b/reporting/rep704.php
@@ -66,21 +66,22 @@ function print_GL_transactions()
        $rep = new FrontReport(_('GL Account Transactions'), "GLAccountTransactions", user_pagesize());
        $dec = user_price_dec();
 
-       $cols = array(0, 80, 100, 150, 210, 280, 340, 400, 450, 510, 570);
+  //$cols = array(0, 80, 100, 150, 210, 280, 340, 400, 450, 510, 570);
+       $cols = array(0, 65, 105, 125, 175, 230, 290, 345, 405, 465, 525);
        //------------0--1---2---3----4----5----6----7----8----9----10-------
        //-----------------------dim1-dim2-----------------------------------
        //-----------------------dim1----------------------------------------
        //-------------------------------------------------------------------
-       $aligns = array('left', 'left', 'left', 'left', 'left', 'left', 'right', 'right', 'right');
+       $aligns = array('left', 'left', 'left', 'left', 'left', 'left', 'left', 'right', 'right', 'right');
 
        if ($dim == 2)
-               $headers = array(_('Type'),     _('#'), _('Date'), _('Dimension')." 1", _('Dimension')." 2",
+               $headers = array(_('Type'),     _('Ref'), _('#'),       _('Date'), _('Dimension')." 1", _('Dimension')." 2",
                        _('Person/Item'), _('Debit'),   _('Credit'), _('Balance'));
        elseif ($dim == 1)
-               $headers = array(_('Type'),     _('#'), _('Date'), _('Dimension'), "", _('Person/Item'),
+               $headers = array(_('Type'),     _('Ref'), _('#'),       _('Date'), _('Dimension'), "", _('Person/Item'),
                        _('Debit'),     _('Credit'), _('Balance'));
        else
-               $headers = array(_('Type'),     _('#'), _('Date'), "", "", _('Person/Item'),
+               $headers = array(_('Type'),     _('Ref'), _('#'),       _('Date'), "", "", _('Person/Item'),
                        _('Debit'),     _('Credit'), _('Balance'));
 
        if ($dim == 2)
@@ -132,12 +133,12 @@ function print_GL_transactions()
                if ($prev_balance == 0.0 && $rows == 0)
                        continue;
                $rep->Font('bold');
-               $rep->TextCol(0, 3,     $account['account_code'] . " " . $account['account_name']);
-               $rep->TextCol(3, 5, _('Opening Balance'));
+               $rep->TextCol(0, 4,     $account['account_code'] . " " . $account['account_name'], -2);
+               $rep->TextCol(4, 6, _('Opening Balance'));
                if ($prev_balance > 0.0)
-                       $rep->AmountCol(6, 7, abs($prev_balance), $dec);
-               else
                        $rep->AmountCol(7, 8, abs($prev_balance), $dec);
+               else
+                       $rep->AmountCol(8, 9, abs($prev_balance), $dec);
                $rep->Font();
                $total = $prev_balance;
                $rep->NewLine(2);
@@ -147,19 +148,21 @@ function print_GL_transactions()
                        {
                                $total += $myrow['amount'];
 
-                               $rep->TextCol(0, 1, $systypes_array[$myrow["type"]]);
-                               $rep->TextCol(1, 2,     $myrow['type_no']);
-                               $rep->DateCol(2, 3,     $myrow["tran_date"], true);
+                               $rep->TextCol(0, 1, $systypes_array[$myrow["type"]], -2);
+                               $reference = get_reference($myrow["type"], $myrow["type_no"]);
+                               $rep->TextCol(1, 2, $reference);
+                               $rep->TextCol(2, 3,     $myrow['type_no'], -2);
+                               $rep->DateCol(3, 4,     $myrow["tran_date"], true);
                                if ($dim >= 1)
-                                       $rep->TextCol(3, 4,     get_dimension_string($myrow['dimension_id']));
+                                       $rep->TextCol(4, 5,     get_dimension_string($myrow['dimension_id']));
                                if ($dim > 1)
-                                       $rep->TextCol(4, 5,     get_dimension_string($myrow['dimension2_id']));
-                               $rep->TextCol(5, 6,     payment_person_name($myrow["person_type_id"],$myrow["person_id"], false));
+                                       $rep->TextCol(5, 6,     get_dimension_string($myrow['dimension2_id']));
+                               $rep->TextCol(6, 7,     payment_person_name($myrow["person_type_id"],$myrow["person_id"], false));
                                if ($myrow['amount'] > 0.0)
-                                       $rep->AmountCol(6, 7, abs($myrow['amount']), $dec);
-                               else
                                        $rep->AmountCol(7, 8, abs($myrow['amount']), $dec);
-                               $rep->TextCol(8, 9,     number_format2($total, $dec));
+                               else
+                                       $rep->AmountCol(8, 9, abs($myrow['amount']), $dec);
+                               $rep->TextCol(9, 10, number_format2($total, $dec));
                                $rep->NewLine();
                                if ($rep->row < $rep->bottomMargin + $rep->lineHeight)
                                {
@@ -170,11 +173,11 @@ function print_GL_transactions()
                        $rep->NewLine();
                }
                $rep->Font('bold');
-               $rep->TextCol(3, 5,     _("Ending Balance"));
+               $rep->TextCol(4, 6,     _("Ending Balance"));
                if ($total > 0.0)
-                       $rep->AmountCol(6, 7, abs($total), $dec);
-               else
                        $rep->AmountCol(7, 8, abs($total), $dec);
+               else
+                       $rep->AmountCol(8, 9, abs($total), $dec);
                $rep->Font();
                $rep->Line($rep->row - $rep->lineHeight + 4);
                $rep->NewLine(2, 1);