summaryrefslogtreecommitdiff
path: root/odoo/modules
diff options
context:
space:
mode:
authorRaphael Collet <rco@openerp.com>2017-01-25 11:52:12 +0100
committerRaphael Collet <rco@openerp.com>2017-02-22 15:24:05 +0100
commitdaa1eb1fc488d45ba9d4e782053c08cfc1a53cfe (patch)
tree2ab197f907f1a56f958025a12972ea80af957d72 /odoo/modules
parent2b46025dd553b01e852ae37a90f90c240851adc1 (diff)
[IMP] base: remove ir_model_* tables from base.sql
Diffstat (limited to 'odoo/modules')
-rw-r--r--odoo/modules/registry.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/odoo/modules/registry.py b/odoo/modules/registry.py
index db22649edf6..18a9731a892 100644
--- a/odoo/modules/registry.py
+++ b/odoo/modules/registry.py
@@ -275,12 +275,13 @@ class Registry(Mapping):
lazy_property.reset_all(self)
env = odoo.api.Environment(cr, SUPERUSER_ID, {})
- # load custom models
- ir_model = env['ir.model']
- cr.execute('SELECT * FROM ir_model WHERE state=%s', ('manual',))
- for model_data in cr.dictfetchall():
- model_class = ir_model._instanciate(model_data)
- model_class._build_model(self, cr)
+ # load custom models (except when loading 'base')
+ if self._init_modules:
+ ir_model = env['ir.model']
+ cr.execute('SELECT * FROM ir_model WHERE state=%s', ('manual',))
+ for model_data in cr.dictfetchall():
+ model_class = ir_model._instanciate(model_data)
+ model_class._build_model(self, cr)
# prepare the setup on all models
models = env.values()