From d20312211de927933f61d2160da65578d44267b1 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Thu, 27 Jan 2011 10:56:54 +0100 Subject: [PATCH] [FIX] addons: restore proper loading of custom osv models (manual customizations) - backport from trunk bzr revid: odo@openerp.com-20110127095654-z5c87abnzpjqsnag --- bin/addons/__init__.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py index bbf391603a2..94d6a0dfdf6 100644 --- a/bin/addons/__init__.py +++ b/bin/addons/__init__.py @@ -882,13 +882,13 @@ def load_modules(db, force_demo=False, status=None, update_module=False): logger.notifyChannel('init', netsvc.LOG_DEBUG, 'Updating graph with %d more modules' % (len(module_list))) processed_modules.extend(load_module_graph(cr, graph, status, report=report, skip_modules=processed_modules)) + # load custom models + cr.execute('select model from ir_model where state=%s', ('manual',)) + for model in cr.dictfetchall(): + pool.get('ir.model').instanciate(cr, 1, model['model'], {}) + # STEP 4: Finish and cleanup if processed_modules: - # load custom models - cr.execute('select model from ir_model where state=%s', ('manual',)) - for model in cr.dictfetchall(): - pool.get('ir.model').instanciate(cr, 1, model['model'], {}) - cr.execute("""select model,name from ir_model where id NOT IN (select distinct model_id from ir_model_access)""") for (model, name) in cr.fetchall(): model_obj = pool.get(model)