SF.net SVN: ledger-smb:[3051] addons/1.3/assets/trunk/sql/modules/Assets. sql

[..hidden..]

Revision: 3051
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=3051&view=rev
Author:   einhverfr
Date:     2010-08-17 19:36:17 +0000 (Tue, 17 Aug 2010)

Log Message:
-----------
Correcting handling of depreciation in imported assets

Modified Paths:
--------------
    addons/1.3/assets/trunk/sql/modules/Assets.sql

Modified: addons/1.3/assets/trunk/sql/modules/Assets.sql
===================================================================
--- addons/1.3/assets/trunk/sql/modules/Assets.sql	2010-08-17 02:31:04 UTC (rev 3050)
+++ addons/1.3/assets/trunk/sql/modules/Assets.sql	2010-08-17 19:36:17 UTC (rev 3051)
@@ -769,7 +769,8 @@
           ai.purchase_date, ai.location_id, ai.invoice_id, ai.asset_account_id,
           ai.dep_account_id, ai.asset_class_id, ai.start_depreciation,
           ai.salvage_value, ai.department_id, ai.exp_account_id, ai.obsolete_by
-   HAVING coalesce(max(ar.report_class), 1) = 1
+   HAVING     2 <> ALL(as_array(ar.report_class)) 
+          and 4 <> ALL(as_array(ar.report_class))
           AND ((ai.purchase_value - coalesce(sum(arl.amount), 0) 
                > ai.salvage_value) and ai.obsolete_by is null)
                OR $1 is not true


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