X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fsales_db.inc;h=ab35dc81ab2a957f5b7ec9ecbbd0e9a5a5070c38;hb=b6af4ea4c99734cfd051395289107bbba5a405e9;hp=8c74c9bfbe597194168cea6667c6725552f67c3d;hpb=3a5c989060c96623b8f621ba89f8eb4405fb1588;p=fa-stable.git

diff --git a/sales/includes/sales_db.inc b/sales/includes/sales_db.inc
index 8c74c9bf..ab35dc81 100644
--- a/sales/includes/sales_db.inc
+++ b/sales/includes/sales_db.inc
@@ -36,14 +36,14 @@ function add_stock_move_customer($type, $stock_id, $trans_id, $location, $date_,
 // $amount is in CUSTOMER'S currency
 
 function add_gl_trans_customer($type, $type_no, $date_, $account, $dimension, $dimension2,
-	$amount, $customer_id, $err_msg="")
+	$amount, $customer_id, $err_msg="", $rate=0)
 {
 	if ($err_msg == "")
 		$err_msg = "The customer GL transaction could not be inserted";
 
 	return add_gl_trans($type, $type_no, $date_, $account, $dimension, $dimension2, "", $amount,
 		get_customer_currency($customer_id),
-		payment_person_types::customer(), $customer_id, $err_msg);
+		payment_person_types::customer(), $customer_id, $err_msg, $rate);
 }
 
 //----------------------------------------------------------------------------------------
@@ -76,7 +76,9 @@ function get_price ($stock_id, $currency, $sales_type_id, $factor=null, $date=nu
 	if ($factor == 0) return false; // auto price calculations off
 
 	$base_id = get_base_sales_type();
-        $home_curr = get_company_currency();
+	if ($base_id <= 0) return 0; // auto price calculations off
+	
+    $home_curr = get_company_currency();
 
     // get all prices which we can use to guess the price.
     // alternative is make up to 2 additional sql queries
@@ -104,11 +106,11 @@ function get_price ($stock_id, $currency, $sales_type_id, $factor=null, $date=nu
 	{
 	    $price = $prices[$sales_type_id][$home_curr] / $rate;
 	}
-	if (isset($prices[$base_id][$currency])) 
+	elseif (isset($prices[$base_id][$currency])) 
 	{
 	    $price = $prices[$base_id][$currency] * $factor;
 	}
-	if (isset($prices[$base_id][$home_curr])) 
+	elseif (isset($prices[$base_id][$home_curr])) 
 	{
 	    $price = $prices[$base_id][$home_curr] * $factor / $rate;
 	}