diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-08-22 17:20:15 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-08-22 17:20:15 +0200 |
| commit | d5f2a38b50ceb2fb9f5dcecb5eeaad3188555705 (patch) | |
| tree | 5ad6be44887a1980ca1703f3fd80c38c10ddf1e5 /addons/mail/wizard | |
| parent | e38de9dfa4c09f861253cb85643a47153d448e3c (diff) | |
| parent | 6956ad54de52055910539118a34355f818e57c4a (diff) | |
[MERGE] forward port branch saas-14 up to 6956ad54de5
Diffstat (limited to 'addons/mail/wizard')
| -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 35114a2542b..b55cc79f922 100644 --- a/addons/mail/wizard/mail_compose_message.py +++ b/addons/mail/wizard/mail_compose_message.py @@ -294,8 +294,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 |