Fixes issue 22960: Ability to define amortization parameters in asset group
authorMikel Irurita <mikel.irurita@openbravo.com>
Sun, 03 Feb 2013 19:24:14 +0100
changeset 19548 4fe8031ec240
parent 19547 e3035063ccaf
child 19549 1f5944baa2ee
Fixes issue 22960: Ability to define amortization parameters in asset group
src-db/database/model/tables/A_ASSET_GROUP.xml
src-db/database/sourcedata/AD_COLUMN.xml
src-db/database/sourcedata/AD_FIELD.xml
src/org/openbravo/erpCommon/ad_callouts/SL_Depreciate.java
--- a/src-db/database/model/tables/A_ASSET_GROUP.xml	Fri Feb 01 22:27:34 2013 +0100
+++ b/src-db/database/model/tables/A_ASSET_GROUP.xml	Sun Feb 03 19:24:14 2013 +0100
@@ -53,6 +53,30 @@
         <default><![CDATA[Y]]></default>
         <onCreateDefault/>
       </column>
+      <column name="AMORTIZATIONTYPE" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false">
+        <default/>
+        <onCreateDefault><![CDATA['LI']]></onCreateDefault>
+      </column>
+      <column name="AMORTIZATIONCALCTYPE" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false">
+        <default/>
+        <onCreateDefault><![CDATA['PE']]></onCreateDefault>
+      </column>
+      <column name="ANNUALAMORTIZATIONPERCENTAGE" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="ASSETSCHEDULE" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false">
+        <default/>
+        <onCreateDefault><![CDATA['MO']]></onCreateDefault>
+      </column>
+      <column name="USELIFEYEARS" primaryKey="false" required="false" type="DECIMAL" size="10,0" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="USELIFEMONTHS" primaryKey="false" required="false" type="DECIMAL" size="10,0" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="A_ASSET_GROUP_AD_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
--- a/src-db/database/sourcedata/AD_COLUMN.xml	Fri Feb 01 22:27:34 2013 +0100
+++ b/src-db/database/sourcedata/AD_COLUMN.xml	Sun Feb 03 19:24:14 2013 +0100
@@ -223871,6 +223871,42 @@
 <!--1B1EC3E0DE05493E9815E38124AA620F-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--1B1EC3E0DE05493E9815E38124AA620F--></AD_COLUMN>
 
+<!--1B5BAA2A8E6C49D9859945239CB55414--><AD_COLUMN>
+<!--1B5BAA2A8E6C49D9859945239CB55414-->  <AD_COLUMN_ID><![CDATA[1B5BAA2A8E6C49D9859945239CB55414]]></AD_COLUMN_ID>
+<!--1B5BAA2A8E6C49D9859945239CB55414-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1B5BAA2A8E6C49D9859945239CB55414-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1B5BAA2A8E6C49D9859945239CB55414-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1B5BAA2A8E6C49D9859945239CB55414-->  <NAME><![CDATA[Calculate Type]]></NAME>
+<!--1B5BAA2A8E6C49D9859945239CB55414-->  <DESCRIPTION><![CDATA[Calculate type]]></DESCRIPTION>
+<!--1B5BAA2A8E6C49D9859945239CB55414-->  <HELP><![CDATA[This field indicates how depreciation will be calculated: choosing the time or the percentage.]]></HELP>
+<!--1B5BAA2A8E6C49D9859945239CB55414-->  <COLUMNNAME><![CDATA[Amortizationcalctype]]></COLUMNNAME>
+<!--1B5BAA2A8E6C49D9859945239CB55414-->  <AD_TABLE_ID><![CDATA[542]]></AD_TABLE_ID>
+<!--1B5BAA2A8E6C49D9859945239CB55414-->  <AD_REFERENCE_ID><![CDATA[17]]></AD_REFERENCE_ID>
+<!--1B5BAA2A8E6C49D9859945239CB55414-->  <AD_REFERENCE_VALUE_ID><![CDATA[800068]]></AD_REFERENCE_VALUE_ID>
+<!--1B5BAA2A8E6C49D9859945239CB55414-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--1B5BAA2A8E6C49D9859945239CB55414-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--1B5BAA2A8E6C49D9859945239CB55414-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--1B5BAA2A8E6C49D9859945239CB55414-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--1B5BAA2A8E6C49D9859945239CB55414-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--1B5BAA2A8E6C49D9859945239CB55414-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--1B5BAA2A8E6C49D9859945239CB55414-->  <SEQNO><![CDATA[31]]></SEQNO>
+<!--1B5BAA2A8E6C49D9859945239CB55414-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--1B5BAA2A8E6C49D9859945239CB55414-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--1B5BAA2A8E6C49D9859945239CB55414-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--1B5BAA2A8E6C49D9859945239CB55414-->  <AD_ELEMENT_ID><![CDATA[800608]]></AD_ELEMENT_ID>
+<!--1B5BAA2A8E6C49D9859945239CB55414-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--1B5BAA2A8E6C49D9859945239CB55414-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--1B5BAA2A8E6C49D9859945239CB55414-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--1B5BAA2A8E6C49D9859945239CB55414-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--1B5BAA2A8E6C49D9859945239CB55414-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--1B5BAA2A8E6C49D9859945239CB55414-->  <POSITION><![CDATA[15]]></POSITION>
+<!--1B5BAA2A8E6C49D9859945239CB55414-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--1B5BAA2A8E6C49D9859945239CB55414-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--1B5BAA2A8E6C49D9859945239CB55414-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--1B5BAA2A8E6C49D9859945239CB55414-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--1B5BAA2A8E6C49D9859945239CB55414-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--1B5BAA2A8E6C49D9859945239CB55414--></AD_COLUMN>
+
 <!--1BDE1D43080946E88595AB6C5BBC696F--><AD_COLUMN>
 <!--1BDE1D43080946E88595AB6C5BBC696F-->  <AD_COLUMN_ID><![CDATA[1BDE1D43080946E88595AB6C5BBC696F]]></AD_COLUMN_ID>
 <!--1BDE1D43080946E88595AB6C5BBC696F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -228606,6 +228642,41 @@
 <!--3808ABE5D08E4650A2DE65596DB61F49-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--3808ABE5D08E4650A2DE65596DB61F49--></AD_COLUMN>
 
