X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fdb%2Fgl_db_banking.inc;h=b20644c58c2d79113383e18df7ce2057ff4ee6be;hb=ddadb47f2620ce6902ad4694ce6512568862ba05;hp=bc4c0b5bd5fd6c794999441d18cb49a1f858e78a;hpb=a4db318fa0c84e099e0970ca82e36215782d661e;p=fa-stable.git

diff --git a/gl/includes/db/gl_db_banking.inc b/gl/includes/db/gl_db_banking.inc
index bc4c0b5b..b20644c5 100644
--- a/gl/includes/db/gl_db_banking.inc
+++ b/gl/includes/db/gl_db_banking.inc
@@ -1,24 +1,24 @@
 <?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
-	Released under the terms of the GNU Affero General Public License,
-	AGPL, as published by the Free Software Foundation, either version 
-	3 of the License, or (at your option) any later version.
+	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/agpl-3.0.html>.
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-function add_exchange_variation($trans_type, $trans_no, $date_, $account,
+function add_exchange_variation($trans_type, $trans_no, $date_, $acc_id, $account,
     $currency, $person_type_id=null, $person_id = "")
 {
 	if (is_company_currency($currency))
 		return;
 	if ($date_ == null)
 		$date_ = Today();
-	$rate = get_exchange_rate_from_home_currency($currency, $date_);	
+	$rate = get_exchange_rate_from_home_currency($currency, $date_);
 	$result = db_query("SELECT SUM(amount) FROM ".TB_PREF."bank_trans WHERE 
-		bank_act='$account' AND trans_date<='".date2sql($date_)."'", 
+		bank_act='$acc_id' AND trans_date<='".date2sql($date_)."'", 
 		"Transactions for account $account could not be calculated");
 	$row = db_fetch_row($result);
 	$foreign_amount = $row[0];
@@ -27,11 +27,11 @@ function add_exchange_variation($trans_type, $trans_no, $date_, $account,
 	if ($diff != 0)
 	{
 		if ($trans_type == null)
-			$trans_type = systypes::journal_entry();
+			$trans_type = ST_JOURNAL;
 		if ($trans_no == null)
 			$trans_no = get_next_trans_no($trans_type);
 		if ($person_type_id == null)
-			$person_type_id = payment_person_types::misc();
+			$person_type_id = PT_MISC;
 		add_gl_trans($trans_type, $trans_no, $date_, $account, 0, 0, _("Exchange Variance"),
     		-$diff, null, $person_type_id, $person_id);
     	add_gl_trans($trans_type, $trans_no, $date_, get_company_pref('exchange_diff_act'), 0, 0, 
@@ -41,11 +41,11 @@ function add_exchange_variation($trans_type, $trans_no, $date_, $account,
 
 function add_exchange_variation_all()
 {
-	$trans_no = get_next_trans_no(0);
+	$trans_no = get_next_trans_no(ST_JOURNAL);
 	$sql = "SELECT * FROM ".TB_PREF."bank_accounts";
 	$result = db_query($sql, "could not retreive bank accounts");
 	while ($myrow = db_fetch($result))
-		add_exchange_variation(0, $trans_no, null, $myrow['account_code'],
+		add_exchange_variation(ST_JOURNAL, $trans_no, null, $myrow['id'], $myrow['account_code'],
 			$myrow['currency_code']);
 }
 //----------------------------------------------------------------------------------
@@ -56,11 +56,13 @@ function add_exchange_variation_all()
 //	
 
 function add_bank_transfer($from_account, $to_account, $date_,
-	$amount, $ref, $memo_)
+	$amount, $ref, $memo_, $charge=0)
 {
+	global $Refs;
+	
 	begin_transaction();
 
-	$trans_type = systypes::bank_transfer();
+	$trans_type = ST_BANKTRANSFER;
 
 	$currency = get_bank_account_currency($from_account);
 
@@ -72,16 +74,23 @@ function add_bank_transfer($from_account, $to_account, $date_,
 	$total = 0;
 	// do the source account postings
     $total += add_gl_trans($trans_type, $trans_no, $date_, $from_gl_account, 0, 0, "",
-		-$amount, $currency);
+		-($amount + $charge), $currency);
 
     add_bank_trans($trans_type, $trans_no, $from_account, $ref,
-		$date_, -$amount,
-		payment_person_types::misc(), "", $currency,
+		$date_, -($amount + $charge),
+		PT_MISC, "", $currency,
 		"Cannot insert a source bank transaction");
 
-	add_exchange_variation($trans_type, $trans_no, $date_, $from_account, 
-		$currency, payment_person_types::misc(), "");
+	add_exchange_variation($trans_type, $trans_no, $date_, $from_account, $from_gl_account, 
+		$currency, PT_MISC, "");
 
+	if ($charge != 0)
+	{
+		/* Now Debit bank charge account with charges */
+		$charge_act = get_company_pref('bank_charge_act');
+		$total += add_gl_trans($trans_type, $trans_no, $date_,
+			$charge_act, 0, 0, "", $charge, $currency);
+	}
 	// do the destination account postings
 	$total += add_gl_trans($trans_type, $trans_no, $date_, $to_gl_account, 0, 0, "",
 		$amount, $currency);
@@ -90,15 +99,16 @@ function add_bank_transfer($from_account, $to_account, $date_,
 	add_gl_balance($trans_type, $trans_no, $date_, -$total);	
 	
 	add_bank_trans($trans_type, $trans_no, $to_account, $ref,
-		$date_, $amount, payment_person_types::misc(), "",
+		$date_, $amount, PT_MISC, "",
 		$currency, "Cannot insert a destination bank transaction");
 
-	add_exchange_variation($trans_type, $trans_no, $date_, $from_account, 
-		$currency, payment_person_types::misc(), "");
+	add_exchange_variation($trans_type, $trans_no, $date_, $from_account, $from_gl_account, 
+		$currency, PT_MISC, "");
 	
 	add_comments($trans_type, $trans_no, $date_, $memo_);
 
-	references::save_last($ref, $trans_type);
+	$Refs->save($trans_type, $trans_no, $ref);
+	add_audit_trail($trans_type, $trans_no, $date_);
 
 	commit_transaction();
 
@@ -119,8 +129,10 @@ function add_bank_transfer($from_account, $to_account, $date_,
 function add_bank_transaction($trans_type, $from_account, $items, $date_,
 	$person_type_id, $person_id, $person_detail_id,	$ref, $memo_)
 {
+	global $Refs;
+
 	// we can only handle type 1 (payment)and type 2 (deposit)
-	if ($trans_type != systypes::bank_payment() && $trans_type != systypes::bank_deposit())
+	if ($trans_type != ST_BANKPAYMENT && $trans_type != ST_BANKDEPOSIT)
 		display_db_error("Invalid type ($trans_type) sent to add_bank_transaction");
 
 	$do_exchange_variance = false;
@@ -133,7 +145,7 @@ function add_bank_transaction($trans_type, $from_account, $items, $date_,
 	// the gl items are already inversed/negated for type 2 (deposit)
 	$total_amount = $items->gl_items_total();
 
-    if ($person_type_id == payment_person_types::customer())
+    if ($person_type_id == PT_CUSTOMER)
     {
     	// we need to add a customer transaction record
 
@@ -146,7 +158,7 @@ function add_bank_transaction($trans_type, $from_account, $items, $date_,
         	$ref, $cust_amount);
 
     }
-    elseif ($person_type_id == payment_person_types::supplier())
+    elseif ($person_type_id == PT_SUPPLIER)
     {
     	// we need to add a supplier transaction record
 		// convert to supp currency
@@ -177,7 +189,7 @@ function add_bank_transaction($trans_type, $from_account, $items, $date_,
 	{
 		$is_bank_to = is_bank_account($gl_item->code_id);
 
-		if ($trans_type == 1 AND $is_bank_to)
+		if ($trans_type == ST_BANKPAYMENT AND $is_bank_to)
 		{
 			// we don't allow payments to go to a bank account. use transfer for this !
 			display_db_error("invalid payment entered. Cannot pay to another bank account", "");
@@ -190,12 +202,12 @@ function add_bank_transaction($trans_type, $from_account, $items, $date_,
 
     	if ($is_bank_to)
     	{
-    		add_bank_trans($trans_type, $trans_no, $gl_item->code_id, $ref,
+    		add_bank_trans($trans_type, $trans_no, $is_bank_to, $ref,
     			$date_, $gl_item->amount,
     			$person_type_id, $person_id, $currency,
     			"Cannot insert a destination bank transaction");
     		if ($do_exchange_variance)
-    			add_exchange_variation($trans_type, $trans_no, $date_, $gl_item->code_id, 
+    			add_exchange_variation($trans_type, $trans_no, $date_, $is_bank_to, $gl_item->code_id, 
     				$currency, $person_type_id, $person_id);
     	}
 		// store tax details if the gl account is a tax account
@@ -203,7 +215,7 @@ function add_bank_transaction($trans_type, $from_account, $items, $date_,
 		$amount = $gl_item->amount;
 		$ex_rate = get_exchange_rate_from_home_currency($currency, $date_);
 			
-		add_gl_tax_details($gl_item->code_id, $trans_type, $trans_no, $amount,
+		add_gl_tax_details($gl_item->code_id, $trans_type, $trans_no, -$amount,
 			$ex_rate, $date_, $memo_);
 	}
 
@@ -212,12 +224,13 @@ function add_bank_transaction($trans_type, $from_account, $items, $date_,
     	-$total, null, $person_type_id, $person_id);
 
     if ($do_exchange_variance)
-    	add_exchange_variation($trans_type, $trans_no, $date_, $from_account, 
+    	add_exchange_variation($trans_type, $trans_no, $date_, $from_account, $bank_gl_account, 
     		$currency, $person_type_id, $person_id);
 
 	add_comments($trans_type, $trans_no, $date_, $memo_);
 
-	references::save_last($ref, $trans_type);
+	$Refs->save($trans_type, $trans_no, $ref);
+	add_audit_trail($trans_type, $trans_no, $date_);
 
 	commit_transaction();