[MOV] *: Reorganize configuration files according to guidelines

123 files changed, 90 insertions, 80 deletions

diff --git a/addons/account/__manifest__.py b/addons/account/__manifest__.py
index fd56de27e03..d2860d183d0 100644
--- a/addons/account/__manifest__.py
+++ b/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/res_config_view.xml',
+        'views/account_config_settings_views.xml',
         'views/web_planner_data.xml',
         'views/account_journal_dashboard_view.xml',
         'report/account_report_payment_receipt_templates.xml',
diff --git a/addons/account/models/__init__.py b/addons/account/models/__init__.py
index b96da81cb4b..440f89134bf 100644
--- a/addons/account/models/__init__.py
+++ b/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 res_config
+from . import account_config_settings
 from . import web_planner
diff --git a/addons/account/models/res_config.py b/addons/account/models/account_config_settings.py
index 5f8f83826ef..5f8f83826ef 100644
--- a/addons/account/models/res_config.py
+++ b/addons/account/models/account_config_settings.py
diff --git a/addons/account/views/res_config_view.xml b/addons/account/views/account_config_settings_views.xml
index c3626626056..c3626626056 100644
--- a/addons/account/views/res_config_view.xml
+++ b/addons/account/views/account_config_settings_views.xml
diff --git a/addons/account_accountant/__manifest__.py b/addons/account_accountant/__manifest__.py
index d9f442828b4..79d4f92dacb 100644
--- a/addons/account_accountant/__manifest__.py
+++ b/addons/account_accountant/__manifest__.py
@@ -19,7 +19,7 @@ It assigns manager and user access rights to the Administrator for the accountin
         'data/account_accountant_data.xml',
         'security/account_accountant_security.xml',
         'views/account_accountant_templates.xml',
-        'views/res_config_view.xml',
+        'views/account_config_settings_views.xml',
         'views/product_views.xml',
     ],
     'demo': ['data/account_accountant_demo.xml'],
diff --git a/addons/account_accountant/models/__init__.py b/addons/account_accountant/models/__init__.py
index c9d3ea6ad49..cdb5588b96c 100644
--- a/addons/account_accountant/models/__init__.py
+++ b/addons/account_accountant/models/__init__.py
@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from . import res_config
+from . import account_config_settings
diff --git a/addons/account_accountant/models/res_config.py b/addons/account_accountant/models/account_config_settings.py
index 3059bbd2d93..3059bbd2d93 100644
--- a/addons/account_accountant/models/res_config.py
+++ b/addons/account_accountant/models/account_config_settings.py
diff --git a/addons/account_accountant/views/res_config_view.xml b/addons/account_accountant/views/account_config_settings_views.xml
index 818db791472..818db791472 100644
--- a/addons/account_accountant/views/res_config_view.xml
+++ b/addons/account_accountant/views/account_config_settings_views.xml
diff --git a/addons/account_analytic_default/__manifest__.py b/addons/account_analytic_default/__manifest__.py
index f16196f24e5..e41e554f1ea 100644
--- a/addons/account_analytic_default/__manifest__.py
+++ b/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/res_config_view.xml',
+        'views/account_config_settings_views.xml',
     ],
     'installable': True,
 }
diff --git a/addons/account_analytic_default/views/res_config_view.xml b/addons/account_analytic_default/views/account_config_settings_views.xml
index b7b92a32926..b7b92a32926 100644
--- a/addons/account_analytic_default/views/res_config_view.xml
+++ b/addons/account_analytic_default/views/account_config_settings_views.xml
diff --git a/addons/account_asset/__manifest__.py b/addons/account_asset/__manifest__.py
index f59459d9a92..bc9aa5f13c3 100644
--- a/addons/account_asset/__manifest__.py
+++ b/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/res_config_view.xml',
+        'views/account_config_settings_views.xml',
         'report/account_asset_report_views.xml',
         'data/account_asset_data.xml',
     ],
diff --git a/addons/account_asset/views/res_config_view.xml b/addons/account_asset/views/account_config_settings_views.xml
index ecdaf929538..ecdaf929538 100644
--- a/addons/account_asset/views/res_config_view.xml
+++ b/addons/account_asset/views/account_config_settings_views.xml
diff --git a/addons/account_budget/__manifest__.py b/addons/account_budget/__manifest__.py
index 343f900d066..fd839a6dfd9 100644
--- a/addons/account_budget/__manifest__.py
+++ b/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/res_config_view.xml',
+        'views/account_config_settings_views.xml',
     ],
     'demo': ['data/account_budget_demo.xml'],
 }
diff --git a/addons/account_budget/views/res_config_view.xml b/addons/account_budget/views/account_config_settings_views.xml
index f48dedb7f98..f48dedb7f98 100644
--- a/addons/account_budget/views/res_config_view.xml
+++ b/addons/account_budget/views/account_config_settings_views.xml
diff --git a/addons/auth_oauth/__manifest__.py b/addons/auth_oauth/__manifest__.py
index b6f8805dedc..d6ab043d07e 100644
--- a/addons/auth_oauth/__manifest__.py
+++ b/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/res_config_views.xml',
+        'views/base_config_settings_views.xml',
         'views/auth_oauth_templates.xml',
         'security/ir.model.access.csv',
     ],
diff --git a/addons/auth_oauth/models/__init__.py b/addons/auth_oauth/models/__init__.py
index 64bbaa4e3d4..9b02f6dc910 100644
--- a/addons/auth_oauth/models/__init__.py
+++ b/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 ir_config_parameter
-from . import res_config
 from . import res_users
