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

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

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

Log Message:
-----------
Ensure fixed assets dont get shown in valuation report

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

Modified: trunk/InventoryValuation.php
===================================================================
--- trunk/InventoryValuation.php	2010-11-06 09:16:30 UTC (rev 4145)
+++ trunk/InventoryValuation.php	2010-11-06 09:34:11 UTC (rev 4146)
@@ -35,6 +35,7 @@
 				locstock
 			WHERE stockmaster.stockid=locstock.stockid
 			AND stockmaster.categoryid=stockcategory.categoryid
+			AND stockcategory.stocktype<>'A'
 			GROUP BY stockmaster.categoryid,
 				stockcategory.categorydescription,
 				unitcost,
@@ -67,6 +68,7 @@
 			AND stockmaster.categoryid >= '" . $_POST['FromCriteria'] . "'
 			AND stockmaster.categoryid <= '" . $_POST['ToCriteria'] . "'
 			AND locstock.loccode = '" . $_POST['Location'] . "'
+			AND stockcategory.stocktype<>'A'
 			ORDER BY stockmaster.categoryid,
 				stockmaster.stockid";
 	}
@@ -206,7 +208,7 @@
 
 		echo '<tr><td>' . _('From Inventory Category Code') . ':</font></td><td><select name=FromCriteria>';
 
-		$sql='SELECT categoryid, categorydescription FROM stockcategory ORDER BY categoryid';
+		$sql='SELECT categoryid, categorydescription FROM stockcategory WHERE stocktype<>"A" ORDER BY categoryid';
 		$CatResult= DB_query($sql,$db);
 		While ($myrow = DB_fetch_array($CatResult)){
 			echo "<option value='" . $myrow['categoryid'] . "'>" . $myrow['categoryid'] . ' - ' . $myrow['categorydescription'];

Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html	2010-11-06 09:16:30 UTC (rev 4145)
+++ trunk/doc/Change.log.html	2010-11-06 09:34:11 UTC (rev 4146)
@@ -1,5 +1,6 @@
 <p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
 <p></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>
 <p>05/11/10 Tim: PurchData.php. Converted field name to lower case for consistency</p>


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