X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fdb%2Fgl_db_banking.inc;h=e73e1e3ac877aab3f5fa7020f5c95cdba0f50893;hb=9b852b19c91b5af6400cf94a9ff65d37d1a730b4;hp=981de46e9d4796d7db0ad86d50fc3ef9774c4110;hpb=231addc23887aa8b906dca18ea0b2a6fe63c3c39;p=fa-stable.git

diff --git a/gl/includes/db/gl_db_banking.inc b/gl/includes/db/gl_db_banking.inc
index 981de46e..e73e1e3a 100644
--- a/gl/includes/db/gl_db_banking.inc
+++ b/gl/includes/db/gl_db_banking.inc
@@ -56,7 +56,7 @@ function add_exchange_variation_all()
 //	
 
 function add_bank_transfer($from_account, $to_account, $date_,
-	$amount, $ref, $memo_)
+	$amount, $ref, $memo_, $charge=0)
 {
 	begin_transaction();
 
@@ -72,16 +72,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,
+		$date_, -($amount + $charge),
 		payment_person_types::misc(), "", $currency,
 		"Cannot insert a source bank transaction");
 
 	add_exchange_variation($trans_type, $trans_no, $date_, $from_account, $from_gl_account, 
 		$currency, payment_person_types::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);
@@ -98,7 +105,7 @@ function add_bank_transfer($from_account, $to_account, $date_,
 	
 	add_comments($trans_type, $trans_no, $date_, $memo_);
 
-	references::save_last($ref, $trans_type);
+	references::save($trans_type, $trans_no, $ref);
 	add_audit_trail($trans_type, $trans_no, $date_);
 
 	commit_transaction();
@@ -204,7 +211,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_);
 	}
 
@@ -218,7 +225,7 @@ function add_bank_transaction($trans_type, $from_account, $items, $date_,
 
 	add_comments($trans_type, $trans_no, $date_, $memo_);
 
-	references::save_last($ref, $trans_type);
+	references::save($trans_type, $trans_no, $ref);
 	add_audit_trail($trans_type, $trans_no, $date_);
 
 	commit_transaction();