[IMP] res_config: Update file names, xmlids, class names according to guidelines

Now that we only have one model (res.config.settings). Uniformize everything according to the guidelines.

addons/account/__manifest__.py

@@ -56,7 +56,7 @@ Core mechanisms for the accounting modules. To display the menuitems, install th
         'views/report_agedpartnerbalance.xml',
         'views/tax_adjustments.xml',
         'wizard/wizard_tax_adjustments_view.xml',
-        'views/account_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'views/web_planner_data.xml',
         'views/account_journal_dashboard_view.xml',
         'views/account_portal_templates.xml',

addons/account/models/__init__.py

@@ -11,5 +11,5 @@ from . import account_analytic_line
 from . import account_journal_dashboard
 from . import product
 from . import company
-from . import account_config_settings
+from . import res_config_settings
 from . import web_planner

addons/account/models/res_config_settings.py

@@ -4,7 +4,7 @@
 from odoo import api, fields, models, _
 
 
-class AccountConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     company_id = fields.Many2one('res.company', string='Company', required=True,
@@ -65,7 +65,7 @@ class AccountConfigSettings(models.TransientModel):
 
     @api.model
     def get_values(self):
-        res = super(AccountConfigSettings, self).get_values()
+        res = super(ResConfigSettings, self).get_values()
         params = self.env['ir.config_parameter'].sudo()
         res.update(
             default_purchase_tax_id=int(params.get_param('account.default_purchase_tax_id', default=False)) or False,
@@ -75,7 +75,7 @@ class AccountConfigSettings(models.TransientModel):
 
     @api.multi
     def set_values(self):
-        super(AccountConfigSettings, self).set_values()
+        super(ResConfigSettings, self).set_values()
         self.env['ir.config_parameter'].sudo().set_param("account.default_purchase_tax_id", self.default_purchase_tax_id.id)
         self.env['ir.config_parameter'].sudo().set_param("account.default_sale_tax_id", self.default_sale_tax_id.id)
         if self.group_multi_currency:
@@ -152,4 +152,4 @@ class AccountConfigSettings(models.TransientModel):
                 values.pop('currency_id')
             if company.accounts_code_digits == values.get('code_digits'):
                 values.pop('code_digits')
-        return super(AccountConfigSettings, self).create(values)
+        return super(ResConfigSettings, self).create(values)

addons/account/views/res_config_settings_views.xml

@@ -9,11 +9,11 @@
             <field name="search_view_id" ref="base.view_module_filter"/>
         </record>
 
-        <record id="account_config_settings_view_form" model="ir.ui.view">
-            <field name="name">account.config.settings.form</field>
+        <record id="res_config_settings_view_form" model="ir.ui.view">
+            <field name="name">res.config.settings.view.form.inherit.account</field>
             <field name="model">res.config.settings</field>
             <field name="priority" eval="8"/>
-            <field name="inherit_id" ref="base.res_config_setting_form"/>
+            <field name="inherit_id" ref="base.res_config_settings_view_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[hasclass('settings')]" position="inside">
                     <div class="app_settings_block" data-string="Accounting" data-key="account_invoicing" groups="account.group_account_manager">

addons/account_analytic_default/__manifest__.py

@@ -24,7 +24,7 @@ Allows to automatically select analytic accounts based on criterions:
         'security/account_analytic_default_security.xml',
         'views/account_analytic_default_view.xml',
         'views/product_views.xml',
-        'views/account_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
     ],
     'installable': True,
 }

addons/account_analytic_default/views/res_config_settings_views.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <record id="account_config_settings_view_form_inherit_analytic_default" model="ir.ui.view">
-        <field name="name">account.config.settings.form.inherit.analytic.default</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.account.analytic.default</field>
         <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="account.account_config_settings_view_form"/>
+        <field name="inherit_id" ref="account.res_config_settings_view_form"/>
         <field name="arch" type="xml">
             <xpath expr="//div[@id='analytic_account_link']" position="after">
                 <div>

addons/account_asset/__manifest__.py

@@ -26,7 +26,7 @@ Keeps track of depreciations, and creates corresponding journal entries.
         'views/account_invoice_views.xml',
         'views/account_asset_templates.xml',
         'views/product_views.xml',
-        'views/account_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'report/account_asset_report_views.xml',
         'data/account_asset_data.xml',
     ],

addons/account_asset/views/res_config_settings_views.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <record id="account_config_settings_view_form_inherit_account_asset" model="ir.ui.view">
-        <field name="name">account.config.settings.form.inherit.asset</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.account.asset</field>
         <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="account.account_config_settings_view_form"/>
+        <field name="inherit_id" ref="account.res_config_settings_view_form"/>
         <field name="arch" type="xml">
             <div id="msg_account_asset" position="replace">
                 <div class="content-group" attrs="{'invisible': [('module_account_asset', '=', False)]}">

addons/account_budget/__manifest__.py

@@ -34,7 +34,7 @@ Three reports are available:
         'security/account_budget_security.xml',
         'views/account_analytic_account_views.xml',
         'views/account_budget_views.xml',
-        'views/account_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
     ],
     'demo': ['data/account_budget_demo.xml'],
 }

addons/account_budget/views/res_config_settings_views.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <record id="account_config_settings_view_form_inherit_account_budget" model="ir.ui.view">
-        <field name="name">account.config.settings.form.inherit.budget</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.account.budget</field>
         <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="account.account_config_settings_view_form"/>
+        <field name="inherit_id" ref="account.res_config_settings_view_form"/>
         <field name="arch" type="xml">
             <div id="msg_account_budget" position="replace">
                 <div class="content-group" attrs="{'invisible': [('module_account_budget', '=', False)]}">

addons/auth_ldap/__manifest__.py

