X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gl%2Fincludes%2Fdb%2Fgl_db_banking.inc;h=9d5b9693879dd70ecaf61f00b735f7a0a37a6b9b;hb=d1babda7c01b314d35fb89f2d195553b55936532;hp=964eac0ce384556adff2f08714e0ceea5eb6a1dd;hpb=fbf51ab0febfd0885620abcab8738339d156ff45;p=fa-stable.git

diff --git a/gl/includes/db/gl_db_banking.inc b/gl/includes/db/gl_db_banking.inc
index 964eac0c..9d5b9693 100644
--- a/gl/includes/db/gl_db_banking.inc
+++ b/gl/includes/db/gl_db_banking.inc
@@ -37,14 +37,29 @@ function add_exchange_variation($trans_no, $date_, $acc_id, $account,
 	$diff = $amount - $for_amount;
 	if (floatcmp($diff,0))
 	{
-		if ($trans_no == null)
-			$trans_no = get_next_trans_no(ST_JOURNAL);
+		// generate journal entry // FIXME: use cart?
+		global $Refs;
+
+		begin_transaction();
+		$trans_no = get_next_trans_no(ST_JOURNAL);
+		$ref = $Refs->get_next(ST_JOURNAL);
+
+		add_journal(ST_JOURNAL, $trans_no, $diff, $date_ , $currency, $ref, '', $rate, $date_, $date_);
+		$Refs->save(ST_JOURNAL, $trans_no, $ref);
+		add_audit_trail(ST_JOURNAL, $trans_no, $date_);
+		add_comments(ST_JOURNAL, $trans_no, $date_, $memo);
+
 		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);
+
+		// positive change in value is positive variance for AR and bank accounts, and negative for AP
+    	$variance_act = ($diff < 0 && $person_id==PT_SUPPLIER) || ($diff > 0 && $person_id != PT_SUPPLIER)
+    		 ? 'exchange_diff_act' : 'exchange_diff_neg_act';
     	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;
 	}
 	return false;
@@ -56,22 +71,28 @@ function add_cust_supp_revaluation($ledger_act, $ex_act, $date, $amount, $person
 	global $Refs;
 	if ($amount == 0)
 		return;
+
+	begin_transaction();
 	$trans_no = get_next_trans_no(ST_JOURNAL);
+	$ref = $Refs->get_next(ST_JOURNAL);
+
+	add_journal(ST_JOURNAL, $trans_no, $amount, $date, $currency, $ref, '', $rate, $date, $date);
+	$Refs->save(ST_JOURNAL, $trans_no, $ref);
+	add_audit_trail(ST_JOURNAL, $trans_no, $date);
+
 	add_gl_trans(ST_JOURNAL, $trans_no, $date, $ledger_act, 0, 0, _("Exchange Variance"),
 		$amount, null, $person_type_id, $person_id);
 	add_gl_trans(ST_JOURNAL, $trans_no, $date, $ex_act, 0, 0, 
 		_("Exchange Variance"),	-$amount, null, $person_type_id, $person_id);
 	add_comments(ST_JOURNAL, $trans_no, $date, $memo);
-	$ref = $Refs->get_next(ST_JOURNAL);
-	$Refs->save(ST_JOURNAL, $trans_no, $ref);
-	add_audit_trail(ST_JOURNAL, $trans_no, $date);
+	commit_transaction();
 }
 
 function get_cust_account_curr_balances($date)
 {
 	$to = date2sql($date);
 
-    $sql = "SELECT SUM(IF(t.type =".ST_CUSTCREDIT." OR t.type = ".ST_CUSTPAYMENT." OR t.type = ".ST_BANKDEPOSIT.",
+    $sql = "SELECT SUM(IF(t.type =".ST_CUSTCREDIT." OR t.type = ".ST_CUSTPAYMENT." OR t.type = ".ST_BANKDEPOSIT." OR t.type = ".ST_JOURNAL.",
 			-(t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount), 
 	    	(t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount))) AS amount,
 	    	dt.debtor_no, dt.name, dt.curr_code, b.receivables_account
