diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index b3acbbe5119..f5c31b2d1bf 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -1422,7 +1422,7 @@ class Action(openerpweb.Controller): except Exception: action_id = 0 # force failed read - base_action = Actions.read([action_id], ['type'], req.context) + base_action = Actions.read([action_id], ['name', 'type'], req.session.get_context()) if base_action: ctx = {} action_type = base_action[0]['type'] @@ -1431,7 +1431,7 @@ class Action(openerpweb.Controller): ctx.update(req.context) action = req.session.model(action_type).read([action_id], False, ctx) if action: - value = clean_action(req, action[0]) + value = clean_action(req, dict(action[0], **base_action[0])) return value @openerpweb.jsonrequest diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index d4cf85a59f2..201f472b800 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -1165,7 +1165,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM }, build_eval_context: function() { var a_dataset = this.dataset; - return new instance.web.CompoundContext(this._build_view_fields_values(), a_dataset.get_context()); + return new instance.web.CompoundContext(a_dataset.get_context(), this._build_view_fields_values()); }, });