X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep601.php;h=9acf1ce7305a7ffc7b9bf950bb52121ad4f36a08;hb=eefe5267ed97b38ac66179141994fc8c9dd09ea8;hp=1614e1166404be545dca9454cce5191626128783;hpb=4deaa6ba6e084655989c30cfb7d9dd307408c7dc;p=fa-stable.git

diff --git a/reporting/rep601.php b/reporting/rep601.php
index 1614e116..9acf1ce7 100644
--- a/reporting/rep601.php
+++ b/reporting/rep601.php
@@ -32,7 +32,7 @@ print_bank_transactions();
 function get_bank_balance_to($to, $account)
 {
 	$to = date2sql($to);
-	$sql = "SELECT SUM(amount) FROM ".TB_PREF."bank_trans WHERE bank_act='$account'
+	$sql = "SELECT SUM(amount+charge) FROM ".TB_PREF."bank_trans WHERE bank_act='$account'
 	AND trans_date < '$to'";
 	$result = db_query($sql, "The starting balance on hand could not be calculated");
 	$row = db_fetch_row($result);
@@ -47,6 +47,7 @@ function get_bank_transactions($from, $to, $account)
 		WHERE bank_act = '$account'
 		AND trans_date >= '$from'
 		AND trans_date <= '$to'
+		AND (amount !=0 OR charge !=0)
 		ORDER BY trans_date, id";
 
 	return db_query($sql,"The transactions for '$account' could not be retrieved");
@@ -72,12 +73,12 @@ function print_bank_transactions()
 	$rep = new FrontReport(_('Bank Statement'), "BankStatement", user_pagesize(), 9, $orientation);
 	$dec = user_price_dec();
 
-	$cols = array(0, 90, 120, 170, 225, 350, 400, 460, 520);
+	$cols = array(0, 90, 120, 170, 225, 350, 400, 450, 500, 550);
 
-	$aligns = array('left',	'left',	'left',	'left',	'left',	'right', 'right', 'right');
+	$aligns = array('left',	'left',	'left',	'left',	'left',	'right', 'right', 'right', 'right');
 
 	$headers = array(_('Type'),	_('#'),	_('Reference'), _('Date'), _('Person/Item'),
-		_('Debit'),	_('Credit'), _('Balance'));
+		_('Debit'),	_('Credit'), _('Fee'), _('Balance'));
 
 	$account = get_bank_account($acc);
 	$act = $account['bank_account_name']." - ".$account['bank_curr_code']." - ".$account['bank_account_number'];
@@ -103,13 +104,13 @@ function print_bank_transactions()
 		$rep->TextCol(0, 3,	$act);
 		$rep->TextCol(3, 5, _('Opening Balance'));
 		if ($prev_balance > 0.0)
-			$rep->AmountCol(5, 6, abs($prev_balance), $dec);
+			$rep->AmountCol(5, 6, $prev_balance, $dec);
 		else
-			$rep->AmountCol(6, 7, abs($prev_balance), $dec);
+			$rep->AmountCol(6, 7, -$prev_balance, $dec);
 		$rep->Font();
 		$total = $prev_balance;
 		$rep->NewLine(2);
-		$total_debit = $total_credit = 0;
+		$total_debit = $total_credit = $charges = 0;
 		if ($rows > 0)
 		{
 			// Keep a running total as we loop through
@@ -119,7 +120,9 @@ function print_bank_transactions()
 			{
 				if ($zero == 0 && $myrow['amount'] == 0.0)
 					continue;
-				$total += $myrow['amount'];
+				$total += $myrow['amount']+$myrow['charge'];
+				$charges += $myrow['charge'];
+				$amount = abs($myrow['amount']);
 
 				$rep->TextCol(0, 1, $systypes_array[$myrow["type"]]);
 				$rep->TextCol(1, 2,	$myrow['trans_no']);
@@ -128,15 +131,17 @@ function print_bank_transactions()
 				$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']);
+					$rep->AmountCol(5, 6, $amount, $dec);
+					$total_debit += $amount;
 				}
 				else
 				{
-					$rep->AmountCol(6, 7, abs($myrow['amount']), $dec);
-					$total_credit += abs($myrow['amount']);
+					$rep->AmountCol(6, 7, $amount, $dec);
+					$total_credit += $amount;
 				}
-				$rep->AmountCol(7, 8, $total, $dec);
+				if ($myrow['charge'])
+					$rep->AmountCol(7, 8, -$myrow['charge'], $dec);
+				$rep->AmountCol(8, 9, $total, $dec);
 				$rep->NewLine();
 				if ($rep->row < $rep->bottomMargin + $rep->lineHeight)
 				{
@@ -148,17 +153,18 @@ function print_bank_transactions()
 		}
 		
 		// Print totals for the debit and credit columns.
-		$rep->TextCol(3, 5, _("Total Debit / Credit"));
+		$rep->TextCol(3, 5, _("Total Debit / Credit / Fees"));
 		$rep->AmountCol(5, 6, $total_debit, $dec);
 		$rep->AmountCol(6, 7, $total_credit, $dec);
+		$rep->AmountCol(7, 8, -$charges, $dec);
 		$rep->NewLine(2);
 
 		$rep->Font('bold');
 		$rep->TextCol(3, 5,	_("Ending Balance"));
 		if ($total > 0.0)
-			$rep->AmountCol(5, 6, abs($total), $dec);
+			$rep->AmountCol(5, 6, $total, $dec);
 		else
-			$rep->AmountCol(6, 7, abs($total), $dec);
+			$rep->AmountCol(6, 7, -$total, $dec);
 		$rep->Font();
 		$rep->Line($rep->row - $rep->lineHeight + 4);
 		$rep->NewLine(2, 1);