diff --git a/addons/crm/models/res_partner.py b/addons/crm/models/res_partner.py index a6df4c7ba51..423aeeffb16 100644 --- a/addons/crm/models/res_partner.py +++ b/addons/crm/models/res_partner.py @@ -2,6 +2,8 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. from odoo import api, fields, models +from odoo.osv import expression + class Partner(models.Model): @@ -67,9 +69,10 @@ class Partner(models.Model): This function returns an action that displays the opportunities from partner. ''' action = self.env['ir.actions.act_window']._for_xml_id('crm.crm_lead_opportunities') - action['context'] = {'active_test': False} + action['context'] = {} if self.is_company: action['domain'] = [('partner_id.commercial_partner_id', '=', self.id)] else: action['domain'] = [('partner_id', '=', self.id)] + action['domain'] = expression.AND([action['domain'], [('active', 'in', [True, False])]]) return action diff --git a/addons/sale_crm/models/crm_lead.py b/addons/sale_crm/models/crm_lead.py index 8d95e4b3b73..e4272d1aaab 100644 --- a/addons/sale_crm/models/crm_lead.py +++ b/addons/sale_crm/models/crm_lead.py @@ -39,7 +39,6 @@ class CrmLead(models.Model): action = self.env["ir.actions.actions"]._for_xml_id("sale_crm.sale_action_quotations_new") action['context'] = self._prepare_opportunity_quotation_context() action['context']['search_default_opportunity_id'] = self.id - action['context']['active_test'] = True return action def action_view_sale_quotation(self):