@@ -8,7 +8,7 @@
     'data' : [
         'views/ldap_installer_views.xml',
         'security/ir.model.access.csv',
-        'views/auth_ldap_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
     ],
     'external_dependencies' : {
         'python' : ['ldap'],

addons/auth_ldap/models/__init__.py

@@ -3,4 +3,4 @@
 from . import res_company
 from . import res_company_ldap
 from . import res_users
-from . import auth_ldap_config_settings
+from . import res_config_settings

addons/auth_ldap/models/res_config_settings.py

@@ -4,7 +4,7 @@
 from odoo import fields, models
 
 
-class BaseConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     ldaps = fields.One2many(related='company_id.ldaps', string="LDAP Parameters")

addons/auth_ldap/views/res_config_settings_views.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <record id="base_config_settings_view_form_inherit_auth_ldap" model="ir.ui.view">
-        <field name="name">base.config.settings.form.inherit.auth.ldap</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.auth.ldap</field>
         <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="base_setup.base_config_settings_view_form"/>
+        <field name="inherit_id" ref="base_setup.res_config_settings_view_form"/>
         <field name="arch" type="xml">
             <div name='auth_ldap_right_pane' position="inside">
                 <div attrs="{'invisible': [('module_auth_ldap','=',False)]}">

addons/auth_oauth/__manifest__.py

@@ -15,7 +15,7 @@ Allow users to login through OAuth2 Provider.
         'data/auth_oauth_data.yml',
         'views/auth_oauth_views.xml',
         'views/res_users_views.xml',
-        'views/base_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'views/auth_oauth_templates.xml',
         'security/ir.model.access.csv',
     ],

addons/auth_oauth/models/__init__.py

@@ -2,6 +2,6 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from . import auth_oauth
-from . import base_config_settings
+from . import res_config_settings
 from . import ir_config_parameter
 from . import res_users

addons/auth_oauth/models/res_config_settings.py

@@ -8,7 +8,7 @@ from odoo import api, fields, models
 _logger = logging.getLogger(__name__)
 
 
-class BaseConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     @api.model
@@ -21,7 +21,7 @@ class BaseConfigSettings(models.TransientModel):
 
     @api.model
     def get_values(self):
