diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-12-10 13:05:58 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-12-10 13:05:58 +0100 |
| commit | 82a495eed52a9f42e5b88caa52c20a85f8d81ce3 (patch) | |
| tree | 6c5e8cc0247d5fe08d24e9abae38fe353fbebc56 /addons/mail/models/mail_thread.py | |
| parent | 0bc2ddae784bf80c4c809d8b7f6d642d576f92a1 (diff) | |
| parent | 4022493c0b85f966e499b6c03ac7cce5556f15e6 (diff) | |
[MERGE] forward port of branch saas-7 up to 4022493
Diffstat (limited to 'addons/mail/models/mail_thread.py')
| -rw-r--r-- | addons/mail/models/mail_thread.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/addons/mail/models/mail_thread.py b/addons/mail/models/mail_thread.py index 21b360a6b73..9164f51697f 100644 --- a/addons/mail/models/mail_thread.py +++ b/addons/mail/models/mail_thread.py @@ -4,7 +4,6 @@ import base64 import datetime import dateutil import email -import json import lxml from lxml import etree import logging @@ -872,7 +871,11 @@ class MailThread(models.AbstractModel): obj = record_set[0] else: obj = self.env[alias.alias_parent_model_id.model].browse(alias.alias_parent_thread_id) - if not author_id or author_id not in [fol.id for fol in obj.message_partner_ids]: + accepted_partner_ids = list( + set(partner.id for partner in obj.message_partner_ids) | + set(partner.id for channel in obj.message_channel_ids for partner in channel.channel_partner_ids) + ) + if not author_id or author_id not in accepted_partner_ids: _warn('alias %s restricted to internal followers, skipping' % alias.alias_name) _create_bounce_email() return False |