Merged changes from main branch up to 2.1.3.

[fa-stable.git] / inventory / inquiry / stock_status.php

diff --git a/inventory/inquiry/stock_status.php b/inventory/inquiry/stock_status.php
index 8707396520864b407b3803a7fddc31998195bad8..9703c6a4e47ee838bb0b4c7e55120a09617a2837 100644 (file)
--- a/inventory/inquiry/stock_status.php
+++ b/inventory/inquiry/stock_status.php
@@ -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);