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

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

Revision: 4149
          http://web-erp.svn.sourceforge.net/web-erp/?rev=4149&view=rev
Author:   tim_schofield
Date:     2010-11-06 15:33:31 +0000 (Sat, 06 Nov 2010)

Log Message:
-----------
Remove fixed assets from selections

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

Modified: trunk/InventoryQuantities.php
===================================================================
--- trunk/InventoryQuantities.php	2010-11-06 12:35:06 UTC (rev 4148)
+++ trunk/InventoryQuantities.php	2010-11-06 15:33:31 UTC (rev 4149)
@@ -21,7 +21,7 @@
 	$wherecategory = " ";
 	$catdescription = " ";
 	if ($_POST['StockCat'] != 'All') {
-	    $wherecategory = " AND stockmaster.categoryid='" . $_POST['StockCat'] . "' ";
+	    $wherecategory = " AND stockmaster.categoryid='" . $_POST['StockCat'] . "' AND stockcategory.stocktype<>'A'";
 		$sql= "SELECT categoryid, categorydescription FROM stockcategory WHERE categoryid='" . $_POST['StockCat'] . "' ";
 		$result = DB_query($sql,$db);
 		$myrow = DB_fetch_row($result);
@@ -39,7 +39,9 @@
 					stockmaster.serialised,
 					stockmaster.controlled
 				FROM locstock,
-					stockmaster,
+					stockmaster
+			LEFT JOIN stockcategory
+			ON stockmaster.categoryid=stockcategory.categoryid,
 					locations
 				WHERE locstock.stockid=stockmaster.stockid
 				AND locstock.loccode=locations.loccode

Modified: trunk/ReorderLevel.php
===================================================================
--- trunk/ReorderLevel.php	2010-11-06 12:35:06 UTC (rev 4148)
+++ trunk/ReorderLevel.php	2010-11-06 15:33:31 UTC (rev 4149)
@@ -21,7 +21,7 @@
 	$wherecategory = " ";
 	$catdescription = " ";
 	if ($_POST['StockCat'] != 'All') {
-	    $wherecategory = " AND stockmaster.categoryid='" . $_POST['StockCat'] . "' ";
+	    $wherecategory = " AND stockmaster.categoryid='" . $_POST['StockCat'] . "' AND stockcategory.stocktype<>'A'";
 		$sql= "SELECT categoryid, categorydescription FROM stockcategory WHERE categoryid='" . $_POST['StockCat'] . "' ";
 		$result = DB_query($sql,$db);
 		$myrow = DB_fetch_row($result);
@@ -42,7 +42,9 @@
 				stockmaster.serialised,
 				stockmaster.controlled
 			FROM locstock,
-				stockmaster,
+				stockmaster
+			LEFT JOIN stockcategory
+			ON stockmaster.categoryid=stockcategory.categoryid,
 				locations
 			WHERE locstock.stockid=stockmaster.stockid " .
 			$wherelocation .
@@ -195,7 +197,7 @@
 	}
 	echo '</select></td></tr>';
 
-	$SQL="SELECT categoryid, categorydescription FROM stockcategory ORDER BY categorydescription";
+	$SQL="SELECT categoryid, categorydescription FROM stockcategory WHERE stocktype<>'A' ORDER BY categorydescription";
 	$result1 = DB_query($SQL,$db);
 	if (DB_num_rows($result1)==0){
 		echo '</table></td></tr>

Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html	2010-11-06 12:35:06 UTC (rev 4148)
+++ trunk/doc/Change.log.html	2010-11-06 15:33:31 UTC (rev 4149)
@@ -1,5 +1,6 @@
 <p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
 <p></p>
+<p>06/11/10 Tim: ReorderLevel.php - Remove fixed assets from selections</p>
 <p>06/11/10 Tim: InventoryQuantities.php - Remove fixed assets from selections</p>
 <p>06/11/10 Tim: Selectproduct.php - Remove fixed assets from selections</p>
 <p>06/11/10 Tim: InventoryValuation.php - Ensure fixed assets dont get shown in valuation report</p>


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