From d62d538ace73072852f676a3015eb577692e9650 Mon Sep 17 00:00:00 2001
From: "Ujjvala Collins (OpenERP)" <uco@tinyerp.com>
Date: Fri, 24 Jun 2011 18:31:31 +0530
Subject: [PATCH 01/25] [IMP] account_asset: Improved+Fixed change duration
 wizard.

bzr revid: uco@tinyerp.com-20110624130131-cwcnk09qy8bes4li
---
 addons/account_asset/__openerp__.py           |  3 +-
 addons/account_asset/account_asset_view.xml   | 17 ++--
 addons/account_asset/wizard/__init__.py       |  4 +-
 .../wizard/account_asset_change_duration.py   | 77 ++++++++++++++++
 .../account_asset_change_duration_view.xml    | 45 ++++++++++
 .../wizard/wizard_asset_modify.py             | 87 -------------------
 6 files changed, 135 insertions(+), 98 deletions(-)
 create mode 100755 addons/account_asset/wizard/account_asset_change_duration.py
 create mode 100644 addons/account_asset/wizard/account_asset_change_duration_view.xml
 delete mode 100755 addons/account_asset/wizard/wizard_asset_modify.py

diff --git a/addons/account_asset/__openerp__.py b/addons/account_asset/__openerp__.py
index be631a91e45..c922c6c6715 100755
--- a/addons/account_asset/__openerp__.py
+++ b/addons/account_asset/__openerp__.py
@@ -39,9 +39,10 @@
     "update_xml" : [
         "security/ir.model.access.csv",
         "account_asset_wizard.xml",
+        "wizard/account_asset_change_duration_view.xml",
         "account_asset_view.xml",
         "account_asset_invoice_view.xml",
-	"account_asset_report_view.xml",
+	    "account_asset_report_view.xml",
         "report/account_asset_report_view.xml",
 	#modif
     ],
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index 229cff87c26..faebfbddf78 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -78,17 +78,18 @@
                     <field name="purchase_date"/>
                     <group colspan="2" col="2">
                         <separator string="Depreciation Dates" colspan="2" />
-                        <button 
-                             name="%(wizard_asset_modify)d" 
-                             states="open" 
-                             string="Change duration" 
-                             type="action" 
-                             colspan="2"/>
-                        <newline/>
                         <field name="method_time" on_change="onchange_method_time(method_time)"/>
                         <field name="method_delay" attrs="{'invisible':[('method_time','=','end')]}"/>
                         <field name="method_period"/>
-                        <field name="method_end" attrs="{'required': [('method_time','=','end')], 'invisible':[('method_time','=','delay')]}"/> 
+                        <field name="method_end" attrs="{'required': [('method_time','=','end')], 'invisible':[('method_time','=','delay')]}"/>
+                        <newline/>
+                        <button 
+                             name="%(action_asset_modify)d" 
+                             states="open" 
+                             string="Change Duration" 
+                             type="action"
+                             icon="terp-stock_effects-object-colorize" 
+                             colspan="2"/> 
                     </group>
                     <group colspan="2" col="2">
                         <separator string="Depreciation Method" colspan="2" />
diff --git a/addons/account_asset/wizard/__init__.py b/addons/account_asset/wizard/__init__.py
index ab4a7159322..0d2ce9879ad 100755
--- a/addons/account_asset/wizard/__init__.py
+++ b/addons/account_asset/wizard/__init__.py
@@ -18,9 +18,9 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
 #
 ##############################################################################
-
+import account_asset_change_duration
 import wizard_asset_compute
 import wizard_asset_close
-import wizard_asset_modify
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account_asset/wizard/account_asset_change_duration.py b/addons/account_asset/wizard/account_asset_change_duration.py
new file mode 100755
index 00000000000..fcca6181e55
--- /dev/null
+++ b/addons/account_asset/wizard/account_asset_change_duration.py
@@ -0,0 +1,77 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+import time
+from osv import osv,fields
+
+class asset_modify(osv.osv_memory):
+    _name = 'asset.modify'
+    _description = 'Modify Asset'
+
+    _columns = {
+                'name': fields.char('Reason', size=64, required=True),
+                'method_delay': fields.float('Number of interval'),
+                'method_period': fields.float('Period per interval'),
+                'method_end': fields.date('Ending date'),
+                'note': fields.text('Notes'),
+    }
+    
+    def default_get(self, cr, uid, fields, context=None):
+        asset_obj = self.pool.get('account.asset.asset')
+        res = super(asset_modify, self).default_get(cr, uid, fields, context=context)
+        asset_id = context.get('active_id', False)
+        asset = asset_obj.browse(cr, uid, asset_id, context=context)
+        if 'name' in fields:
+            res.update({'name': asset.name})
+        if 'method_delay' in fields and asset.method_time == 'delay':
+            res.update({'method_delay': asset.method_delay})
+        if 'method_period' in fields:
+            res.update({'method_period': asset.method_period})
+        if 'method_end' in fields and asset.method_time == 'end':
+            res.update({'method_end': asset.method_end})
+        return res
+    
+    def modify(self, cr, uid, ids, context=None):
+        asset_obj = self.pool.get('account.asset.asset')
+        history_obj = self.pool.get('account.asset.history')
+        asset_id = context.get('active_id', False)
+        asset = asset_obj.browse(cr, uid, asset_id, context=context)
+        data = self.browse(cr, uid, ids[0], context=context)
+        history_obj.create(cr, uid, {
+            'asset_id': asset_id,
+            'name': asset.name,
+            'method_delay': asset.method_delay,
+            'method_period': asset.method_period,
+            'method_end': asset.method_end,
+            'user_id': uid,
+            'date': time.strftime('%Y-%m-%d'),
+            'note': data.note,
+        }, context=context)
+        asset_obj.write(cr, uid, [asset_id], {
+            'name': data.name,
+            'method_delay': data.method_delay,
+            'method_period': data.method_period,
+            'method_end': data.method_end,
+        }, context=context)
+        return {'type': 'ir.actions.act_window_close'}
+
+asset_modify()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_asset/wizard/account_asset_change_duration_view.xml b/addons/account_asset/wizard/account_asset_change_duration_view.xml
new file mode 100644
index 00000000000..be536b8242f
--- /dev/null
+++ b/addons/account_asset/wizard/account_asset_change_duration_view.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    
+        <record model="ir.ui.view" id="asset_modify_form">
+	        <field name="name">wizard.asset.modify.form</field>
+	        <field name="model">asset.modify</field>
+	        <field name="type">form</field>
+	        <field name="arch" type="xml">
+			    <form string="Modify Asset">
+			        <group colspan="4" col="4">
+					    <separator string="Asset properties to modify" colspan="4"/>
+					    <field name="name" colspan="4"/>
+					    <field name="method_period"/>
+					    <group colspan="2" col="2">
+                            <field name="method_delay" attrs="{'invisible': [('method_end','!=',False)]}"/>
+                            <field name="method_end" attrs="{'invisible': [('method_delay','!=',0.0)]}"/>
+                        </group>
+					    <separator string="Notes" colspan="4"/>
+					    <field name="note" nolabel="1" colspan="4"/>
+                    </group>
+                    <newline/>
+                    <group colspan="4" col="4">
+                        <separator string ="" colspan="4"/>
+                        <newline/>
+                        <group colspan="2" col="2"/>
+                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                        <button name="modify" string="Modify" type="object" icon="terp-check"/>
+                     </group>
+				</form>
+			</field>
+	    </record>
+	    
+	    <record id="action_asset_modify" model="ir.actions.act_window">
+             <field name="name">Modify Asset</field>
+             <field name="res_model">asset.modify</field>
+             <field name="type">ir.actions.act_window</field>
+             <field name="view_type">form</field>
+             <field name="view_mode">tree,form</field>
+             <field name="view_id" ref="asset_modify_form"/>
+             <field name="target">new</field>
+       </record>
+	
+	</data>
+</openerp>
diff --git a/addons/account_asset/wizard/wizard_asset_modify.py b/addons/account_asset/wizard/wizard_asset_modify.py
deleted file mode 100755
index 586a278b21a..00000000000
--- a/addons/account_asset/wizard/wizard_asset_modify.py
+++ /dev/null
@@ -1,87 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import pooler
-
-asset_end_arch = '''<?xml version="1.0"?>
-<form string="Modify asset">
-    <separator string="Asset properties to modify" colspan="4"/>
-    <field name="name" colspan="4"/>
-    <field name="method_delay"/>
-    <field name="method_period"/>
-    <separator string="Notes" colspan="4"/>
-    <field name="note" nolabel="1" colspan="4"/>
-</form>'''
-
-asset_end_fields = {
-    'name': {'string':'Reason', 'type':'char', 'size':64, 'required':True},
-    'method_delay': {'string':'Number of interval', 'type':'float'},
-    'method_period': {'string':'Period per interval', 'type':'float'},
-    'note': {'string':'Notes', 'type':'text'},
-}
-
-def _asset_default(self, cr, uid, data, context={}):
-    pool = pooler.get_pool(cr.dbname)
-    prop = pool.get('account.asset.property').browse(cr, uid, data['id'], context)
-    return {
-        'name': prop.name,
-        'method_delay': prop.method_delay,
-        'method_period': prop.method_period
-    }
-
-def _asset_modif(self, cr, uid, data, context={}):
-    pool = pooler.get_pool(cr.dbname)
-    prop = pool.get('account.asset.property').browse(cr, uid, data['id'], context)
-    pool.get('account.asset.property.history').create(cr, uid, {
-        'asset_property_id': data['id'],
-        'name': prop.name,
-        'method_delay': prop.method_delay,
-        'method_period': prop.method_period,
-        'note': data['form']['note'],
-    }, context)
-    pool.get('account.asset.property').write(cr, uid, [data['id']], {
-        'name': data['form']['name'],
-        'method_delay': data['form']['method_delay'],
-        'method_period': data['form']['method_period'],
-    }, context)
-    return {}
-
-
-class wizard_asset_modify(wizard.interface):
-    states = {
-        'init': {
-            'actions': [_asset_default],
-            'result': {'type':'form', 'arch':asset_end_arch, 'fields':asset_end_fields, 'state':[
-                ('end','Cancel'),
-                ('asset_modify','Modify asset')
-            ]}
-        },
-        'asset_modify': {
-            'actions': [_asset_modif],
-            'result': {'type' : 'state', 'state': 'end'}
-        }
-    }
-wizard_asset_modify('account.asset.modify')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From a3fc4b62b330c23c67d5fccee3d1c41c13a35d6f Mon Sep 17 00:00:00 2001
From: "Ujjvala Collins (OpenERP)" <uco@tinyerp.com>
Date: Fri, 24 Jun 2011 18:38:21 +0530
Subject: [PATCH 02/25] [IMP] account_asset: Added docstrings for methods and
 improved indentation.

