X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fbanking.inc;h=a05f6e1198afd5c56df9d354aff862c230dd8ece;hb=268a54dcfd08aff7113bc3afe8b784f36db2d0d4;hp=cf532ea05ec95548da9b870edbe694c8fc4e1ec4;hpb=21290a4a16ca78fe736f62cf1cb039c06cb53fca;p=fa-stable.git

diff --git a/includes/banking.inc b/includes/banking.inc
index cf532ea0..a05f6e11 100644
--- a/includes/banking.inc
+++ b/includes/banking.inc
@@ -11,25 +11,6 @@
 ***********************************************************************/
 include_once($path_to_root . "/gl/includes/gl_db.inc");
 
-//----------------------------------------------------------------------------------
-//	Check if given account is used by any bank_account. 
-//	Returns id of first bank_account using account_code, null otherwise.
-//
-//	Keep in mind that direct posting to bank account is depreciated
-//	because we have no way to select right bank account if 
-//	there is more than one using given gl account.
-//
-function is_bank_account($account_code)
-{
-	$sql= "SELECT id FROM ".TB_PREF."bank_accounts WHERE account_code='$account_code'";
-	$result = db_query($sql, "checking account is bank account");
-	if (db_num_rows($result) > 0) {
-		$acct = db_fetch($result);
-		return $acct['id'];
-	} else
-		return false;
-}
-
 //----------------------------------------------------------------------------------
 
 function is_company_currency($currency)
@@ -41,66 +22,20 @@ 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];
-}
-
-//----------------------------------------------------------------------------------
-
-function get_bank_account_currency($id)
-{
-	$sql= "SELECT bank_curr_code FROM ".TB_PREF."bank_accounts WHERE id='$id'";
-	$result = db_query($sql, "retreive bank account currency");
-
-	$myrow = db_fetch_row($result);
-	return $myrow[0];
-}
-
-//----------------------------------------------------------------------------------
-
-function get_customer_currency($customer_id)
-{
-    $sql = "SELECT curr_code FROM ".TB_PREF."debtors_master WHERE debtor_no = '$customer_id'";
-
-	$result = db_query($sql, "Retreive currency of customer $customer_id");
-
-	$myrow=db_fetch_row($result);
-	return $myrow[0];
-}
-
-//----------------------------------------------------------------------------------
-
-function get_supplier_currency($supplier_id)
-{
-    $sql = "SELECT curr_code FROM ".TB_PREF."suppliers WHERE supplier_id = '$supplier_id'";
-
-	$result = db_query($sql, "Retreive currency of supplier $supplier_id");
-
-	$myrow=db_fetch_row($result);
-	return $myrow[0];
+	return get_company_pref('curr_default');
 }
 
 //----------------------------------------------------------------------------------
 
 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'
-				AND date_ <= '$date' GROUP BY rate_buy ORDER BY date_ Desc LIMIT 1";
 
-	$result = db_query($sql, "could not query exchange rates");
+	$rate = get_last_exchange_rate($currency_code, $date_);
 
-	if (db_num_rows($result) == 0)
+	if (!$rate)
 	{
 		// no stored exchange rate, just return 1
 		display_error(
@@ -109,8 +44,7 @@ function get_exchange_rate_from_home_currency($currency_code, $date_)
 		return 1.000;
 	}
 
-	$myrow = db_fetch_row($result);
-	return $myrow[0];
+	return $rate['rate_buy'];
 }
 
 //----------------------------------------------------------------------------------
@@ -164,11 +98,14 @@ 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']);
@@ -180,7 +117,7 @@ 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))
@@ -190,24 +127,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');
 		if (date1_greater_date2($date, $pyt_date))
 		{
-			$memo = systypes::name($pyt_type)." ".$pyt_no;
+			$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::name($type)." ".$trans_no;
+			$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);
 		}
 	}
 }
 
-?>
\ No newline at end of file