+<!--380F0508A84B435FA1B7C6F56C53EBEF--><AD_COLUMN>
+<!--380F0508A84B435FA1B7C6F56C53EBEF-->  <AD_COLUMN_ID><![CDATA[380F0508A84B435FA1B7C6F56C53EBEF]]></AD_COLUMN_ID>
+<!--380F0508A84B435FA1B7C6F56C53EBEF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--380F0508A84B435FA1B7C6F56C53EBEF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--380F0508A84B435FA1B7C6F56C53EBEF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--380F0508A84B435FA1B7C6F56C53EBEF-->  <NAME><![CDATA[Annual Depreciation %]]></NAME>
+<!--380F0508A84B435FA1B7C6F56C53EBEF-->  <DESCRIPTION><![CDATA[Depreciation annual %]]></DESCRIPTION>
+<!--380F0508A84B435FA1B7C6F56C53EBEF-->  <HELP><![CDATA[Anual percentage used to depreciate this asset.]]></HELP>
+<!--380F0508A84B435FA1B7C6F56C53EBEF-->  <COLUMNNAME><![CDATA[Annualamortizationpercentage]]></COLUMNNAME>
+<!--380F0508A84B435FA1B7C6F56C53EBEF-->  <AD_TABLE_ID><![CDATA[542]]></AD_TABLE_ID>
+<!--380F0508A84B435FA1B7C6F56C53EBEF-->  <AD_REFERENCE_ID><![CDATA[22]]></AD_REFERENCE_ID>
+<!--380F0508A84B435FA1B7C6F56C53EBEF-->  <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--380F0508A84B435FA1B7C6F56C53EBEF-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--380F0508A84B435FA1B7C6F56C53EBEF-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--380F0508A84B435FA1B7C6F56C53EBEF-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--380F0508A84B435FA1B7C6F56C53EBEF-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--380F0508A84B435FA1B7C6F56C53EBEF-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--380F0508A84B435FA1B7C6F56C53EBEF-->  <SEQNO><![CDATA[41]]></SEQNO>
+<!--380F0508A84B435FA1B7C6F56C53EBEF-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--380F0508A84B435FA1B7C6F56C53EBEF-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--380F0508A84B435FA1B7C6F56C53EBEF-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--380F0508A84B435FA1B7C6F56C53EBEF-->  <AD_ELEMENT_ID><![CDATA[800262]]></AD_ELEMENT_ID>
+<!--380F0508A84B435FA1B7C6F56C53EBEF-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--380F0508A84B435FA1B7C6F56C53EBEF-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--380F0508A84B435FA1B7C6F56C53EBEF-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--380F0508A84B435FA1B7C6F56C53EBEF-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--380F0508A84B435FA1B7C6F56C53EBEF-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--380F0508A84B435FA1B7C6F56C53EBEF-->  <POSITION><![CDATA[16]]></POSITION>
+<!--380F0508A84B435FA1B7C6F56C53EBEF-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--380F0508A84B435FA1B7C6F56C53EBEF-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--380F0508A84B435FA1B7C6F56C53EBEF-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--380F0508A84B435FA1B7C6F56C53EBEF-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--380F0508A84B435FA1B7C6F56C53EBEF-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--380F0508A84B435FA1B7C6F56C53EBEF--></AD_COLUMN>
+
 <!--3824DF0F4FCE41E1A71D3D633C1B66DA--><AD_COLUMN>
 <!--3824DF0F4FCE41E1A71D3D633C1B66DA-->  <AD_COLUMN_ID><![CDATA[3824DF0F4FCE41E1A71D3D633C1B66DA]]></AD_COLUMN_ID>
 <!--3824DF0F4FCE41E1A71D3D633C1B66DA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -230663,6 +230734,41 @@
 <!--44CEFF9219664416AAB7296F6BEE0A4C-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--44CEFF9219664416AAB7296F6BEE0A4C--></AD_COLUMN>
 
+<!--44FEB17954664DC7B481BC04BEE13E29--><AD_COLUMN>
+<!--44FEB17954664DC7B481BC04BEE13E29-->  <AD_COLUMN_ID><![CDATA[44FEB17954664DC7B481BC04BEE13E29]]></AD_COLUMN_ID>
+<!--44FEB17954664DC7B481BC04BEE13E29-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--44FEB17954664DC7B481BC04BEE13E29-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--44FEB17954664DC7B481BC04BEE13E29-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--44FEB17954664DC7B481BC04BEE13E29-->  <NAME><![CDATA[Usable Life - Years]]></NAME>
+<!--44FEB17954664DC7B481BC04BEE13E29-->  <DESCRIPTION><![CDATA[Years of the usable life of the asset]]></DESCRIPTION>
+<!--44FEB17954664DC7B481BC04BEE13E29-->  <HELP><![CDATA[Years of the usable life of the asset]]></HELP>
+<!--44FEB17954664DC7B481BC04BEE13E29-->  <COLUMNNAME><![CDATA[UseLifeYears]]></COLUMNNAME>
+<!--44FEB17954664DC7B481BC04BEE13E29-->  <AD_TABLE_ID><![CDATA[542]]></AD_TABLE_ID>
+<!--44FEB17954664DC7B481BC04BEE13E29-->  <AD_REFERENCE_ID><![CDATA[11]]></AD_REFERENCE_ID>
+<!--44FEB17954664DC7B481BC04BEE13E29-->  <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--44FEB17954664DC7B481BC04BEE13E29-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--44FEB17954664DC7B481BC04BEE13E29-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--44FEB17954664DC7B481BC04BEE13E29-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--44FEB17954664DC7B481BC04BEE13E29-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--44FEB17954664DC7B481BC04BEE13E29-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--44FEB17954664DC7B481BC04BEE13E29-->  <SEQNO><![CDATA[61]]></SEQNO>
+<!--44FEB17954664DC7B481BC04BEE13E29-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--44FEB17954664DC7B481BC04BEE13E29-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--44FEB17954664DC7B481BC04BEE13E29-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--44FEB17954664DC7B481BC04BEE13E29-->  <AD_ELEMENT_ID><![CDATA[1947]]></AD_ELEMENT_ID>
+<!--44FEB17954664DC7B481BC04BEE13E29-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--44FEB17954664DC7B481BC04BEE13E29-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--44FEB17954664DC7B481BC04BEE13E29-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--44FEB17954664DC7B481BC04BEE13E29-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--44FEB17954664DC7B481BC04BEE13E29-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--44FEB17954664DC7B481BC04BEE13E29-->  <POSITION><![CDATA[18]]></POSITION>
+<!--44FEB17954664DC7B481BC04BEE13E29-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--44FEB17954664DC7B481BC04BEE13E29-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--44FEB17954664DC7B481BC04BEE13E29-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--44FEB17954664DC7B481BC04BEE13E29-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--44FEB17954664DC7B481BC04BEE13E29-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--44FEB17954664DC7B481BC04BEE13E29--></AD_COLUMN>
+
 <!--45EC328B1FD04787B812EBF1F57AAF95--><AD_COLUMN>
 <!--45EC328B1FD04787B812EBF1F57AAF95-->  <AD_COLUMN_ID><![CDATA[45EC328B1FD04787B812EBF1F57AAF95]]></AD_COLUMN_ID>
 <!--45EC328B1FD04787B812EBF1F57AAF95-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -277920,6 +278026,42 @@
 <!--891617453C9C41799A5BC0D18D18E8BF-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--891617453C9C41799A5BC0D18D18E8BF--></AD_COLUMN>
 
