diff --git a/openerp/addons/base/ir/ir_ui_view.py b/openerp/addons/base/ir/ir_ui_view.py index 707b81e213e..8d49c129947 100644 --- a/openerp/addons/base/ir/ir_ui_view.py +++ b/openerp/addons/base/ir/ir_ui_view.py @@ -1163,7 +1163,7 @@ class view(osv.osv): cr.execute("""SELECT max(v.id) FROM ir_ui_view v LEFT JOIN ir_model_data md ON (md.model = 'ir.ui.view' AND md.res_id = v.id) - WHERE md.module IS NULL + WHERE md.module NOT IN (SELECT name FROM ir_module_module) AND v.model = %s AND v.active = true GROUP BY coalesce(v.inherit_id, v.id) diff --git a/openerp/modules/loading.py b/openerp/modules/loading.py index 18592b511cd..174b9b7c7a9 100644 --- a/openerp/modules/loading.py +++ b/openerp/modules/loading.py @@ -394,12 +394,9 @@ def load_modules(db, force_demo=False, status=None, update_module=False): # STEP 6: verify custom views on every model if update_module: Views = registry['ir.ui.view'] - custom_view_test = True for model in registry.models.keys(): if not Views._validate_custom_views(cr, SUPERUSER_ID, model): - custom_view_test = False - _logger.error('invalid custom view(s) for model %s', model) - report.record_result(custom_view_test) + _logger.warning('Invalid custom view(s) for model %s', model) if report.failures: _logger.error('At least one test failed when loading the modules.')