From 1f2df05a89b0ef7a76a0edd60466c697dcfa2ede Mon Sep 17 00:00:00 2001
From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Sat, 14 Mar 2009 00:12:24 +0000
Subject: [PATCH] Changed so exchange variances is stamped on invoice GL
 instead of payment GL   if invoice date is later than payment date

---
 CHANGELOG.txt        |  5 +++++
 includes/banking.inc | 17 ++++++++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index f50ce0b..e4959d2 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,11 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+14-Mar-2009 Joe Hunt
+! Changed so exchange variances is stamped on invoice GL instead of payment GL
+  if invoice date is later than payment date
+$ /includes/banking.inc
+
 13-Mar-2009 Janusz Dobrowolski/Joe Hunt
 # GL line delete bug fixed.
 $ /gl/includes/ui/gl_bank_ui.inc
diff --git a/includes/banking.inc b/includes/banking.inc
index 4de6ae4..cf532ea 100644
--- a/includes/banking.inc
+++ b/includes/banking.inc
@@ -171,6 +171,7 @@ function exchange_variation($pyt_type, $pyt_no, $type, $trans_no, $pyt_date, $am
 		$ar_ap_act = $trans['receivables_account'];
 		$person_id = $trans['debtor_no'];
 		$curr = $trans['curr_code'];
+		$date = sql2date($trans['tran_date']);
 	}
 	else
 	{
@@ -180,6 +181,7 @@ function exchange_variation($pyt_type, $pyt_no, $type, $trans_no, $pyt_date, $am
 		$ar_ap_act = $supp_accs['payable_account'];
 		$person_id = $trans['supplier_id'];
 		$curr = $trans['SupplierCurrCode'];
+		$date = sql2date($trans['tran_date']);
 	}
 	if (is_company_currency($curr))
 		return;
@@ -193,9 +195,18 @@ function exchange_variation($pyt_type, $pyt_no, $type, $trans_no, $pyt_date, $am
 		if ($neg)
 			$diff = -$diff;
 		$exc_var_act = get_company_pref('exchange_diff_act');
-		$memo = systypes::name($type)." ".$trans_no;
-		add_gl_trans($pyt_type, $pyt_no, $pyt_date, $ar_ap_act, 0, 0, $memo, -$diff, null, $person_type, $person_id);
-		add_gl_trans($pyt_type, $pyt_no, $pyt_date, $exc_var_act, 0, 0, $memo, $diff, null, $person_type, $person_id);
+		if (date1_greater_date2($date, $pyt_date))
+		{
+			$memo = systypes::name($pyt_type)." ".$pyt_no;
+			add_gl_trans($type, $trans_no, $date, $ar_ap_act, 0, 0, $memo, -$diff, null, $person_type, $person_id);
+			add_gl_trans($type, $trans_no, $date, $exc_var_act, 0, 0, $memo, $diff, null, $person_type, $person_id);
+		}
+		else
+		{
+			$memo = systypes::name($type)." ".$trans_no;
+			add_gl_trans($pyt_type, $pyt_no, $pyt_date, $ar_ap_act, 0, 0, $memo, -$diff, null, $person_type, $person_id);
+			add_gl_trans($pyt_type, $pyt_no, $pyt_date, $exc_var_act, 0, 0, $memo, $diff, null, $person_type, $person_id);
+		}
 	}
 }
 
-- 
2.30.2