+<!--89764FE12A384CAF9D50F6DB4DFD8521--><AD_COLUMN>
+<!--89764FE12A384CAF9D50F6DB4DFD8521-->  <AD_COLUMN_ID><![CDATA[89764FE12A384CAF9D50F6DB4DFD8521]]></AD_COLUMN_ID>
+<!--89764FE12A384CAF9D50F6DB4DFD8521-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--89764FE12A384CAF9D50F6DB4DFD8521-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--89764FE12A384CAF9D50F6DB4DFD8521-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--89764FE12A384CAF9D50F6DB4DFD8521-->  <NAME><![CDATA[Depreciation Type]]></NAME>
+<!--89764FE12A384CAF9D50F6DB4DFD8521-->  <DESCRIPTION><![CDATA[Depreciation Type]]></DESCRIPTION>
+<!--89764FE12A384CAF9D50F6DB4DFD8521-->  <HELP><![CDATA[Indicates the method used to depreciate this asset.]]></HELP>
+<!--89764FE12A384CAF9D50F6DB4DFD8521-->  <COLUMNNAME><![CDATA[Amortizationtype]]></COLUMNNAME>
+<!--89764FE12A384CAF9D50F6DB4DFD8521-->  <AD_TABLE_ID><![CDATA[542]]></AD_TABLE_ID>
+<!--89764FE12A384CAF9D50F6DB4DFD8521-->  <AD_REFERENCE_ID><![CDATA[17]]></AD_REFERENCE_ID>
+<!--89764FE12A384CAF9D50F6DB4DFD8521-->  <AD_REFERENCE_VALUE_ID><![CDATA[800040]]></AD_REFERENCE_VALUE_ID>
+<!--89764FE12A384CAF9D50F6DB4DFD8521-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--89764FE12A384CAF9D50F6DB4DFD8521-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--89764FE12A384CAF9D50F6DB4DFD8521-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--89764FE12A384CAF9D50F6DB4DFD8521-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--89764FE12A384CAF9D50F6DB4DFD8521-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--89764FE12A384CAF9D50F6DB4DFD8521-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--89764FE12A384CAF9D50F6DB4DFD8521-->  <SEQNO><![CDATA[21]]></SEQNO>
+<!--89764FE12A384CAF9D50F6DB4DFD8521-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--89764FE12A384CAF9D50F6DB4DFD8521-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--89764FE12A384CAF9D50F6DB4DFD8521-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--89764FE12A384CAF9D50F6DB4DFD8521-->  <AD_ELEMENT_ID><![CDATA[800282]]></AD_ELEMENT_ID>
+<!--89764FE12A384CAF9D50F6DB4DFD8521-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--89764FE12A384CAF9D50F6DB4DFD8521-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--89764FE12A384CAF9D50F6DB4DFD8521-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--89764FE12A384CAF9D50F6DB4DFD8521-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--89764FE12A384CAF9D50F6DB4DFD8521-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--89764FE12A384CAF9D50F6DB4DFD8521-->  <POSITION><![CDATA[14]]></POSITION>
+<!--89764FE12A384CAF9D50F6DB4DFD8521-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--89764FE12A384CAF9D50F6DB4DFD8521-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--89764FE12A384CAF9D50F6DB4DFD8521-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--89764FE12A384CAF9D50F6DB4DFD8521-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--89764FE12A384CAF9D50F6DB4DFD8521-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--89764FE12A384CAF9D50F6DB4DFD8521--></AD_COLUMN>
+
 <!--8998C675C0834D77BC4304F2F05561C2--><AD_COLUMN>
 <!--8998C675C0834D77BC4304F2F05561C2-->  <AD_COLUMN_ID><![CDATA[8998C675C0834D77BC4304F2F05561C2]]></AD_COLUMN_ID>
 <!--8998C675C0834D77BC4304F2F05561C2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -305000,6 +305142,42 @@
 <!--D10341F87FE84D33A6C94FD353D13E5A-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--D10341F87FE84D33A6C94FD353D13E5A--></AD_COLUMN>
 
