X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep601.php;h=66fbbf2abb8dffffd8e3eee0d3b5299c72e80947;hb=e41d9f32739a4d895138feb772f7dccdde312dbd;hp=0408c3ac9b1032df2c653e3aece2ee56b68eb16c;hpb=b92aec29b1c65957e04dafdd74ab3653dc6662ba;p=fa-stable.git

diff --git a/reporting/rep601.php b/reporting/rep601.php
index 0408c3ac..66fbbf2a 100644
--- a/reporting/rep601.php
+++ b/reporting/rep601.php
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 $page_security = 2;
 // ----------------------------------------------------------------
 // $ Revision:	2.0 $
@@ -7,16 +16,15 @@ $page_security = 2;
 // date_:	2005-05-19
 // Title:	Bank Accounts Transactions
 // ----------------------------------------------------------------
-$path_to_root="../";
+$path_to_root="..";
 
-include_once($path_to_root . "includes/session.inc");
-include_once($path_to_root . "includes/date_functions.inc");
-include_once($path_to_root . "includes/data_checks.inc");
-include_once($path_to_root . "gl/includes/gl_db.inc");
+include_once($path_to_root . "/includes/session.inc");
+include_once($path_to_root . "/includes/date_functions.inc");
+include_once($path_to_root . "/includes/data_checks.inc");
+include_once($path_to_root . "/gl/includes/gl_db.inc");
 
 //----------------------------------------------------------------------------------------------------
 
-// trial_inquiry_controls();
 print_bank_transactions();
 
 //----------------------------------------------------------------------------------------------------
@@ -35,11 +43,10 @@ function get_bank_transactions($from, $to, $account)
 {
 	$from = date2sql($from);
 	$to = date2sql($to);
-	$sql = "SELECT ".TB_PREF."bank_trans.*,name AS BankTransType FROM ".TB_PREF."bank_trans, ".TB_PREF."bank_trans_types
+	$sql = "SELECT ".TB_PREF."bank_trans.* FROM ".TB_PREF."bank_trans
 		WHERE ".TB_PREF."bank_trans.bank_act = '$account'
 		AND trans_date >= '$from'
 		AND trans_date <= '$to'
-		AND ".TB_PREF."bank_trans_types.id = ".TB_PREF."bank_trans.bank_trans_type_id
 		ORDER BY trans_date,".TB_PREF."bank_trans.id";
 
 	return db_query($sql,"The transactions for '$account' could not be retrieved");
@@ -49,22 +56,24 @@ function print_bank_transactions()
 {
 	global $path_to_root;
 
-	include_once($path_to_root . "reporting/includes/pdf_report.inc");
-
-	$rep = new FrontReport(_('Bank Statement'), "BankStatement.pdf", user_pagesize());
-
 	$acc = $_POST['PARAM_0'];
 	$from = $_POST['PARAM_1'];
 	$to = $_POST['PARAM_2'];
 	$comments = $_POST['PARAM_3'];
+	$destination = $_POST['PARAM_4'];
+	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());
 	$dec = user_price_dec();
 
-	$cols = array(0, 90, 110, 170, 225, 270, 350, 400, 460, 520);
+	$cols = array(0, 90, 110, 170, 225, 350, 400, 460, 520);
 
-	$aligns = array('left',	'left',	'left',	'left',	'left',	'left',	'right', 'right', 'right');
+	$aligns = array('left',	'left',	'left',	'left',	'left',	'right', 'right', 'right');
 
-	$headers = array(_('Type'),	_('#'),	_('Reference'), _('Date'), _('Type'), _('Person/Item'),
+	$headers = array(_('Type'),	_('#'),	_('Reference'), _('Date'), _('Person/Item'),
 		_('Debit'),	_('Credit'), _('Balance'));
 
 	$account = get_bank_account($acc);
@@ -78,9 +87,9 @@ function print_bank_transactions()
 	$rep->Header();
 
 
-	$prev_balance = get_bank_balance_to($from, $account["account_code"]);
+	$prev_balance = get_bank_balance_to($from, $account["id"]);
 
-	$trans = get_bank_transactions($from, $to, $account['account_code']);
+	$trans = get_bank_transactions($from, $to, $account['id']);
 
 	$rows = db_num_rows($trans);
 	if ($prev_balance != 0.0 || $rows != 0)
@@ -89,9 +98,9 @@ function print_bank_transactions()
 		$rep->TextCol(0, 3,	$act);
 		$rep->TextCol(3, 5, _('Opening Balance'));
 		if ($prev_balance > 0.0)
-			$rep->TextCol(6, 7,	number_format2(abs($prev_balance), $dec));
+			$rep->AmountCol(5, 6, abs($prev_balance), $dec);
 		else
-			$rep->TextCol(7, 8,	number_format2(abs($prev_balance), $dec));
+			$rep->AmountCol(6, 7, abs($prev_balance), $dec);
 		$rep->Font();
 		$total = $prev_balance;
 		$rep->NewLine(2);
@@ -104,14 +113,13 @@ function print_bank_transactions()
 				$rep->TextCol(0, 1,	systypes::name($myrow["type"]));
 				$rep->TextCol(1, 2,	$myrow['trans_no']);
 				$rep->TextCol(2, 3,	$myrow['ref']);
-				$rep->TextCol(3, 4,	sql2date($myrow["trans_date"]));
-				$rep->TextCol(4, 5,	$myrow['BankTransType']);
-				$rep->TextCol(5, 6,	payment_person_types::person_name($myrow["person_type_id"],$myrow["person_id"], false));
+				$rep->DateCol(3, 4,	$myrow["trans_date"], true);
+				$rep->TextCol(4, 5,	payment_person_types::person_name($myrow["person_type_id"],$myrow["person_id"], false));
 				if ($myrow['amount'] > 0.0)
-					$rep->TextCol(6, 7,	number_format2(abs($myrow['amount']), $dec));
+					$rep->AmountCol(5, 6, abs($myrow['amount']), $dec);
 				else
-					$rep->TextCol(7, 8,	number_format2(abs($myrow['amount']), $dec));
-				$rep->TextCol(8, 9,	number_format2($total, $dec));
+					$rep->AmountCol(6, 7, abs($myrow['amount']), $dec);
+				$rep->AmountCol(7, 8, $total, $dec);
 				$rep->NewLine();
 				if ($rep->row < $rep->bottomMargin + $rep->lineHeight)
 				{
@@ -124,9 +132,9 @@ function print_bank_transactions()
 		$rep->Font('bold');
 		$rep->TextCol(3, 5,	_("Ending Balance"));
 		if ($total > 0.0)
-			$rep->TextCol(6, 7,	number_format2(abs($total), $dec));
+			$rep->AmountCol(5, 6, abs($total), $dec);
 		else
-			$rep->TextCol(7, 8,	number_format2(abs($total), $dec));
+			$rep->AmountCol(6, 7, abs($total), $dec);
 		$rep->Font();
 		$rep->Line($rep->row - $rep->lineHeight + 4);
 		$rep->NewLine(2, 1);