X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep602.php;h=dd7c5427fefecac9c9d2ad4c7b0c543a0fb9a1ee;hb=6ca1979dd3d94414a18958346bcb39b984f7a544;hp=5c9b324ff5c6ca3523f0d3f83bc58dccf3375312;hpb=8ffddf50ffbe93672c769e2cf0501d0f9125e2a0;p=fa-stable.git

diff --git a/reporting/rep602.php b/reporting/rep602.php
index 5c9b324f..dd7c5427 100644
--- a/reporting/rep602.php
+++ b/reporting/rep602.php
@@ -44,14 +44,14 @@ function get_bank_transactions($from, $to, $account)
 {
 	$from = date2sql($from);
 	$to = date2sql($to);
-	$sql = "SELECT ".TB_PREF."bank_trans.*, ".TB_PREF."comments.memo_
-			FROM ".TB_PREF."bank_trans LEFT JOIN ".TB_PREF."comments ON 
-			(".TB_PREF."bank_trans.type = ".TB_PREF."comments.type
-			AND ".TB_PREF."bank_trans.trans_no = ".TB_PREF."comments.id)
-		WHERE ".TB_PREF."bank_trans.bank_act = '$account'
+	$sql = "SELECT trans.*, com.memo_
+			FROM "
+				.TB_PREF."bank_trans trans
+				LEFT JOIN ".TB_PREF."comments com ON trans.type = com.type AND trans.trans_no = com.id
+		WHERE trans.bank_act = '$account'
 		AND trans_date >= '$from'
 		AND trans_date <= '$to'
-		ORDER BY trans_date,".TB_PREF."bank_trans.id";
+		ORDER BY trans_date,trans.id";
 
 	return db_query($sql,"The transactions for '$account' could not be retrieved");
 }
@@ -73,7 +73,7 @@ function print_bank_transactions_reconcile()
 	$rep = new FrontReport(_('Bank Statement w/Reconcile'), "BankStatementReconcile", user_pagesize(), 9, "L");
 	$dec = user_price_dec();
 
-	$cols = array(0, 90, 110, 170, 225, 450, 500, 550, 600, 660, 700);
+	$cols = array(0, 90, 120, 170, 225, 450, 500, 550, 600, 660, 700);
 
 	$aligns = array('left',	'left',	'left',	'left',	'left',	'right', 'right', 'right', 'center', 'left');