diff options
| author | Antony Lesuisse <al@openerp.com> | 2011-09-24 16:52:58 +0200 |
|---|---|---|
| committer | Antony Lesuisse <al@openerp.com> | 2011-09-24 16:52:58 +0200 |
| commit | 7a88d9058d8e61d01bebc359609d3bfebdba11a0 (patch) | |
| tree | 40e56db35e0ceb928cf783b64d2c98152e202695 /openerp/modules/loading.py | |
| parent | d743353e1681b8400cca3e02d3964117eeb16ab5 (diff) | |
| parent | dfccbaf28b77fef5860b9ad60ffdf97f3b4a64e0 (diff) | |
[MERGE] trunk
bzr revid: al@openerp.com-20110924145258-16r9qi7hr3dip1jz
Diffstat (limited to 'openerp/modules/loading.py')
| -rw-r--r-- | openerp/modules/loading.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/openerp/modules/loading.py b/openerp/modules/loading.py index 4bc8e440b62..40986580d1b 100644 --- a/openerp/modules/loading.py +++ b/openerp/modules/loading.py @@ -347,7 +347,7 @@ def load_modules(db, force_demo=False, status=None, update_module=False): cr.execute("""select distinct mod.model, mod.name from ir_model_access acc, ir_model mod where acc.model_id = mod.id""") for (model, name) in cr.fetchall(): model_obj = pool.get(model) - if isinstance(model_obj, osv.osv.osv_memory): + if isinstance(model_obj, osv.osv.osv_memory) and not isinstance(model_obj, osv.osv.osv): logger.notifyChannel('init', netsvc.LOG_WARNING, 'In-memory object %s (%s) should not have explicit access rules!' % (model, name)) cr.execute("SELECT model from ir_model") |