X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep601.php;h=1614e1166404be545dca9454cce5191626128783;hb=af67579e02816d14a4cd428cb8ea191a6fa66aa7;hp=41eb26aff9e7ce406c5aef5332a0555bdd9a8a6c;hpb=264c09696d65efe4532c197f317162daf8c24f32;p=fa-stable.git

diff --git a/reporting/rep601.php b/reporting/rep601.php
index 41eb26af..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");
 }
@@ -61,16 +61,18 @@ function print_bank_transactions()
 	$to = $_POST['PARAM_2'];
 	$zero = $_POST['PARAM_3'];
 	$comments = $_POST['PARAM_4'];
-	$destination = $_POST['PARAM_5'];
+	$orientation = $_POST['PARAM_5'];
+	$destination = $_POST['PARAM_6'];
 	if ($destination)
 		include_once($path_to_root . "/reporting/includes/excel_report.inc");
 	else
 		include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
-	$rep = new FrontReport(_('Bank Statement'), "BankStatement", user_pagesize());
+	$orientation = ($orientation ? 'L' : 'P');
+	$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');
 
@@ -83,6 +85,8 @@ function print_bank_transactions()
 	    1 => array('text' => _('Period'), 'from' => $from, 'to' => $to),
 	    2 => array('text' => _('Bank Account'),'from' => $act,'to' => ''));
 
+    if ($orientation == 'L')
+    	recalculate_cols($cols);
 	$rep->Font();
 	$rep->Info($params, $cols, $headers, $aligns);
 	$rep->NewPage();
@@ -170,4 +174,3 @@ function print_bank_transactions()
 	$rep->End();
 }
 
-?>
\ No newline at end of file