+<!--D1237164C5EC4B7C80DCA5E9ED525724--><AD_COLUMN>
+<!--D1237164C5EC4B7C80DCA5E9ED525724-->  <AD_COLUMN_ID><![CDATA[D1237164C5EC4B7C80DCA5E9ED525724]]></AD_COLUMN_ID>
+<!--D1237164C5EC4B7C80DCA5E9ED525724-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D1237164C5EC4B7C80DCA5E9ED525724-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D1237164C5EC4B7C80DCA5E9ED525724-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D1237164C5EC4B7C80DCA5E9ED525724-->  <NAME><![CDATA[Amortize]]></NAME>
+<!--D1237164C5EC4B7C80DCA5E9ED525724-->  <DESCRIPTION><![CDATA[Asset schedule]]></DESCRIPTION>
+<!--D1237164C5EC4B7C80DCA5E9ED525724-->  <HELP><![CDATA[Refers to the periods chosen between depreciation entries (monthly, yearly...).]]></HELP>
+<!--D1237164C5EC4B7C80DCA5E9ED525724-->  <COLUMNNAME><![CDATA[Assetschedule]]></COLUMNNAME>
+<!--D1237164C5EC4B7C80DCA5E9ED525724-->  <AD_TABLE_ID><![CDATA[542]]></AD_TABLE_ID>
+<!--D1237164C5EC4B7C80DCA5E9ED525724-->  <AD_REFERENCE_ID><![CDATA[17]]></AD_REFERENCE_ID>
+<!--D1237164C5EC4B7C80DCA5E9ED525724-->  <AD_REFERENCE_VALUE_ID><![CDATA[800041]]></AD_REFERENCE_VALUE_ID>
+<!--D1237164C5EC4B7C80DCA5E9ED525724-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--D1237164C5EC4B7C80DCA5E9ED525724-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--D1237164C5EC4B7C80DCA5E9ED525724-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--D1237164C5EC4B7C80DCA5E9ED525724-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--D1237164C5EC4B7C80DCA5E9ED525724-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--D1237164C5EC4B7C80DCA5E9ED525724-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--D1237164C5EC4B7C80DCA5E9ED525724-->  <SEQNO><![CDATA[51]]></SEQNO>
+<!--D1237164C5EC4B7C80DCA5E9ED525724-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--D1237164C5EC4B7C80DCA5E9ED525724-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--D1237164C5EC4B7C80DCA5E9ED525724-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--D1237164C5EC4B7C80DCA5E9ED525724-->  <AD_ELEMENT_ID><![CDATA[800284]]></AD_ELEMENT_ID>
+<!--D1237164C5EC4B7C80DCA5E9ED525724-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--D1237164C5EC4B7C80DCA5E9ED525724-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--D1237164C5EC4B7C80DCA5E9ED525724-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--D1237164C5EC4B7C80DCA5E9ED525724-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--D1237164C5EC4B7C80DCA5E9ED525724-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D1237164C5EC4B7C80DCA5E9ED525724-->  <POSITION><![CDATA[17]]></POSITION>
+<!--D1237164C5EC4B7C80DCA5E9ED525724-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--D1237164C5EC4B7C80DCA5E9ED525724-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--D1237164C5EC4B7C80DCA5E9ED525724-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--D1237164C5EC4B7C80DCA5E9ED525724-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--D1237164C5EC4B7C80DCA5E9ED525724-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--D1237164C5EC4B7C80DCA5E9ED525724--></AD_COLUMN>
+
 <!--D160BFBF2CD74DAEB9FF7C425874E282--><AD_COLUMN>
 <!--D160BFBF2CD74DAEB9FF7C425874E282-->  <AD_COLUMN_ID><![CDATA[D160BFBF2CD74DAEB9FF7C425874E282]]></AD_COLUMN_ID>
 <!--D160BFBF2CD74DAEB9FF7C425874E282-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -305139,6 +305317,41 @@
 <!--D1BA6C3D01714981AE40690180B364AC-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--D1BA6C3D01714981AE40690180B364AC--></AD_COLUMN>
 
+<!--D2A9D48448C24EAA847A52E607072C7B--><AD_COLUMN>
+<!--D2A9D48448C24EAA847A52E607072C7B-->  <AD_COLUMN_ID><![CDATA[D2A9D48448C24EAA847A52E607072C7B]]></AD_COLUMN_ID>
+<!--D2A9D48448C24EAA847A52E607072C7B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D2A9D48448C24EAA847A52E607072C7B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D2A9D48448C24EAA847A52E607072C7B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D2A9D48448C24EAA847A52E607072C7B-->  <NAME><![CDATA[Usable Life - Months]]></NAME>
+<!--D2A9D48448C24EAA847A52E607072C7B-->  <DESCRIPTION><![CDATA[Months of the usable life of the asset]]></DESCRIPTION>
+<!--D2A9D48448C24EAA847A52E607072C7B-->  <HELP><![CDATA[Months of the usable life of the asset]]></HELP>
+<!--D2A9D48448C24EAA847A52E607072C7B-->  <COLUMNNAME><![CDATA[UseLifeMonths]]></COLUMNNAME>
+<!--D2A9D48448C24EAA847A52E607072C7B-->  <AD_TABLE_ID><![CDATA[542]]></AD_TABLE_ID>
+<!--D2A9D48448C24EAA847A52E607072C7B-->  <AD_REFERENCE_ID><![CDATA[11]]></AD_REFERENCE_ID>
+<!--D2A9D48448C24EAA847A52E607072C7B-->  <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--D2A9D48448C24EAA847A52E607072C7B-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--D2A9D48448C24EAA847A52E607072C7B-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--D2A9D48448C24EAA847A52E607072C7B-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--D2A9D48448C24EAA847A52E607072C7B-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--D2A9D48448C24EAA847A52E607072C7B-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--D2A9D48448C24EAA847A52E607072C7B-->  <SEQNO><![CDATA[71]]></SEQNO>
+<!--D2A9D48448C24EAA847A52E607072C7B-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--D2A9D48448C24EAA847A52E607072C7B-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--D2A9D48448C24EAA847A52E607072C7B-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--D2A9D48448C24EAA847A52E607072C7B-->  <AD_ELEMENT_ID><![CDATA[1946]]></AD_ELEMENT_ID>
+<!--D2A9D48448C24EAA847A52E607072C7B-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--D2A9D48448C24EAA847A52E607072C7B-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--D2A9D48448C24EAA847A52E607072C7B-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--D2A9D48448C24EAA847A52E607072C7B-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--D2A9D48448C24EAA847A52E607072C7B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D2A9D48448C24EAA847A52E607072C7B-->  <POSITION><![CDATA[19]]></POSITION>
+<!--D2A9D48448C24EAA847A52E607072C7B-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--D2A9D48448C24EAA847A52E607072C7B-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--D2A9D48448C24EAA847A52E607072C7B-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--D2A9D48448C24EAA847A52E607072C7B-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--D2A9D48448C24EAA847A52E607072C7B-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--D2A9D48448C24EAA847A52E607072C7B--></AD_COLUMN>
+
 <!--D2D94A198496486D96E37016F840A675--><AD_COLUMN>
 <!--D2D94A198496486D96E37016F840A675-->  <AD_COLUMN_ID><![CDATA[D2D94A198496486D96E37016F840A675]]></AD_COLUMN_ID>
 <!--D2D94A198496486D96E37016F840A675-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_FIELD.xml	Fri Feb 01 22:27:34 2013 +0100