@@ -193,7 +214,7 @@ function add_bank_transfer($from_account, $to_account, $date_,
 	$amount, $ref, $memo_, $charge=0, $target_amount=0)
 {
 	global $Refs, $SysPrefs;
-	
+
 	begin_transaction();
 	$args = func_get_args(); if (count($args) < 8) $args[] = 0;
 	$args = (object)array_combine(array('from_account', 'to_account', 'date_', 'amount',
@@ -282,6 +303,80 @@ function add_bank_transfer($from_account, $to_account, $date_,
 
 	return $trans_no;
 }
+
+function check_bank_transfer(
+    $trans_no, $from_account, $to_account, $date_,
+    $amount, $target_amount=0)
+{
+	$dbResult = get_bank_trans(ST_BANKTRANSFER, $trans_no);
+	if (2 != db_num_rows($dbResult)) {
+		// How are errors handled? Throw an exception would be nice. CP 2014-10
+	}
+
+	$old_from = db_fetch($dbResult);
+	$old_to = db_fetch($dbResult);
+	if ($old_to['amount'] < 0.0) {
+		$tmp = $old_from;
+		$old_from = $old_to;
+		$old_to = $tmp;
+	}
+	// There are four accounts to consider:
+	// 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']));
+	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 (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_);
+		}
+	}
+
+	if (null != $problemTransaction) {
+		$problemTransaction['account'] = $old_from['bank_act'];
+		$problemTransaction['bank_account_name'] = $old_from['bank_account_name'];
+		return $problemTransaction;
+	}
+	// 4) The edited to account, that is having funds added which is always ok.
+
+	return $problemTransaction;
+
+}
+
+function update_bank_transfer(
+	$trans_no, $from_account, $to_account, $date_,
+	$amount, $ref, $memo_, $charge=0, $target_amount=0)
+{
+	begin_transaction();
+	delete_comments(ST_BANKTRANSFER, $trans_no);
+	void_bank_trans(ST_BANKTRANSFER, $trans_no, true);
+	void_gl_trans(ST_BANKTRANSFER, $trans_no, true);
+	$new_trans_no = add_bank_transfer(
+		$from_account, $to_account, $date_, $amount,
+		$ref, $memo_, $charge, $target_amount
+	);
+	commit_transaction();
+	return $new_trans_no;
+}
+
 //----------------------------------------------------------------------------------
 //	Add bank payment or deposit to database.
 //
@@ -321,7 +416,8 @@ function write_bank_transaction($trans_type, $trans_no, $from_account, $items, $
 		$old_trans = $trans_no;
 		$Refs->restore_last($trans_type, $trans_no);
 		$aid = has_attachment($trans_type, $trans_no);
-	}
+	} else
+		$old_trans = false;
 
 	$currency = get_bank_account_currency($from_account);
 	$bank_gl_account = get_bank_gl_account($from_account);
@@ -343,7 +439,8 @@ function write_bank_transaction($trans_type, $trans_no, $from_account, $items, $
 
 		$trans_no = write_customer_trans($trans_type, 0, $person_id, $person_detail_id, $date_,
         	$ref, $cust_amount);
-
+		if ($old_trans)
+			move_trans_attachments($trans_type, $old_trans, $trans_no);
     }
     elseif ($person_type_id == PT_SUPPLIER)
     {
@@ -359,7 +456,8 @@ function write_bank_transaction($trans_type, $trans_no, $from_account, $items, $
 
 		$trans_no = write_supp_trans($trans_type, 0, $person_id, $date_, '',
 			$ref, "", $supp_amount, 0, 0);
-
+		if ($old_trans)
+			move_trans_attachments($trans_type, $old_trans, $trans_no);
     }
     else
     {
@@ -440,8 +538,16 @@ function write_bank_transaction($trans_type, $trans_no, $from_account, $items, $
 
 	// old transaction can be voided only after new transaction is entered,
 	//  otherwise the operation could fail for cash accounts due to temporary negative balance
-	if (@$old_trans) 
-			void_transaction($trans_type, $old_trans, Today(), _("Document reentered."));
+	if ($old_trans) 
+	{
+		$msg = void_transaction($trans_type, $old_trans, Today(), _("Document reentered."));
+		if ($msg)
+		{
+			display_error($msg);
+			return false;
+		}
+	}
+
 
 	$args->trans_no = $trans_no;
 	hook_db_postwrite($args, $trans_type);