X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fdb%2Fgl_db_banking.inc;h=a7ad5576093a7f8501f923cf71f59e015d5029d0;hb=690541d38346ab42d73b59431544a262d0d961c0;hp=e071b9ac8f6c27906b29301f26b5c824f6aab884;hpb=92516cf782e07af078fab627e35c75c822702ab2;p=fa-stable.git

diff --git a/gl/includes/db/gl_db_banking.inc b/gl/includes/db/gl_db_banking.inc
index e071b9ac..a7ad5576 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;
 	}
@@ -298,8 +298,7 @@ function add_bank_transfer($from_account, $to_account, $date_,
 	return $trans_no;
 }
 
-function check_bank_transfer(
-    $trans_no, $from_account, $to_account, $date_,
+function check_bank_transfer($trans_no, $from_account, $to_account, $date_,
     $amount, $target_amount=0)
 {
 	$dbResult = get_bank_trans(ST_BANKTRANSFER, $trans_no);
@@ -315,33 +314,34 @@ function check_bank_transfer(
 	// 1) The original from account that is being voided. This results in funds being put back which is always fine.
 	// 2) The original to account that is being voided. This results in funds being removed which may result in a
 	//    negative balance in the account at some time and therefore needs to be checked.
-	$problemTransaction = check_bank_account_history(-$old_to['amount'], $old_to['bank_act'], sql2date($old_to['trans_date']));
+	$problemTransaction = check_bank_account_history(-$old_to['amount'], $old_to['bank_act'], sql2date($old_from['trans_date']));
 	if ($problemTransaction) {
 		// If the destination account is the same as that being edited, it may be that this edit will resolve the
 		// problem of voiding.
-		if ($to_account == $old_to['bank_act'] && sql_date_comp($problemTransaction['trans_date'], date2sql($date_)) >= 0) {
-			$problemTransaction = check_bank_account_history($target_amount-$old_to['amount'], $to_account, $date_);
+		if ($to_account == $old_to['bank_act'] && sql_date_comp($problemTransaction['trans_date'], date2sql($date_)) > 0) {
+			$problemTransaction['amount'] += $amount;
+			if ($problemTransaction['amount'] >= 0) {
+				$problemTransaction = null;
+			}
+		}
+		if ($problemTransaction != null) {
+			$problemTransaction['account'] = $old_to['bank_act'];
+			$problemTransaction['bank_account_name'] = $old_to['bank_account_name'];
+			return $problemTransaction;
 		}
-	}
-	if (null != $problemTransaction) {
-		$problemTransaction['account'] = $old_to['bank_act'];
-		$problemTransaction['bank_account_name'] = $old_to['bank_account_name'];
-		return $problemTransaction;
 	}
 
 	// 3) The edited from account, that is having funds removed which may result in a
 	//    negative balance in the account at some time and therefore needs to be checked.
-	$problemTransaction = check_bank_account_history(-$amount, $from_account, $date_);
-	if ($problemTransaction) {
-		// If the target account is the same as that being edited, it may be that voiding old transfer will
-		// solve balance problem.
-		//
-		if ($from_account == $old_from['bank_act'] && sql_date_comp($problemTransaction['trans_date'], $old_from['trans_date']) >=0 ) {
-			$problemTransaction = check_bank_account_history(-$amount-$old_from['amount'], $from_account, $date_);
-		}
+	$balance_offset = 0;
+	if ($from_account == $old_from['bank_act'] && sql_date_comp(date2sql($date_), $old_from['trans_date']) >= 0) {
+		// If the edited from_account is the same as the original transaction, and the new date is later than the old date
+		// then add the amount from the original from transaction when checking the history to simulate the void that would
+		// take effect from that date.
+		$balance_offset = -$old_from['amount'];
 	}
-
-	if (null != $problemTransaction) {
+	$problemTransaction = check_bank_account_history(-$amount, $from_account, $date_, null, $balance_offset);
+	if ($problemTransaction != null) {
 		$problemTransaction['account'] = $old_from['bank_act'];
 		$problemTransaction['bank_account_name'] = $old_from['bank_account_name'];
 		return $problemTransaction;
@@ -349,7 +349,6 @@ function check_bank_transfer(
 	// 4) The edited to account, that is having funds added which is always ok.
 
 	return $problemTransaction;
-
 }
 
 function update_bank_transfer(
@@ -358,7 +357,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,