X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fdb%2Fgl_db_bank_trans.inc;h=37c173c0aea059b82d06a5c8adb9abb87e1c5387;hb=883307779f9ca5bac0533702a8702b0cccb4742f;hp=200277fb60b2280cb44c17a18429c7e5a6cb83db;hpb=f12dbe7523bb1abc6cd69b009ef8f0be838f5348;p=fa-stable.git

diff --git a/gl/includes/db/gl_db_bank_trans.inc b/gl/includes/db/gl_db_bank_trans.inc
index 200277fb..37c173c0 100644
--- a/gl/includes/db/gl_db_bank_trans.inc
+++ b/gl/includes/db/gl_db_bank_trans.inc
@@ -1,13 +1,22 @@
 <?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>.
+***********************************************************************/
 //----------------------------------------------------------------------------------
 
 // add a bank transaction
 // $amount is in $currency
 // $date_ is display date (non-sql)
 
-function add_bank_trans($type, $trans_no, $bank_act, $ref, $date_, $bank_trans_type_id,
-	$amount, $person_type_id, $person_id, $currency="", $err_msg="")
+function add_bank_trans($type, $trans_no, $bank_act, $ref, $date_,
+	$amount, $person_type_id, $person_id, $currency="", $err_msg="", $rate=0)
 {
 	$sqlDate = date2sql($date_);
 
@@ -15,7 +24,10 @@ function add_bank_trans($type, $trans_no, $bank_act, $ref, $date_, $bank_trans_t
 	if ($currency != "")
 	{
     	$bank_account_currency = get_bank_account_currency($bank_act);
-    	$to_bank_currency = get_exchange_rate_from_to($currency, $bank_account_currency, $date_);
+    	if ($rate == 0)
+    		$to_bank_currency = get_exchange_rate_from_to($currency, $bank_account_currency, $date_);
+    	else
+    		$to_bank_currency = 1 / $rate;
     	$amount_bank = ($amount / $to_bank_currency);
 	}
 	else
@@ -26,10 +38,11 @@ function add_bank_trans($type, $trans_no, $bank_act, $ref, $date_, $bank_trans_t
 	//$BankToHomeCurrencyRate = get_exchange_rate_to_home_currency($bank_account_currency, $date_);
 
 	$sql = "INSERT INTO ".TB_PREF."bank_trans (type, trans_no, bank_act, ref,
-		trans_date, bank_trans_type_id, amount, person_type_id, person_id) ";
+		trans_date, amount, person_type_id, person_id) ";
 
-	$sql .= "VALUES ($type, $trans_no, '$bank_act', ".db_escape($ref).", '$sqlDate', '$bank_trans_type_id',
-		$amount_bank, $person_type_id, ". db_escape($person_id).")";
+	$sql .= "VALUES ($type, $trans_no, '$bank_act', ".db_escape($ref).", '$sqlDate',
+		".db_escape($amount_bank).", ".db_escape($person_type_id)
+		.", ". db_escape($person_id).")";
 
 	if ($err_msg == "")
 		$err_msg = "The bank transaction could not be inserted";
