From 355f99069a157a4212b654ba9a45c87fbde2a3f3 Mon Sep 17 00:00:00 2001 From: helly kapatel Date: Thu, 17 Oct 2019 13:03:26 +0000 Subject: [PATCH] [FIX] mail: do not mention on archive users MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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) --- addons/mail/models/res_partner.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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