From b7420cd5c0abe35d2377a11f0f8dde38dae8fd59 Mon Sep 17 00:00:00 2001 From: Victor Feyens Date: Mon, 17 Jan 2022 15:50:10 +0000 Subject: [PATCH] [IMP] website_sale: clean fields on website class override Part-of: odoo/odoo#82374 --- addons/website_sale/models/website.py | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/addons/website_sale/models/website.py b/addons/website_sale/models/website.py index 748da9d7e74..51c2c8a6564 100644 --- a/addons/website_sale/models/website.py +++ b/addons/website_sale/models/website.py @@ -15,22 +15,25 @@ _logger = logging.getLogger(__name__) class Website(models.Model): _inherit = 'website' - pricelist_id = fields.Many2one('product.pricelist', compute='_compute_pricelist_id', string='Default Pricelist') - currency_id = fields.Many2one('res.currency', - related='pricelist_id.currency_id', depends=(), related_sudo=False, - string='Default Currency', readonly=False) - salesperson_id = fields.Many2one('res.users', string='Salesperson') - - def _get_default_website_team(self): - try: - team = self.env.ref('sales_team.salesteam_website_sales') - return team if team.active else None - except ValueError: + def _default_salesteam_id(self): + team = self.env.ref('sales_team.salesteam_website_sales', False) + if team and team.active: + return team.id + else: return None + salesperson_id = fields.Many2one('res.users', string='Salesperson') salesteam_id = fields.Many2one('crm.team', string='Sales Team', ondelete="set null", - default=_get_default_website_team) + default=_default_salesteam_id) + + pricelist_id = fields.Many2one( + 'product.pricelist', + compute='_compute_pricelist_id', + string='Default Pricelist') + currency_id = fields.Many2one( + related='pricelist_id.currency_id', depends=(), related_sudo=False, + string='Default Currency', readonly=False) pricelist_ids = fields.One2many('product.pricelist', compute="_compute_pricelist_ids", string='Price list available for this Ecommerce/Website') all_pricelist_ids = fields.One2many('product.pricelist', 'website_id', string='All pricelists',