From 9540e16bb69ab998b0f48a2e137cf263448c9fec Mon Sep 17 00:00:00 2001 From: "mra (Open ERP)" Date: Tue, 7 Jul 2009 15:17:02 +0530 Subject: [PATCH] [REV] revert chanegs for revision no 1810 bzr revid: mra@tinyerp.com-20090707094702-hn9phh0hgrauml40 --- bin/addons/__init__.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py index 10e2791efc5..d2b33ce7a4d 100644 --- a/bin/addons/__init__.py +++ b/bin/addons/__init__.py @@ -573,16 +573,18 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, **kwargs): modobj = None for package in graph: + logger.notifyChannel('init', netsvc.LOG_INFO, 'module %s: loading objects' % package.name) + migrations.migrate_module(package, 'pre') + register_class(package.name) + modules = pool.instanciate(package.name, cr) + if hasattr(package, 'init') or hasattr(package, 'update') or package.state in ('to install', 'to upgrade'): + init_module_objects(cr, package.name, modules) + cr.commit() + + for package in graph: + status['progress'] = (float(statusi)+0.1) / len(graph) m = package.name mid = package.id - logger.notifyChannel('init', netsvc.LOG_INFO, 'module %s: loading objects' % m) - migrations.migrate_module(package, 'pre') - register_class(m) - modules = pool.instanciate(m, cr) - if hasattr(package, 'init') or hasattr(package, 'update') or package.state in ('to install', 'to upgrade'): - init_module_objects(cr, m, modules) - cr.commit() - status['progress'] = (float(statusi)+0.1) / len(graph) if modobj is None: modobj = pool.get('ir.module.module') @@ -627,7 +629,7 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, **kwargs): tools.convert_xml_import(cr, m, fp, idref, mode=mode, noupdate=True, **kwargs) fp.close() cr.execute('update ir_module_module set demo=%s where id=%s', (True, mid)) - package_todo.append(m) + package_todo.append(package.name) migrations.migrate_module(package, 'post')