diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-04-20 12:33:31 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-04-20 12:33:31 +0200 |
| commit | 9750c1eae31df8008100debf8bf2bb3ca2ae64e7 (patch) | |
| tree | 26b043d9def371133d6bac635c261d92b4fe4b85 /addons/mail | |
| parent | 06fd9e3aa31d0c6493b22b5b910cb101bf922189 (diff) | |
| parent | 44059bce4bfb11e8282a23c7b03fc4c10bdff821 (diff) | |
[MERGE] forward port of branch 8.0 up to 44059bc
Diffstat (limited to 'addons/mail')
| -rw-r--r-- | addons/mail/mail_followers.py | 1 | ||||
| -rw-r--r-- | addons/mail/wizard/mail_compose_message.py | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py index 9111e8a8f92..4dd48c2abe0 100644 --- a/addons/mail/mail_followers.py +++ b/addons/mail/mail_followers.py @@ -214,6 +214,7 @@ class mail_notification(osv.Model): mail_values = { 'mail_message_id': message.id, 'auto_delete': (context or {}).get('mail_auto_delete', True), + 'mail_server_id': (context or {}).get('mail_server_id', False), 'body_html': body_html, 'recipient_ids': [(4, id) for id in chunk], 'references': references, diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py index 0f62ab37184..2e0823add68 100644 --- a/addons/mail/wizard/mail_compose_message.py +++ b/addons/mail/wizard/mail_compose_message.py @@ -248,6 +248,7 @@ class mail_compose_message(osv.TransientModel): if wizard.template_id: context['mail_notify_user_signature'] = False # template user_signature is added when generating body_html context['mail_auto_delete'] = wizard.template_id.auto_delete # mass mailing: use template auto_delete value -> note, for emails mass mailing only + context['mail_server_id'] = wizard.template_id.mail_server_id.id if wizard.attachment_ids and wizard.composition_mode != 'mass_mail' and wizard.template_id: new_attachment_ids = [] for attachment in wizard.attachment_ids: |