[Weberp-svn] SF.net SVN: weberp:[4579] trunk

[<tim...@us...>]

Revision: 4579
          http://weberp.svn.sourceforge.net/weberp/?rev=4579&view=rev
Author:   tim_schofield
Date:     2011-02-09 20:06:20 +0000 (Wed, 09 Feb 2011)

Log Message:
-----------
Phil - InventoryPlanning and InventoryPlanningPrefSupplier now excludes quotation sales order demand

Modified Paths:
--------------
    trunk/InventoryPlanning.php
    trunk/InventoryPlanningPrefSupplier.php

Modified: trunk/InventoryPlanning.php
===================================================================
--- trunk/InventoryPlanning.php	2011-02-09 17:25:27 UTC (rev 4578)
+++ trunk/InventoryPlanning.php	2011-02-09 20:06:20 UTC (rev 4579)
@@ -187,19 +187,19 @@
 
 		if ($_POST['Location']=='All'){
 			$SQL = "SELECT SUM(salesorderdetails.quantity - salesorderdetails.qtyinvoiced) AS qtydemand
-				FROM salesorderdetails,
-					salesorders
-				WHERE salesorderdetails.orderno=salesorders.orderno
-				AND salesorderdetails.stkcode = '" . $InventoryPlan['stockid'] . "'
-				AND salesorderdetails.completed = 0";
+				FROM salesorderdetails INNER JOIN salesorders
+				ON salesorderdetails.orderno=salesorders.orderno
+				WHERE salesorderdetails.stkcode = '" . $InventoryPlan['stockid'] . "'
+				AND salesorderdetails.completed = 0
+				AND salesorders.quotation=0";
 		} else {
 			$SQL = "SELECT SUM(salesorderdetails.quantity - salesorderdetails.qtyinvoiced) AS qtydemand
-				FROM salesorderdetails,
-					salesorders
-				WHERE salesorderdetails.orderno=salesorders.orderno
-				AND salesorders.fromstkloc ='" . $_POST['Location'] . "'
+				FROM salesorderdetails INNER JOIN salesorders
+				ON salesorderdetails.orderno=salesorders.orderno
+				WHERE salesorders.fromstkloc ='" . $_POST['Location'] . "'
 				AND salesorderdetails.stkcode = '" . $InventoryPlan['stockid'] . "'
-				AND salesorderdetails.completed = 0";
+				AND salesorderdetails.completed = 0
+				AND salesorders.quotation=0";
 		}
 
 		$DemandResult = DB_query($SQL, $db, '', '', false , false);
@@ -221,29 +221,34 @@
 
 		if ($_POST['Location']=='All'){
 			$SQL = "SELECT SUM((salesorderdetails.quantity-salesorderdetails.qtyinvoiced)*bom.quantity) AS dem
-				FROM salesorderdetails,
-					bom,
-					stockmaster
-				WHERE salesorderdetails.stkcode=bom.parent
+				FROM salesorderdetails INNER JOIN bom
+					ON salesorderdetails.stkcode=bom.parent
+					INNER JOIN	stockmaster
+					ON stockmaster.stockid=bom.parent
+					INNER JOIN salesorders
+					ON salesorders.orderno = salesorderdetails.orderno
+				WHERE salesorderdetails.quantity-salesorderdetails.qtyinvoiced > 0
 				AND salesorderdetails.quantity-salesorderdetails.qtyinvoiced > 0
 				AND bom.component='" . $InventoryPlan['stockid'] . "'
-				AND stockmaster.stockid=bom.parent
 				AND stockmaster.mbflag='A'
-				AND salesorderdetails.completed=0";
+				AND salesorderdetails.completed=0
+				AND salesorders.quotation=0";
 		} else {
 			$SQL = "SELECT SUM((salesorderdetails.quantity-salesorderdetails.qtyinvoiced)*bom.quantity) AS dem
-				FROM salesorderdetails,
-					salesorders,
-					bom,
-					stockmaster
-				WHERE salesorderdetails.orderno=salesorders.orderno
-				AND salesorderdetails.stkcode=bom.parent
+				FROM salesorderdetails INNER JOIN bom
+					ON salesorderdetails.stkcode=bom.parent
+					INNER JOIN	stockmaster
+					ON stockmaster.stockid=bom.parent
+					INNER JOIN salesorders
+					ON salesorders.orderno = salesorderdetails.orderno
+				WHERE salesorderdetails.quantity-salesorderdetails.qtyinvoiced > 0
 				AND salesorderdetails.quantity-salesorderdetails.qtyinvoiced > 0
 				AND bom.component='" . $InventoryPlan['stockid'] . "'
 				AND stockmaster.stockid=bom.parent
 				AND salesorders.fromstkloc ='" . $_POST['Location'] . "'
 				AND stockmaster.mbflag='A'
-				AND salesorderdetails.completed=0";
+				AND salesorderdetails.completed=0
+				AND salesorders.quotation=0";
 		}
 
 		$BOMDemandResult = DB_query($SQL,$db,'','',false,false);

