[0004212] Work Order Entry: fixed error when voided WO refence is reused.

[fa-stable.git] / reporting / rep601.php

diff --git a/reporting/rep601.php b/reporting/rep601.php
index 66fbbf2abb8dffffd8e3eee0d3b5299c72e80947..1614e1166404be545dca9454cce5191626128783 100644 (file)
--- a/reporting/rep601.php
+++ b/reporting/rep601.php
@@ -9,7 +9,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$page_security = 2;
+$page_security = 'SA_BANKREP';
 // ----------------------------------------------------------------
 // $ Revision: 2.0 $
 // Creator:    Joe Hunt
@@ -43,33 +43,36 @@ function get_bank_transactions($from, $to, $account)
 {
        $from = date2sql($from);
        $to = date2sql($to);
-       $sql = "SELECT ".TB_PREF."bank_trans.* FROM ".TB_PREF."bank_trans
-               WHERE ".TB_PREF."bank_trans.bank_act = '$account'
+       $sql = "SELECT * FROM ".TB_PREF."bank_trans
+               WHERE bank_act = '$account'
                AND trans_date >= '$from'
                AND trans_date <= '$to'
-               ORDER BY trans_date,".TB_PREF."bank_trans.id";
+               ORDER BY trans_date, id";
 
        return db_query($sql,"The transactions for '$account' could not be retrieved");
 }
 
 function print_bank_transactions()
 {
-       global $path_to_root;
+       global $path_to_root, $systypes_array;
 
        $acc = $_POST['PARAM_0'];
        $from = $_POST['PARAM_1'];
        $to = $_POST['PARAM_2'];
-       $comments = $_POST['PARAM_3'];
-       $destination = $_POST['PARAM_4'];
+       $zero = $_POST['PARAM_3'];
+       $comments = $_POST['PARAM_4'];
+       $orientation = $_POST['PARAM_5'];
+       $destination = $_POST['PARAM_6'];
        if ($destination)
                include_once($path_to_root . "/reporting/includes/excel_report.inc");
        else
                include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
-       $rep = new FrontReport(_('Bank Statement'), "BankStatement", user_pagesize());
+       $orientation = ($orientation ? 'L' : 'P');
+       $rep = new FrontReport(_('Bank Statement'), "BankStatement", user_pagesize(), 9, $orientation);
        $dec = user_price_dec();
 
-       $cols = array(0, 90, 110, 170, 225, 350, 400, 460, 520);
+       $cols = array(0, 90, 120, 170, 225, 350, 400, 460, 520);
 
        $aligns = array('left', 'left', 'left', 'left', 'left', 'right', 'right', 'right');
 
@@ -82,9 +85,11 @@ function print_bank_transactions()
            1 => array('text' => _('Period'), 'from' => $from, 'to' => $to),
            2 => array('text' => _('Bank Account'),'from' => $act,'to' => ''));
 
+    if ($orientation == 'L')
+       recalculate_cols($cols);
        $rep->Font();
        $rep->Info($params, $cols, $headers, $aligns);
-       $rep->Header();
+       $rep->NewPage();
 
 
        $prev_balance = get_bank_balance_to($from, $account["id"]);
@@ -104,31 +109,50 @@ function print_bank_transactions()
                $rep->Font();
                $total = $prev_balance;
                $rep->NewLine(2);
+               $total_debit = $total_credit = 0;
                if ($rows > 0)
                {
+                       // Keep a running total as we loop through
+                       // the transactions.
+                       
                        while ($myrow=db_fetch($trans))
                        {
+                               if ($zero == 0 && $myrow['amount'] == 0.0)
+                                       continue;
                                $total += $myrow['amount'];
 
-                               $rep->TextCol(0, 1,     systypes::name($myrow["type"]));
+                               $rep->TextCol(0, 1, $systypes_array[$myrow["type"]]);
                                $rep->TextCol(1, 2,     $myrow['trans_no']);
                                $rep->TextCol(2, 3,     $myrow['ref']);
                                $rep->DateCol(3, 4,     $myrow["trans_date"], true);
-                               $rep->TextCol(4, 5,     payment_person_types::person_name($myrow["person_type_id"],$myrow["person_id"], false));
+                               $rep->TextCol(4, 5,     get_counterparty_name($myrow["type"], $myrow["trans_no"], 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)
                                {
                                        $rep->Line($rep->row - 2);
-                                       $rep->Header();
+                                       $rep->NewPage();
                                }
                        }
                        $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,8 +162,15 @@ 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();
 }
 
-?>
\ No newline at end of file