From 1de4f131f08c425b5867896ba0a9c779c8b830da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 22 Mar 2011 12:07:16 +0100 Subject: [PATCH] Use new pyson_email on report --- tryton/gui/window/view_form/view/form.py | 5 +++-- tryton/gui/window/view_form/view/list.py | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tryton/gui/window/view_form/view/form.py b/tryton/gui/window/view_form/view/form.py index 2c9e351b54..3a4599d9ca 100644 --- a/tryton/gui/window/view_form/view/form.py +++ b/tryton/gui/window/view_form/view/form.py @@ -121,8 +121,9 @@ class ViewForm(ParserView): 'to be able to use the action button!'), self.window) return False email = {} - if 'email' in action: - email = self.screen.current_record.expr_eval(action['email']) + if 'pyson_email' in action: + email = self.screen.current_record.expr_eval( + action['pyson_email']) if not email: email = {} email['subject'] = action['name'].replace('_', '') diff --git a/tryton/gui/window/view_form/view/list.py b/tryton/gui/window/view_form/view/list.py index b2aeac8917..f0e04915b2 100644 --- a/tryton/gui/window/view_form/view/list.py +++ b/tryton/gui/window/view_form/view/list.py @@ -285,8 +285,8 @@ class ViewList(ParserView): message(_('No record selected!'), self.window) return False email = {} - if action.get('email'): - email = self.screen.current_record.expr_eval(action['email']) + if action.get('pyson_email'): + email = self.screen.current_record.expr_eval(action['pyson_email']) if not email: email = {} email['subject'] = action['name'].replace('_', '')