From 09f1dbfa770151d1afb9532429a55be9d41c0619 Mon Sep 17 00:00:00 2001 From: Sergi Almacellas Abellana Date: Fri, 28 Feb 2014 20:38:47 +0100 Subject: [PATCH] Pass the action which is calling a wizard or a report issue3675 review3481003 --- tryton/action/main.py | 1 + tryton/gui/window/wizard.py | 3 +++ 2 files changed, 4 insertions(+) diff --git a/tryton/action/main.py b/tryton/action/main.py index 9179a945e6..9ede0112af 100644 --- a/tryton/action/main.py +++ b/tryton/action/main.py @@ -83,6 +83,7 @@ class Action(object): if 'type' not in (action or {}): return + data['action_id'] = action['id'] if action['type'] == 'ir.action.act_window': view_ids = False view_mode = None diff --git a/tryton/gui/window/wizard.py b/tryton/gui/window/wizard.py index 8e0969e72b..c76664acf5 100644 --- a/tryton/gui/window/wizard.py +++ b/tryton/gui/window/wizard.py @@ -28,6 +28,7 @@ class Wizard(object): self.id = None self.ids = None self.action = None + self.action_id = None self.direct_print = False self.email_print = False self.email = False @@ -46,6 +47,7 @@ class Wizard(object): def run(self, action, data, direct_print=False, email_print=False, email=None, context=None): self.action = action + self.action_id = data.get('action_id') self.id = data.get('id') self.ids = data.get('ids') self.model = data.get('model') @@ -72,6 +74,7 @@ class Wizard(object): ctx['active_id'] = self.id ctx['active_ids'] = self.ids ctx['active_model'] = self.model + ctx['action_id'] = self.action_id if self.screen: data = { self.screen_state: self.screen.get_on_change_value(),