X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fdb%2Fgl_db_banking.inc;h=a2cf9f78db893d7426ac7769d9b4a0e5f83d507f;hb=64f24ae3a63762d18b1ab6408263ec6ca1e14fb2;hp=d587746bce2150cdc13fe6c7f38181a29d90972c;hpb=1cb4f8ee15c1b2971594821b48d9ef034f5edb13;p=fa-stable.git

diff --git a/gl/includes/db/gl_db_banking.inc b/gl/includes/db/gl_db_banking.inc
index d587746b..a2cf9f78 100644
--- a/gl/includes/db/gl_db_banking.inc
+++ b/gl/includes/db/gl_db_banking.inc
@@ -50,10 +50,10 @@ function add_exchange_variation($trans_no, $date_, $acc_id, $account,
 		if ($person_type_id == null)
 			$person_type_id = PT_MISC;
 		add_gl_trans(ST_JOURNAL, $trans_no, $date_, $account, 0, 0, _("Exchange Variance"),
-    		$diff, null, $person_type_id, $person_id);
+    		-$diff, null, $person_type_id, $person_id);
 
     	add_gl_trans(ST_JOURNAL, $trans_no, $date_, get_company_pref('exchange_diff_act'), 0, 0, 
-    		_("Exchange Variance"),	-$diff, null, $person_type_id, $person_id);
+    		_("Exchange Variance"),	$diff, null, $person_type_id, $person_id);
 		commit_transaction();
 		return true;
 	}
@@ -237,8 +237,7 @@ function add_bank_transfer($from_account, $to_account, $date_,
 
     add_bank_trans($trans_type, $trans_no, $from_account, $ref,
 		$date_, -($amount + $charge),
-		PT_MISC, $person_id, $currency,
-		"Cannot insert a source bank transaction");
+		PT_MISC, $person_id, $currency);
 	if ($SysPrefs->auto_currency_revaluation())
 	{
 		$trans_no1 = get_next_trans_no(ST_JOURNAL);
@@ -270,8 +269,7 @@ function add_bank_transfer($from_account, $to_account, $date_,
 	   		0, 0, _("Exchange Variance"), -$total);
 	
 	add_bank_trans($trans_type, $trans_no, $to_account, $ref,
-		$date_, $to_amount, PT_MISC, $person_id,
-		$to_currency, "Cannot insert a destination bank transaction");
+		$date_, $to_amount, PT_MISC, $person_id);
 
 	if ($SysPrefs->auto_currency_revaluation())
 	{
@@ -357,7 +355,7 @@ function update_bank_transfer(
 {
 	begin_transaction();
 	delete_comments(ST_BANKTRANSFER, $trans_no);
-	void_bank_trans(ST_BANKTRANSFER, $trans_no, true);
+	void_transaction(ST_BANKTRANSFER, $trans_no, Today(), _("Document reentered."));
 	void_gl_trans(ST_BANKTRANSFER, $trans_no, true);
 	$new_trans_no = add_bank_transfer(
 		$from_account, $to_account, $date_, $amount,
@@ -467,8 +465,7 @@ function write_bank_transaction($trans_type, $trans_no, $from_account, $items, $
     add_bank_trans($trans_type, $trans_no, $from_account, $ref,
     	$date_, -$total_amount,
     	$person_type_id, $person_id,
-    	$currency,
-    	"Cannot insert a source bank transaction");
+    	$currency);
 	$total = 0;
 	foreach ($items->gl_items as $gl_item)
 	{
@@ -489,8 +486,7 @@ function write_bank_transaction($trans_type, $trans_no, $from_account, $items, $
     	{
     		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");
+    			$person_type_id, $person_id, $currency);
     		if ($do_exchange_variance)
     		{
     			add_exchange_variation($trans_no1, $date_, $is_bank_to, $gl_item->code_id,