Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[4487] trunk
|
From: <dai...@us...> - 2011-02-08 09:42:04
|
Revision: 4487
http://web-erp.svn.sourceforge.net/web-erp/?rev=4487&view=rev
Author: daintree
Date: 2011-02-08 09:41:58 +0000 (Tue, 08 Feb 2011)
Log Message:
-----------
InventoryPlanning and InventoryPlanningPrefSupplier now excludes quotation sales order demand
Modified Paths:
--------------
trunk/InventoryPlanning.php
trunk/InventoryPlanningPrefSupplier.php
trunk/doc/Change.log.html
Modified: trunk/InventoryPlanning.php
===================================================================
--- trunk/InventoryPlanning.php 2011-02-08 09:20:50 UTC (rev 4486)
+++ trunk/InventoryPlanning.php 2011-02-08 09:41:58 UTC (rev 4487)
@@ -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-08 09:20:50 UTC (rev 4486)
+++ trunk/InventoryPlanningPrefSupplier.php 2011-02-08 09:41:58 UTC (rev 4487)
@@ -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);
@@ -362,8 +364,7 @@
}
if ($_POST['Location']=='All'){
- $SQL = "SELECT SUM(purchorderdetails.quantityord*(CASE WHEN purchdata.conversionfactor IS NULL THEN 1 ELSE purchdata.conversionfactor END)
- - purchorderdetails.quantityrecd*(CASE WHEN purchdata.conversionfactor IS NULL THEN 1 ELSE purchdata.conversionfactor END)) as qtyonorder
+ $SQL = "SELECT SUM(purchorderdetails.quantityord- purchorderdetails.quantityrecd) as qtyonorder
FROM purchorderdetails
LEFT JOIN purchorders
ON purchorderdetails.orderno = purchorders.orderno
@@ -376,8 +377,7 @@
AND purchorders.status <> 'Rejected'
AND purchorders.status <> 'Pending'";
} else {
- $SQL = "SELECT SUM(purchorderdetails.quantityord*(CASE WHEN purchdata.conversionfactor IS NULL THEN 1 ELSE purchdata.conversionfactor END)
- - purchorderdetails.quantityrecd*(CASE WHEN purchdata.conversionfactor IS NULL THEN 1 ELSE purchdata.conversionfactor END)) as qtyonorder
+ $SQL = "SELECT SUM(purchorderdetails.quantityord - purchorderdetails.quantityrecd) as qtyonorder
FROM purchorderdetails
LEFT JOIN purchorders
ON purchorderdetails.orderno = purchorders.orderno
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2011-02-08 09:20:50 UTC (rev 4486)
+++ trunk/doc/Change.log.html 2011-02-08 09:41:58 UTC (rev 4487)
@@ -1,5 +1,6 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p
<p></p>
+<p>8/2/11: Phil Fix InventoryPlanning and InventoryPlanningPrefSupplier to only show sales order demand - excluding quotations. Also fixed for conversionfactor as now all purchase order quantities are in our normal stock units</p>
<p>8/2/11: Phil Fix incorrect layout of narrative on multiple lines of PDFQuotation.php as reported by Ricard Andreu</p>
<p>8/2/11: Tim/Ricard StockLocTransfer.php can now transfer the same amount as on hand in the location - previously checked to see that the transfer was less than the quantity on hand (when checking for negative stock)</p>
<p>8/2/11: Tim Payments.php and javascripts/MiscFunctions.js corrections to javascript</p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
