diff options
| author | Paul Morelle <pmo@odoo.com> | 2020-03-13 08:43:17 +0000 |
|---|---|---|
| committer | Paul Morelle <pmo@odoo.com> | 2020-03-13 12:20:57 +0000 |
| commit | 828531d66fee06df22054dec0a7051d47b31960c (patch) | |
| tree | b640369ee06323df916ae96aa94485d551443258 /addons/mail/models/mail_thread.py | |
| parent | 78beadb748a0bc7f533c8899dd872eaa75b893c5 (diff) | |
[FIX] mail: fix wrong calls to expression.AND
MailThread._mail_search_on_* was obviously never called with an
extra_domain yet, or it would have raised an exception: expression.AND
expects only one argument, with the list of expressions to AND, and here
we were passing them as *args.
closes odoo/odoo#47585
X-original-commit: b20c5350c4d0e0e140f8824e6f5d2a0009af9810
Signed-off-by: Paul Morelle <madprog@users.noreply.github.com>
Diffstat (limited to 'addons/mail/models/mail_thread.py')
| -rw-r--r-- | addons/mail/models/mail_thread.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/mail/models/mail_thread.py b/addons/mail/models/mail_thread.py index 90aebbff672..96a25fef64e 100644 --- a/addons/mail/models/mail_thread.py +++ b/addons/mail/models/mail_thread.py @@ -1587,7 +1587,7 @@ class MailThread(models.AbstractModel): on partner like ('user_ids', '!=', False) that would not be efficient. """ domain = [('email_normalized', 'in', normalized_emails)] if extra_domain: - domain = expression.AND(domain, extra_domain) + domain = expression.AND([domain, extra_domain]) partners = self.env['res.users'].sudo().search(domain, order='name ASC').mapped('partner_id') # return a search on partner to filter results current user should not see (multi company for example) return self.env['res.partner'].search([('id', 'in', partners.ids)]) @@ -1595,7 +1595,7 @@ class MailThread(models.AbstractModel): def _mail_search_on_partner(self, normalized_emails, extra_domain=False): domain = [('email_normalized', 'in', normalized_emails)] if extra_domain: - domain = expression.AND(domain, extra_domain) + domain = expression.AND([domain, extra_domain]) return self.env['res.partner'].search(domain) def _mail_find_user_for_gateway(self, email, alias=None): |