bzr revid: uco@tinyerp.com-20110624130821-9spobpiq2sp31cfy
---
 .../wizard/account_asset_change_duration.py   | 27 +++++++++++++++----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/addons/account_asset/wizard/account_asset_change_duration.py b/addons/account_asset/wizard/account_asset_change_duration.py
index fcca6181e55..9cb89e2c62f 100755
--- a/addons/account_asset/wizard/account_asset_change_duration.py
+++ b/addons/account_asset/wizard/account_asset_change_duration.py
@@ -26,14 +26,22 @@ class asset_modify(osv.osv_memory):
     _description = 'Modify Asset'
 
     _columns = {
-                'name': fields.char('Reason', size=64, required=True),
-                'method_delay': fields.float('Number of interval'),
-                'method_period': fields.float('Period per interval'),
-                'method_end': fields.date('Ending date'),
-                'note': fields.text('Notes'),
+        'name': fields.char('Reason', size=64, required=True),
+        'method_delay': fields.float('Number of interval'),
+        'method_period': fields.float('Period per interval'),
+        'method_end': fields.date('Ending date'),
+        'note': fields.text('Notes'),
     }
     
     def default_get(self, cr, uid, fields, context=None):
+        """ To get default values for the object.
+        @param self: The object pointer.
+        @param cr: A database cursor
+        @param uid: ID of the user currently logged in
+        @param fields: List of fields for which we want default values 
+        @param context: A standard dictionary 
+        @return: A dictionary which of fields with values. 
+        """ 
         asset_obj = self.pool.get('account.asset.asset')
         res = super(asset_modify, self).default_get(cr, uid, fields, context=context)
         asset_id = context.get('active_id', False)
@@ -49,6 +57,15 @@ class asset_modify(osv.osv_memory):
         return res
     
     def modify(self, cr, uid, ids, context=None):
+        """ Modifies the duration of asset for calculating depreciation
+        and maintains the history of old values.
+        @param self: The object pointer.
+        @param cr: A database cursor
+        @param uid: ID of the user currently logged in
+        @param ids: List of Ids 
+        @param context: A standard dictionary 
+        @return: Close the wizard. 
+        """ 
         asset_obj = self.pool.get('account.asset.asset')
         history_obj = self.pool.get('account.asset.history')
         asset_id = context.get('active_id', False)

From af901b51eb506114ed4609b6c9529ad96f293866 Mon Sep 17 00:00:00 2001
From: bde <bde@tiny2-desktop>
Date: Mon, 27 Jun 2011 11:37:34 +0530
Subject: [PATCH 03/25] [ADD] Added fields in list and search view of Asset
 Category

bzr revid: bde@tiny2-desktop-20110627060734-pvr1gvy84og8oqk4
---
 addons/account_asset/account_asset_view.xml | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index 229cff87c26..03d34158893 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -47,14 +47,29 @@
         <field name="arch" type="xml">
             <tree string="Asset category">
                 <field name="name"/>
+                <field name="method_time"/>
+                <field name="method_delay"/>
+                <field name="method"/>
                 <field name="journal_id"/>
                 <field name="account_asset_id"/>
-                <field name="account_depreciation_id"/>
+                <field name="account_expense_depreciation_id"/>
                 <field name="company_id" groups="base.group_multi_company"/>
             </tree>
         </field>
     </record>
 
+    <record model="ir.ui.view" id="view_account_asset_category_search">
+        <field name="name">account.asset.category.search</field>
+        <field name="model">account.asset.category</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Asset Category Search">
+                    <field name="name"/>
+                    <field name="journal_id"/>
+            </search>
+        </field>
+    </record>
+
     <record model="ir.ui.view" id="view_account_asset_asset_form">
         <field name="name">account.asset.asset.form</field>
         <field name="model">account.asset.asset</field>

From b7605a8862ac1f768216762049c6c52806a6187d Mon Sep 17 00:00:00 2001
From: "Ujjvala Collins (OpenERP)" <uco@tinyerp.com>
Date: Mon, 27 Jun 2011 12:12:52 +0530
Subject: [PATCH 04/25] [IMP] account_asset: Added parent_id field on asset
 form view and added constraint for the same to check recursion.

bzr revid: uco@tinyerp.com-20110627064252-n7pp50jf41hqr3ml
---
 addons/account_asset/account_asset.py       | 4 ++++
 addons/account_asset/account_asset_view.xml | 1 +
 2 files changed, 5 insertions(+)

diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index c67a60e0da2..67f3f8951e6 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -228,6 +228,9 @@ class account_asset_asset(osv.osv):
         'currency_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.currency_id.id,
         'company_id': lambda self, cr, uid, context: self.pool.get('res.company')._company_default_get(cr, uid, 'account.asset.asset',context=context),
     }
+    
+    def _check_recursion(self, cr, uid, ids, context=None, parent=None):
+        return super(account_asset_asset, self)._check_recursion(cr, uid, ids, context=context, parent=parent)
 
     def _check_prorata(self, cr, uid, ids, context=None):
         for asset in self.browse(cr, uid, ids, context=context):
@@ -236,6 +239,7 @@ class account_asset_asset(osv.osv):
         return True
 
     _constraints = [
+        (_check_recursion, 'Error ! You can not create recursive assets.', ['parent_id']),
         (_check_prorata, '\nProrata temporis can be applied only for computation method linear and time method delay.', ['prorata']),
     ]
 
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index 229cff87c26..07ef8617dc6 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -65,6 +65,7 @@
                  <field name="name" select="1"/>
                  <field name="category_id" select="1" on_change="onchange_category_id(category_id)"/>
                  <field name="code" select="1"/>
+                 <field name="parent_id"/>
                  <field name="purchase_value" select="1"/>
                  <field name="salvage_value"/>
                  <field name="value_residual"/>

From acd1107c6deb26754f1bc24760c23bfd13a41cc8 Mon Sep 17 00:00:00 2001
From: bde <bde@tiny2-desktop>
Date: Mon, 27 Jun 2011 12:30:19 +0530
Subject: [PATCH 05/25] [IMP] Improved Indentation and Search String in Search
 view of Account Asset Category

bzr revid: bde@tiny2-desktop-20110627070019-u59pwjeg9bwu0u7h
---
 addons/account_asset/account_asset_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index 03d34158893..75b3290db94 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -63,9 +63,9 @@
         <field name="model">account.asset.category</field>
         <field name="type">search</field>
         <field name="arch" type="xml">
-            <search string="Asset Category Search">
-                    <field name="name"/>
-                    <field name="journal_id"/>
+            <search string="Search Asset Category">
+                <field name="name"/>
+                <field name="journal_id"/>
             </search>
         </field>
     </record>

From 0c4460a25fdee8bf14f0a49ef50c966fe57519e5 Mon Sep 17 00:00:00 2001
From: "Ujjvala Collins (OpenERP)" <uco@tinyerp.com>
Date: Mon, 27 Jun 2011 14:21:42 +0530
Subject: [PATCH 06/25] [REF] account_asset: Corrected usability and
 indentation. Improvement: Latest history should come first in the list.

bzr revid: uco@tinyerp.com-20110627085142-5amjoke1d3jtkdz3
---
 addons/account_asset/account_asset.py         |  2 +
 .../wizard/account_asset_change_duration.py   | 11 ++++--
 .../account_asset_change_duration_view.xml    | 38 +++++++++----------
 3 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index c67a60e0da2..f686c2dbb83 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -524,10 +524,12 @@ class account_asset_history(osv.osv):
         'method_end': fields.date('Ending date'),
         'note': fields.text('Note'),
     }
+    _order = 'create_date desc'
     _defaults = {
         'date': lambda *args: time.strftime('%Y-%m-%d'),
         'user_id': lambda self,cr, uid,ctx: uid
     }
+    
 account_asset_history()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_asset/wizard/account_asset_change_duration.py b/addons/account_asset/wizard/account_asset_change_duration.py
index 9cb89e2c62f..9abe8519851 100755
--- a/addons/account_asset/wizard/account_asset_change_duration.py
+++ b/addons/account_asset/wizard/account_asset_change_duration.py
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 import time
+
 from osv import osv,fields
 
 class asset_modify(osv.osv_memory):
