[Weberp-cvs] SF.net SVN: web-erp:[3423] trunk

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

Revision: 3423
          http://web-erp.svn.sourceforge.net/web-erp/?rev=3423&view=rev
Author:   tim_schofield
Date:     2010-04-18 16:38:59 +0000 (Sun, 18 Apr 2010)

Log Message:
-----------
Ricard: InventoryPlanning.php - Remove discontinued items from inventory planning reports.

Modified Paths:
--------------
    trunk/InventoryPlanning.php
    trunk/doc/Change.log.html

Modified: trunk/InventoryPlanning.php
===================================================================
--- trunk/InventoryPlanning.php	2010-04-18 02:02:57 UTC (rev 3422)
+++ trunk/InventoryPlanning.php	2010-04-18 16:38:59 UTC (rev 3423)
@@ -61,6 +61,7 @@
 				stockmaster,
 				stockcategory
 			WHERE locstock.stockid=stockmaster.stockid
+			AND stockmaster.discontinued = 0
 			AND stockmaster.categoryid=stockcategory.categoryid
 			AND (stockmaster.mbflag='B' OR stockmaster.mbflag='M')
 			AND stockmaster.categoryid >= '" . $_POST['FromCriteria'] . "'
@@ -82,6 +83,7 @@
 					stockmaster,
 					stockcategory
 				WHERE locstock.stockid=stockmaster.stockid
+				AND stockmaster.discontinued = 0
 				AND stockmaster.categoryid >= '" . $_POST['FromCriteria'] . "'
 				AND stockmaster.categoryid=stockcategory.categoryid
 				AND stockmaster.categoryid <= '" . $_POST['ToCriteria'] . "'
@@ -176,7 +178,7 @@
 	   		if ($debug==1){
 	      		echo "<br>$SQL";
 	   		}
-			
+
 	   		include('includes/footer.inc');
 	   		exit;
 		}
@@ -302,18 +304,18 @@
 		$LeftOvers = $pdf->addTextWrap(374, $YPos, 40,$FontSize,number_format($SalesRow['prd2'],0),'right');
 		$LeftOvers = $pdf->addTextWrap(415, $YPos, 40,$FontSize,number_format($SalesRow['prd1'],0),'right');
 		$LeftOvers = $pdf->addTextWrap(456, $YPos, 40,$FontSize,number_format($SalesRow['prd0'],0),'right');
-		
+
 		if ($_POST['NumberMonthsHolding']>10){
 			$NumberMonths=$_POST['NumberMonthsHolding']-10;
 			$MaxMthSales = ($SalesRow['prd1']+$SalesRow['prd2']+$SalesRow['prd3']+$SalesRow['prd4']+$SalesRow['prd5'])/5;
 		}
-		else{		
-			$NumberMonths=$_POST['NumberMonthsHolding'];	
+		else{
+			$NumberMonths=$_POST['NumberMonthsHolding'];
 			$MaxMthSales = max($SalesRow['prd1'], $SalesRow['prd2'], $SalesRow['prd3'], $SalesRow['prd4'], $SalesRow['prd5']);
 		}
-		
-						
-			
+
+
+
 		$IdealStockHolding = ceil($MaxMthSales * $NumberMonths);
 		$LeftOvers = $pdf->addTextWrap(497, $YPos, 40,$FontSize,number_format($IdealStockHolding,0),'right');
 		$LeftOvers = $pdf->addTextWrap(597, $YPos, 40,$FontSize,number_format($InventoryPlan['qoh'],0),'right');
@@ -326,7 +328,7 @@
 			$LeftOvers = $pdf->addTextWrap(720, $YPos, 40,$FontSize,_('   '),'right');
 
 		} else {
-			
+
 			$LeftOvers = $pdf->addTextWrap(720, $YPos, 40,$FontSize,number_format($SuggestedTopUpOrder,0),'right');
 		}
 
@@ -359,8 +361,8 @@
 
 	$title=_('Inventory Planning Reporting');
 	include('includes/header.inc');
-	
 
+
 	if (strlen($_POST['FromCriteria'])<1 || strlen($_POST['ToCriteria'])<1) {
 
 	/*if $FromCriteria is not set then show a form to allow input	*/

Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html	2010-04-18 02:02:57 UTC (rev 3422)
+++ trunk/doc/Change.log.html	2010-04-18 16:38:59 UTC (rev 3423)
@@ -1,5 +1,6 @@
 <p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
 <p></p>
+<p>18/04/10 Ricard: InventoryPlanning.php - Remove discontinued items from inventory planning reports.</p>
 <p>15/04/10 Kalmer Piiskop: MiscFunctions.js - Update IsDAte() function for all date formats.</p>
 <p>15/04/10 Ricard: WWW_Users.php - Correctly show the last visited date.</p>
 <p>15/04/10 Tim: GLJournal.php - Fix to show the footer on completion of the journal.</p>


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