From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Mon, 22 Feb 2010 22:19:51 +0000 (+0000)
Subject: Rerun
X-Git-Tag: 2.3-final~958
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=4235547f197afc92d317f3137419421d8660c168;p=fa-stable.git

Rerun
---

diff --git a/gl/includes/db/gl_db_banking.inc b/gl/includes/db/gl_db_banking.inc
index 71ffaa7a..bcc6c2be 100644
--- a/gl/includes/db/gl_db_banking.inc
+++ b/gl/includes/db/gl_db_banking.inc
@@ -29,8 +29,8 @@ function add_exchange_variation($trans_type, $trans_no, $date_, $acc_id, $accoun
 	{
 		$for_amount += $row['for_amount'];
 		
-		$sql2 = "SELECT SUM(IF(((gt.amount < 0 AND ".$row['for_amount']." < 0) OR (gt.amount >= 0 AND ".$row['for_amount']." >= 0)), 
-			gt.amount, 0)) AS amount FROM ".TB_PREF."gl_trans gt
+		$sql2 = "SELECT SUM(IF(((gt.amount < 0 AND ".$row['for_amount']." < 0) OR (gt.amount >= 0 AND ".$row['for_amount']." >= 0))
+			OR gt.memo_ = '"._("Exchange Variance")."', gt.amount, 0)) AS amount FROM ".TB_PREF."gl_trans gt
 			WHERE gt.account = '".$row['account_code']."' AND gt.type = ".$row['type']."
 			AND gt.type_no = ".$row['trans_no']." AND gt.tran_date = '".$row['trans_date']."'";
 		$res = db_query($sql2, "Transactions for GL account ".$row['account_code']." could not be calculated");