-        res = super(BaseConfigSettings, self).get_values()
+        res = super(ResConfigSettings, self).get_values()
         google_provider = self.env.ref('auth_oauth.provider_google', False)
         res.update(
             auth_oauth_google_enabled=google_provider.enabled,
@@ -31,7 +31,7 @@ class BaseConfigSettings(models.TransientModel):
         return res
 
     def set_values(self):
-        super(BaseConfigSettings, self).set_values()
+        super(ResConfigSettings, self).set_values()
         google_provider = self.env.ref('auth_oauth.provider_google', False)
         google_provider.write({
             'enabled': self.auth_oauth_google_enabled,

addons/auth_oauth/views/res_config_settings_views.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-        <record id="base_config_settings_view_form_inherit_auth_oauth" model="ir.ui.view">
-            <field name="name">base.config.settings.form.inherit.oauth</field>
+        <record id="res_config_settings_view_form" model="ir.ui.view">
+            <field name="name">res.config.settings.view.form.inherit.auth.oauth</field>
             <field name="model">res.config.settings</field>
-            <field name="inherit_id" ref="base_setup.base_config_settings_view_form"/>
+            <field name="inherit_id" ref="base_setup.res_config_settings_view_form"/>
             <field name="arch" type="xml">
                 <div id="msg_module_auth_oauth" position="replace">
                     <div class="content-group" attrs="{'invisible': [('module_auth_oauth','=',False)]}">

addons/auth_signup/__manifest__.py

@@ -17,7 +17,7 @@ Allow users to sign up and reset their password
     ],
     'data': [
         'data/auth_signup_data.xml',
-        'views/base_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'views/res_users_views.xml',
         'views/auth_signup_login_templates.xml',
     ],

addons/auth_signup/models/__init__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from . import base_config_settings
+from . import res_config_settings
 from . import ir_http
 from . import res_partner
 from . import res_users

addons/auth_signup/models/res_config_settings.py

@@ -4,7 +4,7 @@
 from odoo import api, fields, models
 
 
-class BaseConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     auth_signup_reset_password = fields.Boolean(string='Enable password reset from Login page')
@@ -16,7 +16,7 @@ class BaseConfigSettings(models.TransientModel):
 
     @api.model
     def get_values(self):
-        res = super(BaseConfigSettings, self).get_values()
+        res = super(ResConfigSettings, self).get_values()
         get_param = self.env['ir.config_parameter'].sudo().get_param
         # the value of the parameter is a nonempty string
         res.update(
@@ -28,7 +28,7 @@ class BaseConfigSettings(models.TransientModel):
 
     @api.multi
     def set_values(self):
-        super(BaseConfigSettings, self).set_values()
+        super(ResConfigSettings, self).set_values()
         set_param = self.env['ir.config_parameter'].sudo().set_param
         # we store the repr of the values, since the value of the parameter is a required string
         set_param('auth_signup.reset_password', repr(self.auth_signup_reset_password))

addons/auth_signup/views/res_config_settings_views.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-        <record id="base_config_settings_view_form_inherit_auth_signup" model="ir.ui.view">
-            <field name="name">base.config.settings.inherit.auth.signup</field>
+        <record id="res_config_settings_view_form" model="ir.ui.view">
+            <field name="name">res.config.settings.view.form.inherit.auth.signup</field>
             <field name="model">res.config.settings</field>
-            <field name="inherit_id" ref="base_setup.base_config_settings_view_form"/>
+            <field name="inherit_id" ref="base_setup.res_config_settings_view_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@id='access_rights']" position="after">
                     <div class="col-xs-12 col-md-6 o_setting_box" title="If unchecked, only invited users may sign up.">

addons/base_gengo/__manifest__.py

@@ -18,7 +18,7 @@ This wizard will activate the CRON job and the Scheduler and will start the auto
     'data': [
         'data/ir_cron_data.xml',
         'views/ir_translation_views.xml',
-        'views/base_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'wizard/base_gengo_translations_view.xml',
     ],
     'demo': ['data/res_company_demo.xml'],

addons/base_gengo/models/__init__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from . import base_config_settings
+from . import res_config_settings
 from . import ir_translation
 from . import res_company

addons/base_gengo/models/res_config_settings.py

@@ -4,7 +4,7 @@
 from odoo import api, models, fields
 
 
-class BaseConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     gengo_private_key = fields.Text(string="Gengo Private Key", related="company_id.gengo_private_key")

addons/base_gengo/views/res_config_settings_views.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <odoo>
-    <record id="view_general_configuration_form_inherit_base_gengo" model="ir.ui.view">
-        <field name="name">base.config.settings.form.inherit.base.gengo</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.base.gengo</field>
         <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="base_setup.base_config_settings_view_form"/>
+        <field name="inherit_id" ref="base_setup.res_config_settings_view_form"/>
         <field name="arch" type="xml">
             <xpath expr="//div[@name='base_gengo_right_pane']" position="inside">
                 <div name="base_gengo_right_pane" position="replace">

addons/base_setup/__manifest__.py

@@ -13,7 +13,7 @@ Shows you a list of applications features to install from.
     """,
     'depends': ['base', 'web'],
     'data': [
-        'views/base_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'views/res_partner_views.xml',
     ],
     'demo': [],

addons/base_setup/models/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from . import base_config_settings
+from . import res_config_settings
 

addons/base_setup/models/res_config_settings.py

@@ -4,7 +4,7 @@
 from odoo import api, fields, models, _
 
 
-class BaseConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
 
     _inherit = 'res.config.settings'
 
@@ -37,7 +37,7 @@ class BaseConfigSettings(models.TransientModel):
 
     @api.model
     def get_values(self):
-        res = super(BaseConfigSettings, self).get_values()
+        res = super(ResConfigSettings, self).get_values()
         params = self.env['ir.config_parameter'].sudo()
         default_external_email_server = params.get_param('base_setup.default_external_email_server', default=False)
         default_user_rights = params.get_param('base_setup.default_user_rights', default=False)
@@ -52,7 +52,7 @@ class BaseConfigSettings(models.TransientModel):
 
     @api.multi
     def set_values(self):
-        super(BaseConfigSettings, self).set_values()
+        super(ResConfigSettings, self).set_values()
         self.env['ir.config_parameter'].sudo().set_param("base_setup.default_external_email_server", self.default_external_email_server)
         self.env['ir.config_parameter'].sudo().set_param("base_setup.default_user_rights", self.default_user_rights)
         self.env['ir.config_parameter'].sudo().set_param("base_setup.default_custom_report_footer", self.default_custom_report_footer)

addons/base_setup/views/res_config_settings_views.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-        <record id="base_config_settings_view_form" model="ir.ui.view">
-            <field name="name">base.config.settings.form</field>
+        <record id="res_config_settings_view_form" model="ir.ui.view">
+            <field name="name">res.config.settings.view.form.inherit.base.setup</field>
             <field name="model">res.config.settings</field>
             <field name="priority" eval="25"/>
-            <field name="inherit_id" ref="base.res_config_setting_form"/>
+            <field name="inherit_id" ref="base.res_config_settings_view_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[hasclass('settings')]" position="inside">
                     <div class="app_settings_block" data-string="General Settings" data-key="general_settings">

addons/base_vat/__manifest__.py

@@ -39,6 +39,6 @@ only the country code will be validated.
     'data': [
         'views/res_partner_views.xml',
         'views/res_company_views.xml',
-        'views/account_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
     ],
 }

addons/base_vat/models/__init__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from . import account_config_settings
+from . import res_config_settings
 from . import res_company
 from . import res_partner

addons/base_vat/models/res_config_settings.py

@@ -3,7 +3,7 @@
 from odoo import fields, models
 
 
-class AccountConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     vat_check_vies = fields.Boolean(related='company_id.vat_check_vies',

addons/base_vat/views/res_config_settings_views.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <record id="account_config_settings_view_form_inherit_base_vat" model="ir.ui.view">
-        <field name="name">account.config.settings.form.inherit.base.vat</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.base.vat</field>
         <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="account.account_config_settings_view_form"/>
+        <field name="inherit_id" ref="account.res_config_settings_view_form"/>
         <field name="arch" type="xml">
             <div id="eu_service" position="after">
                 <div class="col-xs-12 col-md-6 o_setting_box" title="If this checkbox is ticked, you will not be able to save a contact if its VAT number cannot be verified by the European VIES service.">

addons/crm/__manifest__.py

@@ -37,7 +37,7 @@
         'wizard/base_partner_merge_views.xml',
 
         'views/crm_templates.xml',
-        'views/crm_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'views/crm_views.xml',
         'views/crm_stage_views.xml',
         'views/crm_lead_views.xml',

addons/crm/models/__init__.py

@@ -6,6 +6,6 @@ from . import calendar
 from . import crm_lead
 from . import crm_stage
 from . import crm_team
-from . import crm_config_settings
+from . import res_config_settings
 from . import res_partner
 from . import web_planner

addons/crm/models/res_config_settings.py

@@ -4,7 +4,7 @@
 from odoo import api, fields, models
 
 
-class CrmConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     company_id = fields.Many2one('res.company', string='Company', required=True,
@@ -41,7 +41,7 @@ class CrmConfigSettings(models.TransientModel):
 
     @api.model
     def get_values(self):
-        res = super(CrmConfigSettings, self).get_values()
+        res = super(ResConfigSettings, self).get_values()
         alias = self._find_default_lead_alias_id()
         res.update(
             alias_prefix=alias.alias_name if alias else False,
@@ -51,7 +51,7 @@ class CrmConfigSettings(models.TransientModel):
 
     @api.multi
     def set_values(self):
-        super(CrmConfigSettings, self).set_values()
+        super(ResConfigSettings, self).set_values()
         self.env['ir.config_parameter'].sudo().set_param('crm.generate_lead_from_alias', self.generate_lead_from_alias)
         alias = self._find_default_lead_alias_id()
         if alias:

addons/crm/views/res_config_settings_views.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <record id="crm_config_settings_view_form" model="ir.ui.view">
-        <field name="name">crm.config.settings.view.form</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.crm</field>
         <field name="model">res.config.settings</field>
         <field name="priority" eval="2"/>
-        <field name="inherit_id" ref="base.res_config_setting_form" />
+        <field name="inherit_id" ref="base.res_config_settings_view_form"/>
         <field name="arch" type="xml">
             <xpath expr="//div[hasclass('settings')]" position="inside">
                 <div class="app_settings_block" data-string="CRM" data-key="crm" groups="sales_team.group_sale_manager">
@@ -101,7 +101,7 @@
         <field name="name">Configure CRM</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">res.config.settings</field>
-        <field name="view_id" ref="crm_config_settings_view_form"/>
+        <field name="view_id" ref="res_config_settings_view_form"/>
         <field name="view_mode">form</field>
         <field name="target">inline</field>
         <field name="context">{'module' : 'crm'}</field>

addons/crm_phone_validation/__manifest__.py

@@ -12,7 +12,7 @@ CRM Phone Numbers Validation
 
 This module allows for validate and format phone numbers for leads and contacts.""",
     'data': [
-        'views/crm_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
     ],
     'depends': [
         'phone_validation',

addons/crm_phone_validation/models/__init__.py

@@ -3,4 +3,4 @@
 
 from . import res_partner
 from . import crm_lead
-from . import crm_config_settings
+from . import res_config_settings

addons/crm_phone_validation/models/res_config_settings.py

@@ -4,7 +4,7 @@
 from odoo import fields, models
 
 
-class CrmConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     crm_phone_valid_method = fields.Selection(related="company_id.phone_international_format", required=True)

addons/crm_phone_validation/views/res_config_settings_views.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-    <record id="crm_config_settings_view_form_inherit_phone_validatation" model="ir.ui.view">
-        <field name="name">crm.config.settings.view.form.inherit.phone.validatation</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.crm.phone.validation</field>
         <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="crm.crm_config_settings_view_form" />
+        <field name="inherit_id" ref="crm.res_config_settings_view_form" />
         <field name="arch" type="xml">
             <xpath expr="//div[@id='module_crm_phone_validation']" position="after">
                 <div class="content-group">

addons/delivery/__manifest__.py

@@ -25,7 +25,7 @@ invoices from picking, the system is able to add and compute the shipping line.
         'data/mail_template_data.xml',
         'views/report_shipping.xml',
         'views/report_deliveryslip.xml',
-        'views/sale_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'wizard/choose_delivery_package_views.xml',
     ],
     'demo': ['data/delivery_demo.xml'],

addons/delivery/views/res_config_settings_views.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <record id="sale_config_settings_view_form_inherit_delivery" model="ir.ui.view">
-        <field name="name">sale.config.settings.inherit.delivery</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.delivery</field>
         <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="sale.sale_config_settings_view_form"/>
+        <field name="inherit_id" ref="sale.res_config_settings_view_form"/>
         <field name="arch" type="xml">
             <xpath expr="//div[@id='delivery_carrier']" position="after">
                 <div class="content-group">

addons/event/__manifest__.py

@@ -27,7 +27,7 @@ Key Features
         'report/event_event_reports.xml',
         'data/email_template_data.xml',
         'data/event_data.xml',
-        'views/event_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'views/event_templates.xml',
         'views/res_partner_views.xml',
     ],

addons/event/models/event_config_settings.py

@@ -2,7 +2,7 @@
 
 from odoo import fields, models
 
-class event_config_settings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     module_event_sale = fields.Boolean("Tickets")

addons/event/views/res_config_settings_views.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data>
-        <record id="event_config_settings_view_form" model="ir.ui.view">
-            <field name="name">event.config.settings.form</field>
+        <record id="res_config_settings_view_form" model="ir.ui.view">
+            <field name="name">res.config.settings.view.form.inherit.event</field>
             <field name="model">res.config.settings</field>
             <field name="priority" eval="13"/>
-            <field name="inherit_id" ref="base.res_config_setting_form"/>
+            <field name="inherit_id" ref="base.res_config_settings_view_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[hasclass('settings')]" position="inside">
                     <div class="app_settings_block" data-string="Events" data-key="event" groups="event.group_event_manager">

addons/fetchmail/__manifest__.py

@@ -40,6 +40,7 @@ For more specific needs, you may also assign custom-defined actions
         'security/ir.model.access.csv',
         'views/fetchmail_views.xml',
         'views/mail_mail_views.xml',
+        'views/res_config_settings_views.xml',
     ],
     'demo': [],
     'installable': True,

addons/fetchmail/views/fetchmail_views.xml

@@ -93,27 +93,6 @@
             <field name="search_view_id" ref="view_email_server_search"/>
         </record>
 
-        <record id="base_config_settings_view_form_inherit_fetchmail" model="ir.ui.view">
-            <field name="name">base.config.settings.inherit.fetchmail</field>
-            <field name="model">res.config.settings</field>
-            <field name="inherit_id" ref="mail.base_config_settings_view_form_inherit_mail"/>
-            <field name="arch" type="xml">
-                <div id="mail_alias_domain" position="after">
-                    <div>
-                        <button type="action"
-                        name="%(action_email_server_tree)d"
-                        string="Incoming Email Servers" icon="fa-arrow-right" class="btn-link"/>
-                    </div>
-                    <div>
-                        <button type="action"
-                        name="%(base.action_ir_mail_server_list)d"
-                        string="Outgoing Email Servers" icon="fa-arrow-right" class="btn-link"/>
-                    </div>
-                </div>
-            </field>
-        </record>
-
-
         <menuitem
             parent="base.menu_email"
             id="menu_action_fetchmail_server_tree"

addons/fetchmail/views/res_config_settings_views.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.fetchmail</field>
+        <field name="model">res.config.settings</field>
+        <field name="inherit_id" ref="mail.res_config_settings_view_form"/>
+        <field name="arch" type="xml">
+            <div id="mail_alias_domain" position="after">
+                <div>
+                    <button type="action"
+                    name="%(action_email_server_tree)d"
+                    string="Incoming Email Servers" icon="fa-arrow-right" class="btn-link"/>
+                </div>
+                <div>
+                    <button type="action"
+                    name="%(base.action_ir_mail_server_list)d"
+                    string="Outgoing Email Servers" icon="fa-arrow-right" class="btn-link"/>
+                </div>
+            </div>
+        </field>
+    </record>
+</odoo>

addons/google_calendar/__manifest__.py

@@ -13,7 +13,7 @@
         'data/google_calendar_data.xml',
         'data/google_calendar_data.xml',
         'security/ir.model.access.csv',
-        'views/base_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'views/res_users_views.xml',
         'views/google_calendar_templates.xml',
     ],

