From 1bf1f0de8f7561023fd0bdf4076c4b6a7a20decd Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Mon, 2 Dec 2013 20:14:11 +0100 Subject: [PATCH] [FIX] forgotten fix for fields_view_get in orm.py (moved to ir_ui_view.py): [MERGE] forward port of branch saas-2 up to revid 4987 chs@openerp.com-20131127105828-ng8z4by1tszmj9d2 bzr revid: chm@openerp.com-20131202191411-edf01rvvpngyezok --- openerp/addons/base/ir/ir_ui_view.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openerp/addons/base/ir/ir_ui_view.py b/openerp/addons/base/ir/ir_ui_view.py index cbd2ea4b792..843588c3b4d 100644 --- a/openerp/addons/base/ir/ir_ui_view.py +++ b/openerp/addons/base/ir/ir_ui_view.py @@ -319,8 +319,8 @@ class view(osv.osv): attribute = (child.get('name'), child.text and child.text.encode('utf8') or None) if attribute[1]: node.set(attribute[0], attribute[1]) - else: - del(node.attrib[attribute[0]]) + elif attribute[0] in node.attrib: + del node.attrib[attribute[0]] else: sib = node.getnext() for child in spec: