X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Finquiry%2Fstock_status.php;h=331ea38321fc7290e7f22f166d3ebbafaaa20533;hb=939337a739e521fc7d69ab30a7d89177b51a3bb3;hp=2461c18899fde8069f34213860c7febcb1132c5c;hpb=3aebde86793f495095e09160ebaae3e7b7040747;p=fa-stable.git

diff --git a/inventory/inquiry/stock_status.php b/inventory/inquiry/stock_status.php
index 2461c188..331ea383 100644
--- a/inventory/inquiry/stock_status.php
+++ b/inventory/inquiry/stock_status.php
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    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="../..";
 include_once($path_to_root . "/includes/session.inc");
@@ -40,15 +49,15 @@ set_global_stock_item($_POST['stock_id']);
 $mb_flag = get_mb_flag($_POST['stock_id']);
 $kitset_or_service = false;
 
+div_start('status_tbl');
 if (is_service($mb_flag))
 {
-	display_note(_("This is a service and cannot have a stock holding, only the total quantity on outstanding sales orders is shown."));
+	display_note(_("This is a service and cannot have a stock holding, only the total quantity on outstanding sales orders is shown."), 0, 1);
 	$kitset_or_service = true;
 }
 
 $loc_details = get_loc_details($_POST['stock_id']);
 
-div_start('status_tbl');
 start_table($table_style);
 
 if ($kitset_or_service == true)
@@ -70,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);