From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Tue, 25 Nov 2008 15:10:18 +0000 (+0000)
Subject: Fixed automatic price calculations always on.
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=46b83f9818f81628f5e776385c8330b2019b01f2;p=textcart.git

Fixed automatic price calculations always on.
---

diff --git a/sales/includes/sales_db.inc b/sales/includes/sales_db.inc
index 338f2d0..579bbb9 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