X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fbanking.inc;h=59f0fe070743d5ca32141fbf489052c29bedf5de;hb=5cd13431fe25eb8cd98f67020c55dab124c7e930;hp=4de6ae471fa1430a9f56222fd88def42ff71aa40;hpb=d567a10b7925c8bb97c734e213d6651a979af29d;p=fa-stable.git

diff --git a/includes/banking.inc b/includes/banking.inc
index 4de6ae47..59f0fe07 100644
--- a/includes/banking.inc
+++ b/includes/banking.inc
@@ -90,7 +90,7 @@ function get_supplier_currency($supplier_id)
 
 function get_exchange_rate_from_home_currency($currency_code, $date_)
 {
-	if ($currency_code == get_company_currency())
+	if ($currency_code == get_company_currency() || $currency_code == null)
 		return 1.0000;
 
 	$date = date2sql($date_);
@@ -164,13 +164,16 @@ function exchange_from_to($amount, $from_curr_code, $to_curr_code, $date_)
 
 function exchange_variation($pyt_type, $pyt_no, $type, $trans_no, $pyt_date, $amount, $person_type, $neg=false)
 {
-	if ($person_type == payment_person_types::customer())
+	global $systypes_array;
+	
+	if ($person_type == PT_CUSTOMER)
 	{
 		$trans = get_customer_trans($trans_no, $type);
 		$pyt_trans = get_customer_trans($pyt_no, $pyt_type);
 		$ar_ap_act = $trans['receivables_account'];
 		$person_id = $trans['debtor_no'];
 		$curr = $trans['curr_code'];
+		$date = sql2date($trans['tran_date']);
 	}
 	else
 	{
@@ -180,6 +183,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;
@@ -188,14 +192,23 @@ function exchange_variation($pyt_type, $pyt_no, $type, $trans_no, $pyt_date, $am
 	if ($inv_amt != $pay_amt)
 	{
 		$diff = $inv_amt - $pay_amt;
-		if ($person_type == payment_person_types::supplier())
+		if ($person_type == PT_SUPPLIER)
 			$diff = -$diff;
 		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_array[$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_array[$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);
+		}
 	}
 }