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

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

Revision: 4147
          http://web-erp.svn.sourceforge.net/web-erp/?rev=4147&view=rev
Author:   tim_schofield
Date:     2010-11-06 12:18:25 +0000 (Sat, 06 Nov 2010)

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

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

Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php	2010-11-06 09:34:11 UTC (rev 4146)
+++ trunk/SelectProduct.php	2010-11-06 12:18:25 UTC (rev 4147)
@@ -28,10 +28,11 @@
 	$_POST['StockCode'] = trim(strtoupper($_POST['StockCode']));
 }
 // Always show the search facilities
-$SQL = 'SELECT categoryid,
+$SQL = "SELECT categoryid,
 		categorydescription
 	FROM stockcategory
-	ORDER BY categorydescription';
+	WHERE stocktype<>'A'
+	ORDER BY categorydescription";
 $result1 = DB_query($SQL, $db);
 if (DB_num_rows($result1) == 0) {
 	echo '<p><font size=4 color=red>' . _('Problem Report') . ':</font><br>' . _('There are no stock categories currently defined please use the link below to set them up');
@@ -523,10 +524,13 @@
 					stockmaster.units,
 					stockmaster.mbflag,
 					stockmaster.decimalplaces
-				FROM stockmaster,
+				FROM stockmaster
+				LEFT JOIN stockcategory
+				ON stockmaster.categoryid=stockcategory.categoryid,
 					locstock
 				WHERE stockmaster.stockid=locstock.stockid
 				AND stockmaster.description " . LIKE . " '$SearchString'
+				AND stockcategory.stocktype<>'A'
 				GROUP BY stockmaster.stockid,
 					stockmaster.description,
 					stockmaster.units,
@@ -561,10 +565,13 @@
 					SUM(locstock.quantity) AS qoh,
 					stockmaster.units,
 					stockmaster.decimalplaces
-				FROM stockmaster,
+				FROM stockmaster
+				LEFT JOIN stockcategory
+				ON stockmaster.categoryid=stockcategory.categoryid,
 					locstock
 				WHERE stockmaster.stockid=locstock.stockid
 				AND stockmaster.stockid " . LIKE . " '%" . $_POST['StockCode'] . "%'
+				AND stockcategory.stocktype<>'A'
 				GROUP BY stockmaster.stockid,
 					stockmaster.description,
 					stockmaster.units,
@@ -598,9 +605,12 @@
 					SUM(locstock.quantity) AS qoh,
 					stockmaster.units,
 					stockmaster.decimalplaces
-				FROM stockmaster,
+				FROM stockmaster
+				LEFT JOIN stockcategory
+				ON stockmaster.categoryid=stockcategory.categoryid,
 					locstock
 				WHERE stockmaster.stockid=locstock.stockid
+				AND stockcategory.stocktype<>'A'
 				GROUP BY stockmaster.stockid,
 					stockmaster.description,
 					stockmaster.units,

Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html	2010-11-06 09:34:11 UTC (rev 4146)
+++ trunk/doc/Change.log.html	2010-11-06 12:18:25 UTC (rev 4147)
@@ -1,5 +1,6 @@
 <p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
 <p></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>
 <p>06/11/10 Tim: FixedAssetItems.php - Fixed typo preventing Item code being shown</p>
 <p>06/11/10 Phil: StockCategory.php FixedAssetCategory.php attempt to add validation to depreciation rates by extending the stock category property logic with new fields for numericvalue, minimumvalue and maximumvalue. Then adding the depreciation rate percentage property to expect numeric values with a minimum of 0 and maximum of 100. Not really happy with the fixed asset stuff - feels like a bit like a hack :-(</p>


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