summaryrefslogtreecommitdiff
path: root/addons/base_setup
diff options
context:
space:
mode:
authorThibault Delavallée <tde@odoo.com>2018-01-16 10:17:43 +0100
committerThibault Delavallée <tde@odoo.com>2018-01-16 13:34:29 +0100
commitfaf6165e037bcb1afee8a4881f3a166c86fdee59 (patch)
tree76ba9c1712e19e1f59f36cc0b5010ac14e2e9a5e /addons/base_setup
parentc434d7f947a9ba8b45ca3cbab16b796a6d3bb0fc (diff)
[REF][FIX] base_setup, sale, website: update config field name for config_parameter fields
Those fields are prefixed by default_ which now strictly means they should be linked to a default value for a given model. Their name is updated so that it does not conflict with the strict verification done recently for settings.
Diffstat (limited to 'addons/base_setup')
-rw-r--r--addons/base_setup/models/res_config_settings.py10
-rw-r--r--addons/base_setup/views/res_config_settings_views.xml8
2 files changed, 12 insertions, 6 deletions
diff --git a/addons/base_setup/models/res_config_settings.py b/addons/base_setup/models/res_config_settings.py
index 2d8d43ffe0c..c511b44fb73 100644
--- a/addons/base_setup/models/res_config_settings.py
+++ b/addons/base_setup/models/res_config_settings.py
@@ -11,8 +11,14 @@ class ResConfigSettings(models.TransientModel):
group_multi_company = fields.Boolean("Manage multiple companies", implied_group='base.group_multi_company')
company_id = fields.Many2one('res.company', string='Company', required=True,
default=lambda self: self.env.user.company_id)
- default_user_rights = fields.Boolean("Default Access Rights", config_parameter='base_setup.default_user_rights')
- default_external_email_server = fields.Boolean("External Email Servers", config_parameter='base_setup.default_external_email_server')
+ user_default_rights = fields.Boolean(
+ "Default Access Rights",
+ config_parameter='base_setup.default_user_rights',
+ oldname='default_user_rights')
+ external_email_server_default = fields.Boolean(
+ "External Email Servers",
+ config_parameter='base_setup.default_external_email_server',
+ oldname='default_external_email_server')
module_base_import = fields.Boolean("Allow users to import data from CSV/XLS/XLSX/ODS files")
module_google_calendar = fields.Boolean(
string='Allow the users to synchronize their calendar with Google Calendar')
diff --git a/addons/base_setup/views/res_config_settings_views.xml b/addons/base_setup/views/res_config_settings_views.xml
index 12b60ef5914..a58f3e0d808 100644
--- a/addons/base_setup/views/res_config_settings_views.xml
+++ b/addons/base_setup/views/res_config_settings_views.xml
@@ -50,17 +50,17 @@
</div>
<div id="emails"/>
<h2>Users</h2>
- <div class="row mt16 o_settings_container" id="default_user_rights">
+ <div class="row mt16 o_settings_container" id="user_default_rights">
<div class="col-xs-12 col-md-6 o_setting_box" title="By default, new users get highest access rights for all installed apps." id="access_rights">
<div class="o_setting_left_pane">
- <field name="default_user_rights"/>
+ <field name="user_default_rights"/>
</div>
<div class="o_setting_right_pane">
- <label string="Access Rights" for="default_user_rights"/>
+ <label string="Access Rights" for="user_default_rights"/>
<div class="text-muted">
Set custom access rights for new users
</div>
- <div class="content-group" attrs="{'invisible': [('default_user_rights','=',False)]}">
+ <div class="content-group" attrs="{'invisible': [('user_default_rights','=',False)]}">
<div class="mt16">
<button type="object" name="open_default_user" string="Default Access Rights" icon="fa-arrow-right" class="btn-link"/>
</div>