diff options
| author | helly kapatel <hpl@odoo.com> | 2019-10-17 13:03:26 +0000 |
|---|---|---|
| committer | Alexandre Kühn <aku@odoo.com> | 2019-11-25 13:02:10 +0000 |
| commit | 355f99069a157a4212b654ba9a45c87fbde2a3f3 (patch) | |
| tree | 864816de420ebc21bbe0ff88520ab6970a31bd2f /addons | |
| parent | 7dcab8a08cefb32b90d5b82078cd770726d55b86 (diff) | |
[FIX] mail: do not mention on archive users
Archived users are inactive, so we shouldn't be able to ping them.
Task-2046885
closes odoo/odoo#40814
X-original-commit: 8169e34a2230b9a2aff359dc6a69b59c04fc9908
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/mail/models/res_partner.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/addons/mail/models/res_partner.py b/addons/mail/models/res_partner.py index fd35e66c342..70890cb368f 100644 --- a/addons/mail/models/res_partner.py +++ b/addons/mail/models/res_partner.py @@ -71,10 +71,11 @@ class Partner(models.Model): """ Return 'limit'-first partners' id, name and email such that the name or email matches a 'search' string. Prioritize users, and then extend the research to all partners. """ search_dom = expression.OR([[('name', 'ilike', search)], [('email', 'ilike', search)]]) + search_dom = expression.AND([[('active', '=', True)], search_dom]) fields = ['id', 'name', 'email'] # Search users - domain = expression.AND([[('user_ids.id', '!=', False)], search_dom]) + domain = expression.AND([[('user_ids.id', '!=', False), ('user_ids.active', '=', True)], search_dom]) users = self.search_read(domain, fields, limit=limit) # Search partners if less than 'limit' users found |
