diff --git a/addons/account_asset/__openerp__.py b/addons/account_asset/__openerp__.py
index be631a91e45..b1240a21baf 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.py b/addons/account_asset/account_asset.py
index c67a60e0da2..3484f6ecc4f 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 = 'id 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/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..34978551dbd
--- /dev/null
+++ b/addons/account_asset/wizard/account_asset_change_duration.py
@@ -0,0 +1,130 @@
+# -*- 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 lxml import etree
+
+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.integer('Number of Depreciations'),
+        'method_period': fields.integer('Period Length'),
+        '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
+        """
+        if not context:
+            context = {}
+        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)
+        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.
+        @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. 
+        """ 
+        if not context:
+            context = {}
+        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):
+        """ 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. 
+        """ 
+        if not context:
+            context = {}
+        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_vals = {
+            'asset_id': asset_id,
+            'name': data.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,
+        }
+        history_obj.create(cr, uid, history_vals, context=context)
+        asset_vals = {
+            'method_delay': data.method_delay,
+            'method_period': data.method_period,
+            'method_end': data.method_end,
+        }
+        asset_obj.write(cr, uid, [asset_id], asset_vals, 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..a655cbe348d
--- /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 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>
+                        <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-camera_test"/>
+                    </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:
-