[MERGE]

[odoo/odoo.git] / addons / account_asset / account_asset_view.xml

diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index e25a8a0..2acdd64 100644 (file)
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -15,6 +15,20 @@
                 <field name="account_asset_id"/>
                 <field name="account_depreciation_id"/>
                 <field name="account_expense_depreciation_id"/>
+                <group colspan="2" col="2">
+                    <separator string="Depreciation Dates" colspan="2" />
+                    <field name="method_time"/>
+                    <field name="method_delay"/>
+                    <field name="method_period" attrs="{'invisible':[('method_time','=','end')]}"/>                
+                </group>
+                <group colspan="2" col="3">
+                    <separator string="Depreciation Method" colspan="4" />
+                    <field name="method"/>
+                    <newline/>
+                    <field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')]}"/>
+                    <newline/>
+                    <field name="prorata" colspan="1"/>
+                </group>
                <group col="4" colspan="4" groups="analytic.group_analytic_accounting">
                    <separator string="Analytic information" colspan="4" />
                    <newline/>
@@ -50,7 +64,7 @@
            <form string="Asset">
               <group col="6" colspan="4">
                  <field name="name" select="1"/>
-                 <field name="category_id" select="1"/>
+                 <field name="category_id" select="1" on_change="onchange_category_id(category_id)"/>
                  <field name="code" select="1"/>
                  <field name="purchase_value" select="1"/>
                  <field name="currency_id" select="1"/>