diff --git a/addons/auth_oauth/models/res_config.py b/addons/auth_oauth/models/base_config_settings.py
index 20784bd9d18..20784bd9d18 100644
--- a/addons/auth_oauth/models/res_config.py
+++ b/addons/auth_oauth/models/base_config_settings.py
diff --git a/addons/auth_oauth/views/res_config_views.xml b/addons/auth_oauth/views/base_config_settings_views.xml
index 0bc57df9127..0bc57df9127 100644
--- a/addons/auth_oauth/views/res_config_views.xml
+++ b/addons/auth_oauth/views/base_config_settings_views.xml
diff --git a/addons/auth_signup/__manifest__.py b/addons/auth_signup/__manifest__.py
index 9b59ad0ad63..d2cd094be1a 100644
--- a/addons/auth_signup/__manifest__.py
+++ b/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/res_config_views.xml',
+        'views/base_config_settings_views.xml',
         'views/res_users_views.xml',
         'views/auth_signup_login_templates.xml',
     ],
diff --git a/addons/auth_signup/models/__init__.py b/addons/auth_signup/models/__init__.py
index 1c34c9b408b..fb8aab1c50d 100644
--- a/addons/auth_signup/models/__init__.py
+++ b/addons/auth_signup/models/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from . import res_config
-from . import res_users
+from . import base_config_settings
 from . import res_partner
+from . import res_users
diff --git a/addons/auth_signup/models/res_config.py b/addons/auth_signup/models/base_config_settings.py
index c8b4342443c..c8b4342443c 100644
--- a/addons/auth_signup/models/res_config.py
+++ b/addons/auth_signup/models/base_config_settings.py
diff --git a/addons/auth_signup/views/res_config_views.xml b/addons/auth_signup/views/base_config_settings_views.xml
index 23c2b1f7608..23c2b1f7608 100644
--- a/addons/auth_signup/views/res_config_views.xml
+++ b/addons/auth_signup/views/base_config_settings_views.xml
diff --git a/addons/base_gengo/__manifest__.py b/addons/base_gengo/__manifest__.py
index b741dc5b76e..688be3ecaff 100644
--- a/addons/base_gengo/__manifest__.py
+++ b/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/res_config_views.xml',
+        'views/base_config_settings_views.xml',
         'wizard/base_gengo_translations_view.xml',
     ],
     'demo': ['data/res_company_demo.xml'],
diff --git a/addons/base_gengo/models/__init__.py b/addons/base_gengo/models/__init__.py
index 7005fe4f9df..a3afdeaac10 100644
--- a/addons/base_gengo/models/__init__.py
+++ b/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 ir_translation
 from . import res_company