addons/google_calendar/models/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from . import base_config_settings
+from . import res_config_settings
 from . import calendar
 from . import google_calendar
 from . import res_users

addons/google_calendar/models/res_config_settings.py

@@ -4,7 +4,7 @@
 from odoo import api, fields, models
 
 
-class BaseConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     cal_client_id = fields.Char("Client_id")
@@ -12,14 +12,14 @@ class BaseConfigSettings(models.TransientModel):
     server_uri = fields.Char('URI for tuto')
 
     def set_values(self):
-        super(BaseConfigSettings, self).set_values()
+        super(ResConfigSettings, self).set_values()
         set_param = self.env['ir.config_parameter'].set_param
         set_param('google_calendar_client_id', (self.cal_client_id or '').strip())
         set_param('google_calendar_client_secret', (self.cal_client_secret or '').strip())
 
     @api.model
     def get_values(self):
-        res = super(BaseConfigSettings, self).get_values()
+        res = super(ResConfigSettings, self).get_values()
         get_param = self.env['ir.config_parameter'].sudo().get_param
         res.update(
             cal_client_id=get_param('google_calendar_client_id', default=''),

addons/google_calendar/views/res_config_settings_views.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-        <record id="base_config_settings_view_form_inherit_google_calendar" model="ir.ui.view">
-            <field name="name">base.config.settings.inherit.google.calendar</field>
+        <record id="res_config_settings_view_form" model="ir.ui.view">
+            <field name="name">res.config.settings.view.form.inherit.google.calendar</field>
             <field name="model">res.config.settings</field>
-            <field name="inherit_id" ref="base_setup.base_config_settings_view_form"/>
+            <field name="inherit_id" ref="base_setup.res_config_settings_view_form"/>
             <field name="arch" type="xml">
                 <div id="msg_module_google_calendar" position="replace">
                     <div class="content-group" attrs="{'invisible': [('module_google_calendar','=',False)]}">

addons/google_drive/__manifest__.py

@@ -12,7 +12,7 @@
         'data/google_drive_data.xml',
         'views/google_drive_views.xml',
         'views/google_drive_templates.xml',
-        'views/base_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
     ],
     'demo': [
         'data/google_drive_demo.xml'

addons/google_drive/models/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from . import base_config_settings
+from . import res_config_settings
 from . import google_drive

addons/google_drive/models/res_config_settings.py

@@ -4,7 +4,7 @@
 from odoo import api, fields, models
 
 
-class BaseConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = "res.config.settings"
 
     google_drive_authorization_code = fields.Char(string='Authorization Code')
@@ -18,14 +18,14 @@ class BaseConfigSettings(models.TransientModel):
 
     @api.model
     def get_values(self):
-        res = super(BaseConfigSettings, self).get_values()
+        res = super(ResConfigSettings, self).get_values()
         res.update(
             google_drive_authorization_code=self.env['ir.config_parameter'].sudo().get_param('google_drive_authorization_code'),
         )
         return res
 
     def set_values(self):
-        super(BaseConfigSettings, self).set_values()
+        super(ResConfigSettings, self).set_values()
         params = self.env['ir.config_parameter'].sudo()
         authorization_code = self.google_drive_authorization_code
         refresh_token = False

addons/google_drive/views/res_config_settings_views.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <record id="base_config_settings_view_form_inherit_google_drive" model="ir.ui.view">
-        <field name="name">base.config.settings.inherit.google.drive</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.google.drive</field>
         <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="base_setup.base_config_settings_view_form"/>
+        <field name="inherit_id" ref="base_setup.res_config_settings_view_form"/>
         <field name="arch" type="xml">
             <div id="msg_module_google_drive" position="replace">
                 <div class="content-group" attrs="{'invisible': [('module_google_drive','=',False)]}">

addons/google_spreadsheet/__manifest__.py

@@ -14,7 +14,7 @@ The module adds the possibility to display data from Odoo in Google Spreadsheets
         'data/google_spreadsheet_data.xml',
         'views/google_spreadsheet_views.xml',
         'views/google_spreadsheet_templates.xml',
-        'views/base_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
     ],
     'qweb': ['static/src/xml/*.xml'],
     'demo': [],

