Fixed write test for main directory during install.

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

diff --git a/reporting/rep601.php b/reporting/rep601.php
index 893c8d9d29daae54f64af6ab9c263d1c469d1382..4690ac615981c8d97287a28cbb8798abf1f99274 100644 (file)
--- a/reporting/rep601.php
+++ b/reporting/rep601.php
@@ -59,8 +59,9 @@ function print_bank_transactions()
        $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'];
+       $destination = $_POST['PARAM_5'];
        if ($destination)
                include_once($path_to_root . "/reporting/includes/excel_report.inc");
        else
@@ -84,7 +85,7 @@ function print_bank_transactions()
 
        $rep->Font();
        $rep->Info($params, $cols, $headers, $aligns);
-       $rep->Header();
+       $rep->NewPage();
 
 
        $prev_balance = get_bank_balance_to($from, $account["id"]);
@@ -104,10 +105,16 @@ 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_array[$myrow["type"]]);
@@ -116,19 +123,32 @@ 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)
                                {
                                        $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,6 +158,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();
 }