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

[<dai...@us...>]

Revision: 4178
          http://web-erp.svn.sourceforge.net/web-erp/?rev=4178&view=rev
Author:   daintree
Date:     2010-12-03 06:32:12 +0000 (Fri, 03 Dec 2010)

Log Message:
-----------
Depreciation calc sql fix

Modified Paths:
--------------
    trunk/FixedAssetDepreciation.php
    trunk/doc/Change.log.html
    trunk/doc/Manual/ManualContributors.html

Modified: trunk/FixedAssetDepreciation.php
===================================================================
--- trunk/FixedAssetDepreciation.php	2010-12-03 06:16:45 UTC (rev 4177)
+++ trunk/FixedAssetDepreciation.php	2010-12-03 06:32:12 UTC (rev 4178)
@@ -48,8 +48,8 @@
 						fixedassetcategories.accumdepnact,
 						fixedassetcategories.depnact,
 						fixedassetcategories.categorydescription,
-						SUM(fixedassettrans.cost) AS costtotal,
-						SUM(fixedassettrans.depn) AS depnbfwd
+						SUM(CASE WHEN fixedassettrans.fixedassettranstype="cost" THEN fixedassettrans.amount ELSE 0 END) AS costtotal,
+						SUM(CASE WHEN fixedassettrans.fixedassettranstype="depn" THEN fixedassettrans.amount ELSE 0 END) AS depnbfwd
 			FROM fixedassets
 			INNER JOIN fixedassetcategories
 				ON fixedassets.assetcategoryid=fixedassetcategories.categoryid

Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html	2010-12-03 06:16:45 UTC (rev 4177)
+++ trunk/doc/Change.log.html	2010-12-03 06:32:12 UTC (rev 4178)
@@ -1,5 +1,6 @@
 <p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
 <p></p>
+<p>3/12/10 Matt Elbrecht : Estonian translation
 <p>30/11/10 Phil: Changed table structure of new fixedassettrans and modified upgrade script - those who already ran that bit will need to change the table again. Modified fixed asset scripts again. New fixed assets manual</p>
 <p>28/11/10 Exsson: CreditStatus.php - Fix bug in sql statement</p>
 <p>28/11/10 Tim: OutstandingGRNs.php - Only show when the invoiced qty is less than the GRN qty</p>

Modified: trunk/doc/Manual/ManualContributors.html
===================================================================
--- trunk/doc/Manual/ManualContributors.html	2010-12-03 06:16:45 UTC (rev 4177)
+++ trunk/doc/Manual/ManualContributors.html	2010-12-03 06:32:12 UTC (rev 4178)
@@ -130,6 +130,8 @@
 <br><br>
 Janusz Dobrowolski - Polish
 <br><br>
+Matt Elbrecht - Estonian
+<br><br>
 Igor Felix - Portuguese Brazilian
 <br><br>
 Karel van der Esch - Dutch


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