-from . import res_config
diff --git a/addons/base_gengo/models/res_config.py b/addons/base_gengo/models/base_config_settings.py
index e7b0031b98d..e7b0031b98d 100644
--- a/addons/base_gengo/models/res_config.py
+++ b/addons/base_gengo/models/base_config_settings.py
diff --git a/addons/base_gengo/views/res_config_views.xml b/addons/base_gengo/views/base_config_settings_views.xml
index 66546b2d1e5..66546b2d1e5 100644
--- a/addons/base_gengo/views/res_config_views.xml
+++ b/addons/base_gengo/views/base_config_settings_views.xml
diff --git a/addons/base_setup/__manifest__.py b/addons/base_setup/__manifest__.py
index 74310b9625f..b6b900ad03a 100644
--- a/addons/base_setup/__manifest__.py
+++ b/addons/base_setup/__manifest__.py
@@ -13,7 +13,7 @@ Shows you a list of applications features to install from.
     """,
     'depends': ['base', 'web'],
     'data': [
-        'views/res_config_views.xml',
+        'views/base_config_settings_views.xml',
         'views/res_partner_views.xml',
     ],
     'demo': [],
diff --git a/addons/base_setup/models/__init__.py b/addons/base_setup/models/__init__.py
index 45cc40bf798..d43ed2fd84b 100644
--- a/addons/base_setup/models/__init__.py
+++ b/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 res_config
+from . import base_config_settings
 
diff --git a/addons/base_setup/models/res_config.py b/addons/base_setup/models/base_config_settings.py
index c1a0076957c..c1a0076957c 100644
--- a/addons/base_setup/models/res_config.py
+++ b/addons/base_setup/models/base_config_settings.py
diff --git a/addons/base_setup/views/res_config_views.xml b/addons/base_setup/views/base_config_settings_views.xml
index 6d4f9277de1..6d4f9277de1 100644
--- a/addons/base_setup/views/res_config_views.xml
+++ b/addons/base_setup/views/base_config_settings_views.xml
diff --git a/addons/base_vat/__manifest__.py b/addons/base_vat/__manifest__.py
index 1137585b4b9..858ebecac2b 100644
--- a/addons/base_vat/__manifest__.py
+++ b/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/res_config_view.xml',
+        'views/account_config_settings_views.xml',
     ],
 }
diff --git a/addons/base_vat/models/__init__.py b/addons/base_vat/models/__init__.py
index cd202586594..ec161810deb 100644
--- a/addons/base_vat/models/__init__.py
+++ b/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_company
 from . import res_partner
-from . import res_config
diff --git a/addons/base_vat/models/res_config.py b/addons/base_vat/models/account_config_settings.py
index 057ec7636a7..057ec7636a7 100644
--- a/addons/base_vat/models/res_config.py
+++ b/addons/base_vat/models/account_config_settings.py
diff --git a/addons/base_vat/views/res_config_view.xml b/addons/base_vat/views/account_config_settings_views.xml
index 73ed1ea90f9..73ed1ea90f9 100644
--- a/addons/base_vat/views/res_config_view.xml
+++ b/addons/base_vat/views/account_config_settings_views.xml
diff --git a/addons/crm/__manifest__.py b/addons/crm/__manifest__.py
index 4af5476bbbd..03347c312ed 100644
--- a/addons/crm/__manifest__.py
+++ b/addons/crm/__manifest__.py
@@ -64,7 +64,7 @@ Dashboard for CRM will include:
         'views/crm_lead_views.xml',
         'views/calendar_views.xml',
         'views/res_partner_views.xml',
-        'views/res_config_views.xml',
+        'views/sale_config_settings_views.xml',
         'views/crm_team_views.xml',
     ],
     'demo': [
diff --git a/addons/crm/models/__init__.py b/addons/crm/models/__init__.py
index ded1cea026e..8059e38d8b8 100644
--- a/addons/crm/models/__init__.py
+++ b/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 res_config
+from . import sale_config_settings
 from . import res_partner
 from . import web_planner
diff --git a/addons/crm/models/res_config.py b/addons/crm/models/sale_config_settings.py
index 2d2324bc29e..2d2324bc29e 100644
--- a/addons/crm/models/res_config.py
+++ b/addons/crm/models/sale_config_settings.py
diff --git a/addons/crm/views/res_config_views.xml b/addons/crm/views/sale_config_settings_views.xml
index d6ed8df62df..d6ed8df62df 100644
--- a/addons/crm/views/res_config_views.xml
+++ b/addons/crm/views/sale_config_settings_views.xml
diff --git a/addons/google_calendar/__manifest__.py b/addons/google_calendar/__manifest__.py
index 3a722b9d923..b933743351d 100644
--- a/addons/google_calendar/__manifest__.py
+++ b/addons/google_calendar/__manifest__.py
@@ -16,7 +16,7 @@ The module adds the possibility to synchronize Google Calendar with Odoo
         'data/google_calendar_data.xml',
         'data/google_calendar_data.xml',
         'security/ir.model.access.csv',
-        'views/res_config_views.xml',
+        'views/base_config_settings_views.xml',
         'views/res_users_views.xml',
         'views/google_calendar_templates.xml',
     ],
diff --git a/addons/google_calendar/models/__init__.py b/addons/google_calendar/models/__init__.py
index 23cba3b99b3..28d5732446b 100644
--- a/addons/google_calendar/models/__init__.py
+++ b/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 calendar
-from . import res_users
 from . import google_calendar
-from . import res_config
+from . import res_users
diff --git a/addons/google_calendar/models/res_config.py b/addons/google_calendar/models/base_config_settings.py
index 3c4f0a686bf..3c4f0a686bf 100644
--- a/addons/google_calendar/models/res_config.py
+++ b/addons/google_calendar/models/base_config_settings.py
diff --git a/addons/google_calendar/views/res_config_views.xml b/addons/google_calendar/views/base_config_settings_views.xml
index 6653c9ba3cd..6653c9ba3cd 100644
--- a/addons/google_calendar/views/res_config_views.xml
+++ b/addons/google_calendar/views/base_config_settings_views.xml
diff --git a/addons/google_drive/__manifest__.py b/addons/google_drive/__manifest__.py
index c41ed3a4f7b..296b46c317c 100644
--- a/addons/google_drive/__manifest__.py
+++ b/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/res_config_views.xml',
+        'views/base_config_settings_views.xml',
     ],
     'demo': [
         'data/google_drive_demo.xml'
diff --git a/addons/google_drive/models/__init__.py b/addons/google_drive/models/__init__.py
index e0a4cc5dc12..288b7b7fbac 100644
--- a/addons/google_drive/models/__init__.py
+++ b/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 google_drive
-from . import res_config
diff --git a/addons/google_drive/models/res_config.py b/addons/google_drive/models/base_config_settings.py
index fba3f8ec9f1..fba3f8ec9f1 100644
--- a/addons/google_drive/models/res_config.py
+++ b/addons/google_drive/models/base_config_settings.py
diff --git a/addons/google_drive/views/res_config_views.xml b/addons/google_drive/views/base_config_settings_views.xml
index 44b70a9d9c3..44b70a9d9c3 100644
--- a/addons/google_drive/views/res_config_views.xml
+++ b/addons/google_drive/views/base_config_settings_views.xml
diff --git a/addons/hr_attendance/__manifest__.py b/addons/hr_attendance/__manifest__.py
index cf373096622..bc36a7d4f5d 100644
--- a/addons/hr_attendance/__manifest__.py
+++ b/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/res_config_view.xml',
+        'views/attendance_config_settings_views.xml',
     ],
     'demo': [
         'data/hr_attendance_demo.xml'
diff --git a/addons/hr_attendance/models/__init__.py b/addons/hr_attendance/models/__init__.py
index a94d4f20a38..94f3e8714a7 100644
--- a/addons/hr_attendance/models/__init__.py
+++ b/addons/hr_attendance/models/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 
+from . import attendance_config_settings
 from . import hr_attendance
 from . import hr_employee
-from . import res_config
diff --git a/addons/hr_attendance/models/res_config.py b/addons/hr_attendance/models/attendance_config_settings.py
index ca13339cbcf..ca13339cbcf 100644
--- a/addons/hr_attendance/models/res_config.py
+++ b/addons/hr_attendance/models/attendance_config_settings.py
diff --git a/addons/hr_attendance/views/res_config_view.xml b/addons/hr_attendance/views/attendance_config_settings_views.xml
index b8c11252fbf..b8c11252fbf 100644
--- a/addons/hr_attendance/views/res_config_view.xml
+++ b/addons/hr_attendance/views/attendance_config_settings_views.xml
diff --git a/addons/hr_expense/__manifest__.py b/addons/hr_expense/__manifest__.py
index 114200460a1..17932b55a18 100644
--- a/addons/hr_expense/__manifest__.py
+++ b/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/res_config_views.xml',
+        'views/hr_expense_config_settings_views.xml',
         'data/web_planner_data.xml',
     ],
     'demo': ['data/hr_expense_demo.xml'],
diff --git a/addons/hr_expense/models/__init__.py b/addons/hr_expense/models/__init__.py
index 103a41b283d..aa63806bf9d 100644
--- a/addons/hr_expense/models/__init__.py
+++ b/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 res_config
+from . import hr_expense_config_settings
 from . import web_planner
diff --git a/addons/hr_expense/models/res_config.py b/addons/hr_expense/models/hr_expense_config_settings.py
index 21da58f7acc..21da58f7acc 100644
--- a/addons/hr_expense/models/res_config.py
+++ b/addons/hr_expense/models/hr_expense_config_settings.py
diff --git a/addons/hr_expense/views/res_config_views.xml b/addons/hr_expense/views/hr_expense_config_settings_views.xml
index 19078d6071c..19078d6071c 100644
--- a/addons/hr_expense/views/res_config_views.xml
+++ b/addons/hr_expense/views/hr_expense_config_settings_views.xml
diff --git a/addons/hr_timesheet/__manifest__.py b/addons/hr_timesheet/__manifest__.py
index e10aaad1c90..51eb66b03ae 100644
--- a/addons/hr_timesheet/__manifest__.py
+++ b/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/res_config_views.xml',
+        'views/hr_timesheet_config_settings_views.xml',
         'views/project_views.xml',
         'report/hr_timesheet_report_view.xml',
         'report/report_timesheet_templates.xml',
diff --git a/addons/hr_timesheet/models/__init__.py b/addons/hr_timesheet/models/__init__.py
index 5dd4c7fb37d..a07ab14a3dc 100644
--- a/addons/hr_timesheet/models/__init__.py
+++ b/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 res_config
+from . import hr_timesheet_config_settings
 from . import project
diff --git a/addons/hr_timesheet/models/res_config.py b/addons/hr_timesheet/models/hr_timesheet_config_settings.py
index b61c745012a..b61c745012a 100644
--- a/addons/hr_timesheet/models/res_config.py
+++ b/addons/hr_timesheet/models/hr_timesheet_config_settings.py
diff --git a/addons/hr_timesheet/views/res_config_views.xml b/addons/hr_timesheet/views/hr_timesheet_config_settings_views.xml
index 9377b3359db..9377b3359db 100644
--- a/addons/hr_timesheet/views/res_config_views.xml
+++ b/addons/hr_timesheet/views/hr_timesheet_config_settings_views.xml
diff --git a/addons/l10n_ch/__manifest__.py b/addons/l10n_ch/__manifest__.py
index f2d4b5c0b32..fc73908ddc5 100644
--- a/addons/l10n_ch/__manifest__.py
+++ b/addons/l10n_ch/__manifest__.py
@@ -39,7 +39,7 @@ Here is how it works:
         'report/isr_report.xml',
         'views/res_bank_view.xml',
         'views/account_invoice_view.xml',
-        'views/res_config_view.xml',
+        'views/account_config_settings_views.xml',
     ],
 
     'demo': [
diff --git a/addons/l10n_ch/models/__init__.py b/addons/l10n_ch/models/__init__.py
index ee8bc390589..0926f969484 100644
--- a/addons/l10n_ch/models/__init__.py
+++ b/addons/l10n_ch/models/__init__.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
+from . import account_config_settings
 from . import account_invoice
 from . import mail_compose_message
 from . import mail_template
 from . import res_bank
 from . import res_company
-from . import res_config
\ No newline at end of file
diff --git a/addons/l10n_ch/models/res_config.py b/addons/l10n_ch/models/account_config_settings.py
index b971335b795..b971335b795 100644
--- a/addons/l10n_ch/models/res_config.py
+++ b/addons/l10n_ch/models/account_config_settings.py
diff --git a/addons/l10n_ch/views/res_config_view.xml b/addons/l10n_ch/views/account_config_settings_views.xml
index f78998f0a43..f78998f0a43 100644
--- a/addons/l10n_ch/views/res_config_view.xml
+++ b/addons/l10n_ch/views/account_config_settings_views.xml
diff --git a/addons/l10n_mx/__manifest__.py b/addons/l10n_mx/__manifest__.py
index bceba50d3cf..49baf7a72ad 100644
--- a/addons/l10n_mx/__manifest__.py
+++ b/addons/l10n_mx/__manifest__.py
@@ -40,6 +40,6 @@ With this module you will have:
         "data/account_tax_data.xml",
         "data/fiscal_position_data.xml",
         "data/account_chart_template_data.yml",
-        "views/res_config_view.xml",
+        "views/account_config_settings_views.xml",
     ],
 }
diff --git a/addons/l10n_mx/models/__init__.py b/addons/l10n_mx/models/__init__.py
index f2b298f3cb9..2e34a1305b9 100644
--- a/addons/l10n_mx/models/__init__.py
+++ b/addons/l10n_mx/models/__init__.py
@@ -2,6 +2,6 @@
 # Copyright 2016 Vauxoo (https://www.vauxoo.com) <info@vauxoo.com>
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
 
-from . import chart_template
 from . import account
-from . import res_config
+from . import account_config_settings
+from . import chart_template
diff --git a/addons/l10n_mx/models/res_config.py b/addons/l10n_mx/models/account_config_settings.py
index 913a422cf4b..aa24e02a747 100644
--- a/addons/l10n_mx/models/res_config.py
+++ b/addons/l10n_mx/models/account_config_settings.py
@@ -4,6 +4,6 @@ from odoo import fields, models
 
 
 class AccountConfigSettings(models.TransientModel):
-    _inherit = 'res.config.settings'
+    _inherit = 'account.config.settings'
 
     module_l10n_mx_edi = fields.Boolean('Mexican Electronic Invoicing')
diff --git a/addons/l10n_mx/views/res_config_view.xml b/addons/l10n_mx/views/account_config_settings_views.xml
index d5f59f6937f..d5f59f6937f 100644
--- a/addons/l10n_mx/views/res_config_view.xml
+++ b/addons/l10n_mx/views/account_config_settings_views.xml
diff --git a/addons/mail/__manifest__.py b/addons/mail/__manifest__.py
index c68b3ee7e16..fc1ceb6dedc 100644
--- a/addons/mail/__manifest__.py
+++ b/addons/mail/__manifest__.py
@@ -37,7 +37,7 @@ Main Features
         'views/mail_channel_views.xml',
         'views/mail_shortcode_views.xml',
         'views/mail_activity_views.xml',
-        'views/res_config_views.xml',
+        'views/base_config_settings_views.xml',
         'data/mail_data.xml',
         'data/mail_channel_data.xml',
         'data/mail_shortcode_data.xml',
diff --git a/addons/mail/models/__init__.py b/addons/mail/models/__init__.py
index f0fbe714fbf..1005d2527e0 100644
--- a/addons/mail/models/__init__.py
+++ b/addons/mail/models/__init__.py
@@ -14,7 +14,7 @@ from . import mail_template
 from . import mail_shortcode
 from . import res_partner
 from . import res_users
-from . import res_config
+from . import base_config_settings
 from . import update
 from . import ir_actions
 from . import ir_autovacuum
diff --git a/addons/mail/models/res_config.py b/addons/mail/models/base_config_settings.py
index c0e4f6bab62..c0e4f6bab62 100644
--- a/addons/mail/models/res_config.py
+++ b/addons/mail/models/base_config_settings.py
diff --git a/addons/mail/views/res_config_views.xml b/addons/mail/views/base_config_settings_views.xml
index 732b7df0497..732b7df0497 100644
--- a/addons/mail/views/res_config_views.xml
+++ b/addons/mail/views/base_config_settings_views.xml
diff --git a/addons/mass_mailing/__manifest__.py b/addons/mass_mailing/__manifest__.py
index c391a611fb0..3ba6b0811b6 100644
--- a/addons/mass_mailing/__manifest__.py
+++ b/addons/mass_mailing/__manifest__.py
@@ -30,7 +30,7 @@ professional emails and reuse templates in a few clicks.
         'views/link_tracker_views.xml',
         'views/mass_mailing_template.xml',
         'views/mass_mailing_views.xml',
-        'views/res_config_views.xml',
+        'views/mass_mailing_config_settings_views.xml',
         'security/ir.model.access.csv',
         'views/editor_field_html.xml',
         'views/themes_templates.xml',
diff --git a/addons/mass_mailing/models/__init__.py b/addons/mass_mailing/models/__init__.py
index 06f5f05cff3..a04c0c665f6 100644
--- a/addons/mass_mailing/models/__init__.py
+++ b/addons/mass_mailing/models/__init__.py
@@ -5,6 +5,6 @@ from . import mass_mailing
 from . import mass_mailing_stats
 from . import mail_mail
 from . import mail_thread
-from . import res_config
+from . import mass_mailing_config_settings
 from . import mass_mailing_report
 from . import link_tracker
diff --git a/addons/mass_mailing/models/res_config.py b/addons/mass_mailing/models/mass_mailing_config_settings.py
index c22bec90e93..c22bec90e93 100644
--- a/addons/mass_mailing/models/res_config.py
+++ b/addons/mass_mailing/models/mass_mailing_config_settings.py
diff --git a/addons/mass_mailing/views/res_config_views.xml b/addons/mass_mailing/views/mass_mailing_config_settings_views.xml
index d7164d017d7..d7164d017d7 100644
--- a/addons/mass_mailing/views/res_config_views.xml
+++ b/addons/mass_mailing/views/mass_mailing_config_settings_views.xml
diff --git a/addons/pad/__manifest__.py b/addons/pad/__manifest__.py
index 3d68dcb2233..7781f56c562 100644
--- a/addons/pad/__manifest__.py
+++ b/addons/pad/__manifest__.py
@@ -16,7 +16,7 @@ pads (by default, http://etherpad.com/).
     'depends': ['web', 'base_setup'],
     'data': [
         'views/pad.xml',
-        'views/res_config_view.xml',
+        'views/base_config_settings_views.xml',
     ],
     'demo': ['data/pad_demo.xml'],
     'web': True,
diff --git a/addons/pad/models/__init__.py b/addons/pad/models/__init__.py
index 8d32f68a656..91cef398de7 100644
--- a/addons/pad/models/__init__.py
+++ b/addons/pad/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 pad
 from . import res_company
-from . import res_config
diff --git a/addons/pad/models/res_config.py b/addons/pad/models/base_config_settings.py
index 304ee926358..304ee926358 100644
--- a/addons/pad/models/res_config.py
+++ b/addons/pad/models/base_config_settings.py
diff --git a/addons/pad/views/res_config_view.xml b/addons/pad/views/base_config_settings_views.xml
index 23dc61858e5..23dc61858e5 100644
--- a/addons/pad/views/res_config_view.xml
+++ b/addons/pad/views/base_config_settings_views.xml
diff --git a/addons/point_of_sale/__manifest__.py b/addons/point_of_sale/__manifest__.py
index 2ff4b266761..27d8303c6b1 100644
--- a/addons/point_of_sale/__manifest__.py
+++ b/addons/point_of_sale/__manifest__.py
@@ -56,7 +56,7 @@ Main Features
         'views/account_statement_report.xml',
         'views/res_users_view.xml',
         'views/res_partner_view.xml',
-        'views/res_config_view.xml',
+        'views/pos_config_settings_views.xml',
         'views/report_statement.xml',
         'views/report_userlabel.xml',
         'views/report_saledetails.xml',
diff --git a/addons/point_of_sale/models/__init__.py b/addons/point_of_sale/models/__init__.py
index 4d04c0f9981..9df58f2c5fe 100644
--- a/addons/point_of_sale/models/__init__.py
+++ b/addons/point_of_sale/models/__init__.py
@@ -6,9 +6,9 @@ from . import account_journal
 from . import barcode_rule
 from . import pos_category
 from . import pos_config
+from . import pos_config_settings
 from . import pos_order
 from . import pos_session
 from . import product
-from . import res_config
 from . import res_partner
 from . import res_users
diff --git a/addons/point_of_sale/models/res_config.py b/addons/point_of_sale/models/pos_config_settings.py
index 3121641d7b0..3121641d7b0 100644
--- a/addons/point_of_sale/models/res_config.py
+++ b/addons/point_of_sale/models/pos_config_settings.py
diff --git a/addons/point_of_sale/views/res_config_view.xml b/addons/point_of_sale/views/pos_config_settings_views.xml
index 71b79b54ad1..71b79b54ad1 100644
--- a/addons/point_of_sale/views/res_config_view.xml
+++ b/addons/point_of_sale/views/pos_config_settings_views.xml
diff --git a/addons/project/__manifest__.py b/addons/project/__manifest__.py
index df6cbb01f0f..08f2d23e57c 100644
--- a/addons/project/__manifest__.py
+++ b/addons/project/__manifest__.py
@@ -40,7 +40,7 @@ Dashboard / Reports for Project Management will include:
         'report/project_report_views.xml',
         'views/project_views.xml',
         'views/res_partner_views.xml',
-        'views/res_config_views.xml',
+        'views/project_config_settings_views.xml',
         'views/project_templates.xml',
         'data/web_planner_data.xml',
         'data/project_mail_template_data.xml',
diff --git a/addons/project/models/__init__.py b/addons/project/models/__init__.py
index a8a24d472c2..0b24938aa3e 100644
--- a/addons/project/models/__init__.py
+++ b/addons/project/models/__init__.py
@@ -2,7 +2,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from . import project
+from . import project_config_settings
 from . import res_company
 from . import res_partner
-from . import res_config
 from . import web_planner
diff --git a/addons/project/models/res_config.py b/addons/project/models/project_config_settings.py
index 4f6b6f2f491..4f6b6f2f491 100644
--- a/addons/project/models/res_config.py
+++ b/addons/project/models/project_config_settings.py
diff --git a/addons/project/views/res_config_views.xml b/addons/project/views/project_config_settings_views.xml
index 8ec189d2e02..8ec189d2e02 100644
--- a/addons/project/views/res_config_views.xml
+++ b/addons/project/views/project_config_settings_views.xml
diff --git a/addons/project_timesheet_holidays/__manifest__.py b/addons/project_timesheet_holidays/__manifest__.py
index 73f0ac35342..600bad8b681 100644
--- a/addons/project_timesheet_holidays/__manifest__.py
+++ b/addons/project_timesheet_holidays/__manifest__.py
@@ -15,7 +15,7 @@ on leaves. Project and task can be configured company-wide.
     """,
     'depends': ['hr_timesheet', 'hr_holidays'],
     'data': [
-        'views/res_config_views.xml',
+        'views/hr_timesheet_config_settings_views.xml',
         'views/hr_holidays_views.xml',
     ],
     'demo': [],
