summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2019-04-08 16:46:31 +0200
committerChristophe Simonis <chs@odoo.com>2019-04-08 16:46:31 +0200
commit9a7e3c8b4986fcfecf3699a194e45f5ec94bde6c (patch)
treef3eb55ac5763798c428071d4a6ae4ab2d72ec556 /addons
parent8d95b6c172334593aa9042b45224b94461d2e88f (diff)
parentcd28e53a31d255b17835f613c0de12a93417f9d9 (diff)
[MERGE] forward port branch saas-15 up to cd28e53a31d
Diffstat (limited to 'addons')
-rw-r--r--addons/mass_mailing/wizard/mail_compose_message.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/addons/mass_mailing/wizard/mail_compose_message.py b/addons/mass_mailing/wizard/mail_compose_message.py
index 8708dd9a098..322057ae616 100644
--- a/addons/mass_mailing/wizard/mail_compose_message.py
+++ b/addons/mass_mailing/wizard/mail_compose_message.py
@@ -62,7 +62,8 @@ class MailComposeMessage(models.TransientModel):
if mail_values.get('email_to'):
recips = tools.email_split(mail_values['email_to'])
else:
- recips = tools.email_split(partners_email.get(res_id))
+ partner_id = (mail_values.get('recipient_ids') or [(False, '')])[0][1]
+ recips = tools.email_split(partners_email.get(partner_id))
mail_to = recips[0].lower() if recips else False
if (blacklist and mail_to in blacklist) or (seen_list and mail_to in seen_list):
# prevent sending to blocked addresses that were included by mistake