X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fdb%2Fmanufacturing_db.inc;h=9378f645219edbab59dc6aeb24b4778a60a853ce;hb=175a48c5bd73abe16e77fa2cb48ba522f00d1501;hp=14927475ed8ad206f406051bf239b6bde12d7320;hpb=e2fa1c1b9543dedb3cd0a3a36dc539c86f7ff473;p=fa-stable.git

diff --git a/includes/db/manufacturing_db.inc b/includes/db/manufacturing_db.inc
index 14927475..9378f645 100644
--- a/includes/db/manufacturing_db.inc
+++ b/includes/db/manufacturing_db.inc
@@ -17,7 +17,8 @@ function get_demand_qty($stock_id, $location)
 			FROM ".TB_PREF."sales_order_details,
 					".TB_PREF."sales_orders
 				WHERE ".TB_PREF."sales_order_details.order_no="
-				.TB_PREF."sales_orders.order_no AND ";
+				.TB_PREF."sales_orders.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.stk_code = ".db_escape($stock_id);
@@ -60,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);
@@ -101,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