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

diff --git a/gl/includes/db/gl_db_banking.inc b/gl/includes/db/gl_db_banking.inc
index 9d5b9693..1a6aed3e 100644
--- a/gl/includes/db/gl_db_banking.inc
+++ b/gl/includes/db/gl_db_banking.inc
@@ -10,7 +10,7 @@
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 function add_exchange_variation($trans_no, $date_, $acc_id, $account,
-    $currency, $person_type_id=null, $person_id = "")
+    $currency, $person_type_id=null, $person_id = "", $memo='')
 {
 	if (is_company_currency($currency))
 		return false;
@@ -20,7 +20,6 @@ function add_exchange_variation($trans_no, $date_, $acc_id, $account,
 
 	// We have to calculate all the currency accounts belonging to the GL account
 	// upto $date_ and calculate with the exchange rates. And then compare with the GL account balance.
-	// 2010-02-23 Joe Hunt with help of Ary Wibowo
 	$sql = "SELECT SUM(bt.amount) AS for_amount, ba.bank_curr_code 		
 		FROM ".TB_PREF."bank_trans bt, ".TB_PREF."bank_accounts ba
 		WHERE ba.id = bt.bank_act AND ba.account_code = ".db_escape($account)." AND bt.trans_date<='".date2sql($date_)."'
@@ -42,30 +41,32 @@ function add_exchange_variation($trans_no, $date_, $acc_id, $account,
 
 		begin_transaction();
 		$trans_no = get_next_trans_no(ST_JOURNAL);
-		$ref = $Refs->get_next(ST_JOURNAL);
+		$ref = $Refs->get_next(ST_JOURNAL, null, $date_);
 
-		add_journal(ST_JOURNAL, $trans_no, $diff, $date_ , $currency, $ref, '', $rate, $date_, $date_);
+		add_journal(ST_JOURNAL, $trans_no, $diff, $date_ , get_company_currency(), $ref, '', 1, $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);
+
+		if ($memo)
+			add_comments(ST_JOURNAL, $trans_no, $date_, $memo);
+
+		$Refs->save(ST_JOURNAL, $trans_no, $ref);
+		add_audit_trail(ST_JOURNAL, $trans_no, $date_);
+
 		commit_transaction();
 		return true;
 	}
 	return false;
 }
 
-//------------- New helper functions for revaluation of customer/supplier currencies 2011-05-08 Joe Hunt.
 function add_cust_supp_revaluation($ledger_act, $ex_act, $date, $amount, $person_type_id, $person_id, $memo)
 {
 	global $Refs;
@@ -76,7 +77,7 @@ function add_cust_supp_revaluation($ledger_act, $ex_act, $date, $amount, $person
 	$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);
+	add_journal(ST_JOURNAL, $trans_no, $amount, $date, get_company_currency(), $ref, '', 1, $date, $date);
 	$Refs->save(ST_JOURNAL, $trans_no, $ref);
 	add_audit_trail(ST_JOURNAL, $trans_no, $date);
 
@@ -92,7 +93,7 @@ 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." OR t.type = ".ST_JOURNAL.",
+    $sql = "SELECT SUM(IF(t.type IN(". implode(',', array(ST_CUSTCREDIT, ST_CUSTPAYMENT, ST_BANKDEPOSIT, 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
@@ -136,32 +137,29 @@ function get_account_home_balance($person_id, $person_type, $rec_account, $to_da
 	$row = db_fetch_row($result);
 	return $row[0];
 }
-//------------- New helper functions for revaluation of customer/supplier currencies 2011-05-08 Joe Hunt.
 
-function add_exchange_variation_all($date=null, $ref="", $memo)
+//
+// Calculate and post currency accounts revaluation including foreign AP/AR
+// Note: in 2.4.9 sparse 'ref' argument was removed (generated transactions use
+// next references from default refline).
+//
+function add_exchange_variation_all($date=null, $memo)
 {
-	global $Refs;
 	begin_transaction();
 	$exchanged = false;
 	$trans_no = get_next_trans_no(ST_JOURNAL);
 	$sql = "SELECT * FROM ".TB_PREF."bank_accounts";
 	$result = db_query($sql, "could not retreive bank accounts");
+	$b_num = 0;
 	while ($myrow = db_fetch($result))
 	{
 		if (add_exchange_variation($trans_no, $date, $myrow['id'], $myrow['account_code'],
-			$myrow['bank_curr_code']))
-			$exchanged = true;
+			$myrow['bank_curr_code'], null, '', $memo))
+		$b_num++;
 	}
-	if ($exchanged)
-	{
-		add_comments(ST_JOURNAL, $trans_no, $date, $memo);
-		if ($ref == "")
-			$ref = $Refs->get_next(ST_JOURNAL);
-		$Refs->save(ST_JOURNAL, $trans_no, $ref);
-		add_audit_trail(ST_JOURNAL, $trans_no, $date);
-	}	
 
-	//------------- BEGIN inserted for revaluation of customer/supplier currencies 2011-05-08 Joe Hunt.
+	// revaluation of customer/supplier currencies
+
 	if ($date == null)
 		$date = Today();
 	$exchange_act = get_company_pref('exchange_diff_act');
@@ -198,10 +196,9 @@ function add_exchange_variation_all($date=null, $ref="", $memo)
 			$je++;	
 		}
 	}
-	//------------- END
 
 	commit_transaction();
-	return array(($exchanged ? $trans_no : 0), $je);
+	return array($b_num, $je);
 }
 //----------------------------------------------------------------------------------
 //	Add bank tranfer to database.