@@ -71,7 +72,7 @@ class asset_modify(osv.osv_memory):
         asset_id = context.get('active_id', False)
         asset = asset_obj.browse(cr, uid, asset_id, context=context)
         data = self.browse(cr, uid, ids[0], context=context)
-        history_obj.create(cr, uid, {
+        history_vals = {
             'asset_id': asset_id,
             'name': asset.name,
             'method_delay': asset.method_delay,
@@ -80,13 +81,15 @@ class asset_modify(osv.osv_memory):
             'user_id': uid,
             'date': time.strftime('%Y-%m-%d'),
             'note': data.note,
-        }, context=context)
-        asset_obj.write(cr, uid, [asset_id], {
+        }
+        history_obj.create(cr, uid, history_vals, context=context)
+        asset_vals = {
             'name': data.name,
             'method_delay': data.method_delay,
             'method_period': data.method_period,
             'method_end': data.method_end,
-        }, context=context)
+        }
+        asset_obj.write(cr, uid, [asset_id], asset_vals, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
 asset_modify()
diff --git a/addons/account_asset/wizard/account_asset_change_duration_view.xml b/addons/account_asset/wizard/account_asset_change_duration_view.xml
index be536b8242f..625fa3cc77f 100644
--- a/addons/account_asset/wizard/account_asset_change_duration_view.xml
+++ b/addons/account_asset/wizard/account_asset_change_duration_view.xml
@@ -3,21 +3,21 @@
     <data>
     
         <record model="ir.ui.view" id="asset_modify_form">
-	        <field name="name">wizard.asset.modify.form</field>
-	        <field name="model">asset.modify</field>
-	        <field name="type">form</field>
-	        <field name="arch" type="xml">
-			    <form string="Modify Asset">
-			        <group colspan="4" col="4">
-					    <separator string="Asset properties to modify" colspan="4"/>
-					    <field name="name" colspan="4"/>
-					    <field name="method_period"/>
-					    <group colspan="2" col="2">
+            <field name="name">wizard.asset.modify.form</field>
+            <field name="model">asset.modify</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Modify Asset">
+                    <group colspan="4" col="4">
+                        <separator string="Asset durations to modify" colspan="4"/>
+                        <field name="name" colspan="4"/>
+                        <field name="method_period"/>
+                        <group colspan="2" col="2">
                             <field name="method_delay" attrs="{'invisible': [('method_end','!=',False)]}"/>
                             <field name="method_end" attrs="{'invisible': [('method_delay','!=',0.0)]}"/>
                         </group>
-					    <separator string="Notes" colspan="4"/>
-					    <field name="note" nolabel="1" colspan="4"/>
+                        <separator string="Notes" colspan="4"/>
+                        <field name="note" nolabel="1" colspan="4"/>
                     </group>
                     <newline/>
                     <group colspan="4" col="4">
@@ -25,13 +25,13 @@
                         <newline/>
                         <group colspan="2" col="2"/>
                         <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                        <button name="modify" string="Modify" type="object" icon="terp-check"/>
-                     </group>
-				</form>
-			</field>
-	    </record>
+                        <button name="modify" string="Modify" type="object" icon="terp-camera_test"/>
+                    </group>
+                </form>
+            </field>
+        </record>
 	    
-	    <record id="action_asset_modify" model="ir.actions.act_window">
+        <record id="action_asset_modify" model="ir.actions.act_window">
              <field name="name">Modify Asset</field>
              <field name="res_model">asset.modify</field>
              <field name="type">ir.actions.act_window</field>
@@ -41,5 +41,5 @@
              <field name="target">new</field>
        </record>
 	
-	</data>
+    </data>
 </openerp>

From 267fc987237945bab590b4f59c444be7bc6897fc Mon Sep 17 00:00:00 2001
From: bde <bde@tiny2-desktop>
Date: Mon, 27 Jun 2011 14:25:11 +0530
Subject: [PATCH 07/25] [ADD] Added Fields in Account Asset's Tree and Search
 View

bzr revid: bde@tiny2-desktop-20110627085511-lzal18dnju0qiusr
---
 addons/account_asset/account_asset_view.xml | 24 ++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index 229cff87c26..906fa2ae794 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -176,14 +176,36 @@
         <field name="arch" type="xml">
             <tree string="Assets">
                 <field name="name"/>
-                <field name="code"/>
+                <field name="category_id"/>                
                 <field name="purchase_date"/>
+                <field name="partner_id"/>
+                <field name="purchase_value"/>
+                <field name="value_residual"/>
+                <field name="currency_id"/>
                 <field name="company_id" groups="base.group_multi_company"/>
                 <field name="state"/>
             </tree>
         </field>
     </record>
 
+    <record id="view_analytic_entries_report_search" model="ir.ui.view">
+        <field name="name">account.asset.asset.search</field>
+        <field name="model">account.asset.asset</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Account Asset Analysis">
+                <group col="10" colspan="12">
+                    <filter icon="terp-document-new" string="Draft" domain="[('state','=', 'draft')]" help="Assets in Draft State"/>
+                    <filter icon="terp-camera_test" string="Running" domain="[('state','=', 'open')]" help="Assets in Running State"/>
+                </group>
+                <field name="name"/>
+                <field name="category_id"/>
+                <field name="purchase_date"/>        
+                <field name="partner_id"/>
+            </search>
+        </field>
+    </record>
+
     <record model="ir.actions.act_window" id="action_account_asset_asset_tree">
         <field name="name">Asset Hierarchy</field>
         <field name="res_model">account.asset.asset</field>

From cec2748751d8bef6dd326e456192b897698745d0 Mon Sep 17 00:00:00 2001
From: bde <bde@tiny2-desktop>
Date: Mon, 27 Jun 2011 15:55:54 +0530
Subject: [PATCH 08/25] [IMP] Improved Usability of Account Asset

bzr revid: bde@tiny2-desktop-20110627102554-p0kk7websm7qxv4r
---
 addons/account_asset/account_asset.py       |  6 ++---
 addons/account_asset/account_asset_view.xml | 29 ++++++++++++---------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index c67a60e0da2..39cfca1bec2 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -189,11 +189,11 @@ class account_asset_asset(osv.osv):
 
         'name': fields.char('Asset', size=64, required=True, select=1),
         'code': fields.char('Reference ', size=16, select=1),
-        'purchase_value': fields.float('Gross value ', required=True, size=16, select=1),
+        'purchase_value': fields.float('Gross Value ', required=True, size=16, select=1),
         'currency_id': fields.many2one('res.currency','Currency',required=True,size=5,select=1),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'note': fields.text('Note'),
-        'category_id': fields.many2one('account.asset.category', 'Asset category',required=True, change_default=True),
+        'category_id': fields.many2one('account.asset.category', 'Asset Category',required=True, change_default=True),
         'localisation': fields.char('Localisation', size=32, select=2),
         'parent_id': fields.many2one('account.asset.asset', 'Parent Asset'),
         'child_ids': fields.one2many('account.asset.asset', 'parent_id', 'Children Assets'),
@@ -205,7 +205,7 @@ class account_asset_asset(osv.osv):
          \nProgressive: Calculated on basis of Gross Value * Progressif Factor"),
         'method_delay': fields.integer('Number of Depreciation', readonly=True, states={'draft':[('readonly',False)]}, help="Calculates Depreciation within specified interval"),
         'method_period': fields.integer('Period Length', readonly=True, states={'draft':[('readonly',False)]}, help="State here the time during 2 depreciations, in months"),
-        'method_end': fields.date('Ending date', readonly=True, states={'draft':[('readonly',False)]}),
+        'method_end': fields.date('Ending Date', readonly=True, states={'draft':[('readonly',False)]}),
         'method_progress_factor': fields.float('Progressif Factor', readonly=True, states={'draft':[('readonly',False)]}),
         'value_residual': fields.function(_amount_residual, method=True, digits_compute=dp.get_precision('Account'), string='Residual Value'),
         'method_time': fields.selection([('delay','Delay'),('end','Ending Period')], 'Time Method', required=True, readonly=True, states={'draft':[('readonly',False)]}, help="Delay: Allow users to enter number of periods to generate depreciation lines \n Ending Period: Calculates depreciation lines on the basis of Ending Period Date and Number of Depreciation"),
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index 906fa2ae794..a258977cead 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -20,7 +20,7 @@
                     <field name="method_time"/>
                     <field name="method_delay" attrs="{'invisible':[('method_time','=','end')]}"/>
                     <field name="method_period"/>
-                    <field name="method_end" attrs="{'required': [('method_time','=','end')], 'invisible':[('method_time','=','delay')]}"/> 
+                    <field name="method_end" attrs="{'required': [('method_time','=','end')], 'invisible':[('method_time','=','delay')]}"/>
                 </group>
                 <group colspan="2" col="2">
                     <separator string="Depreciation Method" colspan="2" />
@@ -78,17 +78,17 @@
                     <field name="purchase_date"/>
                     <group colspan="2" col="2">
                         <separator string="Depreciation Dates" colspan="2" />
-                        <button 
-                             name="%(wizard_asset_modify)d" 
-                             states="open" 
-                             string="Change duration" 
-                             type="action" 
+                        <button
+                             name="%(wizard_asset_modify)d"
+                             states="open"
+                             string="Change duration"
+                             type="action"
                              colspan="2"/>
                         <newline/>
                         <field name="method_time" on_change="onchange_method_time(method_time)"/>
                         <field name="method_delay" attrs="{'invisible':[('method_time','=','end')]}"/>
                         <field name="method_period"/>
-                        <field name="method_end" attrs="{'required': [('method_time','=','end')], 'invisible':[('method_time','=','delay')]}"/> 
+                        <field name="method_end" attrs="{'required': [('method_time','=','end')], 'invisible':[('method_time','=','delay')]}"/>
                     </group>
                     <group colspan="2" col="2">
                         <separator string="Depreciation Method" colspan="2" />
@@ -176,7 +176,7 @@
         <field name="arch" type="xml">
             <tree string="Assets">
                 <field name="name"/>
-                <field name="category_id"/>                
+                <field name="category_id"/>
                 <field name="purchase_date"/>
                 <field name="partner_id"/>
                 <field name="purchase_value"/>
@@ -188,7 +188,7 @@
         </field>
     </record>
 
-    <record id="view_analytic_entries_report_search" model="ir.ui.view">
+    <record id="view_account_asset_search" model="ir.ui.view">
         <field name="name">account.asset.asset.search</field>
         <field name="model">account.asset.asset</field>
         <field name="type">search</field>
@@ -197,11 +197,12 @@
                 <group col="10" colspan="12">
                     <filter icon="terp-document-new" string="Draft" domain="[('state','=', 'draft')]" help="Assets in Draft State"/>
                     <filter icon="terp-camera_test" string="Running" domain="[('state','=', 'open')]" help="Assets in Running State"/>
+                    <separator orientation="vertical"/>
+                    <field name="name"/>
+                    <field name="category_id"/>
+                    <field name="purchase_date"/>
+                    <field name="partner_id"/>
                 </group>
-                <field name="name"/>
-                <field name="category_id"/>
-                <field name="purchase_date"/>        
-                <field name="partner_id"/>
             </search>
         </field>
     </record>
@@ -223,6 +224,8 @@
         <field name="name">Assets</field>
         <field name="res_model">account.asset.asset</field>
         <field name="view_type">form</field>
+        <field name="view_id" ref="view_account_asset_asset_tree"/>
+        <field name="search_view_id" ref="view_account_asset_search"/>
     </record>
 
     <menuitem

From 89d9c9407d5053db138e2a673c5b06b632dbafba Mon Sep 17 00:00:00 2001
From: "Ujjvala Collins (OpenERP)" <uco@tinyerp.com>
Date: Mon, 27 Jun 2011 16:21:05 +0530
Subject: [PATCH 09/25] [FIX] account_asset: Changed order by id for history
 changes. Improved indentations. Changed field types.

bzr revid: uco@tinyerp.com-20110627105105-33w6pup1elslw542
---
 addons/account_asset/__openerp__.py                         | 2 +-
 addons/account_asset/account_asset.py                       | 2 +-
 .../account_asset/wizard/account_asset_change_duration.py   | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/account_asset/__openerp__.py b/addons/account_asset/__openerp__.py
index c922c6c6715..b1240a21baf 100755
--- a/addons/account_asset/__openerp__.py
+++ b/addons/account_asset/__openerp__.py
@@ -42,7 +42,7 @@
         "wizard/account_asset_change_duration_view.xml",
         "account_asset_view.xml",
         "account_asset_invoice_view.xml",
-	    "account_asset_report_view.xml",
+        "account_asset_report_view.xml",
         "report/account_asset_report_view.xml",
 	#modif
     ],
diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index f686c2dbb83..3484f6ecc4f 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -524,7 +524,7 @@ class account_asset_history(osv.osv):
         'method_end': fields.date('Ending date'),
         'note': fields.text('Note'),
     }
-    _order = 'create_date desc'
+    _order = 'id desc'
     _defaults = {
         'date': lambda *args: time.strftime('%Y-%m-%d'),
         'user_id': lambda self,cr, uid,ctx: uid
diff --git a/addons/account_asset/wizard/account_asset_change_duration.py b/addons/account_asset/wizard/account_asset_change_duration.py
index 9abe8519851..fe9274fb101 100755
--- a/addons/account_asset/wizard/account_asset_change_duration.py
+++ b/addons/account_asset/wizard/account_asset_change_duration.py
@@ -20,7 +20,7 @@
 ##############################################################################
 import time
 
-from osv import osv,fields
+from osv import osv, fields
 
 class asset_modify(osv.osv_memory):
     _name = 'asset.modify'
@@ -28,8 +28,8 @@ class asset_modify(osv.osv_memory):
 
     _columns = {
         'name': fields.char('Reason', size=64, required=True),
-        'method_delay': fields.float('Number of interval'),
-        'method_period': fields.float('Period per interval'),
+        'method_delay': fields.integer('Number of Depreciation'),
+        'method_period': fields.integer('Period Length'),
         'method_end': fields.date('Ending date'),
         'note': fields.text('Notes'),
     }

From a7407a955117ec32c4c576b935a1041d89c9d12a Mon Sep 17 00:00:00 2001
From: "Ujjvala Collins (OpenERP)" <uco@tinyerp.com>
Date: Mon, 27 Jun 2011 16:29:39 +0530
Subject: [PATCH 10/25] [IMP] account_asset: Changed position of parent_id
 field. [ADD] : Added tree view for Asset hierarchy.

bzr revid: uco@tinyerp.com-20110627105939-jun2vn3j2fx3lu81
---
 addons/account_asset/account_asset_view.xml | 24 +++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index 07ef8617dc6..c3b6b0d82e4 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -65,10 +65,10 @@
                  <field name="name" select="1"/>
                  <field name="category_id" select="1" on_change="onchange_category_id(category_id)"/>
                  <field name="code" select="1"/>
-                 <field name="parent_id"/>
                  <field name="purchase_value" select="1"/>
                  <field name="salvage_value"/>
                  <field name="value_residual"/>
+                 <field name="parent_id"/>
                  <field name="currency_id" select="1"/>
                  <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
               </group>
@@ -184,13 +184,33 @@
             </tree>
         </field>
     </record>
+    
+    <record model="ir.ui.view" id="view_account_asset_asset_hierarchy_tree">
+        <field name="name">account.asset.asset.hierarchy</field>
+        <field name="model">account.asset.asset</field>
+        <field name="type">tree</field>
+        <field name="field_parent">child_ids</field>
+        <field name="arch" type="xml">
+            <tree string="Assets">
+                <field name="name"/>
+                <field name="code"/>
+                <field name="category_id"/>
+                <field name="purchase_date"/>
+                <field name="purchase_value"/>
+                <field name="value_residual"/>
+                <field name="currency_id"/>
+                <field name="company_id" groups="base.group_multi_company"/>
+                <field name="state"/>
+            </tree>
+        </field>
+    </record>
 
     <record model="ir.actions.act_window" id="action_account_asset_asset_tree">
         <field name="name">Asset Hierarchy</field>
         <field name="res_model">account.asset.asset</field>
         <field name="view_type">tree</field>
         <field name="domain">[('parent_id','=',False)]</field>
-        <field name="view_id" ref="view_account_asset_asset_tree"/>
+        <field name="view_id" ref="view_account_asset_asset_hierarchy_tree"/>
     </record>
 
     <menuitem id="menu_finance_assets" name="Assets" parent="account.menu_finance"/>

From 7d4553eb524abe31e15248e1ca0fc837f9aacb9d Mon Sep 17 00:00:00 2001
From: bde <bde@tiny2-desktop>
Date: Mon, 27 Jun 2011 16:38:14 +0530
Subject: [PATCH 11/25] [IMP] Improved Usability of Account Asset Form View

bzr revid: bde@tiny2-desktop-20110627110814-d0pb8we338ihu9lj
---
 addons/account_asset/account_asset_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index 229cff87c26..4882b61f3e9 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -97,6 +97,10 @@
                         <field name="prorata" attrs="{'invisible': ['|',('method_time','=','end'),('method','!=','linear')]}"/>
                     </group>
                     <newline/>
+                    <group colspan="4" col="4">
+                        <field name="state" readonly="1" colspan="3"/>
+                        <button name="validate" states="draft" string="Confirm Asset" type="object" icon="terp-camera_test"/>
+                    </group>
                  </page>
                  <page string="Depreciation board">
                     <field name="depreciation_line_ids" colspan="4" nolabel="1" mode="tree,graph" >
@@ -125,10 +129,6 @@
                     <field name="note" nolabel="1"/>
                  </page>
               </notebook>
-              <field name="state" readonly="1"/>
-              <group colspan="2" col="2">
-                 <button name="validate" states="draft" string="Confirm asset" type="object"/>
-              </group>
            </form>
        </field>
     </record>

From a5b04d3de0940c26ed9dc44f5b14e11d66578728 Mon Sep 17 00:00:00 2001
From: "Ujjvala Collins (OpenERP)" <uco@tinyerp.com>
Date: Mon, 27 Jun 2011 17:52:39 +0530
Subject: [PATCH 12/25] [ADD] account_asset: Added fields_view_get method for
 setting the fields invisible based on Time method of asset.

bzr revid: uco@tinyerp.com-20110627122239-byt91wu5b1akzzgq
---
 .../wizard/account_asset_change_duration.py   | 32 ++++++++++++++++++-
 .../account_asset_change_duration_view.xml    |  4 +--
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/addons/account_asset/wizard/account_asset_change_duration.py b/addons/account_asset/wizard/account_asset_change_duration.py
index fe9274fb101..6a4da648ae2 100755
--- a/addons/account_asset/wizard/account_asset_change_duration.py
+++ b/addons/account_asset/wizard/account_asset_change_duration.py
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 import time
+from lxml import etree
 
 from osv import osv, fields
 
@@ -33,7 +34,36 @@ class asset_modify(osv.osv_memory):
         'method_end': fields.date('Ending date'),
         'note': fields.text('Notes'),
     }
