Merge lp:~openerp-dev/openobject-addons/trunk-bug-1207194-cod into lp:openobject-addons

[Chirag Dodiya(OpenERP)]

Hello,

      I have fixed this issue,Traceback when we click on Change Duration button in Accounting -> Asset and also improved code to hide field.

Thanks,
Chirag Dodiya(cod).

[Turkesh Patel (openERP) (turkesh-tinyerp)]

review: Approve

Unmerged revisions

8952. By Chirag Dodiya(OpenERP) on 2013-10-22

[FIX]fixed traceback when click on Change Duration button

=== modified file 'account_asset/wizard/account_asset_change_duration.py'
--- account_asset/wizard/account_asset_change_duration.py	2013-05-21 12:23:59 +0000
+++ account_asset/wizard/account_asset_change_duration.py	2013-10-22 05:29:20 +0000
@@ -22,6 +22,7 @@
 from lxml import etree
 
 from openerp.osv import fields, osv
+from openerp.osv.orm import setup_modifiers
 
 class asset_modify(osv.osv_memory):
     _name = 'asset.modify'
@@ -55,12 +56,14 @@
         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 == 'number':
+            if asset.method_time == 'number' and doc.xpath("//field[@name='method_end']"):
                 node = doc.xpath("//field[@name='method_end']")[0]
                 node.set('invisible', '1')
-            elif asset.method_time == 'end':
+                setup_modifiers(node, result['fields']['method_end'])
+            elif asset.method_time == 'end' and doc.xpath("//field[@name='method_number']"):
                 node = doc.xpath("//field[@name='method_number']")[0]
                 node.set('invisible', '1')
+                setup_modifiers(node, result['fields']['method_number'])
             result['arch'] = etree.tostring(doc)
         return result