diff --git a/addons/project_timesheet_holidays/models/__init__.py b/addons/project_timesheet_holidays/models/__init__.py
index 59576c427c4..26656f63db2 100644
--- a/addons/project_timesheet_holidays/models/__init__.py
+++ b/addons/project_timesheet_holidays/models/__init__.py
@@ -3,5 +3,5 @@
 
 from . import account_analytic
 from . import hr_holidays
+from . import hr_timesheet_config_settings
 from . import res_company
-from . import res_config
diff --git a/addons/project_timesheet_holidays/models/res_config.py b/addons/project_timesheet_holidays/models/hr_timesheet_config_settings.py
index d1603fb007f..d1603fb007f 100644
--- a/addons/project_timesheet_holidays/models/res_config.py
+++ b/addons/project_timesheet_holidays/models/hr_timesheet_config_settings.py
diff --git a/addons/project_timesheet_holidays/views/res_config_views.xml b/addons/project_timesheet_holidays/views/hr_timesheet_config_settings_views.xml
index 5c29c1d31f3..5c29c1d31f3 100644
--- a/addons/project_timesheet_holidays/views/res_config_views.xml
+++ b/addons/project_timesheet_holidays/views/hr_timesheet_config_settings_views.xml
diff --git a/addons/purchase/__manifest__.py b/addons/purchase/__manifest__.py
index 1b68f43f35f..3e3888ca1c5 100644
--- a/addons/purchase/__manifest__.py
+++ b/addons/purchase/__manifest__.py
@@ -40,7 +40,7 @@ Dashboard / Reports for Purchase Management will include:
         'views/res_partner_views.xml',
         'report/purchase_report_views.xml',
         'data/mail_template_data.xml',