@@ -41,8 +54,8 @@ function add_bank_trans($type, $trans_no, $bank_act, $ref, $date_, $bank_trans_t
 
 function exists_bank_trans($type, $type_no)
 {
-	$sql = "SELECT trans_no FROM ".TB_PREF."bank_trans WHERE type=$type
-		AND trans_no=$type_no";
+	$sql = "SELECT trans_no FROM ".TB_PREF."bank_trans WHERE type=".db_escape($type)
+		." AND trans_no=".db_escape($type_no);
 	$result = db_query($sql, "Cannot retreive a bank transaction");
 
     return (db_num_rows($result) > 0);
@@ -52,18 +65,17 @@ function exists_bank_trans($type, $type_no)
 
 function get_bank_trans($type, $trans_no=null, $person_type_id=null, $person_id=null)
 {
-	$sql = "SELECT *, bank_account_name, account_code, bank_curr_code, name AS BankTransType
-		FROM ".TB_PREF."bank_trans, ".TB_PREF."bank_accounts, ".TB_PREF."bank_trans_types
-		WHERE ".TB_PREF."bank_trans_types.id = ".TB_PREF."bank_trans.bank_trans_type_id
-		AND ".TB_PREF."bank_accounts.account_code=".TB_PREF."bank_trans.bank_act ";
+	$sql = "SELECT *, bank_account_name, account_code, bank_curr_code
+		FROM ".TB_PREF."bank_trans, ".TB_PREF."bank_accounts
+		WHERE ".TB_PREF."bank_accounts.id=".TB_PREF."bank_trans.bank_act ";
 	if ($type != null)
-		$sql .= " AND type=$type ";
+		$sql .= " AND type=".db_escape($type);
 	if ($trans_no != null)
-		$sql .= " AND ".TB_PREF."bank_trans.trans_no = $trans_no ";
+		$sql .= " AND ".TB_PREF."bank_trans.trans_no = ".db_escape($trans_no);
 	if ($person_type_id != null)
-		$sql .= " AND ".TB_PREF."bank_trans.person_type_id = $person_type_id ";
+		$sql .= " AND ".TB_PREF."bank_trans.person_type_id = ".db_escape($person_type_id);
 	if ($person_id != null)
-		$sql .= " AND ".TB_PREF."bank_trans.person_id = '$person_id'";
+		$sql .= " AND ".TB_PREF."bank_trans.person_id = ".db_escape($person_id);
 	$sql .= " ORDER BY trans_date, ".TB_PREF."bank_trans.id";
 
 	return db_query($sql, "query for bank transaction");
@@ -71,9 +83,38 @@ function get_bank_trans($type, $trans_no=null, $person_type_id=null, $person_id=
 
 //----------------------------------------------------------------------------------------
 
+function get_bank_trans_for_bank_account($bank_account, $from, $to)
+{
+	$from = date2sql($from);
+	$to = date2sql($to);
+	$sql = "SELECT ".TB_PREF."bank_trans.* FROM ".TB_PREF."bank_trans
+		WHERE ".TB_PREF."bank_trans.bank_act = ".db_escape($bank_account) . "
+		AND trans_date >= '$from'
+		AND trans_date <= '$to'
+		ORDER BY trans_date,".TB_PREF."bank_trans.id";
+
+	return db_query($sql,"The transactions for '" . $bank_account . "' could not be retrieved");
+}
+
+//----------------------------------------------------------------------------------------
+
+function get_balance_before_for_bank_account($bank_account, $from)
+{
+	$from = date2sql($from);
+	$sql = "SELECT SUM(amount) FROM ".TB_PREF."bank_trans WHERE bank_act="
+		.db_escape($bank_account) . "
+		AND trans_date < '$from'";
+	$before_qty = db_query($sql, "The starting balance on hand could not be calculated");
+	$bfw_row = db_fetch_row($before_qty);
+	return $bfw_row[0];
+}
+//----------------------------------------------------------------------------------------
+
 function get_gl_trans_value($account, $type, $trans_no)
 {
-	$sql = "SELECT SUM(amount) FROM ".TB_PREF."gl_trans WHERE account='$account' AND type=$type AND type_no=$trans_no";
+	$sql = "SELECT SUM(amount) FROM ".TB_PREF."gl_trans WHERE account="
+	.db_escape($account)." AND type=".db_escape($type)
+	." AND type_no=".db_escape($trans_no);
 
 	$result = db_query($sql, "query for gl trans value");
 
@@ -89,7 +130,7 @@ function void_bank_trans($type, $type_no, $nested=false)
 		begin_transaction();
 
 	$sql = "UPDATE ".TB_PREF."bank_trans SET amount=0
-		WHERE type=$type AND trans_no=$type_no";
+		WHERE type=".db_escape($type)." AND trans_no=".db_escape($type_no);
 
 	$result = db_query($sql, "could not void bank transactions for type=$type and trans_no=$type_no");
 
@@ -103,6 +144,8 @@ function void_bank_trans($type, $type_no, $nested=false)
 	void_supp_allocations($type, $type_no);
 	void_supp_trans($type, $type_no);
 
+	void_trans_tax_details($type, $type_no);
+
 	if (!$nested)
 		commit_transaction();
 }