X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fincludes%2Fdb%2Fitems_locations_db.inc;h=e85d39a1ce97164f5379d37574e2b3220b04b684;hb=490690013b7bb161ee2295b89cb18e1a88cae2af;hp=4a12c671cc73aa60dcf45980fb8f06cb40b68399;hpb=46c5f7a65a7659a44ae8254c63152074363d3987;p=fa-stable.git

diff --git a/inventory/includes/db/items_locations_db.inc b/inventory/includes/db/items_locations_db.inc
index 4a12c671..e85d39a1 100644
--- a/inventory/includes/db/items_locations_db.inc
+++ b/inventory/includes/db/items_locations_db.inc
@@ -9,12 +9,12 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-function add_item_location($loc_code, $location_name, $delivery_address, $phone, $phone2, $fax, $email, $contact)
+function add_item_location($loc_code, $location_name, $delivery_address, $phone, $phone2, $fax, $email, $contact, $fixed_asset = 0)
 {
-	$sql = "INSERT INTO ".TB_PREF."locations (loc_code, location_name, delivery_address, phone, phone2, fax, email, contact)
+	$sql = "INSERT INTO ".TB_PREF."locations (loc_code, location_name, delivery_address, phone, phone2, fax, email, contact, fixed_asset)
 		VALUES (".db_escape($loc_code).", ".db_escape($location_name).", ".db_escape($delivery_address).", "
 			.db_escape($phone).", ".db_escape($phone2).", ".db_escape($fax).", ".db_escape($email).", "
-			.db_escape($contact).")";
+			.db_escape($contact).", ".db_escape($fixed_asset).")";
 
 	db_query($sql,"a location could not be added");
 
@@ -27,13 +27,14 @@ function add_item_location($loc_code, $location_name, $delivery_address, $phone,
 
 //------------------------------------------------------------------------------------
 
-function update_item_location($loc_code, $location_name, $delivery_address, $phone, $phone2, $fax, $email, $contact)
+function update_item_location($loc_code, $location_name, $delivery_address, $phone, $phone2, $fax, $email, $contact, $fixed_asset = 0)
 
 {
     $sql = "UPDATE ".TB_PREF."locations SET location_name=".db_escape($location_name).",
     	delivery_address=".db_escape($delivery_address).",
     	phone=".db_escape($phone).", phone2=".db_escape($phone2).", fax=".db_escape($fax).",
-    	email=".db_escape($email).", contact=".db_escape($contact)."
+    	email=".db_escape($email).", contact=".db_escape($contact).",
+      fixed_asset=".db_escape($fixed_asset)."
     	WHERE loc_code = ".db_escape($loc_code);
 
 	db_query($sql,"a location could not be updated");
@@ -63,11 +64,11 @@ function get_item_location($item_location)
 
 //------------------------------------------------------------------------------------
 
-function get_item_locations($show_inactive)
+function get_item_locations($show_inactive, $fixed_asset = 0)
 {
-	$sql = "SELECT * FROM ".TB_PREF."locations";
-	if (!$show_inactive) $sql .= " WHERE !inactive";
-	return db_query($sql, "could not query locations");;
+	$sql = "SELECT * FROM ".TB_PREF."locations WHERE fixed_asset = ".db_escape($fixed_asset);
+	if (!$show_inactive) $sql .= " AND !inactive";
+	return db_query($sql, "could not query locations");
 }
 
 //------------------------------------------------------------------------------------
@@ -82,14 +83,15 @@ function set_reorder_level($stock_id, $loc_code, $reorder_level)
 
 //------------------------------------------------------------------------------------
 
-function get_loc_details($stock_id)
+function get_loc_details($stock_id, $fixed_asset = 0)
 {
-	$sql = "SELECT ".TB_PREF."loc_stock.*, ".TB_PREF."locations.location_name
-		FROM ".TB_PREF."loc_stock, ".TB_PREF."locations
-		WHERE ".TB_PREF."loc_stock.loc_code=".TB_PREF."locations.loc_code
-		AND ".TB_PREF."loc_stock.stock_id = ".db_escape($stock_id) 
-		." ORDER BY ".TB_PREF."loc_stock.loc_code";
+	$sql = "SELECT stock.loc_code, stock.location_name, "
+	.db_escape($stock_id)." as stock_id, reorders.reorder_level
+		FROM ".TB_PREF."locations stock LEFT JOIN ".TB_PREF."loc_stock reorders ON
+		reorders.loc_code=stock.loc_code
+		AND reorders.stock_id = ".db_escape($stock_id)
+	    ." WHERE stock.fixed_asset = ".db_escape($fixed_asset)
+		." ORDER BY reorders.loc_code";
 	return db_query($sql,"an item reorder could not be retreived");
 }
 
-?>
\ No newline at end of file