-    
+
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        """ Returns views and fields for current model.
+        @param cr: A database cursor
+        @param user: ID of the user currently logged in
+        @param view_id: list of fields, which required to read signatures
+        @param view_type: defines a view type. it can be one of (form, tree, graph, calender, gantt, search, mdx)
+        @param context: context arguments, like lang, time zone
+        @param toolbar: contains a list of reports, wizards, and links related to current model
+
+        @return: Returns a dictionary that contains definition for fields, views, and toolbars
+        """
+        asset_obj = self.pool.get('account.asset.asset')
+        result = super(asset_modify, self).fields_view_get(cr, uid, view_id, view_type, context=context, toolbar=toolbar, submenu=submenu)
+        if not context:
+            context = {}
+        asset_id = context.get('active_id', False)
+        active_model = context.get('active_model', '')
+        if active_model == 'account.asset.asset' and asset_id:
+            asset = asset_obj.browse(cr, uid, asset_id, context=context)
+            doc = etree.XML(result['arch'])
+            if asset.method_time == 'delay':
+                node = doc.xpath("//field[@name='method_end']")[0]
+                node.set('invisible', '1')
+            elif asset.method_time == 'end':
+                node = doc.xpath("//field[@name='method_delay']")[0]
+                node.set('invisible', '1')
+            result['arch'] = etree.tostring(doc)
+        return result
+
     def default_get(self, cr, uid, fields, context=None):
         """ To get default values for the object.
         @param self: The object pointer.
diff --git a/addons/account_asset/wizard/account_asset_change_duration_view.xml b/addons/account_asset/wizard/account_asset_change_duration_view.xml
index 625fa3cc77f..a655cbe348d 100644
--- a/addons/account_asset/wizard/account_asset_change_duration_view.xml
+++ b/addons/account_asset/wizard/account_asset_change_duration_view.xml
@@ -13,8 +13,8 @@
                         <field name="name" colspan="4"/>
                         <field name="method_period"/>
                         <group colspan="2" col="2">
-                            <field name="method_delay" attrs="{'invisible': [('method_end','!=',False)]}"/>
-                            <field name="method_end" attrs="{'invisible': [('method_delay','!=',0.0)]}"/>
+                            <field name="method_delay"/>
+                            <field name="method_end"/>
                         </group>
                         <separator string="Notes" colspan="4"/>
                         <field name="note" nolabel="1" colspan="4"/>

From 4662d6e141cea1a76bf4260c654965a782c3292e Mon Sep 17 00:00:00 2001
From: bde <bde@tiny2-desktop>
Date: Tue, 28 Jun 2011 11:49:08 +0530
Subject: [PATCH 13/25] [ADD] compute_depreciation_board method called on def
 create() method

bzr revid: bde@tiny2-desktop-20110628061908-9xoq1b3b0ysao10u
---
 addons/account_asset/account_asset.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index c67a60e0da2..eef4d223b23 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -350,6 +350,13 @@ class account_asset_asset(osv.osv):
                 if period and (period.date_start<=date_start):
                     result += self._compute_move(cr, uid, property, period, context)
         return result
+
+    def create(self, cr, uid, vals, context=None):
+        val = super(account_asset_asset, self).create(cr, uid, vals, context=context)
+        obj = self.pool.get('account.asset.asset')
+        obj.compute_depreciation_board(cr, uid, [val])
+        return val
+
 account_asset_asset()
 
 class account_asset_depreciation_line(osv.osv):

From bbee97d3b1c42a4f459e64dd616ae5648dbb1594 Mon Sep 17 00:00:00 2001
From: bde <bde@tiny2-desktop>
Date: Tue, 28 Jun 2011 12:20:50 +0530
Subject: [PATCH 14/25] [IMP] improved create method

bzr revid: bde@tiny2-desktop-20110628065050-91ivn5jj5kt64ul9
---
 addons/account_asset/account_asset.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index eef4d223b23..f0222b8ce3e 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -352,10 +352,9 @@ class account_asset_asset(osv.osv):
         return result
 
     def create(self, cr, uid, vals, context=None):
-        val = super(account_asset_asset, self).create(cr, uid, vals, context=context)
-        obj = self.pool.get('account.asset.asset')
-        obj.compute_depreciation_board(cr, uid, [val])
-        return val
+        asset_id = super(account_asset_asset, self).create(cr, uid, vals, context=context)
+        self.compute_depreciation_board(cr, uid, [asset_id], context=context)
+        return asset_id
 
 account_asset_asset()
 

From 3a7223c2ac49afed039fcce33ca5bb7fd23254e6 Mon Sep 17 00:00:00 2001
From: bde <bde@tiny2-desktop>
Date: Tue, 28 Jun 2011 15:43:40 +0530
Subject: [PATCH 15/25] [ADD] added functionality for close state in Account
 Asset

bzr revid: bde@tiny2-desktop-20110628101340-v9k65xcvwf4adyqa
---
 addons/account_asset/account_asset.py       | 9 ++++++++-
 addons/account_asset/account_asset_view.xml | 3 ++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index c67a60e0da2..7e1facd1c7c 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -169,6 +169,9 @@ class account_asset_asset(osv.osv):
             'state':'open'
         }, context)
 
+    def set_to_close(self, cr, uid, ids, context=None):
+        return self.write(cr, uid, ids, {'state': 'close'}, context=context)
+
     def _amount_residual(self, cr, uid, ids, name, args, context=None):
         cr.execute("""SELECT
                 l.asset_id as id, round(SUM(abs(l.debit-l.credit))) AS amount
@@ -350,6 +353,7 @@ class account_asset_asset(osv.osv):
                 if period and (period.date_start<=date_start):
                     result += self._compute_move(cr, uid, property, period, context)
         return result
+
 account_asset_asset()
 
 class account_asset_depreciation_line(osv.osv):
@@ -374,7 +378,7 @@ class account_asset_depreciation_line(osv.osv):
         'move_check': fields.function(_get_move_check, method=True, type='boolean', string='Posted', store=True)
     }
 
-    def create_move(self, cr, uid,ids, context=None):
+    def create_move(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
         asset_obj = self.pool.get('account.asset.asset')
@@ -383,6 +387,7 @@ class account_asset_depreciation_line(osv.osv):
         move_line_obj = self.pool.get('account.move.line')
         currency_obj = self.pool.get('res.currency')
         for line in self.browse(cr, uid, ids, context=context):
+            rem_value = line.remaining_value
             depreciation_date = line.asset_id.prorata and line.asset_id.purchase_date or time.strftime('%Y-%m-%d')
             period_ids = period_obj.find(cr, uid, depreciation_date, context=context)
             company_currency = line.asset_id.company_id.currency_id.id
@@ -429,6 +434,8 @@ class account_asset_depreciation_line(osv.osv):
                 'asset_id': line.asset_id.id
             })
             self.write(cr, uid, line.id, {'move_id': move_id}, context=context)
+            if rem_value == 0:
+                asset_obj.write(cr, uid, line.asset_id.id, {'state': 'close'}, context=context)                
         return True
 
 account_asset_depreciation_line()
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index 229cff87c26..5fb644e3376 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -127,7 +127,8 @@
               </notebook>
               <field name="state" readonly="1"/>
               <group colspan="2" col="2">
-                 <button name="validate" states="draft" string="Confirm asset" type="object"/>
+                  <button name="validate" states="draft" string="Confirm asset" type="object"/>
+                  <button name="set_to_close" states="open" string="Set to Close" type="object" icon="gtk-close"/>
               </group>
            </form>
        </field>

From 7c7c0d1668b6db359a8b417946d72a4ceac1a708 Mon Sep 17 00:00:00 2001
From: bde <bde@tiny2-desktop>
Date: Tue, 28 Jun 2011 17:07:54 +0530
Subject: [PATCH 16/25] [IMP] Copied the name of the Asset Name in Analytic
 Line

