X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep302.php;h=e92c27c5ff4a5fc4249f40c28861e55c86f828b8;hb=5dec41f0d87e407e1c9ffcb8eb63b92e4e471a9b;hp=fc600e965739f212f06a5e1522d8cedccdf3a3aa;hpb=ad96cd0abbfd826592b851b8e0cb6d89e450fdf4;p=fa-stable.git

diff --git a/reporting/rep302.php b/reporting/rep302.php
index fc600e96..e92c27c5 100644
--- a/reporting/rep302.php
+++ b/reporting/rep302.php
@@ -23,6 +23,7 @@ include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/includes/data_checks.inc");
 include_once($path_to_root . "/gl/includes/gl_db.inc");
 include_once($path_to_root . "/inventory/includes/db/items_category_db.inc");
+include_once($path_to_root . "/includes/db/manufacturing_db.inc");
 
 //----------------------------------------------------------------------------------------------------
 
@@ -45,7 +46,7 @@ function getTransactions($category, $location)
 	if ($category != 0)
 		$sql .= " AND ".TB_PREF."stock_master.category_id = '$category'";
 	if ($location != 'all')
-		$sql .= " AND ".TB_PREF."stock_moves.loc_code = '$location'";
+		$sql .= " AND IF(".TB_PREF."stock_moves.stock_id IS NULL, '1=1',".TB_PREF."stock_moves.loc_code = '$location')";
 	$sql .= " GROUP BY ".TB_PREF."stock_master.category_id,
 		".TB_PREF."stock_category.description,
 		".TB_PREF."stock_master.stock_id,
@@ -57,65 +58,6 @@ function getTransactions($category, $location)
 
 }
 
-function getCustQty($stockid, $location)
-{
-	$sql = "SELECT SUM(".TB_PREF."sales_order_details.quantity - ".TB_PREF."sales_order_details.qty_sent) AS qty_demand
-				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 ";
-	if ($location != "")
-		$sql .= TB_PREF."sales_orders.from_stk_loc ='$location' AND ";
-	$sql .= TB_PREF."sales_order_details.stk_code = '$stockid'";
-
-    $TransResult = db_query($sql,"No transactions were returned");
-	$DemandRow = db_fetch($TransResult);
-	return $DemandRow['qty_demand'];
-}
-
-function getCustAsmQty($stockid, $location)
-{
-	$sql = "SELECT SUM((".TB_PREF."sales_order_details.quantity-".TB_PREF."sales_order_details.qty_sent)*".TB_PREF."bom.quantity)
-				   AS Dem
-				   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 ";
-	if ($location != "")
-		$sql .= TB_PREF."sales_orders.from_stk_loc ='$location' AND ";
-	$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'";
-
-    $TransResult = db_query($sql,"No transactions were returned");
-	if (db_num_rows($TransResult) == 1)
-	{
-		$DemandRow = db_fetch_row($TransResult);
-		$DemandQty = $DemandRow[0];
-	}
-	else
-		$DemandQty = 0.0;
-
-    return $DemandQty;
-}
-
-function getSuppQty($stockid, $location)
-{
-	$sql = "SELECT SUM(".TB_PREF."purch_order_details.quantity_ordered - ".TB_PREF."purch_order_details.quantity_received) AS QtyOnOrder
-				FROM ".TB_PREF."purch_order_details,
-					".TB_PREF."purch_orders
-				WHERE ".TB_PREF."purch_order_details.order_no = ".TB_PREF."purch_orders.order_no
-				AND ".TB_PREF."purch_order_details.item_code = '$stockid'";
-	if ($location != "")			
-		$sql .= " AND ".TB_PREF."purch_orders.into_stock_location= '$location'";
-
-    $TransResult = db_query($sql,"No transactions were returned");
-	$DemandRow = db_fetch($TransResult);
-	return $DemandRow['QtyOnOrder'];
-}
-
 function getPeriods($stockid, $location)
 {
 	$date5 = date('Y-m-d');
@@ -212,10 +154,11 @@ function print_inventory_planning()
 		if ($location == 'all')
 			$loc_code = "";
 		else
-			$loc_code = $trans['loc_code'];
-		$custqty = getCustQty($trans['stock_id'], $loc_code);
-		$custqty += getCustAsmQty($trans['stock_id'], $loc_code);
-		$suppqty = getSuppQty($trans['stock_id'], $loc_code);
+			$loc_code = $location;
+		$custqty = get_demand_qty($trans['stock_id'], $loc_code);
+		$custqty += get_demand_asm_qty($trans['stock_id'], $loc_code);
+		$suppqty = get_on_porder_qty($trans['stock_id'], $loc_code);
+		$suppqty += get_on_worder_qty($trans['stock_id'], $loc_code);
 		$period = getPeriods($trans['stock_id'], $trans['loc_code']);
 		$rep->NewLine();
 		$dec = get_qty_dec($trans['stock_id']);