-        'views/res_config_views.xml',
+        'views/purchase_config_settings_views.xml',
         'views/account_config_settings_views.xml',
         'report/purchase_order_templates.xml',
         'report/purchase_quotation_templates.xml',
diff --git a/addons/purchase/models/__init__.py b/addons/purchase/models/__init__.py
index 91e0b0ba492..7de7d10071f 100644
--- a/addons/purchase/models/__init__.py
+++ b/addons/purchase/models/__init__.py
@@ -3,8 +3,8 @@
 
 from . import account_invoice
 from . import purchase
-from . import stock_config_settings
+from . import purchase_config_settings
 from . import res_company
-from . import res_config
 from . import res_partner
 from . import stock
+from . import stock_config_settings
diff --git a/addons/purchase/models/res_config.py b/addons/purchase/models/purchase_config_settings.py
index d5c8708725e..d5c8708725e 100644
--- a/addons/purchase/models/res_config.py
+++ b/addons/purchase/models/purchase_config_settings.py
diff --git a/addons/purchase/views/res_config_views.xml b/addons/purchase/views/purchase_config_settings_views.xml
index 57f7f97d080..57f7f97d080 100644
--- a/addons/purchase/views/res_config_views.xml
+++ b/addons/purchase/views/purchase_config_settings_views.xml
diff --git a/addons/sales_team/__manifest__.py b/addons/sales_team/__manifest__.py
index f3d02eb8352..bda707e7d53 100644
--- a/addons/sales_team/__manifest__.py
+++ b/addons/sales_team/__manifest__.py
@@ -14,7 +14,7 @@ Using this application you can manage Sales Channels  with CRM and/or Sales
     'data': ['security/sales_team_security.xml',
              'security/ir.model.access.csv',
              'data/sales_team_data.xml',
-             'views/res_config_view.xml',
+             'views/sale_config_settings_views.xml',
              'views/crm_team_views.xml',
              'views/sales_team_dashboard.xml',
              ],
