X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Finquiry%2Fstock_status.php;h=ee0e58716551cc5cfc0164cde0222a841ce91995;hb=fbdfe3f3da62ecf86e3ad978b89efbb6c317a47a;hp=9c8aff5b546e4487f64d04cb93f27121377190b7;hpb=0e782e0129275e050d04617ddbfcd134a078d4ca;p=fa-stable.git

diff --git a/inventory/inquiry/stock_status.php b/inventory/inquiry/stock_status.php
index 9c8aff5b..ee0e5871 100644
--- a/inventory/inquiry/stock_status.php
+++ b/inventory/inquiry/stock_status.php
@@ -9,15 +9,15 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$page_security = 2;
-$path_to_root="../..";
+$page_security = 'SA_ITEMSSTATVIEW';
+$path_to_root = "../..";
 include_once($path_to_root . "/includes/session.inc");
 
 if (isset($_GET['stock_id'])){
 	$_POST['stock_id'] = $_GET['stock_id'];
-	page(_("Inventory Item Status"), true);
+	page(_($help_context = "Inventory Item Status"), true);
 } else {
-	page(_("Inventory Item Status"));
+	page(_($help_context = "Inventory Item Status"));
 }
 
 include_once($path_to_root . "/includes/date_functions.inc");
@@ -33,7 +33,7 @@ if (list_updated('stock_id'))
 
 check_db_has_stock_items(_("There are no items defined in the system."));
 
-start_form(false, true);
+start_form();
 
 if (!isset($_POST['stock_id']))
 	$_POST['stock_id'] = get_global_stock_item();
@@ -79,46 +79,15 @@ while ($myrow = db_fetch($loc_details))
 
 	alt_table_row_color($k);
 
-	$sql = "SELECT Sum(".TB_PREF."sales_order_details.quantity-".TB_PREF."sales_order_details.qty_sent) AS DEM
-		FROM ".TB_PREF."sales_order_details, ".TB_PREF."sales_orders
-		WHERE ".TB_PREF."sales_orders.order_no = ".TB_PREF."sales_order_details.order_no
-		AND ".TB_PREF."sales_orders.from_stk_loc='" . $myrow["loc_code"] . "'
-		AND ".TB_PREF."sales_order_details.qty_sent < ".TB_PREF."sales_order_details.quantity
-		AND ".TB_PREF."sales_order_details.stk_code='" . $_POST['stock_id'] . "'";
-
-	$demand_result = db_query($sql,"Could not retreive demand for item");
-
-	if (db_num_rows($demand_result) == 1)
-	{
-	  $demand_row = db_fetch_row($demand_result);
-	  $demand_qty =  $demand_row[0];
-	}
-	else
-	{
-	  $demand_qty =0;
-	}
-
+	$demand_qty = get_demand_qty($_POST['stock_id'], $myrow["loc_code"]);
+	$demand_qty += get_demand_asm_qty($_POST['stock_id'], $myrow["loc_code"]);
 
 	$qoh = get_qoh_on_date($_POST['stock_id'], $myrow["loc_code"]);
 
 	if ($kitset_or_service == false)
 	{
-		$sql = "SELECT Sum(".TB_PREF."purch_order_details.quantity_ordered - ".TB_PREF."purch_order_details.quantity_received) AS qoo
-			FROM ".TB_PREF."purch_order_details INNER JOIN ".TB_PREF."purch_orders ON ".TB_PREF."purch_order_details.order_no=".TB_PREF."purch_orders.order_no
-			WHERE ".TB_PREF."purch_orders.into_stock_location='" . $myrow["loc_code"] . "'
-			AND ".TB_PREF."purch_order_details.item_code='" . $_POST['stock_id'] . "'";
-		$qoo_result = db_query($sql,"could not receive quantity on order for item");
-
-		if (db_num_rows($qoo_result) == 1)
-		{
-    		$qoo_row = db_fetch_row($qoo_result);
-    		$qoo =  $qoo_row[0];
-		}
-		else
-		{
-			$qoo = 0;
-		}
-
+		$qoo = get_on_porder_qty($_POST['stock_id'], $myrow["loc_code"]);
+		$qoo += get_on_worder_qty($_POST['stock_id'], $myrow["loc_code"]);
 		label_cell($myrow["location_name"]);
 		qty_cell($qoh, false, $dec);
         qty_cell($myrow["reorder_level"], false, $dec);