X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep601.php;h=1614e1166404be545dca9454cce5191626128783;hb=1a88a3e8c8dc9b63d88697e4f330a0501a301f44;hp=6f9c41b963e7c4f7babd43846f10784ed980a319;hpb=0489317205141deaecefe3a7243d11a3e38a51d0;p=fa-stable.git

diff --git a/reporting/rep601.php b/reporting/rep601.php
index 6f9c41b9..1614e116 100644
--- a/reporting/rep601.php
+++ b/reporting/rep601.php
@@ -43,11 +43,11 @@ 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");
 }
@@ -72,7 +72,7 @@ function print_bank_transactions()
 	$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');
 
@@ -86,7 +86,7 @@ function print_bank_transactions()
 	    2 => array('text' => _('Bank Account'),'from' => $act,'to' => ''));
 
     if ($orientation == 'L')
-    	$rep->recalculate_cols($cols);
+    	recalculate_cols($cols);
 	$rep->Font();
 	$rep->Info($params, $cols, $headers, $aligns);
 	$rep->NewPage();
@@ -174,4 +174,3 @@ function print_bank_transactions()
 	$rep->End();
 }
 
-?>
\ No newline at end of file