Modified: trunk/InventoryPlanningPrefSupplier.php
===================================================================
--- trunk/InventoryPlanningPrefSupplier.php	2011-02-09 17:25:27 UTC (rev 4578)
+++ trunk/InventoryPlanningPrefSupplier.php	2011-02-09 20:06:20 UTC (rev 4579)
@@ -288,19 +288,19 @@
 
 		if ($_POST['Location']=='All'){
 			$SQL = "SELECT SUM(salesorderdetails.quantity - salesorderdetails.qtyinvoiced) AS qtydemand
-				FROM salesorderdetails,
-					salesorders
-				WHERE salesorderdetails.orderno=salesorders.orderno
-				AND salesorderdetails.stkcode = '" . $InventoryPlan['stockid'] . "'
-				AND salesorderdetails.completed = 0";
+				FROM salesorderdetails INNER JOIN salesorders
+				ON salesorderdetails.orderno=salesorders.orderno
+				WHERE salesorderdetails.stkcode = '" . $InventoryPlan['stockid'] . "'
+				AND salesorderdetails.completed = 0
+				AND salesorders.quotation=0";
 		} else {
 			$SQL = "SELECT SUM(salesorderdetails.quantity - salesorderdetails.qtyinvoiced) AS qtydemand
-				FROM salesorderdetails,
-					salesorders
-				WHERE salesorderdetails.orderno=salesorders.orderno
-				AND salesorders.fromstkloc ='" . $_POST['Location'] . "'
+				FROM salesorderdetails INNER JOIN salesorders
+				ON salesorderdetails.orderno=salesorders.orderno
+				WHERE salesorders.fromstkloc ='" . $_POST['Location'] . "'
 				AND salesorderdetails.stkcode = '" . $InventoryPlan['stockid'] . "'
-				AND salesorderdetails.completed = 0";
+				AND salesorderdetails.completed = 0
+				AND salesorders.quotation=0";
 		}
 
 		$DemandResult = DB_query($SQL, $db, '', '', false, false);
@@ -322,29 +322,31 @@
 
 		if ($_POST['Location']=='All'){
 			$SQL = "SELECT SUM((salesorderdetails.quantity-salesorderdetails.qtyinvoiced)*bom.quantity) AS dem
-					FROM salesorderdetails,
-						bom,
-						stockmaster
-					WHERE salesorderdetails.stkcode=bom.parent
-					AND salesorderdetails.quantity-salesorderdetails.qtyinvoiced > 0
+					FROM salesorderdetails INNER JOIN bom
+					ON salesorderdetails.stkcode=bom.parent
+					INNER JOIN	stockmaster
+					ON stockmaster.stockid=bom.parent
+					INNER JOIN salesorders
+					ON salesorders.orderno = salesorderdetails.orderno
+					WHERE  salesorderdetails.quantity-salesorderdetails.qtyinvoiced > 0
 					AND bom.component='" . $InventoryPlan['stockid'] . "'
-					AND stockmaster.stockid=bom.parent
 					AND stockmaster.mbflag='A'
-					AND salesorderdetails.completed=0";
+					AND salesorderdetails.completed=0
+					AND salesorders.quotation=0";
 		} else {
 			$SQL = "SELECT SUM((salesorderdetails.quantity-salesorderdetails.qtyinvoiced)*bom.quantity) AS dem
-					FROM salesorderdetails,
-						salesorders,
-						bom,
-						stockmaster
-					WHERE salesorderdetails.orderno=salesorders.orderno
-					AND salesorderdetails.stkcode=bom.parent
-					AND salesorderdetails.quantity-salesorderdetails.qtyinvoiced > 0
+					FROM salesorderdetails INNER JOIN bom
+					ON salesorderdetails.stkcode=bom.parent
+					INNER JOIN	stockmaster
+					ON stockmaster.stockid=bom.parent
+					INNER JOIN salesorders
+					ON salesorders.orderno = salesorderdetails.orderno
+					WHERE salesorderdetails.quantity-salesorderdetails.qtyinvoiced > 0
 					AND bom.component='" . $InventoryPlan['stockid'] . "'
-					AND stockmaster.stockid=bom.parent
 					AND salesorders.fromstkloc ='" . $_POST['Location'] . "'
 					AND stockmaster.mbflag='A'
-					AND salesorderdetails.completed=0";
+					AND salesorderdetails.completed=0
+					AND salesorders.quotation=0";
 		}
 
 		$BOMDemandResult = DB_query($SQL,$db,'','',false,false);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.