diff --git a/addons/sales_team/models/__init__.py b/addons/sales_team/models/__init__.py
index 57f64bcc3e4..858af63daf3 100644
--- a/addons/sales_team/models/__init__.py
+++ b/addons/sales_team/models/__init__.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
+
 from . import crm_team
 from . import res_partner
 from . import res_users
-from . import res_config
+from . import sale_config_settings
diff --git a/addons/sales_team/models/res_config.py b/addons/sales_team/models/sale_config_settings.py
index dffa4888516..dffa4888516 100644
--- a/addons/sales_team/models/res_config.py
+++ b/addons/sales_team/models/sale_config_settings.py
diff --git a/addons/sales_team/views/res_config_view.xml b/addons/sales_team/views/sale_config_settings_views.xml
index 628f217904c..628f217904c 100644
--- a/addons/sales_team/views/res_config_view.xml
+++ b/addons/sales_team/views/sale_config_settings_views.xml
diff --git a/addons/website/__manifest__.py b/addons/website/__manifest__.py
index 5e62bf95162..caf23f76bc4 100644
--- a/addons/website/__manifest__.py
+++ b/addons/website/__manifest__.py
@@ -23,7 +23,7 @@ Odoo Website CMS
         'views/website_navbar_templates.xml',
         'views/snippets.xml',
         'views/website_views.xml',