+++ b/src-db/database/sourcedata/AD_FIELD.xml	Sun Feb 03 19:24:14 2013 +0100
@@ -181581,6 +181581,35 @@
 <!--1AC08374983A41819BA240E7778A16BC-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--1AC08374983A41819BA240E7778A16BC--></AD_FIELD>
 
+<!--1ADA30AAB4EC4C698CFBC518B9876EC4--><AD_FIELD>
+<!--1ADA30AAB4EC4C698CFBC518B9876EC4-->  <AD_FIELD_ID><![CDATA[1ADA30AAB4EC4C698CFBC518B9876EC4]]></AD_FIELD_ID>
+<!--1ADA30AAB4EC4C698CFBC518B9876EC4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1ADA30AAB4EC4C698CFBC518B9876EC4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1ADA30AAB4EC4C698CFBC518B9876EC4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1ADA30AAB4EC4C698CFBC518B9876EC4-->  <NAME><![CDATA[Calculate Type]]></NAME>
+<!--1ADA30AAB4EC4C698CFBC518B9876EC4-->  <DESCRIPTION><![CDATA[Calculate type]]></DESCRIPTION>
+<!--1ADA30AAB4EC4C698CFBC518B9876EC4-->  <HELP><![CDATA[This field indicates how depreciation will be calculated: choosing the time or the percentage.]]></HELP>
+<!--1ADA30AAB4EC4C698CFBC518B9876EC4-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--1ADA30AAB4EC4C698CFBC518B9876EC4-->  <AD_TAB_ID><![CDATA[452]]></AD_TAB_ID>
+<!--1ADA30AAB4EC4C698CFBC518B9876EC4-->  <AD_COLUMN_ID><![CDATA[1B5BAA2A8E6C49D9859945239CB55414]]></AD_COLUMN_ID>
+<!--1ADA30AAB4EC4C698CFBC518B9876EC4-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--1ADA30AAB4EC4C698CFBC518B9876EC4-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--1ADA30AAB4EC4C698CFBC518B9876EC4-->  <DISPLAYLOGIC><![CDATA[@IsDepreciated@='Y']]></DISPLAYLOGIC>
+<!--1ADA30AAB4EC4C698CFBC518B9876EC4-->  <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
+<!--1ADA30AAB4EC4C698CFBC518B9876EC4-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--1ADA30AAB4EC4C698CFBC518B9876EC4-->  <SEQNO><![CDATA[90]]></SEQNO>
+<!--1ADA30AAB4EC4C698CFBC518B9876EC4-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--1ADA30AAB4EC4C698CFBC518B9876EC4-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--1ADA30AAB4EC4C698CFBC518B9876EC4-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--1ADA30AAB4EC4C698CFBC518B9876EC4-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--1ADA30AAB4EC4C698CFBC518B9876EC4-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--1ADA30AAB4EC4C698CFBC518B9876EC4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--1ADA30AAB4EC4C698CFBC518B9876EC4-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--1ADA30AAB4EC4C698CFBC518B9876EC4-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--1ADA30AAB4EC4C698CFBC518B9876EC4-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--1ADA30AAB4EC4C698CFBC518B9876EC4-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--1ADA30AAB4EC4C698CFBC518B9876EC4--></AD_FIELD>
+
 <!--1AEC8CA808744FBCA4BE1C2833B4AF6D--><AD_FIELD>
 <!--1AEC8CA808744FBCA4BE1C2833B4AF6D-->  <AD_FIELD_ID><![CDATA[1AEC8CA808744FBCA4BE1C2833B4AF6D]]></AD_FIELD_ID>
 <!--1AEC8CA808744FBCA4BE1C2833B4AF6D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -210862,6 +210891,35 @@
 <!--64B5669D6F914ADC8813E6CABED3F901-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--64B5669D6F914ADC8813E6CABED3F901--></AD_FIELD>
 
+<!--64B6C2B322DB4601AE9D9B3BBEEC75B0--><AD_FIELD>
+<!--64B6C2B322DB4601AE9D9B3BBEEC75B0-->  <AD_FIELD_ID><![CDATA[64B6C2B322DB4601AE9D9B3BBEEC75B0]]></AD_FIELD_ID>
+<!--64B6C2B322DB4601AE9D9B3BBEEC75B0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--64B6C2B322DB4601AE9D9B3BBEEC75B0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--64B6C2B322DB4601AE9D9B3BBEEC75B0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--64B6C2B322DB4601AE9D9B3BBEEC75B0-->  <NAME><![CDATA[Usable Life - Years]]></NAME>
+<!--64B6C2B322DB4601AE9D9B3BBEEC75B0-->  <DESCRIPTION><![CDATA[Years of the usable life of the asset]]></DESCRIPTION>
+<!--64B6C2B322DB4601AE9D9B3BBEEC75B0-->  <HELP><![CDATA[Years of the usable life of the asset]]></HELP>
+<!--64B6C2B322DB4601AE9D9B3BBEEC75B0-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--64B6C2B322DB4601AE9D9B3BBEEC75B0-->  <AD_TAB_ID><![CDATA[452]]></AD_TAB_ID>
+<!--64B6C2B322DB4601AE9D9B3BBEEC75B0-->  <AD_COLUMN_ID><![CDATA[44FEB17954664DC7B481BC04BEE13E29]]></AD_COLUMN_ID>
+<!--64B6C2B322DB4601AE9D9B3BBEEC75B0-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--64B6C2B322DB4601AE9D9B3BBEEC75B0-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--64B6C2B322DB4601AE9D9B3BBEEC75B0-->  <DISPLAYLOGIC><![CDATA[@IsDepreciated@='Y'  & @Amortizationcalctype@ = 'TI' & @Assetschedule@='YE']]></DISPLAYLOGIC>
+<!--64B6C2B322DB4601AE9D9B3BBEEC75B0-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
+<!--64B6C2B322DB4601AE9D9B3BBEEC75B0-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--64B6C2B322DB4601AE9D9B3BBEEC75B0-->  <SEQNO><![CDATA[120]]></SEQNO>
+<!--64B6C2B322DB4601AE9D9B3BBEEC75B0-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--64B6C2B322DB4601AE9D9B3BBEEC75B0-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--64B6C2B322DB4601AE9D9B3BBEEC75B0-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--64B6C2B322DB4601AE9D9B3BBEEC75B0-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--64B6C2B322DB4601AE9D9B3BBEEC75B0-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--64B6C2B322DB4601AE9D9B3BBEEC75B0-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--64B6C2B322DB4601AE9D9B3BBEEC75B0-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--64B6C2B322DB4601AE9D9B3BBEEC75B0-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--64B6C2B322DB4601AE9D9B3BBEEC75B0-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--64B6C2B322DB4601AE9D9B3BBEEC75B0-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--64B6C2B322DB4601AE9D9B3BBEEC75B0--></AD_FIELD>
+
 <!--65513584935845A78B5A6F8A0EA26213--><AD_FIELD>
 <!--65513584935845A78B5A6F8A0EA26213-->  <AD_FIELD_ID><![CDATA[65513584935845A78B5A6F8A0EA26213]]></AD_FIELD_ID>
 <!--65513584935845A78B5A6F8A0EA26213-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -222772,6 +222830,35 @@
 <!--810B57661CF2824EE040007F010150AE-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--810B57661CF2824EE040007F010150AE--></AD_FIELD>
 
