diff --git a/addons/account/models/res_config_settings.py b/addons/account/models/res_config_settings.py index fa6adf5d86f..725706c11a5 100644 --- a/addons/account/models/res_config_settings.py +++ b/addons/account/models/res_config_settings.py @@ -228,6 +228,8 @@ class ResConfigSettings(models.TransientModel): def action_update_terms(self): self.ensure_one() + if hasattr(self, 'website_id') and self.env.user.has_group('website.group_website_designer'): + return self.env["website"].get_client_action('/terms', True) return { 'name': _('Update Terms & Conditions'), 'type': 'ir.actions.act_window', diff --git a/addons/website_sale/models/res_config_settings.py b/addons/website_sale/models/res_config_settings.py index 282a9072a22..c7b76e68e77 100644 --- a/addons/website_sale/models/res_config_settings.py +++ b/addons/website_sale/models/res_config_settings.py @@ -29,7 +29,6 @@ class ResConfigSettings(models.TransientModel): cart_abandoned_delay = fields.Float(string="Send After", related='website_id.cart_abandoned_delay', readonly=False) send_abandoned_cart_email = fields.Boolean('Abandoned Email', related='website_id.send_abandoned_cart_email', readonly=False) add_to_cart_action = fields.Selection(related='website_id.add_to_cart_action', readonly=False) - terms_url = fields.Char(compute='_compute_terms_url', string="URL", help="A preview will be available at this URL.") module_delivery_mondialrelay = fields.Boolean("Mondial Relay Connector") group_product_pricelist = fields.Boolean( @@ -56,11 +55,6 @@ class ResConfigSettings(models.TransientModel): related='website_id.show_line_subtotals_tax_selection', ) - @api.depends('website_id') - def _compute_terms_url(self): - for record in self: - record.terms_url = '%s/terms' % record.website_id.get_base_url() - @api.model def get_values(self): res = super(ResConfigSettings, self).get_values() @@ -101,10 +95,6 @@ class ResConfigSettings(models.TransientModel): else: record.website_id.auth_signup_uninvited = 'b2b' - def action_update_terms(self): - self.ensure_one() - return self.env["website"].get_client_action('/terms', True) - def action_open_extra_info(self): self.ensure_one() # Add the "edit" parameter in the url to tell the controller diff --git a/addons/website_sale/views/res_config_settings_views.xml b/addons/website_sale/views/res_config_settings_views.xml index 3f5a24a8ad2..00ab7095d6d 100644 --- a/addons/website_sale/views/res_config_settings_views.xml +++ b/addons/website_sale/views/res_config_settings_views.xml @@ -1,22 +1,6 @@ - - res.config.settings.view.form.inherit.account.web.terms - res.config.settings - - - - - - res.config.settings.view.form.inherit.sale res.config.settings