Rerun

[fa-stable.git] / includes / db / manufacturing_db.inc

diff --git a/includes/db/manufacturing_db.inc b/includes/db/manufacturing_db.inc
index ca1841d2570e131fa017b44a193f79e123982090..c2da112f48595b3cbbbda494f15e2faecdc2279d 100644 (file)
--- a/includes/db/manufacturing_db.inc
+++ b/includes/db/manufacturing_db.inc
@@ -61,10 +61,10 @@ function stock_demand_manufacture($stock_id, $qty, $demand_id, $location, $level
                $qoh_stock = array();
                load_stock_levels($location);
        }
-       $stock_qty = $qoh_stock[$stock_id];
-       if ($stock_qty == NULL) $stock_qty = 0;
+       if (empty($qoh_stock[$stock_id])) $stock_qty = 0;
+       else $stock_qty = $qoh_stock[$stock_id];
        if ($qty <= $stock_qty) return $demand;
-       $bom = $bom_list[$stock_id];
+       $bom = @$bom_list[$stock_id];
        if ($bom == NULL) {
                $sql = "SELECT parent, component, quantity FROM "
                        .TB_PREF."bom WHERE parent = ".db_escape($stock_id);
@@ -102,7 +102,9 @@ function get_demand_asm_qty($stock_id, $location)
                                   FROM ".TB_PREF."sales_order_details,
                                                ".TB_PREF."sales_orders,
                                                ".TB_PREF."stock_master
-                                  WHERE ".TB_PREF."sales_orders.order_no = ".TB_PREF."sales_order_details.order_no AND ";
+                                  WHERE ".TB_PREF."sales_orders.order_no = ".TB_PREF."sales_order_details.order_no AND 
+                                       ".TB_PREF."sales_orders.trans_type=".ST_SALESORDER." AND 
+                                       ".TB_PREF."sales_orders.trans_type=".TB_PREF."sales_order_details.trans_type AND ";
        if ($location != "")
                $sql .= TB_PREF."sales_orders.from_stk_loc =".db_escape($location)." AND ";
        $sql .= TB_PREF."sales_order_details.quantity-".TB_PREF."sales_order_details.qty_sent > 0 AND