bzr revid: bde@tiny2-desktop-20110628113754-w6723yrwj7d1hmul
---
 addons/account_asset/account_asset.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index c67a60e0da2..c09cd5c342c 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -399,7 +399,7 @@ class account_asset_depreciation_line(osv.osv):
                 }
             move_id = move_obj.create(cr, uid, move_vals, context=context)
             move_line_obj.create(cr, uid, {
-                'name': line.name,
+                'name': line.asset_id.name,
                 'ref': line.name,
                 'move_id': move_id,
                 'account_id': line.asset_id.category_id.account_depreciation_id.id,
@@ -413,7 +413,7 @@ class account_asset_depreciation_line(osv.osv):
                 'date': depreciation_date,
             })
             move_line_obj.create(cr, uid, {
-                'name': line.name,
+                'name': line.asset_id.name,
                 'ref': line.name,
                 'move_id': move_id,
                 'account_id': line.asset_id.category_id.account_expense_depreciation_id.id,

From 3c58e5c81870bfe1554d827b514b64dfcdb88f78 Mon Sep 17 00:00:00 2001
From: bde <bde@tiny2-desktop>
Date: Tue, 28 Jun 2011 18:13:08 +0530
Subject: [PATCH 17/25] [IMP] Optimized the Code

bzr revid: bde@tiny2-desktop-20110628124308-b1d0phgot9u6a1p0
---
 addons/account_asset/account_asset.py | 30 ++++++++++++++++-----------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index c09cd5c342c..6a1c2af75ef 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -398,30 +398,36 @@ class account_asset_depreciation_line(osv.osv):
                 'journal_id': line.asset_id.category_id.journal_id.id,
                 }
             move_id = move_obj.create(cr, uid, move_vals, context=context)
+            asset_name = line.asset_id.name
+            reference = line.name
+            mov_id = move_id
+            amt = amount
+            journal_id = line.asset_id.category_id.journal_id.id
+            partner_id = line.asset_id.partner_id.id
             move_line_obj.create(cr, uid, {
-                'name': line.asset_id.name,
-                'ref': line.name,
-                'move_id': move_id,
+                'name': asset_name,
+                'ref': reference,
+                'move_id': mov_id,
                 'account_id': line.asset_id.category_id.account_depreciation_id.id,
                 'debit': 0.0,
-                'credit': amount,
+                'credit': amt,
                 'period_id': period_ids and period_ids[0] or False,
-                'journal_id': line.asset_id.category_id.journal_id.id,
-                'partner_id': line.asset_id.partner_id.id,
+                'journal_id': journal_id,
+                'partner_id': partner_id,
                 'currency_id': company_currency <> current_currency and  current_currency or False,
                 'amount_currency': company_currency <> current_currency and - sign * line.amount or 0.0,
                 'date': depreciation_date,
             })
             move_line_obj.create(cr, uid, {
-                'name': line.asset_id.name,
-                'ref': line.name,
-                'move_id': move_id,
+                'name': asset_name,
+                'ref': reference,
+                'move_id': mov_id,
                 'account_id': line.asset_id.category_id.account_expense_depreciation_id.id,
                 'credit': 0.0,
-                'debit': amount,
+                'debit': amt,
                 'period_id': period_ids and period_ids[0] or False,
-                'journal_id': line.asset_id.category_id.journal_id.id,
-                'partner_id': line.asset_id.partner_id.id,
+                'journal_id': journal_id,
+                'partner_id': partner_id,
                 'currency_id': company_currency <> current_currency and  current_currency or False,
                 'amount_currency': company_currency <> current_currency and sign * line.amount or 0.0,
                 'analytic_account_id': line.asset_id.category_id.account_analytic_id.id,

From 52205d1140ac6e2a836d52db5cea0b480eeda3be Mon Sep 17 00:00:00 2001
From: bde <bde@tiny2-desktop>
Date: Tue, 28 Jun 2011 18:26:52 +0530
Subject: [PATCH 18/25] [IMP] Improved the Code by removing unnecessary
 variables

bzr revid: bde@tiny2-desktop-20110628125652-s19i628aro8f2kue
---
 addons/account_asset/account_asset.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index 6a1c2af75ef..c7227653133 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -400,17 +400,15 @@ class account_asset_depreciation_line(osv.osv):
             move_id = move_obj.create(cr, uid, move_vals, context=context)
             asset_name = line.asset_id.name
             reference = line.name
-            mov_id = move_id
-            amt = amount
             journal_id = line.asset_id.category_id.journal_id.id
             partner_id = line.asset_id.partner_id.id
             move_line_obj.create(cr, uid, {
                 'name': asset_name,
                 'ref': reference,
-                'move_id': mov_id,
+                'move_id': move_id,
                 'account_id': line.asset_id.category_id.account_depreciation_id.id,
                 'debit': 0.0,
-                'credit': amt,
+                'credit': amount,
                 'period_id': period_ids and period_ids[0] or False,
                 'journal_id': journal_id,
                 'partner_id': partner_id,
@@ -421,10 +419,10 @@ class account_asset_depreciation_line(osv.osv):
             move_line_obj.create(cr, uid, {
                 'name': asset_name,
                 'ref': reference,
-                'move_id': mov_id,
+                'move_id': move_id,
                 'account_id': line.asset_id.category_id.account_expense_depreciation_id.id,
                 'credit': 0.0,
-                'debit': amt,
+                'debit': amount,
                 'period_id': period_ids and period_ids[0] or False,
                 'journal_id': journal_id,
                 'partner_id': partner_id,

From 58a0f85f1f205999e057546af39e8f7197952757 Mon Sep 17 00:00:00 2001
From: bde <bde@tiny2-desktop>
Date: Tue, 28 Jun 2011 19:01:19 +0530
Subject: [PATCH 19/25] [IMP] Made the fields and Button Readonly when the
 state is in running or close

bzr revid: bde@tiny2-desktop-20110628133119-auxy6qkyznz51gds
---
 addons/account_asset/account_asset.py       | 20 ++++++++++----------
 addons/account_asset/account_asset_view.xml |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index 7e1facd1c7c..1f76d367adf 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -190,20 +190,20 @@ class account_asset_asset(osv.osv):
         'period_id': fields.many2one('account.period', 'First Period', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'account_move_line_ids': fields.one2many('account.move.line', 'asset_id', 'Entries', readonly=True, states={'draft':[('readonly',False)]}),
 
-        'name': fields.char('Asset', size=64, required=True, select=1),
-        'code': fields.char('Reference ', size=16, select=1),
-        'purchase_value': fields.float('Gross value ', required=True, size=16, select=1),
-        'currency_id': fields.many2one('res.currency','Currency',required=True,size=5,select=1),
-        'company_id': fields.many2one('res.company', 'Company', required=True),
+        'name': fields.char('Asset', size=64, required=True, select=1, readonly=False, states={'close':[('readonly',True)]}),
+        'code': fields.char('Reference ', size=16, select=1, readonly=False, states={'close':[('readonly',True)]}),
+        'purchase_value': fields.float('Gross value ', required=True, size=16, select=1, readonly=False, states={'close':[('readonly',True)]}),
+        'currency_id': fields.many2one('res.currency','Currency',required=True,size=5,select=1, readonly=False, states={'close':[('readonly',True)]}),
+        'company_id': fields.many2one('res.company', 'Company', required=True, readonly=False, states={'close':[('readonly',True)]}),
         'note': fields.text('Note'),
-        'category_id': fields.many2one('account.asset.category', 'Asset category',required=True, change_default=True),
+        'category_id': fields.many2one('account.asset.category', 'Asset category',required=True, change_default=True, readonly=False, states={'close':[('readonly',True)]}),
         'localisation': fields.char('Localisation', size=32, select=2),
         'parent_id': fields.many2one('account.asset.asset', 'Parent Asset'),
         'child_ids': fields.one2many('account.asset.asset', 'parent_id', 'Children Assets'),
-        'purchase_date': fields.date('Purchase Date', required=True),
+        'purchase_date': fields.date('Purchase Date', required=True, readonly=False, states={'close':[('readonly',True)]}),
         'state': fields.selection([('draft','Draft'),('open','Running'),('close','Close')], 'State', required=True),
         'active': fields.boolean('Active', select=2),
-        'partner_id': fields.many2one('res.partner', 'Partner'),
+        'partner_id': fields.many2one('res.partner', 'Partner', readonly=False, states={'close':[('readonly',True)]}),
         'method': fields.selection([('linear','Linear'),('progressif','Progressive')], 'Computation Method', required=True, readonly=True, states={'draft':[('readonly',False)]}, help="Linear: Calculated on basis of Gross Value/During (interval) \
          \nProgressive: Calculated on basis of Gross Value * Progressif Factor"),
         'method_delay': fields.integer('Number of Depreciation', readonly=True, states={'draft':[('readonly',False)]}, help="Calculates Depreciation within specified interval"),
@@ -212,10 +212,10 @@ class account_asset_asset(osv.osv):
         'method_progress_factor': fields.float('Progressif Factor', readonly=True, states={'draft':[('readonly',False)]}),
         'value_residual': fields.function(_amount_residual, method=True, digits_compute=dp.get_precision('Account'), string='Residual Value'),
         'method_time': fields.selection([('delay','Delay'),('end','Ending Period')], 'Time Method', required=True, readonly=True, states={'draft':[('readonly',False)]}, help="Delay: Allow users to enter number of periods to generate depreciation lines \n Ending Period: Calculates depreciation lines on the basis of Ending Period Date and Number of Depreciation"),
-        'prorata':fields.boolean('Prorata Temporis', Readonly="True", help='Indicates that the accounting entries for this asset have to be done from the purchase date instead of the first January'),
+        'prorata':fields.boolean('Prorata Temporis', readonly="True", states={'draft':[('readonly',False)]}, help='Indicates that the accounting entries for this asset have to be done from the purchase date instead of the first January'),
         'history_ids': fields.one2many('account.asset.history', 'asset_id', 'History', readonly=True),
         'depreciation_line_ids': fields.one2many('account.asset.depreciation.line', 'asset_id', 'Depreciation Lines'),
-        'salvage_value': fields.float('Salvage Value', digits_compute=dp.get_precision('Account'), help="It is the amount you plan to have that you cannot depreciate."),
+        'salvage_value': fields.float('Salvage Value', digits_compute=dp.get_precision('Account'), help="It is the amount you plan to have that you cannot depreciate.", readonly=False, states={'close':[('readonly',True)]}),
     }
     _defaults = {
         'code': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'account.asset.code'),
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index 5fb644e3376..a49f3417c79 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -115,7 +115,7 @@
                           <field name="depreciated_value"/>
                        </graph>
                     </field>
-                    <button type="object" name="compute_depreciation_board" string="Compute" icon="terp-stock_format-scientific" colspan="2"/>
+                    <button type="object" name="compute_depreciation_board" string="Compute" icon="terp-stock_format-scientific" colspan="2" attrs="{'invisible':[('state','=','close')]}"/>
                  </page>
                  <page string="History">
                     <field name="account_move_line_ids" colspan="4" nolabel="1" readonly="1"/>

From c5302b81f3ea704f5b9b53108f35b0ef03f5c3c8 Mon Sep 17 00:00:00 2001
From: bde <bde@tiny2-desktop>
Date: Wed, 29 Jun 2011 12:10:56 +0530
Subject: [PATCH 20/25] [IMP] improved the code in create move method and made
 the depreciation lines readonly in close state

bzr revid: bde@tiny2-desktop-20110629064056-2vwqlfvr68tmarjv
---
 addons/account_asset/account_asset.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index 1f76d367adf..8b751584222 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -214,7 +214,7 @@ class account_asset_asset(osv.osv):
         'method_time': fields.selection([('delay','Delay'),('end','Ending Period')], 'Time Method', required=True, readonly=True, states={'draft':[('readonly',False)]}, help="Delay: Allow users to enter number of periods to generate depreciation lines \n Ending Period: Calculates depreciation lines on the basis of Ending Period Date and Number of Depreciation"),
         'prorata':fields.boolean('Prorata Temporis', readonly="True", states={'draft':[('readonly',False)]}, help='Indicates that the accounting entries for this asset have to be done from the purchase date instead of the first January'),
         'history_ids': fields.one2many('account.asset.history', 'asset_id', 'History', readonly=True),
-        'depreciation_line_ids': fields.one2many('account.asset.depreciation.line', 'asset_id', 'Depreciation Lines'),
+        'depreciation_line_ids': fields.one2many('account.asset.depreciation.line', 'asset_id', 'Depreciation Lines', readonly=True, states={'draft':[('readonly',False)]}),
         'salvage_value': fields.float('Salvage Value', digits_compute=dp.get_precision('Account'), help="It is the amount you plan to have that you cannot depreciate.", readonly=False, states={'close':[('readonly',True)]}),
     }
     _defaults = {
@@ -379,6 +379,7 @@ class account_asset_depreciation_line(osv.osv):
     }
 
     def create_move(self, cr, uid, ids, context=None):
+        can_close = False
         if context is None:
             context = {}
         asset_obj = self.pool.get('account.asset.asset')
@@ -387,7 +388,8 @@ class account_asset_depreciation_line(osv.osv):
         move_line_obj = self.pool.get('account.move.line')
         currency_obj = self.pool.get('res.currency')
         for line in self.browse(cr, uid, ids, context=context):
-            rem_value = line.remaining_value
+            if line.remaining_value == 0.0:
+                can_close = True
             depreciation_date = line.asset_id.prorata and line.asset_id.purchase_date or time.strftime('%Y-%m-%d')
             period_ids = period_obj.find(cr, uid, depreciation_date, context=context)
             company_currency = line.asset_id.company_id.currency_id.id
@@ -434,8 +436,9 @@ class account_asset_depreciation_line(osv.osv):
                 'asset_id': line.asset_id.id
             })
             self.write(cr, uid, line.id, {'move_id': move_id}, context=context)
-            if rem_value == 0:
-                asset_obj.write(cr, uid, line.asset_id.id, {'state': 'close'}, context=context)                
+        if can_close:
+            asset_obj.write(cr, uid, [line.asset_id.id], {'state': 'close'}, context=context)                
+            return True
         return True
 
 account_asset_depreciation_line()

From 29c0b41357ff59b1a58f72948674d88ebdc93018 Mon Sep 17 00:00:00 2001
From: bde <bde@tiny2-desktop>
Date: Wed, 29 Jun 2011 12:37:43 +0530
Subject: [PATCH 21/25] [REM] removed extra return statement

bzr revid: bde@tiny2-desktop-20110629070743-6jnd10diemwlcndc
---
 addons/account_asset/account_asset.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index 8b751584222..2337275af8a 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -438,7 +438,6 @@ class account_asset_depreciation_line(osv.osv):
             self.write(cr, uid, line.id, {'move_id': move_id}, context=context)
         if can_close:
             asset_obj.write(cr, uid, [line.asset_id.id], {'state': 'close'}, context=context)                
-            return True
         return True
 
 account_asset_depreciation_line()

From 88a46e55b232c90ba99a3e4e8c7971bdacf0766c Mon Sep 17 00:00:00 2001
From: bde <bde@tiny2-desktop>
Date: Thu, 30 Jun 2011 17:14:53 +0530
Subject: [PATCH 22/25] [IMP] improved the module description in __openerp__.py
 file

bzr revid: bde@tiny2-desktop-20110630114453-7p2x4jbu3ea1fhk5
---
 addons/account_asset/__openerp__.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/account_asset/__openerp__.py b/addons/account_asset/__openerp__.py
index be631a91e45..be6fdd4596a 100755
--- a/addons/account_asset/__openerp__.py
+++ b/addons/account_asset/__openerp__.py
@@ -25,10 +25,8 @@
     "depends" : ["account"],
     "author" : "Tiny",
     "description": """Financial and accounting asset management.
-    Allows to define
-    * Asset category. 
-    * Assets.
-    *Asset usage period and property.
+    This Module manages the assets owned by a company or an individual. It will keep track of depreciation's occurred on 
+    those assets. And it allows to create Move's of the depreciation lines.
     """,
     "website" : "http://www.openerp.com",
     "category" : "Generic Modules/Accounting",

From 3864c9acf42a0e41a228325c1ab8bf6d199862a1 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 1 Jul 2011 10:42:33 +0200
Subject: [PATCH 23/25] [IMP] account_asset: usability changes for asset
 history

bzr revid: qdp-launchpad@openerp.com-20110701084233-rcmwin10fh5oq72g
---
 addons/account_asset/account_asset.py              |  9 +++++----
 addons/account_asset/account_asset_view.xml        | 14 ++++++++++----
 .../wizard/account_asset_change_duration.py        |  1 +
 .../wizard/account_asset_change_duration_view.xml  |  2 +-
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index 5c7d2f063ab..b1314dc125f 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -40,7 +40,7 @@ class account_asset_category(osv.osv):
         'journal_id': fields.many2one('account.journal', 'Journal', required=True),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'method': fields.selection([('linear','Linear'),('progressif','Progressive')], 'Computation method', required=True),
-        'method_delay': fields.integer('Number of Depreciation'),
+        'method_delay': fields.integer('Number of Depreciations'),
         'method_period': fields.integer('Period Length', help="State here the time between 2 depreciations, in months"),
         'method_progress_factor': fields.float('Progressif Factor'),
         'method_time': fields.selection([('delay','Delay'),('end','Ending Period')], 'Time Method', required=True),
@@ -203,7 +203,7 @@ class account_asset_asset(osv.osv):
         'partner_id': fields.many2one('res.partner', 'Partner'),
         'method': fields.selection([('linear','Linear'),('progressif','Progressive')], 'Computation Method', required=True, readonly=True, states={'draft':[('readonly',False)]}, help="Linear: Calculated on basis of Gross Value/During (interval) \
          \nProgressive: Calculated on basis of Gross Value * Progressif Factor"),
-        'method_delay': fields.integer('Number of Depreciation', readonly=True, states={'draft':[('readonly',False)]}, help="Calculates Depreciation within specified interval"),
+        'method_delay': fields.integer('Number of Depreciations', readonly=True, states={'draft':[('readonly',False)]}, help="Calculates Depreciation within specified interval"),
         'method_period': fields.integer('Period Length', readonly=True, states={'draft':[('readonly',False)]}, help="State here the time during 2 depreciations, in months"),
         'method_end': fields.date('Ending date', readonly=True, states={'draft':[('readonly',False)]}),
         'method_progress_factor': fields.float('Progressif Factor', readonly=True, states={'draft':[('readonly',False)]}),
@@ -519,8 +519,9 @@ class account_asset_history(osv.osv):
         'user_id': fields.many2one('res.users', 'User', required=True),
         'date': fields.date('Date', required=True),
         'asset_id': fields.many2one('account.asset.asset', 'Asset', required=True),
-        'method_delay': fields.integer('Number of interval'),
-        'method_period': fields.integer('Period per interval'),
+        'method_time': fields.selection([('delay','Delay'),('end','Ending Period')], 'Time Method', required=True, help="Delay: Allow users to enter number of periods to generate depreciation lines \n Ending Period: Calculates depreciation lines on the basis of Ending Period Date and Number of Depreciations"),
+        'method_delay': fields.integer('Number of Depreciations'),
+        'method_period': fields.integer('Period Length', help="Time in month between two depreciations"),
         'method_end': fields.date('Ending date'),
         'note': fields.text('Note'),
     }
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index faebfbddf78..e8a5580f15e 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -140,14 +140,20 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Asset history">
+              <group col="6" colspan="4">
                 <field name="name" select="1"/>
                 <field name="date" select="1"/>
                 <field name="user_id" select="1"/>
-                <field name="method_delay" select="2"/>
+              </group>
+              <group col="2" colspan="2">
+                <separator string="Depreciation Dates" colspan="2" />
+                <field name="method_time"/>
+                <field name="method_delay" attrs="{'invisible':[('method_time','=','end')]}"/>
                 <field name="method_period"/>
-                <field name="method_end"/>
-                <separator string="Notes" colspan="4"/>
-                <field name="note" colspan="4" nolabel="1"/>
+                <field name="method_end" attrs="{'invisible':[('method_time','=','delay')]}"/>
+              </group>
+              <separator string="Notes" colspan="4"/>
+              <field name="note" colspan="4" nolabel="1"/>
             </form>
         </field>
     </record>
diff --git a/addons/account_asset/wizard/account_asset_change_duration.py b/addons/account_asset/wizard/account_asset_change_duration.py
index 34978551dbd..699f94a69f5 100755
--- a/addons/account_asset/wizard/account_asset_change_duration.py
+++ b/addons/account_asset/wizard/account_asset_change_duration.py
@@ -109,6 +109,7 @@ class asset_modify(osv.osv_memory):
         history_vals = {
             'asset_id': asset_id,
             'name': data.name,
+            'method_time': asset.method_time,
             'method_delay': asset.method_delay,
             'method_period': asset.method_period,
             'method_end': asset.method_end,
diff --git a/addons/account_asset/wizard/account_asset_change_duration_view.xml b/addons/account_asset/wizard/account_asset_change_duration_view.xml
index a655cbe348d..34d0c419105 100644
--- a/addons/account_asset/wizard/account_asset_change_duration_view.xml
+++ b/addons/account_asset/wizard/account_asset_change_duration_view.xml
@@ -11,11 +11,11 @@
                     <group colspan="4" col="4">
                         <separator string="Asset durations to modify" colspan="4"/>
                         <field name="name" colspan="4"/>
-                        <field name="method_period"/>
                         <group colspan="2" col="2">
                             <field name="method_delay"/>
                             <field name="method_end"/>
                         </group>
+                        <field name="method_period"/>
                         <separator string="Notes" colspan="4"/>
                         <field name="note" nolabel="1" colspan="4"/>
                     </group>

From 2f25946d7a53aaf3b35e3f39e230d6b04f1baae0 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 1 Jul 2011 14:21:57 +0200
Subject: [PATCH 24/25] [IMP] account_asset: refactored some code in order to
 ease the inheritancy of asset depreciation methods + small cleaning

bzr revid: qdp-launchpad@openerp.com-20110701122157-wtu6cylm96g9z2qs
---
 addons/account_asset/account_asset.py       | 55 ++++++++++++---------
 addons/account_asset/account_asset_view.xml |  1 +
 2 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index ac59db610fb..7715c4e6465 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -107,6 +107,34 @@ class account_asset_asset(osv.osv):
             GROUP BY a.id, a.purchase_date """, (tuple(ids),))
         return dict(cr.fetchall())
 
+    def _compute_board_amount(self, cr, uid, asset, i, residual_amount, amount_to_depr, undone_dotation_number, posted_depreciation_line_ids, total_days, context=None):
+        #by default amount = 0
+        amount = 0
+        if i == undone_dotation_number:
+            amount = residual_amount
+        else:
+            if asset.method == 'linear':
+                amount = amount_to_depr / (undone_dotation_number - len(posted_depreciation_line_ids))
+                if asset.prorata:
+                    amount = amount_to_depr / asset.method_delay
+                    days = total_days - float(depreciation_date.strftime('%j'))
+                    if i == 1:
+                        amount = (amount_to_depr / asset.method_delay) / total_days * days
+                    elif i == undone_dotation_number:
+                        amount = (amount_to_depr / asset.method_delay) / total_days * (total_days - days)
+            elif asset.method == 'degressive':
+                amount = residual_amount * asset.method_progress_factor
+        return amount
+
+    def _compute_board_undone_dotation_nb(self, cr, uid, asset, depreciation_date, total_days, context=None):
+        undone_dotation_number = asset.method_delay
+        if asset.method_time == 'end':
+            end_date = datetime.strptime(asset.method_end, '%Y-%m-%d')
+            undone_dotation_number = (end_date - depreciation_date).days / total_days
+        if asset.prorata or asset.method_time == 'end':
+            undone_dotation_number += 1
+        return undone_dotation_number
+
     def compute_depreciation_board(self, cr, uid,ids, context=None):
         depreciation_lin_obj = self.pool.get('account.asset.depreciation.line')
         for asset in self.browse(cr, uid, ids, context=context):
@@ -124,28 +152,11 @@ class account_asset_asset(osv.osv):
             month = depreciation_date.month
             year = depreciation_date.year
             total_days = (year % 4) and 365 or 366
-            undone_dotation_number = asset.method_delay
-            if asset.method_time == 'end':
-                end_date = datetime.strptime(asset.method_end, '%Y-%m-%d')
-                undone_dotation_number = (end_date - depreciation_date).days / total_days
-            if asset.prorata or asset.method_time == 'end':
-                undone_dotation_number += 1
+
+            undone_dotation_number = self._compute_board_undone_dotation_nb(cr, uid, asset, depreciation_date, total_days, context=context)
             for x in range(len(posted_depreciation_line_ids), undone_dotation_number):
                 i = x + 1
-                if i == undone_dotation_number:
-                    amount = residual_amount
-                else:
-                    if asset.method == 'linear':
-                        amount = amount_to_depr / (undone_dotation_number - len(posted_depreciation_line_ids))
-                        if asset.prorata:
-                            amount = amount_to_depr / asset.method_delay
-                            if i == 1:
-                                days = total_days - float(depreciation_date.strftime('%j'))
-                                amount = (amount_to_depr / asset.method_delay) / total_days * days
-                            elif i == undone_dotation_number:
-                                amount = (amount_to_depr / asset.method_delay) / total_days * (total_days - days)
-                    else:
-                        amount = residual_amount * asset.method_progress_factor
+                amount = self._compute_board_amount(cr, uid, asset, i, residual_amount, amount_to_depr, undone_dotation_number, posted_depreciation_line_ids, total_days, context=context)
                 residual_amount -= amount
                 vals = {
                      'amount': amount,
@@ -201,8 +212,8 @@ class account_asset_asset(osv.osv):
         'state': fields.selection([('draft','Draft'),('open','Running'),('close','Close')], 'State', required=True),
         'active': fields.boolean('Active', select=2),
         'partner_id': fields.many2one('res.partner', 'Partner'),
-        'method': fields.selection([('linear','Linear'),('progressif','Progressive')], 'Computation Method', required=True, readonly=True, states={'draft':[('readonly',False)]}, help="Linear: Calculated on basis of Gross Value/During (interval) \
-         \nProgressive: Calculated on basis of Gross Value * Progressif Factor"),
+        'method': fields.selection([('linear','Linear'),('degressive','Degressive')], 'Computation Method', required=True, readonly=True, states={'draft':[('readonly',False)]}, help="Linear: Calculated on basis of Gross Value/During (interval) \
+         \nDegressive: Calculated on basis of Gross Value * Degressive Factor"),
         'method_delay': fields.integer('Number of Depreciations', readonly=True, states={'draft':[('readonly',False)]}, help="Calculates Depreciation within specified interval"),
         'method_period': fields.integer('Period Length', readonly=True, states={'draft':[('readonly',False)]}, help="State here the time during 2 depreciations, in months"),
         'method_end': fields.date('Ending date', readonly=True, states={'draft':[('readonly',False)]}),
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index 7bf9cff2743..9e3f589c008 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -92,6 +92,7 @@
                     <field name="parent_id"/>
                     <field name="partner_id"/>
                     <field name="purchase_date"/>
+                    <newline/>
                     <group colspan="2" col="2">
                         <separator string="Depreciation Dates" colspan="2" />
                         <field name="method_time" on_change="onchange_method_time(method_time)"/>

From 27232d05054f810ba7845596fc7dd1c0fdfe2b12 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 1 Jul 2011 14:55:05 +0200
Subject: [PATCH 25/25] [FIX] account_asset: added missing argument for
 _compute_board_amount

bzr revid: qdp-launchpad@openerp.com-20110701125505-6aey92y0zrq24gxh
---
 addons/account_asset/account_asset.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index 7715c4e6465..068d0b40f24 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -107,7 +107,7 @@ class account_asset_asset(osv.osv):
             GROUP BY a.id, a.purchase_date """, (tuple(ids),))
         return dict(cr.fetchall())
 
-    def _compute_board_amount(self, cr, uid, asset, i, residual_amount, amount_to_depr, undone_dotation_number, posted_depreciation_line_ids, total_days, context=None):
+    def _compute_board_amount(self, cr, uid, asset, i, residual_amount, amount_to_depr, undone_dotation_number, posted_depreciation_line_ids, total_days, depreciation_date, context=None):
         #by default amount = 0
         amount = 0
         if i == undone_dotation_number:
@@ -156,7 +156,7 @@ class account_asset_asset(osv.osv):
             undone_dotation_number = self._compute_board_undone_dotation_nb(cr, uid, asset, depreciation_date, total_days, context=context)
             for x in range(len(posted_depreciation_line_ids), undone_dotation_number):
                 i = x + 1
-                amount = self._compute_board_amount(cr, uid, asset, i, residual_amount, amount_to_depr, undone_dotation_number, posted_depreciation_line_ids, total_days, context=context)
+                amount = self._compute_board_amount(cr, uid, asset, i, residual_amount, amount_to_depr, undone_dotation_number, posted_depreciation_line_ids, total_days, depreciation_date, context=context)
                 residual_amount -= amount
                 vals = {
                      'amount': amount,