From d8eded3f5856ef840837f0e2639d10a643adc732 Mon Sep 17 00:00:00 2001
From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Mon, 25 Jan 2010 11:00:40 +0000
Subject: [PATCH] Bug in the sequence in sales price pickup

---
 CHANGELOG.txt               |  3 +++
 sales/includes/sales_db.inc | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 67434e3..97e8726 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -20,6 +20,9 @@ Legend:
 $ -> Affected files
 
 25-Jan-2010 Joe Hunt
+# Bug in the sequence in sales price pickup
+$ /sales/includes/sales_db.inc
+
 + Added document Receipt and small rearrangements and bugfixes
 $ /includes/types.inc
   /includes/ui/ui_view.inc
diff --git a/sales/includes/sales_db.inc b/sales/includes/sales_db.inc
index 7a7d1e3..cd5d999 100644
--- a/sales/includes/sales_db.inc
+++ b/sales/includes/sales_db.inc
@@ -113,6 +113,23 @@ function get_price ($stock_id, $currency, $sales_type_id, $factor=null, $date=nu
 	    $prices[$myrow['sales_type_id']][$myrow['curr_abrev']] = $myrow['price'];
 	}
 	$price = false;
+	if (isset($prices[$sales_type_id][$currency])) 
+	{
+	    $price = $prices[$sales_type_id][$currency];
+	}
+	elseif (isset($prices[$base_id][$currency])) 
+	{
+	    $price = $prices[$base_id][$currency] * $factor;
+	}
+	elseif (isset($prices[$sales_type_id][$home_curr])) 
+	{
+	    $price = $prices[$sales_type_id][$home_curr] / $rate;
+	}
+	elseif (isset($prices[$base_id][$home_curr])) 
+	{
+	    $price = $prices[$base_id][$home_curr] * $factor / $rate;
+	}
+/*
 	if (isset($prices[$sales_type_id][$home_curr])) 
 	{
 	    $price = $prices[$sales_type_id][$home_curr] / $rate;
@@ -125,6 +142,7 @@ function get_price ($stock_id, $currency, $sales_type_id, $factor=null, $date=nu
 	{
 	    $price = $prices[$base_id][$home_curr] * $factor / $rate;
 	}
+*/	
 	elseif ($num_rows == 0 && $add_pct != -1)
 	{
 		$price = get_calculated_price($stock_id, $add_pct);
-- 
2.30.2