svn commit: r677769 - in /ofbiz/trunk/applications/accounting: config/AccountingUiLabels.xml script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml

[adrianc]

Author: adrianc
Date: Thu Jul 17 16:00:21 2008
New Revision: 677769

URL: http://svn.apache.org/viewvc?rev=677769&view=rev
Log:
Fixed exception thrown when calculateFixedAssetDepreciation service didn't return any values.

Internationalization note: This commit contains a new UI label.

Modified:
    ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=677769&r1=677768&r2=677769&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Thu Jul 17 16:00:21 2008
@@ -2184,6 +2184,9 @@
         <value xml:lang="it">Svalutazioni</value>
         <value xml:lang="th">ค่าเสื่อมราคา</value>
     </property>
+    <property key="AccountingFixedAssetDepreciationMethodNotFound">
+        <value xml:lang="en">Depreciation method not found</value>
+    </property>
     <property key="AccountingFixedAssetEdit">
         <value xml:lang="ar">استحداث/تحديث أصل ثابت</value>
         <value xml:lang="en">Create/Update Fixed Asset</value>

Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml?rev=677769&r1=677768&r2=677769&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml Thu Jul 17 16:00:21 2008
@@ -583,6 +583,10 @@
             <log level="info" message="Asset's Net Book Values (NBV) from acquired date after deducting depreciation are ${assetNBVAfterDepreciation}"/>
             <field-to-result field-name="assetDepreciationTillDate"/>
             <field-to-result field-name="assetNBVAfterDepreciation"/>
+        <else>
+            <add-error><fail-property resource="AccountingUiLabels" property="AccountingFixedAssetDepreciationMethodNotFound"/></add-error>
+            <check-errors/>
+        </else>
         </if-not-empty>    
     </simple-method>
 </simple-methods>