@@ -235,7 +232,6 @@ function add_bank_transfer($from_account, $to_account, $date_,
 	$from_gl_account = get_bank_gl_account($from_account);
 	$to_gl_account = get_bank_gl_account($to_account);
 	
-	$exchanged = false;
 	$total = 0;
 	// do the source account postings
     $total += add_gl_trans($trans_type, $trans_no, $date_, $from_gl_account, 0, 0, $person_id,
@@ -248,9 +244,8 @@ function add_bank_transfer($from_account, $to_account, $date_,
 	if ($SysPrefs->auto_currency_revaluation())
 	{
 		$trans_no1 = get_next_trans_no(ST_JOURNAL);
-		if (add_exchange_variation($trans_no1, $date_, $from_account, $from_gl_account, 
-			$currency, PT_MISC, $person_id))
-			$exchanged = true;
+		add_exchange_variation($trans_no1, $date_, $from_account, $from_gl_account, 
+			$currency, PT_MISC, $person_id);
 	}
 	if ($charge != 0)
 	{
@@ -282,15 +277,8 @@ function add_bank_transfer($from_account, $to_account, $date_,
 	if ($SysPrefs->auto_currency_revaluation())
 	{
 		$currency = get_bank_account_currency($to_account);
-		if (add_exchange_variation($trans_no1, $date_, $to_account, $to_gl_account,	
-			$currency, PT_MISC, $person_id))
-			$exchanged = true;
-	}
-	if ($exchanged == true)
-	{
-		$ref1 = $Refs->get_next(ST_JOURNAL);
-		$Refs->save(ST_JOURNAL, $trans_no1, $ref1);
-		add_audit_trail(ST_JOURNAL, $trans_no1, $date_);
+		add_exchange_variation($trans_no1, $date_, $to_account, $to_gl_account,	
+			$currency, PT_MISC, $person_id);
 	}
 	add_comments($trans_type, $trans_no, $date_, $memo_);
 
@@ -304,14 +292,10 @@ 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);
-	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);
@@ -324,33 +308,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;
@@ -358,7 +343,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(
@@ -367,7 +351,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, $date_, _("Document reentered."));
 	void_gl_trans(ST_BANKTRANSFER, $trans_no, true);
 	$new_trans_no = add_bank_transfer(
 		$from_account, $to_account, $date_, $amount,
@@ -401,7 +385,6 @@ function write_bank_transaction($trans_type, $trans_no, $from_account, $items, $
 		display_db_error("Invalid type ($trans_type) sent to add_bank_transaction");
 
 	$do_exchange_variance = false;
-	$exchanged = false;
 	if ($use_transaction)
 		begin_transaction();
 
@@ -517,18 +500,13 @@ function write_bank_transaction($trans_type, $trans_no, $from_account, $items, $
 	}
 
 	// do the source account postings
-    add_gl_trans($trans_type, $trans_no, $date_, $bank_gl_account, 0, 0, $memo_,
+    add_gl_trans($trans_type, $trans_no, $date_, $bank_gl_account, $gl_item->dimension_id, $gl_item->dimension2_id, $memo_,
     	-$total, null, $person_type_id, $person_id);
 
     if ($do_exchange_variance)
     {
-    	if ($exchanged || add_exchange_variation($trans_no1, $date_, $from_account, $bank_gl_account, 
-    		$currency, $person_type_id, $person_id))
-    	{
-   			$ref1 = $Refs->get_next(ST_JOURNAL);
-			$Refs->save(ST_JOURNAL, $trans_no1, $ref1);
-			add_audit_trail(ST_JOURNAL, $trans_no1, $date_);
-		}
+    	add_exchange_variation($trans_no1, $date_, $from_account, $bank_gl_account, 
+    		$currency, $person_type_id, $person_id);
 	}
 
 	add_comments($trans_type, $trans_no, $date_, $memo_);
@@ -540,7 +518,7 @@ function write_bank_transaction($trans_type, $trans_no, $from_account, $items, $
 	//  otherwise the operation could fail for cash accounts due to temporary negative balance
 	if ($old_trans) 
 	{
-		$msg = void_transaction($trans_type, $old_trans, Today(), _("Document reentered."));
+		$msg = void_transaction($trans_type, $old_trans, $date_, _("Document reentered."));
 		if ($msg)
 		{
 			display_error($msg);