-        'views/res_config_views.xml',
+        'views/website_config_settings_views.xml',
         'views/ir_actions_views.xml',
         'wizard/base_language_install_views.xml',
         'data/web_planner_data.xml',
diff --git a/addons/website/models/__init__.py b/addons/website/models/__init__.py
index 1b00dcf0510..aa289415d5d 100644
--- a/addons/website/models/__init__.py
+++ b/addons/website/models/__init__.py
@@ -2,12 +2,12 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from . import ir_actions
-from . import ir_ui_view
-from . import ir_qweb
-from . import ir_http
 from . import ir_attachment
+from . import ir_http
+from . import ir_qweb
+from . import ir_ui_view
 from . import res_company
 from . import res_partner
-from . import res_config
-from . import website
 from . import web_planner
+from . import website
+from . import website_config_settings
diff --git a/addons/website/models/res_config.py b/addons/website/models/website_config_settings.py
index b1a8f26608d..b1a8f26608d 100644
--- a/addons/website/models/res_config.py
+++ b/addons/website/models/website_config_settings.py
diff --git a/addons/website/views/res_config_views.xml b/addons/website/views/website_config_settings_views.xml
index 32f0a61e2d9..32f0a61e2d9 100644
--- a/addons/website/views/res_config_views.xml
+++ b/addons/website/views/website_config_settings_views.xml
diff --git a/addons/website_livechat/__manifest__.py b/addons/website_livechat/__manifest__.py
index 9caf3260d36..cb789e6b5f3 100644
--- a/addons/website_livechat/__manifest__.py
+++ b/addons/website_livechat/__manifest__.py
@@ -15,10 +15,10 @@ It also will include the feedback tool for the livechat, and web pages to displa
     'auto_install': True,
     'data': [
         'views/website_livechat.xml',
-        'views/res_config.xml',
+        'views/website_config_settings_views.xml',
         'views/website_livechat_view.xml',
         'security/ir.model.access.csv',
         'security/website_livechat.xml',
-        'website_livechat_data.xml',
+        'data/website_livechat_data.xml',
     ],
 }
diff --git a/addons/website_livechat/website_livechat_data.xml b/addons/website_livechat/data/website_livechat_data.xml
index 850898308f9..850898308f9 100644
--- a/addons/website_livechat/website_livechat_data.xml
+++ b/addons/website_livechat/data/website_livechat_data.xml
diff --git a/addons/website_livechat/models/__init__.py b/addons/website_livechat/models/__init__.py
index 20b496ebf18..f90e6c892b0 100644
--- a/addons/website_livechat/models/__init__.py
+++ b/addons/website_livechat/models/__init__.py
@@ -1,3 +1,5 @@
 # -*- coding: utf-8 -*-
+
 from . import im_livechat
 from . import website
+from . import website_config_settings
\ No newline at end of file
diff --git a/addons/website_livechat/models/website.py b/addons/website_livechat/models/website.py
index 84980a84c93..e207482416a 100644
--- a/addons/website_livechat/models/website.py
+++ b/addons/website_livechat/models/website.py
@@ -9,10 +9,3 @@ class Website(models.Model):
     _inherit = "website"
 
     channel_id = fields.Many2one('im_livechat.channel', string='Website Live Chat Channel')
-
-
-class WebsiteConfigSettings(models.TransientModel):
-
-    _inherit = 'website.config.settings'
-
-    channel_id = fields.Many2one('im_livechat.channel', string='Website Live Channel', related='website_id.channel_id')
diff --git a/addons/website_livechat/models/website_config_settings.py b/addons/website_livechat/models/website_config_settings.py
new file mode 100644
index 00000000000..7f241b49263
--- /dev/null
+++ b/addons/website_livechat/models/website_config_settings.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import fields, models
+
+
+class WebsiteConfigSettings(models.TransientModel):
+    _inherit = 'website.config.settings'
+
+    channel_id = fields.Many2one('im_livechat.channel', string='Website Live Channel', related='website_id.channel_id')
diff --git a/addons/website_livechat/views/res_config.xml b/addons/website_livechat/views/website_config_settings_views.xml
index 03189ce1d70..03189ce1d70 100644
--- a/addons/website_livechat/views/res_config.xml
+++ b/addons/website_livechat/views/website_config_settings_views.xml
diff --git a/addons/website_mass_mailing/__manifest__.py b/addons/website_mass_mailing/__manifest__.py
index ec9fa4278dc..f2253996f94 100644
--- a/addons/website_mass_mailing/__manifest__.py
+++ b/addons/website_mass_mailing/__manifest__.py
@@ -15,7 +15,7 @@ Add a snippet in the website builder to subscribe a mass_mailing list
         'views/unsubscribe_templates.xml',
         'views/snippets_templates.xml',
         'views/mass_mailing_view.xml',
