Fixed price priority in automatic calculations.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index b6670853a9f7e4d8a67bdb6b296e1264f2242827..4786f688171226e6f4e434f6067b29e1015065be 100644 (file)
--- 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 1f5e0f31f7dc93c7e1c126b517566ddcd5769bd4..338f2d0098a18981a477a8fe0c743131e7c93429 100644 (file)
--- 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;
        }