X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep601.php;h=1614e1166404be545dca9454cce5191626128783;hb=da7df35c61205d0b1af47d286be591b8a3194b0c;hp=42c9ef30007820078c328edb8e9f12aadafe6df0;hpb=b37623cf1de2cfce6825744557d76475f002321f;p=fa-stable.git

diff --git a/reporting/rep601.php b/reporting/rep601.php
index 42c9ef30..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");
 }
@@ -59,17 +59,20 @@ function print_bank_transactions()
 	$acc = $_POST['PARAM_0'];
 	$from = $_POST['PARAM_1'];
 	$to = $_POST['PARAM_2'];
-	$comments = $_POST['PARAM_3'];
-	$destination = $_POST['PARAM_4'];
+	$zero = $_POST['PARAM_3'];
+	$comments = $_POST['PARAM_4'];
+	$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');
 
@@ -82,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();
@@ -104,21 +109,23 @@ function print_bank_transactions()
 		$rep->Font();
 		$total = $prev_balance;
 		$rep->NewLine(2);
+		$total_debit = $total_credit = 0;
 		if ($rows > 0)
 		{
 			// Keep a running total as we loop through
 			// the transactions.
-			$total_debit = $total_credit = 0;			
 			
 			while ($myrow=db_fetch($trans))
 			{
+				if ($zero == 0 && $myrow['amount'] == 0.0)
+					continue;
 				$total += $myrow['amount'];
 
 				$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_name($myrow["person_type_id"],$myrow["person_id"], false));
+				$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);
@@ -167,4 +174,3 @@ function print_bank_transactions()
 	$rep->End();
 }
 
-?>
\ No newline at end of file