X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fsales_db.inc;h=579bbb9a8e0f65d5da31653694256d4a82c54c6f;hb=f1a6302759ae11aab99e3e4b4d37f2d3e1e1c368;hp=338f2d0098a18981a477a8fe0c743131e7c93429;hpb=33186e23c535d0226bd51ff67c5024a5df841ed5;p=fa-stable.git

diff --git a/sales/includes/sales_db.inc b/sales/includes/sales_db.inc
index 338f2d00..579bbb9a 100644
--- a/sales/includes/sales_db.inc
+++ b/sales/includes/sales_db.inc
@@ -72,10 +72,12 @@ function get_price ($stock_id, $currency, $sales_type_id, $factor=null, $date=nu
 		$myrow = db_fetch_row($result);
 		return $myrow[0];
 	}
-	if ($factor == 0) return 0; // auto price calculations off
+	if ($factor == 0) return 0; // auto price calculations off for current pricelist
 
 	$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