diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-08-23 11:23:08 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-08-23 11:23:08 +0200 |
| commit | 59f8b849fba3b53eee3682af64a757a32acc12da (patch) | |
| tree | d7242422b7d75898b480a5144656a07b3b720831 /addons/mail/wizard/mail_compose_message.py | |
| parent | dbdf994df8e0a618c78de2bb0d383a23f401e67e (diff) | |
| parent | d5f2a38b50ceb2fb9f5dcecb5eeaad3188555705 (diff) | |
[MERGE] forward port branch saas-15 up to d5f2a38b50c
Diffstat (limited to 'addons/mail/wizard/mail_compose_message.py')
| -rw-r--r-- | addons/mail/wizard/mail_compose_message.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py index 92822154ff3..6285f70c1ea 100644 --- a/addons/mail/wizard/mail_compose_message.py +++ b/addons/mail/wizard/mail_compose_message.py @@ -295,8 +295,11 @@ class MailComposer(models.TransientModel): 'mail_server_id': self.mail_server_id.id, 'mail_activity_type_id': self.mail_activity_type_id.id, } + # mass mailing: rendering override wizard static values if mass_mail_mode and self.model: + if self.model in self.env and hasattr(self.env[self.model], 'message_get_email_values'): + mail_values.update(self.env[self.model].browse(res_id).message_get_email_values()) # keep a copy unless specifically requested, reset record name (avoid browsing records) mail_values.update(notification=not self.auto_delete_message, model=self.model, res_id=res_id, record_name=False) # auto deletion of mail_mail |