From 1954c7ae2b8d3e3048e244f6443dd931fdc27a83 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 14 Dec 2012 14:05:07 +0100 Subject: [PATCH] [FIX] unresolved reference: 'model' not available inside test body if generator used bzr revid: xmo@openerp.com-20121214130507-qc1fqzbdttb2a0n2 --- openerp/addons/base/ir/ir_model.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/openerp/addons/base/ir/ir_model.py b/openerp/addons/base/ir/ir_model.py index 7cb0e387710..4e21f83992e 100644 --- a/openerp/addons/base/ir/ir_model.py +++ b/openerp/addons/base/ir/ir_model.py @@ -158,9 +158,10 @@ class ir_model(osv.osv): if context is None: context = {} if isinstance(ids, (int, long)): ids = [ids] - if not context.get(MODULE_UNINSTALL_FLAG) and \ - any(model.state != 'manual' for model in self.browse(cr, user, ids, context)): - raise except_orm(_('Error'), _("Model '%s' contains module data and cannot be removed!") % (model.name,)) + if not context.get(MODULE_UNINSTALL_FLAG): + for model in self.browse(cr, user, ids, context): + if model.state != 'manual': + raise except_orm(_('Error'), _("Model '%s' contains module data and cannot be removed!") % (model.name,)) self._drop_table(cr, user, ids, context) res = super(ir_model, self).unlink(cr, user, ids, context)