+<!--811290719F9D48909AF77DF70AA5528E--><AD_FIELD>
+<!--811290719F9D48909AF77DF70AA5528E-->  <AD_FIELD_ID><![CDATA[811290719F9D48909AF77DF70AA5528E]]></AD_FIELD_ID>
+<!--811290719F9D48909AF77DF70AA5528E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--811290719F9D48909AF77DF70AA5528E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--811290719F9D48909AF77DF70AA5528E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--811290719F9D48909AF77DF70AA5528E-->  <NAME><![CDATA[Amortize]]></NAME>
+<!--811290719F9D48909AF77DF70AA5528E-->  <DESCRIPTION><![CDATA[Asset schedule]]></DESCRIPTION>
+<!--811290719F9D48909AF77DF70AA5528E-->  <HELP><![CDATA[Refers to the periods chosen between depreciation entries (monthly, yearly...).]]></HELP>
+<!--811290719F9D48909AF77DF70AA5528E-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--811290719F9D48909AF77DF70AA5528E-->  <AD_TAB_ID><![CDATA[452]]></AD_TAB_ID>
+<!--811290719F9D48909AF77DF70AA5528E-->  <AD_COLUMN_ID><![CDATA[D1237164C5EC4B7C80DCA5E9ED525724]]></AD_COLUMN_ID>
+<!--811290719F9D48909AF77DF70AA5528E-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--811290719F9D48909AF77DF70AA5528E-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--811290719F9D48909AF77DF70AA5528E-->  <DISPLAYLOGIC><![CDATA[@IsDepreciated@='Y' & @Amortizationcalctype@='TI']]></DISPLAYLOGIC>
+<!--811290719F9D48909AF77DF70AA5528E-->  <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
+<!--811290719F9D48909AF77DF70AA5528E-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--811290719F9D48909AF77DF70AA5528E-->  <SEQNO><![CDATA[110]]></SEQNO>
+<!--811290719F9D48909AF77DF70AA5528E-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--811290719F9D48909AF77DF70AA5528E-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--811290719F9D48909AF77DF70AA5528E-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--811290719F9D48909AF77DF70AA5528E-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--811290719F9D48909AF77DF70AA5528E-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--811290719F9D48909AF77DF70AA5528E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--811290719F9D48909AF77DF70AA5528E-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--811290719F9D48909AF77DF70AA5528E-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--811290719F9D48909AF77DF70AA5528E-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--811290719F9D48909AF77DF70AA5528E-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--811290719F9D48909AF77DF70AA5528E--></AD_FIELD>
+
 <!--811D6EDA72F1400DA692E954A9C0CF96--><AD_FIELD>
 <!--811D6EDA72F1400DA692E954A9C0CF96-->  <AD_FIELD_ID><![CDATA[811D6EDA72F1400DA692E954A9C0CF96]]></AD_FIELD_ID>
 <!--811D6EDA72F1400DA692E954A9C0CF96-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -239494,6 +239581,35 @@
 <!--AC84A50FAE7A4B82975FF0766AA3BAAC-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--AC84A50FAE7A4B82975FF0766AA3BAAC--></AD_FIELD>
 
+<!--AC84FCDBDC7141B1BB9477390C7C73B2--><AD_FIELD>
+<!--AC84FCDBDC7141B1BB9477390C7C73B2-->  <AD_FIELD_ID><![CDATA[AC84FCDBDC7141B1BB9477390C7C73B2]]></AD_FIELD_ID>
+<!--AC84FCDBDC7141B1BB9477390C7C73B2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--AC84FCDBDC7141B1BB9477390C7C73B2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--AC84FCDBDC7141B1BB9477390C7C73B2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--AC84FCDBDC7141B1BB9477390C7C73B2-->  <NAME><![CDATA[Depreciation Type]]></NAME>
+<!--AC84FCDBDC7141B1BB9477390C7C73B2-->  <DESCRIPTION><![CDATA[Depreciation Type]]></DESCRIPTION>
+<!--AC84FCDBDC7141B1BB9477390C7C73B2-->  <HELP><![CDATA[Indicates the method used to depreciate this asset.]]></HELP>
+<!--AC84FCDBDC7141B1BB9477390C7C73B2-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--AC84FCDBDC7141B1BB9477390C7C73B2-->  <AD_TAB_ID><![CDATA[452]]></AD_TAB_ID>
+<!--AC84FCDBDC7141B1BB9477390C7C73B2-->  <AD_COLUMN_ID><![CDATA[89764FE12A384CAF9D50F6DB4DFD8521]]></AD_COLUMN_ID>
+<!--AC84FCDBDC7141B1BB9477390C7C73B2-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--AC84FCDBDC7141B1BB9477390C7C73B2-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--AC84FCDBDC7141B1BB9477390C7C73B2-->  <DISPLAYLOGIC><![CDATA[@IsDepreciated@='Y']]></DISPLAYLOGIC>
+<!--AC84FCDBDC7141B1BB9477390C7C73B2-->  <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
+<!--AC84FCDBDC7141B1BB9477390C7C73B2-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--AC84FCDBDC7141B1BB9477390C7C73B2-->  <SEQNO><![CDATA[80]]></SEQNO>
+<!--AC84FCDBDC7141B1BB9477390C7C73B2-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--AC84FCDBDC7141B1BB9477390C7C73B2-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--AC84FCDBDC7141B1BB9477390C7C73B2-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--AC84FCDBDC7141B1BB9477390C7C73B2-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--AC84FCDBDC7141B1BB9477390C7C73B2-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--AC84FCDBDC7141B1BB9477390C7C73B2-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--AC84FCDBDC7141B1BB9477390C7C73B2-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--AC84FCDBDC7141B1BB9477390C7C73B2-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--AC84FCDBDC7141B1BB9477390C7C73B2-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--AC84FCDBDC7141B1BB9477390C7C73B2-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--AC84FCDBDC7141B1BB9477390C7C73B2--></AD_FIELD>
+
 <!--AC8984CFDCC44E43BDADB2630586ABAF--><AD_FIELD>
 <!--AC8984CFDCC44E43BDADB2630586ABAF-->  <AD_FIELD_ID><![CDATA[AC8984CFDCC44E43BDADB2630586ABAF]]></AD_FIELD_ID>
 <!--AC8984CFDCC44E43BDADB2630586ABAF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -261931,6 +262047,35 @@
 <!--D1551130292C4CD38C949BBF399A37A5-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--D1551130292C4CD38C949BBF399A37A5--></AD_FIELD>
 
+<!--D16BDA21D4824DF7BC9760FD5B24455B--><AD_FIELD>
+<!--D16BDA21D4824DF7BC9760FD5B24455B-->  <AD_FIELD_ID><![CDATA[D16BDA21D4824DF7BC9760FD5B24455B]]></AD_FIELD_ID>
+<!--D16BDA21D4824DF7BC9760FD5B24455B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D16BDA21D4824DF7BC9760FD5B24455B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D16BDA21D4824DF7BC9760FD5B24455B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D16BDA21D4824DF7BC9760FD5B24455B-->  <NAME><![CDATA[Annual Depreciation %]]></NAME>
+<!--D16BDA21D4824DF7BC9760FD5B24455B-->  <DESCRIPTION><![CDATA[Depreciation annual %]]></DESCRIPTION>
+<!--D16BDA21D4824DF7BC9760FD5B24455B-->  <HELP><![CDATA[Anual percentage used to depreciate this asset.]]></HELP>
+<!--D16BDA21D4824DF7BC9760FD5B24455B-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--D16BDA21D4824DF7BC9760FD5B24455B-->  <AD_TAB_ID><![CDATA[452]]></AD_TAB_ID>
+<!--D16BDA21D4824DF7BC9760FD5B24455B-->  <AD_COLUMN_ID><![CDATA[380F0508A84B435FA1B7C6F56C53EBEF]]></AD_COLUMN_ID>
+<!--D16BDA21D4824DF7BC9760FD5B24455B-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--D16BDA21D4824DF7BC9760FD5B24455B-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--D16BDA21D4824DF7BC9760FD5B24455B-->  <DISPLAYLOGIC><![CDATA[@IsDepreciated@='Y' & @Amortizationcalctype@!'TI']]></DISPLAYLOGIC>
+<!--D16BDA21D4824DF7BC9760FD5B24455B-->  <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
+<!--D16BDA21D4824DF7BC9760FD5B24455B-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--D16BDA21D4824DF7BC9760FD5B24455B-->  <SEQNO><![CDATA[100]]></SEQNO>
+<!--D16BDA21D4824DF7BC9760FD5B24455B-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--D16BDA21D4824DF7BC9760FD5B24455B-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--D16BDA21D4824DF7BC9760FD5B24455B-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--D16BDA21D4824DF7BC9760FD5B24455B-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--D16BDA21D4824DF7BC9760FD5B24455B-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--D16BDA21D4824DF7BC9760FD5B24455B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D16BDA21D4824DF7BC9760FD5B24455B-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--D16BDA21D4824DF7BC9760FD5B24455B-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--D16BDA21D4824DF7BC9760FD5B24455B-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--D16BDA21D4824DF7BC9760FD5B24455B-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--D16BDA21D4824DF7BC9760FD5B24455B--></AD_FIELD>
+
 <!--D196F5AB9FDC426FA3867557193F1408--><AD_FIELD>
 <!--D196F5AB9FDC426FA3867557193F1408-->  <AD_FIELD_ID><![CDATA[D196F5AB9FDC426FA3867557193F1408]]></AD_FIELD_ID>
 <!--D196F5AB9FDC426FA3867557193F1408-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -262505,6 +262650,33 @@
 <!--D40FC53464A54922BD8951019D6AC994-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--D40FC53464A54922BD8951019D6AC994--></AD_FIELD>
 
+<!--D424F36A86D34228A09E070CEDBD164F--><AD_FIELD>
+<!--D424F36A86D34228A09E070CEDBD164F-->  <AD_FIELD_ID><![CDATA[D424F36A86D34228A09E070CEDBD164F]]></AD_FIELD_ID>
+<!--D424F36A86D34228A09E070CEDBD164F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D424F36A86D34228A09E070CEDBD164F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D424F36A86D34228A09E070CEDBD164F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D424F36A86D34228A09E070CEDBD164F-->  <NAME><![CDATA[Owned]]></NAME>
+<!--D424F36A86D34228A09E070CEDBD164F-->  <DESCRIPTION><![CDATA[The asset is owned by the organization]]></DESCRIPTION>
+<!--D424F36A86D34228A09E070CEDBD164F-->  <HELP><![CDATA[The asset may not be in possession, but the asset is legally owned by the organization]]></HELP>
+<!--D424F36A86D34228A09E070CEDBD164F-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--D424F36A86D34228A09E070CEDBD164F-->  <AD_TAB_ID><![CDATA[452]]></AD_TAB_ID>
+<!--D424F36A86D34228A09E070CEDBD164F-->  <AD_COLUMN_ID><![CDATA[58596AC09DBC7310E040007F01006523]]></AD_COLUMN_ID>
+<!--D424F36A86D34228A09E070CEDBD164F-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--D424F36A86D34228A09E070CEDBD164F-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--D424F36A86D34228A09E070CEDBD164F-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--D424F36A86D34228A09E070CEDBD164F-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--D424F36A86D34228A09E070CEDBD164F-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--D424F36A86D34228A09E070CEDBD164F-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--D424F36A86D34228A09E070CEDBD164F-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--D424F36A86D34228A09E070CEDBD164F-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--D424F36A86D34228A09E070CEDBD164F-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--D424F36A86D34228A09E070CEDBD164F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D424F36A86D34228A09E070CEDBD164F-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--D424F36A86D34228A09E070CEDBD164F-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--D424F36A86D34228A09E070CEDBD164F-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--D424F36A86D34228A09E070CEDBD164F-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--D424F36A86D34228A09E070CEDBD164F--></AD_FIELD>
+
 <!--D457508398F64635B85797E78C815D54--><AD_FIELD>
 <!--D457508398F64635B85797E78C815D54-->  <AD_FIELD_ID><![CDATA[D457508398F64635B85797E78C815D54]]></AD_FIELD_ID>
 <!--D457508398F64635B85797E78C815D54-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -263617,6 +263789,35 @@
 <!--D784EC5346E94D6DA1C349CF289DED36-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--D784EC5346E94D6DA1C349CF289DED36--></AD_FIELD>
 
