diff --git a/addons/sale_stock/models/sale_config_settings.py b/addons/sale_stock/models/sale_config_settings.py index 32baad15126..8ff323c809e 100644 --- a/addons/sale_stock/models/sale_config_settings.py +++ b/addons/sale_stock/models/sale_config_settings.py @@ -1,8 +1,7 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from odoo import api, fields, models, _ -from odoo.exceptions import AccessError +from odoo import api, fields, models class SaleConfiguration(models.TransientModel): @@ -37,10 +36,6 @@ class SaleConfiguration(models.TransientModel): @api.multi def set_sale_defaults(self): - self.ensure_one() - if not self.env.user._is_admin(): - raise AccessError(_("Only administrators can change the settings")) - default_picking_policy = 'one' if self.default_picking_policy else 'direct' self.env['ir.values'].sudo().set_default('sale.order', 'picking_policy', default_picking_policy) return super(SaleConfiguration, self).set_sale_defaults() diff --git a/openerp/addons/base/res/res_config.py b/openerp/addons/base/res/res_config.py index 22618bf48f5..61986ced93c 100644 --- a/openerp/addons/base/res/res_config.py +++ b/openerp/addons/base/res/res_config.py @@ -512,7 +512,7 @@ class ResConfigSettings(models.TransientModel, ResConfigModuleInstallationMixin) @api.multi def execute(self): self.ensure_one() - if not self.env.user._is_admin(): + if not self.env.user._is_superuser() and not self.env.user.has_group('base.group_system'): raise AccessError(_("Only administrators can change the settings")) self = self.with_context(active_test=False)