addons/google_spreadsheet/models/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from . import base_config_settings
+from . import res_config_settings
 from . import google_drive

addons/google_spreadsheet/models/res_config_settings.py

@@ -4,7 +4,7 @@
 from odoo import fields, models
 
 
-class BaseConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = "res.config.settings"
 
     google_drive_uri_copy = fields.Char(related='google_drive_uri', string='URI', help="The URL to generate the authorization code from Google")

addons/google_spreadsheet/views/res_config_settings_views.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <record id="base_config_settings_view_form_inherit_spreadsheet" model="ir.ui.view">
-        <field name="name">base.config.settings.inherit.spreadsheet</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.google.spreadsheet</field>
         <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="base_setup.base_config_settings_view_form" />
+        <field name="inherit_id" ref="base_setup.res_config_settings_view_form" />
         <field name="arch" type="xml">
             <xpath expr="//div[@id='msg_module_google_spreadsheet']" position="replace">
                 <div class="content-group" attrs="{'invisible': [('module_google_spreadsheet','=',False)]}">

addons/hr/__manifest__.py

@@ -26,7 +26,7 @@
         'security/ir.model.access.csv',
         'views/hr_views.xml',
         'views/hr_templates.xml',
-        'views/hr_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'data/hr_data.xml',
     ],
     'demo': [

addons/hr/models/__init__.py

@@ -2,7 +2,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from . import hr
-from . import hr_config_settings
+from . import res_config_settings
 from . import mail_alias
 from . import res_partner
 from . import res_users

addons/hr/models/res_config_settings.py

@@ -3,7 +3,7 @@
 from odoo import fields, models
 
 
-class HrConfigurator(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     company_id = fields.Many2one(

addons/hr/views/res_config_settings_views.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <record id="hr_config_settings_view_form" model="ir.ui.view">
-        <field name="name">hr.config.settings.form</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.hr</field>
         <field name="model">res.config.settings</field>
         <field name="priority" eval="14"/>
-        <field name="inherit_id" ref="base.res_config_setting_form"/>
+        <field name="inherit_id" ref="base.res_config_settings_view_form"/>
         <field name="arch" type="xml">
             <xpath expr="//div[hasclass('settings')]" position="inside">
                 <div class="app_settings_block" data-string="Employee" data-key="hr" groups="hr.group_hr_manager">

addons/hr_attendance/__manifest__.py

@@ -25,7 +25,7 @@ actions(Check in/Check out) performed by them.
         'report/hr_employee_badge.xml',
         'views/hr_department_view.xml',
         'views/hr_employee_view.xml',
-        'views/attendance_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
     ],
     'demo': [
         'data/hr_attendance_demo.xml'

addons/hr_attendance/models/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from . import attendance_config_settings
+from . import res_config_settings
 from . import hr_attendance
 from . import hr_employee

addons/hr_attendance/models/res_config_settings.py

@@ -4,7 +4,7 @@
 from odoo import fields, models
 
 
-class BaseConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     group_attendance_use_pin = fields.Boolean(string='Employee PIN',

addons/hr_attendance/views/res_config_settings_views.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <record id="hr_attendance_view_config" model="ir.ui.view">
-        <field name="name">attendance.config.settings.hr.form.attendance</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.hr.attendance</field>
         <field name="model">res.config.settings</field>
         <field name="priority" eval="16"/>
-        <field name="inherit_id" ref="base.res_config_setting_form"/>
+        <field name="inherit_id" ref="base.res_config_settings_view_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[hasclass('settings')]" position="inside">
                     <div class="app_settings_block" data-string="Attendances" data-key="hr_attendance" groups="hr_attendance.group_hr_attendance_manager">

addons/hr_expense/__manifest__.py

@@ -39,7 +39,7 @@ This module also uses analytic accounting and is compatible with the invoice on
         'report/report_expense_sheet.xml',
         'views/hr_dashboard.xml',
         'views/hr_expense.xml',
-        'views/hr_expense_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'data/web_planner_data.xml',
     ],
     'demo': ['data/hr_expense_demo.xml'],

addons/hr_expense/models/__init__.py

@@ -4,5 +4,5 @@ from . import account_move_line
 from . import hr_department
 from . import hr_expense
 from . import product_template
-from . import hr_expense_config_settings
+from . import res_config_settings
 from . import web_planner

addons/hr_expense/models/res_config_settings.py

@@ -3,7 +3,7 @@
 from odoo import api, fields, models
 
 
-class HrExpenseConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     alias_prefix = fields.Char('Default Alias Name for Expenses')
@@ -13,7 +13,7 @@ class HrExpenseConfigSettings(models.TransientModel):
 
     @api.model
     def get_values(self):
-        res = super(HrExpenseConfigSettings, self).get_values()
+        res = super(ResConfigSettings, self).get_values()
         res.update(
             alias_prefix=self.env.ref('hr_expense.mail_alias_expense').alias_name,
             use_mailgateway=self.env['ir.config_parameter'].sudo().get_param('hr_expense.use_mailgateway'),
@@ -22,7 +22,7 @@ class HrExpenseConfigSettings(models.TransientModel):
 
     @api.multi
     def set_values(self):
-        super(HrExpenseConfigSettings, self).set_values()
+        super(ResConfigSettings, self).set_values()
         self.env.ref('hr_expense.mail_alias_expense').write({'alias_name': self.alias_prefix})
         self.env['ir.config_parameter'].sudo().set_param('hr_expense.use_mailgateway', self.use_mailgateway)
 

addons/hr_expense/views/res_config_settings_views.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data>
-        <record id="hr_expense_config_setting_view_form" model="ir.ui.view">
-            <field name="name">hr.expense.config.settings.form</field>
+        <record id="res_config_settings_view_form" model="ir.ui.view">
+            <field name="name">res.config.settings.view.form.inherit.hr.expense</field>
             <field name="model">res.config.settings</field>
             <field name="priority" eval="17"/>
-            <field name="inherit_id" ref="base.res_config_setting_form"/>
+            <field name="inherit_id" ref="base.res_config_settings_view_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[hasclass('settings')]" position="inside">
                     <div class="app_settings_block" data-string="Expense" data-key="hr_expense" groups="hr_expense.group_hr_expense_manager">

addons/hr_payroll/__manifest__.py

@@ -25,7 +25,7 @@
         'views/hr_payroll_report.xml',
         'data/hr_payroll_data.xml',
         'wizard/hr_payroll_contribution_register_report_views.xml',
-        'views/hr_payroll_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'views/report_contributionregister_templates.xml',
         'views/report_payslip_templates.xml',
         'views/report_payslipdetails_templates.xml',

addons/hr_payroll/models/__init__.py

@@ -3,6 +3,6 @@
 
 from . import hr_contract
 from . import hr_employee
-from . import hr_payroll_config_settings
+from . import res_config_settings
 from . import hr_salary_rule
 from . import hr_payslip

addons/hr_payroll/models/res_config_settings.py

@@ -4,7 +4,7 @@
 from odoo import fields, models
 
 
-class HrPayrollConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     module_account_accountant = fields.Boolean(string='Account Accountant')

addons/hr_payroll/views/res_config_settings_views.xml

@@ -8,11 +8,11 @@
             <field name="search_view_id" ref="base.view_module_filter"/>
         </record>
 
-        <record id="view_hr_payroll_configuration" model="ir.ui.view">
-            <field name="name">Configure Payroll</field>
+        <record id="res_config_settings_view_form" model="ir.ui.view">
+            <field name="name">res.config.settings.view.form.inherit.hr.payroll</field>
             <field name="model">res.config.settings</field>
             <field name="priority" eval="9"/>
-            <field name="inherit_id" ref="base.res_config_setting_form"/>
+            <field name="inherit_id" ref="base.res_config_settings_view_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[hasclass('settings')]" position="inside">
                     <div class="app_settings_block" data-string="Payroll" data-key="hr_payroll" groups="hr_payroll.group_hr_payroll_manager">

addons/hr_recruitment/__manifest__.py

@@ -22,7 +22,7 @@
         'security/ir.model.access.csv',
         'data/hr_recruitment_data.xml',
         'views/hr_recruitment_views.xml',
-        'views/hr_recruitment_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'views/hr_recruitment_templates.xml',
         'views/hr_department_views.xml',
         'views/hr_job_views.xml',

addons/hr_recruitment/models/__init__.py

@@ -2,5 +2,5 @@ from . import hr_department
 from . import hr_recruitment
 from . import hr_employee
 from . import hr_job
-from . import hr_recruitment_config_settings
+from . import res_config_settings
 from . import calendar

addons/hr_recruitment/models/res_config_settings.py

@@ -4,7 +4,7 @@
 from odoo import fields, models
 
 
-class RecruitmentSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = ['res.config.settings']
 
     module_website_hr_recruitment = fields.Boolean(string='Online Posting')

addons/hr_recruitment/views/res_config_settings_views.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data>
-        <record id="hr_recruitment_config_settings_view_form" model="ir.ui.view">
-            <field name="name">hr.recruitment.config.settings.form</field>
+        <record id="res_config_settings_view_form" model="ir.ui.view">
+            <field name="name">res.config.settings.view.form.inherit.hr.recruitment</field>
             <field name="model">res.config.settings</field>
             <field name="priority" eval="15"/>
-            <field name="inherit_id" ref="base.res_config_setting_form"/>
+            <field name="inherit_id" ref="base.res_config_settings_view_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[hasclass('settings')]" position="inside">
                     <div class="app_settings_block" data-string="Recruitment" data-key="hr_recruitment" groups="hr_recruitment.group_hr_recruitment_manager">

addons/hr_recruitment_survey/__manifest__.py

@@ -16,7 +16,7 @@
         'data/survey_survey_data.xml',
         'views/hr_job_views.xml',
         'views/hr_applicant_views.xml',
-        'views/hr_recruitment_config_setting_views.xml',
+        'views/res_config_setting_views.xml',
     ],
     'demo': [
         'data/hr_job_demo.xml',

addons/hr_recruitment_survey/views/res_config_setting_views.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <record id="hr_recruitment_config_settings_view_form_inherit_survey" model="ir.ui.view">
-        <field name="name">hr.recruitment.config.settings.inherit.recruitment.survey</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.hr.recruitment.survey</field>
         <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="hr_recruitment.hr_recruitment_config_settings_view_form"/>
+        <field name="inherit_id" ref="hr_recruitment.res_config_settings_view_form"/>
         <field name="arch" type="xml">
             <div id="interview_forms" position="replace">
                 <div class="content-group">

addons/hr_timesheet/__manifest__.py

@@ -25,7 +25,7 @@ up a management by affair.
         'security/hr_timesheet_security.xml',
         'security/ir.model.access.csv',
         'views/hr_timesheet_views.xml',
-        'views/hr_timesheet_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'views/project_views.xml',
         'views/project_portal_templates.xml',
         'report/hr_timesheet_report_view.xml',

addons/hr_timesheet/models/__init__.py

@@ -2,5 +2,5 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from . import hr_timesheet
-from . import hr_timesheet_config_settings
+from . import res_config_settings
 from . import project

addons/hr_timesheet/models/res_config_settings.py

@@ -4,7 +4,7 @@
 from odoo import fields, models
 
 
-class HrTimesheetConfiguration(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     module_project_timesheet_synchro = fields.Boolean("Awesome Timesheet")

addons/hr_timesheet/views/res_config_settings_views.xml

@@ -3,11 +3,11 @@
     <menuitem id="hr_timesheet_menu_configuration" name="Configuration" parent="timesheet_menu_root"
         groups="group_timesheet_manager" sequence="100"/>
 
-    <record id="hr_timesheet_config_settings_view_form" model="ir.ui.view">
-        <field name="name">hr.timesheet.config.settings.view.form</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.hr.timesheet</field>
         <field name="model">res.config.settings</field>
         <field name="priority" eval="11"/>
-        <field name="inherit_id" ref="base.res_config_setting_form"/>
+        <field name="inherit_id" ref="base.res_config_settings_view_form"/>
         <field name="arch" type="xml">
             <xpath expr="//div[hasclass('settings')]" position="inside">
                 <div class="app_settings_block" data-string="Timesheets" data-key="hr_timesheet" groups="hr_timesheet.group_timesheet_manager">

addons/l10n_be_hr_payroll_fleet/__manifest__.py

@@ -9,7 +9,7 @@
     """,
     'data': [
         'views/fleet_views.xml',
-        'views/fleet_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'views/hr_contract_views.xml',
     ],
     'auto_install': True,

addons/l10n_be_hr_payroll_fleet/models/__init__.py

@@ -2,5 +2,5 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from . import fleet
-from . import fleet_config_settings
+from . import res_config_settings
 from . import hr_contract

addons/l10n_be_hr_payroll_fleet/models/res_config_settings.py

@@ -4,19 +4,19 @@
 from odoo import api, fields, models
 
 
-class FleetConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = ['res.config.settings']
 
     max_unused_cars = fields.Integer(string='Maximum unused cars')
 
     def set_values(self):
-        super(FleetConfigSettings, self).set_values()
+        super(ResConfigSettings, self).set_values()
         Param = self.env['ir.config_parameter'].sudo()
         Param.set_param("l10n_be_hr_payroll_fleet.max_unused_cars", self.max_unused_cars)
 
     @api.model
     def get_values(self):
-        res = super(FleetConfigSettings, self).get_values()
+        res = super(ResConfigSettings, self).get_values()
         params = self.env['ir.config_parameter'].sudo()
         res.update(max_unused_cars=int(params.get_param('l10n_be_hr_payroll_fleet.max_unused_cars', default=3)))
         return res

addons/l10n_be_hr_payroll_fleet/views/res_config_settings_views.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data>
-        <record id="fleet_config_settings_view_form" model="ir.ui.view">
-            <field name="name">fleet.config.settings.form</field>
+        <record id="res_config_settings_view_form" model="ir.ui.view">
+            <field name="name">res.config.settings.view.form.inherit.l10n.be.hr.payroll.fleet</field>
             <field name="model">res.config.settings</field>
             <field name="priority" eval="18"/>
-            <field name="inherit_id" ref="base.res_config_setting_form"/>
+            <field name="inherit_id" ref="base.res_config_settings_view_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[hasclass('settings')]" position="inside">
                     <div class="app_settings_block" data-string="Fleet" data-key="fleet" groups="fleet.fleet_group_manager">

addons/l10n_ch/__manifest__.py

@@ -40,7 +40,7 @@ Here is how it works:
         'report/isr_report.xml',
         'views/res_bank_view.xml',
         'views/account_invoice_view.xml',
-        'views/account_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
     ],
 
     'demo': [

addons/l10n_ch/models/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from . import account_config_settings
+from . import res_config_settings
 from . import account_invoice
 from . import mail_compose_message
 from . import mail_template

addons/l10n_ch/models/res_config_settings.py

@@ -4,7 +4,7 @@
 from odoo import fields, models
 
 
-class AccountConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     l10n_ch_isr_print_bank_location = fields.Boolean(string="Print bank on ISR",

addons/l10n_ch/views/res_config_settings_views.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data>
-        <record id="l10n_ch-isr_account_config_settings" model="ir.ui.view">
-            <field name="name">l10n_ch.isr.config.settings.form</field>
+        <record id="res_config_settings_view_form" model="ir.ui.view">
+            <field name="name">res.config.settings.view.form.inherit.l10n.ch</field>
             <field name="model">res.config.settings</field>
-            <field name="inherit_id" ref="account.account_config_settings_view_form"/>
+            <field name="inherit_id" ref="account.res_config_settings_view_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@id='accounting_reports']" position="inside">
                     <div class="col-xs-12 col-md-6 o_setting_box" id="l10n_ch-isr_print_bank">

addons/l10n_eu_service/__manifest__.py

@@ -57,6 +57,6 @@ References
         'security/ir.model.access.csv',
         'wizard/wizard.xml',
         'data/l10n_eu_service.service_tax_rate.csv',
-        'views/account_settings_config_views.xml'
+        'views/res_config_settings_views.xml'
     ],
 }

addons/l10n_eu_service/views/res_config_settings_views.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <record id="account_config_settings_view_form" model="ir.ui.view">
-        <field name="name">account.config.settings.form</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.l10n.eu.service</field>
         <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="account.account_config_settings_view_form"/>
+        <field name="inherit_id" ref="account.res_config_settings_view_form"/>
         <field name="arch" type="xml">
             <div name="l10n_eu_service_right_pane" position="inside">
                 <div class="content-group" attrs="{'invisible': [('module_l10n_eu_service', '=', False)]}">

addons/l10n_fr_hr_payroll/__manifest__.py

@@ -28,7 +28,7 @@ TODO:
     'data': [
         'data/l10n_fr_hr_payroll_data.xml',
         'views/l10n_fr_hr_payroll_view.xml',
-        'views/l10n_fr_hr_payroll_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'report/report_l10n_fr_fiche_paye.xml',
         'report/l10n_fr_hr_payroll_report.xml',
     ],

addons/l10n_fr_hr_payroll/models/__init__.py

@@ -2,4 +2,4 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from . import l10n_fr_hr_payroll
-from . import l10n_fr_hr_payroll_config_settings
+from . import res_config_settings