+<!--D78A871BCDE0492D867EF696C1692B28--><AD_FIELD>
+<!--D78A871BCDE0492D867EF696C1692B28-->  <AD_FIELD_ID><![CDATA[D78A871BCDE0492D867EF696C1692B28]]></AD_FIELD_ID>
+<!--D78A871BCDE0492D867EF696C1692B28-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D78A871BCDE0492D867EF696C1692B28-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D78A871BCDE0492D867EF696C1692B28-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D78A871BCDE0492D867EF696C1692B28-->  <NAME><![CDATA[Usable Life - Months]]></NAME>
+<!--D78A871BCDE0492D867EF696C1692B28-->  <DESCRIPTION><![CDATA[Months of the usable life of the asset]]></DESCRIPTION>
+<!--D78A871BCDE0492D867EF696C1692B28-->  <HELP><![CDATA[Months of the usable life of the asset]]></HELP>
+<!--D78A871BCDE0492D867EF696C1692B28-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--D78A871BCDE0492D867EF696C1692B28-->  <AD_TAB_ID><![CDATA[452]]></AD_TAB_ID>
+<!--D78A871BCDE0492D867EF696C1692B28-->  <AD_COLUMN_ID><![CDATA[D2A9D48448C24EAA847A52E607072C7B]]></AD_COLUMN_ID>
+<!--D78A871BCDE0492D867EF696C1692B28-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--D78A871BCDE0492D867EF696C1692B28-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--D78A871BCDE0492D867EF696C1692B28-->  <DISPLAYLOGIC><![CDATA[@IsDepreciated@='Y' & @Amortizationcalctype@='TI' & @Assetschedule@='MO']]></DISPLAYLOGIC>
+<!--D78A871BCDE0492D867EF696C1692B28-->  <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
+<!--D78A871BCDE0492D867EF696C1692B28-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--D78A871BCDE0492D867EF696C1692B28-->  <SEQNO><![CDATA[130]]></SEQNO>
+<!--D78A871BCDE0492D867EF696C1692B28-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--D78A871BCDE0492D867EF696C1692B28-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--D78A871BCDE0492D867EF696C1692B28-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--D78A871BCDE0492D867EF696C1692B28-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--D78A871BCDE0492D867EF696C1692B28-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--D78A871BCDE0492D867EF696C1692B28-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D78A871BCDE0492D867EF696C1692B28-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--D78A871BCDE0492D867EF696C1692B28-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--D78A871BCDE0492D867EF696C1692B28-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--D78A871BCDE0492D867EF696C1692B28-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--D78A871BCDE0492D867EF696C1692B28--></AD_FIELD>
+
 <!--D7B99052E65E44AA9BA76D9026A25F50--><AD_FIELD>
 <!--D7B99052E65E44AA9BA76D9026A25F50-->  <AD_FIELD_ID><![CDATA[D7B99052E65E44AA9BA76D9026A25F50]]></AD_FIELD_ID>
 <!--D7B99052E65E44AA9BA76D9026A25F50-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_Depreciate.java	Fri Feb 01 22:27:34 2013 +0100
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Depreciate.java	Sun Feb 03 19:24:14 2013 +0100
@@ -11,7 +11,7 @@
  * under the License. 
  * The Original Code is Openbravo ERP. 
  * The Initial Developer of the Original Code is Openbravo SLU 
- * All portions are Copyright (C) 2012 Openbravo SLU 
+ * All portions are Copyright (C) 2012-2013 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -21,7 +21,6 @@
 
 import javax.servlet.ServletException;
 
-import org.apache.commons.lang.StringUtils;
 import org.openbravo.base.filter.IsIDFilter;
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBDal;
@@ -33,18 +32,21 @@
   @Override
   protected void execute(CalloutInfo info) throws ServletException {
     final String assetCategoryID = info.getStringParameter("inpaAssetGroupId", IsIDFilter.instance);
-    if (!StringUtils.isBlank(assetCategoryID)) {
-      info.addResult("inpisdepreciated", getDepreciatedFlag(assetCategoryID));
+    if (!assetCategoryID.isEmpty()) {
+      OBContext.setAdminMode(true);
+      try {
+        final AssetGroup assetGroup = OBDal.getInstance().get(AssetGroup.class, assetCategoryID);
+        info.addResult("inpisdepreciated", assetGroup.isDepreciate());
+        info.addResult("inpamortizationtype", assetGroup.getDepreciationType());
+        info.addResult("inpamortizationcalctype", assetGroup.getCalculateType());
+        info.addResult("inpannualamortizationpercentage", assetGroup.getAnnualDepreciation());
+        info.addResult("inpassetschedule", assetGroup.getAmortize());
+        info.addResult("inpuselifemonths", assetGroup.getUsableLifeMonths());
+        info.addResult("inpuselifeyears", assetGroup.getUsableLifeYears());
+      } finally {
+        OBContext.restorePreviousMode();
+      }
     }
   }
 
-  protected Boolean getDepreciatedFlag(final String assetCategoryID) {
-    OBContext.setAdminMode();
-    try {
-      final AssetGroup assetCategory = OBDal.getInstance().get(AssetGroup.class, assetCategoryID);
-      return (assetCategory == null ? Boolean.FALSE : assetCategory.isDepreciate());
-    } finally {
-      OBContext.restorePreviousMode();
-    }
-  }
 }