diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-05-05 17:17:02 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-05-05 17:17:02 +0200 |
| commit | c0e4ab80804fffb88e4f9fe4e35f7bce1f441f9e (patch) | |
| tree | be51505b01f0719dad3f99d9a19e14415cb1ba2c /addons/mass_mailing/wizard/mail_compose_message.py | |
| parent | 9335e234992cf132b806fb1a62cf72bce6f59551 (diff) | |
| parent | bac4d13d47ae35d17794fac74c3a8271b32dc9b3 (diff) | |
[MERGE] forward port branch saas-14 up to bac4d13d47a
Diffstat (limited to 'addons/mass_mailing/wizard/mail_compose_message.py')
| -rw-r--r-- | addons/mass_mailing/wizard/mail_compose_message.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/mass_mailing/wizard/mail_compose_message.py b/addons/mass_mailing/wizard/mail_compose_message.py index 413415c9f5f..6c1fc81280e 100644 --- a/addons/mass_mailing/wizard/mail_compose_message.py +++ b/addons/mass_mailing/wizard/mail_compose_message.py @@ -61,8 +61,8 @@ class MailComposeMessage(models.TransientModel): mail_values = res[res_id] if mail_values.get('email_to'): recips = tools.email_split(mail_values['email_to']) - elif mail_values.get('recipient_ids') and partners_email.get(res_id): - recips = tools.email_split(partners_email[res_id]) + else: + recips = tools.email_split(partners_email.get(res_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 |