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

diff --git a/includes/banking.inc b/includes/banking.inc
index 4de6ae47..53af3598 100644
--- a/includes/banking.inc
+++ b/includes/banking.inc
@@ -21,7 +21,7 @@ include_once($path_to_root . "/gl/includes/gl_db.inc");
 //
 function is_bank_account($account_code)
 {
-	$sql= "SELECT id FROM ".TB_PREF."bank_accounts WHERE account_code='$account_code'";
+	$sql= "SELECT id FROM ".TB_PREF."bank_accounts WHERE account_code=".db_escape($account_code);
 	$result = db_query($sql, "checking account is bank account");
 	if (db_num_rows($result) > 0) {
 		$acct = db_fetch($result);
@@ -41,21 +41,14 @@ function is_company_currency($currency)
 
 function get_company_currency()
 {
-	$sql= "SELECT curr_default FROM ".TB_PREF."company";
-	$result = db_query($sql, "retreive company currency");
-
-	if (db_num_rows($result) == 0)
-		display_db_error("Could not find the requested currency. Fatal.", $sql);
-
-	$myrow = db_fetch_row($result);
-	return $myrow[0];
+	return get_company_pref('curr_default');
 }
 
 //----------------------------------------------------------------------------------
 
 function get_bank_account_currency($id)
 {
-	$sql= "SELECT bank_curr_code FROM ".TB_PREF."bank_accounts WHERE id='$id'";
+	$sql= "SELECT bank_curr_code FROM ".TB_PREF."bank_accounts WHERE id=".db_escape($id);
 	$result = db_query($sql, "retreive bank account currency");
 
 	$myrow = db_fetch_row($result);
@@ -66,7 +59,7 @@ function get_bank_account_currency($id)
 
 function get_customer_currency($customer_id)
 {
-    $sql = "SELECT curr_code FROM ".TB_PREF."debtors_master WHERE debtor_no = '$customer_id'";
+    $sql = "SELECT curr_code FROM ".TB_PREF."debtors_master WHERE debtor_no = ".db_escape($customer_id);
 
 	$result = db_query($sql, "Retreive currency of customer $customer_id");
 
@@ -78,7 +71,7 @@ function get_customer_currency($customer_id)
 
 function get_supplier_currency($supplier_id)
 {
-    $sql = "SELECT curr_code FROM ".TB_PREF."suppliers WHERE supplier_id = '$supplier_id'";
+    $sql = "SELECT curr_code FROM ".TB_PREF."suppliers WHERE supplier_id = ".db_escape($supplier_id);
 
 	$result = db_query($sql, "Retreive currency of supplier $supplier_id");
 
@@ -90,12 +83,12 @@ 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_);
 
-	$sql = "SELECT rate_buy, max(date_) as date_ FROM ".TB_PREF."exchange_rates WHERE curr_code = '$currency_code'
+	$sql = "SELECT rate_buy, max(date_) as date_ FROM ".TB_PREF."exchange_rates WHERE curr_code = ".db_escape($currency_code)."
 				AND date_ <= '$date' GROUP BY rate_buy ORDER BY date_ Desc LIMIT 1";
 
 	$result = db_query($sql, "could not query exchange rates");
@@ -164,13 +157,17 @@ 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'];
+		$cust_accs = get_branch_accounts($trans['branch_code']);
+		$ar_ap_act = $cust_accs['receivables_account'];
 		$person_id = $trans['debtor_no'];
 		$curr = $trans['curr_code'];
+		$date = sql2date($trans['tran_date']);
 	}
 	else
 	{
@@ -179,7 +176,8 @@ function exchange_variation($pyt_type, $pyt_no, $type, $trans_no, $pyt_date, $am
 		$supp_accs = get_supplier_accounts($trans['supplier_id']);
 		$ar_ap_act = $supp_accs['payable_account'];
 		$person_id = $trans['supplier_id'];
-		$curr = $trans['SupplierCurrCode'];
+		$curr = $trans['curr_code'];
+		$date = sql2date($trans['tran_date']);
 	}
 	if (is_company_currency($curr))
 		return;
@@ -188,14 +186,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);
+		}
 	}
 }