X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep601.php;h=7e443fb29b0cebacee938e6054a06ef1fbd0aac9;hb=7286bbfc939360b0fcb573ae075b2b8e899d96c8;hp=b5ed420a32b14a524cb69e8b3c2bd6e8d4540aac;hpb=902f1015d874c33bd7946b17de2ad80b4f2144b6;p=fa-stable.git

diff --git a/reporting/rep601.php b/reporting/rep601.php
index b5ed420a..7e443fb2 100644
--- a/reporting/rep601.php
+++ b/reporting/rep601.php
@@ -54,7 +54,7 @@ function get_bank_transactions($from, $to, $account)
 
 function print_bank_transactions()
 {
-	global $path_to_root;
+	global $path_to_root, $systypes_array;
 
 	$acc = $_POST['PARAM_0'];
 	$from = $_POST['PARAM_1'];
@@ -106,19 +106,29 @@ 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'];
 
-				$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,	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();
 }