X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fincludes%2Fdb%2Fitems_prices_db.inc;h=5a474e7c1bbcec34d67e4a117eaf8a64ddbd0afe;hb=490690013b7bb161ee2295b89cb18e1a88cae2af;hp=9b2ee373c0969b9c82a688b0cbdb6481962bc587;hpb=17b390efcf904072b02ec866b2a427490471a260;p=fa-stable.git

diff --git a/inventory/includes/db/items_prices_db.inc b/inventory/includes/db/items_prices_db.inc
index 9b2ee373..5a474e7c 100644
--- a/inventory/includes/db/items_prices_db.inc
+++ b/inventory/includes/db/items_prices_db.inc
@@ -14,8 +14,8 @@ function add_item_price($stock_id, $sales_type_id, $curr_abrev, $price)
 	$sql = "INSERT INTO ".TB_PREF."prices (stock_id, sales_type_id, curr_abrev, price) 
 		VALUES (".db_escape($stock_id).", ".db_escape($sales_type_id)
 		.", ".db_escape($curr_abrev).", ".db_escape($price).")";
-	
-	db_query($sql,"an item price could not be added");		
+
+	db_query($sql,"an item price could not be added");
 }
 
 function update_item_price($price_id, $sales_type_id, $curr_abrev, $price)
@@ -23,33 +23,34 @@ function update_item_price($price_id, $sales_type_id, $curr_abrev, $price)
 	$sql = "UPDATE ".TB_PREF."prices SET sales_type_id=".db_escape($sales_type_id).", 
 		curr_abrev=".db_escape($curr_abrev).", 
 		price=".db_escape($price)." WHERE id=".db_escape($price_id);
-	
-	db_query($sql,"an item price could not be updated");		
+
+	db_query($sql,"an item price could not be updated");
 }
 
 function delete_item_price($price_id)
 {
 	$sql="DELETE FROM ".TB_PREF."prices WHERE id= ".db_escape($price_id);
-	db_query($sql,"an item price could not be deleted");			
+	db_query($sql,"an item price could not be deleted");
 }
 
 function get_prices($stock_id)
 {
-	$sql = "SELECT ".TB_PREF."sales_types.sales_type, ".TB_PREF."prices.* 
-		FROM ".TB_PREF."prices, ".TB_PREF."sales_types 
-		WHERE ".TB_PREF."prices.sales_type_id = ".TB_PREF."sales_types.id 
+	$sql = "SELECT pricelist.sales_type, price.* 
+		FROM ".TB_PREF."prices price, "
+			.TB_PREF."sales_types pricelist
+		WHERE price.sales_type_id = pricelist.id
 		AND stock_id=".db_escape($stock_id)
-		." ORDER BY curr_abrev, sales_type_id";	
-	
+		." ORDER BY curr_abrev, sales_type_id";
+
 	return db_query($sql,"item prices could not be retreived");
 }
 
 function get_stock_price($price_id)
 {
 	$sql = "SELECT * FROM ".TB_PREF."prices WHERE id=".db_escape($price_id);
-	
+
 	$result = db_query($sql,"price could not be retreived");
-	
+
 	return db_fetch($result);
 }
 
@@ -58,8 +59,8 @@ function get_stock_price_type_currency($stock_id, $type, $currency)
 	$sql = "SELECT * FROM ".TB_PREF."prices WHERE stock_id=".db_escape($stock_id)."
 		AND sales_type_id=".db_escape($type)."
 		AND curr_abrev=".db_escape($currency);
-	
+
 	$result = db_query($sql,"price could not be retreived");
-	
+
 	return db_fetch($result);
 }