From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Mon, 3 Nov 2008 17:37:34 +0000 (+0000)
Subject: Fixed price priority in automatic calculations.
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=015d0155f9159d34738e2881329092529f7ed60b;p=textcart.git

Fixed price priority in automatic calculations.
---

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index b667085..4786f68 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,10 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+03-Nov-2008 Janusz Dobrowolski
+# Fixed price priority in automatic calculations.
+$ sales/includes/sales_db.inc
+
 30-Oct-2008 Janusz Dobrowolski
 # [0000080] BOM elements was not editable after entry.
 $ /manufacturing/manage/bom_edit.php
diff --git a/sales/includes/sales_db.inc b/sales/includes/sales_db.inc
index 1f5e0f3..338f2d0 100644
--- a/sales/includes/sales_db.inc
+++ b/sales/includes/sales_db.inc
@@ -104,11 +104,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;
 	}