From 704639cc7c4a12f6c5e0a4a4acaa674d312f8f47 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Sun, 22 Sep 2013 19:28:51 +0200 Subject: [PATCH] [IMP] revert bzr revid: fp@openerp.com-20130922172851-j9jrcjcyc5kmtlik --- openerp/tools/convert.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/openerp/tools/convert.py b/openerp/tools/convert.py index a316dc28a9b..6df22828b84 100644 --- a/openerp/tools/convert.py +++ b/openerp/tools/convert.py @@ -248,9 +248,7 @@ class xml_import(object): return val.lower() not in ('0', 'false', 'off') def isnoupdate(self, data_node=None): - if data_node and data_node.get('noupdate'): - return len(data_node) and self.nodeattr2bool(data_node, 'noupdate', False) - return self.noupdate + return self.noupdate or (len(data_node) and self.nodeattr2bool(data_node, 'noupdate', False)) def get_context(self, data_node, node, eval_dict): data_node_context = (len(data_node) and data_node.get('context','').encode('utf8'))