diff --git a/CHANGELOG b/CHANGELOG index b7af6e4913..778f67e32f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,4 @@ +* Allow nested inherited view * Add button on cron to run once * Check all fields when writing a sequence of records, values (CVE-2015-0861) * Add view_ids on tree view diff --git a/trytond/model/modelview.py b/trytond/model/modelview.py index 60cdca1fb0..dda860e632 100644 --- a/trytond/model/modelview.py +++ b/trytond/model/modelview.py @@ -241,13 +241,13 @@ class ModelView(Model): else: domain = [ ('model', '=', cls.__name__), - ('type', '=', view_type), ['OR', ('inherit', '=', None), ('inherit.model', '!=', cls.__name__), ], ] views = View.search(domain) + views = filter(lambda v: v.rng_type == view_type, views) if views: view = views[0] if view: @@ -258,7 +258,7 @@ class ModelView(Model): # if a view was found if view: - result['type'] = view.type + result['type'] = view.rng_type result['view_id'] = view_id result['arch'] = view.arch result['field_childs'] = view.field_childs