Added non closed work order requirements on On Order in Inventory Items Status

Added mb_flag 'M' in demand checks

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 1d100acf8909806ecd7b7ae901bbdb40b9cc6375..1ac3b29dbbbd64434bcfab057d19f37cc738c419 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -22,6 +22,13 @@ $ -> Affected files
 18-May-2009 Joe Hunt
 ! Reinserted the link to GL in Work Order Inquiry.
 $ /manufacturing/search_work_orders.php
+# Added non closed work order requirements on On Order in Inventory Items Status
+$ /inventory/inquiry/stock_status.php
+! Added mb_flag 'M' in demand checks
+$ /sales/includes/db/sales_order_db.inc
+  /reporting/rep302.php
+  /reporting/rep303.php
+  
 
 17-May-2009 Joe Hunt
 ! Changed service items to use cogs account instead of inventory account.

diff --git a/inventory/inquiry/stock_status.php b/inventory/inquiry/stock_status.php
index 9c8aff5b546e4487f64d04cb93f27121377190b7..c683fa950868af4e20df9e77684a40998a109055 100644 (file)
--- a/inventory/inquiry/stock_status.php
+++ b/inventory/inquiry/stock_status.php
@@ -98,6 +98,26 @@ while ($myrow = db_fetch($loc_details))
          $demand_qty =0;
        }
 
+       $sql = "SELECT SUM((".TB_PREF."sales_order_details.quantity-".TB_PREF."sales_order_details.qty_sent)*".TB_PREF."bom.quantity)
+                                  AS DemAsm
+                                  FROM ".TB_PREF."sales_order_details,
+                                               ".TB_PREF."sales_orders,
+                                               ".TB_PREF."bom,
+                                               ".TB_PREF."stock_master
+                                  WHERE ".TB_PREF."sales_order_details.stk_code=".TB_PREF."bom.parent 
+                                               AND ".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.quantity-".TB_PREF."sales_order_details.qty_sent > 0 
+                                               AND ".TB_PREF."bom.component='" . $_POST['stock_id'] . "' 
+                                               AND ".TB_PREF."stock_master.stock_id=".TB_PREF."bom.parent 
+                                               AND (".TB_PREF."stock_master.mb_flag='M' OR ".TB_PREF."stock_master.mb_flag='A')";
+
+    $result = db_query($sql,"No transactions were returned");
+       if (db_num_rows($result)==1)
+       {
+               $demand_row = db_fetch_row($result);
+               $demand_qty += $demand_row[0];
+       }
 
        $qoh = get_qoh_on_date($_POST['stock_id'], $myrow["loc_code"]);
 
@@ -118,7 +138,18 @@ while ($myrow = db_fetch($loc_details))
                {
                        $qoo = 0;
                }
-
+               $sql = "SELECT Sum(".TB_PREF."workorders.units_reqd * ".TB_PREF."wo_requirements.units_req) AS qoo
+                       FROM ".TB_PREF."wo_requirements INNER JOIN ".TB_PREF."workorders 
+                               ON ".TB_PREF."wo_requirements.workorder_id=".TB_PREF."workorders.id
+                       WHERE ".TB_PREF."wo_requirements.loc_code='" . $myrow["loc_code"] . "'
+                               AND ".TB_PREF."wo_requirements.stock_id='" . $_POST['stock_id'] . "'
+                               AND ".TB_PREF."workorders.closed=0";
+               $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];
+               }
                label_cell($myrow["location_name"]);
                qty_cell($qoh, false, $dec);
         qty_cell($myrow["reorder_level"], false, $dec);

diff --git a/reporting/rep302.php b/reporting/rep302.php
index fc600e965739f212f06a5e1522d8cedccdf3a3aa..f2297d8915b0333a111f3d50e0f6711d304e765f 100644 (file)
--- a/reporting/rep302.php
+++ b/reporting/rep302.php
@@ -87,7 +87,7 @@ function getCustAsmQty($stockid, $location)
        $sql .= TB_PREF."sales_order_details.quantity-".TB_PREF."sales_order_details.qty_sent > 0 AND
                                   ".TB_PREF."bom.component='$stockid' AND
                                   ".TB_PREF."stock_master.stock_id=".TB_PREF."bom.parent AND
-                                  ".TB_PREF."stock_master.mb_flag='A'";
+                                  (".TB_PREF."stock_master.mb_flag='M' OR ".TB_PREF."stock_master.mb_flag='A')";
 
     $TransResult = db_query($sql,"No transactions were returned");
        if (db_num_rows($TransResult) == 1)

diff --git a/reporting/rep303.php b/reporting/rep303.php
index f50361e5e4251b651b361628976fe848cd25068c..ffeb9b8195c091966e85aa3fd7c82ba67f117d74 100644 (file)
--- a/reporting/rep303.php
+++ b/reporting/rep303.php
@@ -86,7 +86,7 @@ function getDemandAsmQty($stockid, $location)
        $sql .= TB_PREF."sales_order_details.quantity-".TB_PREF."sales_order_details.qty_sent > 0 AND
                                   ".TB_PREF."bom.component='$stockid' AND
                                   ".TB_PREF."stock_master.stock_id=".TB_PREF."bom.parent AND
-                                  ".TB_PREF."stock_master.mb_flag='A'";
+                                  (".TB_PREF."stock_master.mb_flag='M' OR ".TB_PREF."stock_master.mb_flag='A')";
 
     $TransResult = db_query($sql,"No transactions were returned");
        if (db_num_rows($TransResult)==1)

diff --git a/sales/includes/db/sales_order_db.inc b/sales/includes/db/sales_order_db.inc
index 7d650280ce158610607cb2afe31da4ef94bd6667..bbaf9706c86fe4271a86c2e54f9a229fb34fb06d 100644 (file)
--- a/sales/includes/db/sales_order_db.inc
+++ b/sales/includes/db/sales_order_db.inc
@@ -38,7 +38,7 @@ function get_demand_asm_qty($stockid, $location)
                                ".TB_PREF."sales_order_details.quantity-".TB_PREF."sales_order_details.qty_sent > 0 AND
                                ".TB_PREF."bom.component='$stockid' AND
                                ".TB_PREF."stock_master.stock_id=".TB_PREF."bom.parent AND
-                               ".TB_PREF."stock_master.mb_flag='A'";
+                               (".TB_PREF."stock_master.mb_flag='M' OR ".TB_PREF."stock_master.mb_flag='A')";
 
        $TransResult = db_query($sql,"No transactions were returned");
        if (db_num_rows($TransResult)==1)