-        'views/res_config_view.xml',
+        'views/mass_mailing_config_settings_views.xml',
     ],
     'auto_install': True,
 }
diff --git a/addons/website_mass_mailing/models/__init__.py b/addons/website_mass_mailing/models/__init__.py
index 5e5b7affad2..18a7a1b26b2 100644
--- a/addons/website_mass_mailing/models/__init__.py
+++ b/addons/website_mass_mailing/models/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
+from . import mass_mailing_config_settings
 from . import mass_mailing_list
-from . import res_config
diff --git a/addons/website_mass_mailing/models/res_config.py b/addons/website_mass_mailing/models/mass_mailing_config_settings.py
index 602d575e151..602d575e151 100644
--- a/addons/website_mass_mailing/models/res_config.py
+++ b/addons/website_mass_mailing/models/mass_mailing_config_settings.py
diff --git a/addons/website_mass_mailing/views/res_config_view.xml b/addons/website_mass_mailing/views/mass_mailing_config_settings_views.xml
index 2def07a7aa3..2def07a7aa3 100644
--- a/addons/website_mass_mailing/views/res_config_view.xml
+++ b/addons/website_mass_mailing/views/mass_mailing_config_settings_views.xml
diff --git a/addons/website_sale/__manifest__.py b/addons/website_sale/__manifest__.py
index d0851c60968..102ed5b4160 100644
--- a/addons/website_sale/__manifest__.py
+++ b/addons/website_sale/__manifest__.py
@@ -25,7 +25,7 @@ Odoo E-Commerce
         'views/payment_views.xml',
         'views/snippets.xml',
         'views/report_shop_saleorder.xml',
-        'views/res_config_view.xml',
+        'views/website_config_settings_views.xml',
     ],
     'demo': [
         'data/demo.xml',
diff --git a/addons/website_sale/models/__init__.py b/addons/website_sale/models/__init__.py
index 9bd76239ea3..7eca4d5c21a 100644
--- a/addons/website_sale/models/__init__.py
+++ b/addons/website_sale/models/__init__.py
@@ -1,7 +1,10 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import crm_team
 from . import ir_http
-from . import rating
 from . import product
+from . import rating
 from . import sale_order
-from . import crm_team
-from . import res_config
 from . import website
+from . import website_config_settings
diff --git a/addons/website_sale/models/res_config.py b/addons/website_sale/models/website_config_settings.py
index 62dabb3ec4b..62dabb3ec4b 100644
--- a/addons/website_sale/models/res_config.py
+++ b/addons/website_sale/models/website_config_settings.py
diff --git a/addons/website_sale/views/res_config_view.xml b/addons/website_sale/views/website_config_settings_views.xml
index 49379c710be..49379c710be 100644
--- a/addons/website_sale/views/res_config_view.xml
+++ b/addons/website_sale/views/website_config_settings_views.xml
diff --git a/addons/website_slides/__manifest__.py b/addons/website_slides/__manifest__.py
index a18082c54f1..f0755ab62b4 100644
--- a/addons/website_slides/__manifest__.py
+++ b/addons/website_slides/__manifest__.py
@@ -18,10 +18,10 @@ Share and Publish Videos, Presentations and Documents'
 """,
     'depends': ['website', 'website_mail'],
     'data': [
-        'view/res_config.xml',
-        'view/website_slides.xml',
-        'view/website_slides_embed.xml',
-        'view/website_slides_backend.xml',
+        'views/website_config_settings_views.xml',
+        'views/website_slides.xml',
+        'views/website_slides_embed.xml',
+        'views/website_slides_backend.xml',
         'data/website_slides_data.xml',
         'security/ir.model.access.csv',
         'security/website_slides_security.xml'
diff --git a/addons/website_slides/models/__init__.py b/addons/website_slides/models/__init__.py
index c34d07ffbd7..2644fb217ef 100644
--- a/addons/website_slides/models/__init__.py
+++ b/addons/website_slides/models/__init__.py
@@ -1,3 +1,4 @@
 # -*- coding: utf-8 -*-
-from . import res_config
+
 from . import slides
+from . import website_config_settings
diff --git a/addons/website_slides/models/res_config.py b/addons/website_slides/models/website_config_settings.py
index 68138e90e3f..68138e90e3f 100644
--- a/addons/website_slides/models/res_config.py
+++ b/addons/website_slides/models/website_config_settings.py
diff --git a/addons/website_slides/view/res_config.xml b/addons/website_slides/views/website_config_settings_views.xml
index 955b92e5eae..955b92e5eae 100644
--- a/addons/website_slides/view/res_config.xml
+++ b/addons/website_slides/views/website_config_settings_views.xml
diff --git a/addons/website_slides/view/website_slides.xml b/addons/website_slides/views/website_slides.xml
index 4cea61c1c3e..4cea61c1c3e 100644
--- a/addons/website_slides/view/website_slides.xml
+++ b/addons/website_slides/views/website_slides.xml
diff --git a/addons/website_slides/view/website_slides_backend.xml b/addons/website_slides/views/website_slides_backend.xml
index 90eeb486cf3..90eeb486cf3 100644
--- a/addons/website_slides/view/website_slides_backend.xml
+++ b/addons/website_slides/views/website_slides_backend.xml
diff --git a/addons/website_slides/view/website_slides_embed.xml b/addons/website_slides/views/website_slides_embed.xml
index c3c77fc676d..c3c77fc676d 100644
--- a/addons/website_slides/view/website_slides_embed.xml
+++ b/addons/website_slides/views/website_slides_embed.xml