From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Fri, 15 Dec 2017 17:44:52 +0000 (+0100)
Subject: Stock Status display, Manufacturing Reports: fixed products on WO count.
X-Git-Tag: v2.4.4~39
X-Git-Url: https://delta.frontaccounting.com/gitweb/?p=fa-stable.git;a=commitdiff_plain;h=493bcbc97444447376832211e9babff793707c95

Stock Status display, Manufacturing Reports: fixed products on WO count.
---

diff --git a/includes/db/manufacturing_db.inc b/includes/db/manufacturing_db.inc
index dc635c3a..93027b76 100644
--- a/includes/db/manufacturing_db.inc
+++ b/includes/db/manufacturing_db.inc
@@ -149,29 +149,14 @@ function get_on_porder_qty($stock_id, $location)
 
 function get_on_worder_qty($stock_id, $location)
 {
-	$sql = "SELECT SUM((wo.units_reqd-wo.units_issued) * (req.units_req-req.units_issued)) AS qoo
-		FROM ".TB_PREF."wo_requirements req
-			INNER JOIN ".TB_PREF."workorders wo	ON req.workorder_id=wo.id
-		WHERE req.stock_id=".db_escape($stock_id)
-			." AND wo.released=1";
-	if ($location != "")
-		$sql .= " AND req.loc_code=".db_escape($location);
-
-	$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.0;
+ 	$qoo = 0.0;
 	$flag = get_mb_flag($stock_id);
 	if ($flag == 'M')
 	{
 		$sql = "SELECT SUM((units_reqd-units_issued)) AS qoo
 			FROM ".TB_PREF."workorders
 			WHERE stock_id=".db_escape($stock_id)
-				." AND released=1";
+				." AND released AND NOT closed";
 
 		if ($location != "")
 			$sql .= " AND loc_code=".db_escape($location);
@@ -180,7 +165,7 @@ function get_on_worder_qty($stock_id, $location)
 		if (db_num_rows($qoo_result) == 1)
 		{
 			$qoo_row = db_fetch_row($qoo_result);
-			$qoo +=  $qoo_row[0];
+			$qoo = $qoo_row[0];
 		}
 	}
 	return $qoo;
diff --git a/reporting/rep303.php b/reporting/rep303.php
index 8851ca7e..65b91c46 100644
--- a/reporting/rep303.php
+++ b/reporting/rep303.php
@@ -175,9 +175,7 @@ function print_stock_check()
 		$demandqty = get_demand_qty($trans['stock_id'], $loc_code);
 		$demandqty += get_demand_asm_qty($trans['stock_id'], $loc_code);
 		$onorder = get_on_porder_qty($trans['stock_id'], $loc_code);
-		$flag = get_mb_flag($trans['stock_id']);
-		if ($flag == 'M')
-			$onorder += get_on_worder_qty($trans['stock_id'], $loc_code);
+		$onorder += get_on_worder_qty($trans['stock_id'], $loc_code);
 		if ($no_zeros && $trans['QtyOnHand'] == 0 && $demandqty == 0 && $onorder == 0)
 			continue;
 		if ($shortage && $trans['QtyOnHand'] - $demandqty >= 0)