Improved safety handling of bad PHP interpretor releases.

[fa-stable.git] / inventory / includes / db / items_locations_db.inc

diff --git a/inventory/includes/db/items_locations_db.inc b/inventory/includes/db/items_locations_db.inc
index b0372971441a3ca1e49d0404fb379770d7b9103f..c37374a9f1f36eb68ad4145c88bfc25bfd3c785a 100644 (file)
--- a/inventory/includes/db/items_locations_db.inc
+++ b/inventory/includes/db/items_locations_db.inc
@@ -63,6 +63,15 @@ function get_item_location($item_location)
 
 //------------------------------------------------------------------------------------
 
+function get_item_locations($show_inactive)
+{
+       $sql = "SELECT * FROM ".TB_PREF."locations";
+       if (!$show_inactive) $sql .= " WHERE !inactive";
+       return db_query($sql, "could not query locations");;
+}
+
+//------------------------------------------------------------------------------------
+
 function set_reorder_level($stock_id, $loc_code, $reorder_level)
 {
        $sql = "UPDATE ".TB_PREF."loc_stock SET reorder_level = $reorder_level
@@ -75,14 +84,13 @@ function set_reorder_level($stock_id, $loc_code, $reorder_level)
 
 function get_loc_details($stock_id)
 {
-       $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)
+               ." ORDER BY reorders.loc_code";
        return db_query($sql,"an item reorder could not be retreived");
 }
 
-//------------------------------------------------------------------------------------
-
 ?>
\ No newline at end of file