[Web-erp-svn] SF.net SVN: web-erp:[5250] trunk

[<vv...@us...>]

Revision: 5250
          http://web-erp.svn.sourceforge.net/web-erp/?rev=5250&view=rev
Author:   vvs2012
Date:     2012-04-16 21:09:34 +0000 (Mon, 16 Apr 2012)
Log Message:
-----------
Added option to display only items that are currently on purchase order in StockLocStatus.php

Modified Paths:
--------------
    trunk/StockLocStatus.php
    trunk/doc/Change.log

Modified: trunk/StockLocStatus.php
===================================================================
--- trunk/StockLocStatus.php	2012-04-16 18:03:24 UTC (rev 5249)
+++ trunk/StockLocStatus.php	2012-04-16 21:09:34 UTC (rev 5250)
@@ -86,16 +86,24 @@
 }
 if ($_POST['BelowReorderQuantity']=='All'){
 	echo '<option selected="selected" value="All">' . _('All') . '</option>
-          <option value="Below">' . _('Only Items Below Re-order Quantity') . '</option>
-          <option value="NotZero">' . _('Only items where stock is available') . '</option>';
+          <option value="Below">' . _('Only items below re-order quantity') . '</option>
+          <option value="NotZero">' . _('Only items where stock is available') . '</option>
+          <option value="OnOrder">' . _('Only items currently on order') . '</option>';
 } else if ($_POST['BelowReorderQuantity']=='Below') {
 	echo '<option value="All">' . _('All') . '</option>
-          <option selected="selected" value="Below">' . _('Only Items Below Re-order Quantity') . '</option>
-          <option value="NotZero">' . _('Only items where stock is available') . '</option>';
+          <option selected="selected" value="Below">' . _('Only items below re-order quantity') . '</option>
+          <option value="NotZero">' . _('Only items where stock is available') . '</option>
+          <option value="OnOrder">' . _('Only items currently on order') . '</option>';
+} else if ($_POST['BelowReorderQuantity']=='OnOrder') {
+    echo '<option value="All">' . _('All') . '</option>
+          <option value="Below">' . _('Only items below re-order quantity') . '</option>
+          <option value="NotZero">' . _('Only items where stock is available') . '</option>
+          <option selected="selected" value="OnOrder">' . _('Only items currently on order') . '</option>';
 } else  {
 	echo '<option value="All">' . _('All') . '</option>
-          <option value="Below">' . _('Only Items Below Re-order Quantity') . '</option>
-          <option selected="selected" value="NotZero">' . _('Only items where stock is available') . '</option>';
+          <option value="Below">' . _('Only items below re-order quantity') . '</option>
+          <option selected="selected" value="NotZero">' . _('Only items where stock is available') . '</option>
+          <option value="OnOrder">' . _('Only items currently on order') . '</option>';
 }
 
 echo '</td>
@@ -242,13 +250,14 @@
 			$QOORow = DB_fetch_row($QOOResult);
 			$QOO =  $QOORow[0];
 		} else {
-			$QOOQty = 0;
+			$QOO = 0;
 		}
 
 		if (($_POST['BelowReorderQuantity']=='Below' AND ($myrow['quantity']-$myrow['reorderlevel']-$DemandQty)<0)
-				OR $_POST['BelowReorderQuantity']=='All' OR $_POST['BelowReorderQuantity']=='NotZero'){
+				OR $_POST['BelowReorderQuantity']=='All' OR $_POST['BelowReorderQuantity']=='NotZero'
+                OR ($_POST['BelowReorderQuantity']=='OnOrder' AND $QOO != 0)){
 
-			if (($_POST['BelowReorderQuantity']=='NotZero') and (($myrow['quantity']-$DemandQty)!=0)) {
+			if (($_POST['BelowReorderQuantity']=='NotZero') AND (($myrow['quantity']-$DemandQty)>0)) {
 
 				if ($k==1){
 					echo '<tr class="OddTableRows">';

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2012-04-16 18:03:24 UTC (rev 5249)
+++ trunk/doc/Change.log	2012-04-16 21:09:34 UTC (rev 5250)
@@ -1,4 +1,5 @@
 webERP Change Log
+16/04/2012 Vitaly: Added option to display only items that are currently on purchase order in StockLocStatus.php
 16/04/2012 Vitaly: Fixed Days textbox where it did not remember entered value.
 16/04/2012 Ricard: ReorderLevelLocation.php only showing items not discontinued (current).
 14/04/2012 Ricard: Adding stock category as filter for selection in TopItems.php

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