From 76d5879c1ecc913b89cf06db59d714e4cd65b437 Mon Sep 17 00:00:00 2001
From: Victor Feyens <vfe@odoo.com>
Date: Mon, 16 May 2022 16:04:31 +0000
Subject: [PATCH] [REF] *: clean settings views inheritance

* make sure xpath expression content is specified in parent view.

Part-of: odoo/odoo#91909
---
 .../views/res_config_settings_views.xml                      | 2 +-
 addons/portal/views/res_config_settings_views.xml            | 2 +-
 .../website_event_track/views/res_config_settings_view.xml   | 5 +++--
 addons/website_payment/views/res_config_settings_views.xml   | 2 +-
 .../views/res_config_settings_views.xml                      | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/addons/auth_totp_mail_enforce/views/res_config_settings_views.xml b/addons/auth_totp_mail_enforce/views/res_config_settings_views.xml
index 06a3b1a26b6..63ee55de812 100644
--- a/addons/auth_totp_mail_enforce/views/res_config_settings_views.xml
+++ b/addons/auth_totp_mail_enforce/views/res_config_settings_views.xml
@@ -6,7 +6,7 @@
             <field name="name">res.config.settings.view.form.inherit.auth_totp_mail_enforce</field>
             <field name="model">res.config.settings</field>
             <field name="priority" eval="40"/>
-            <field name="inherit_id" ref="base.res_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='allow_import']" position="before">
                     <div class="col-12 col-lg-6 o_setting_box" id="auth_totp_policy">
diff --git a/addons/portal/views/res_config_settings_views.xml b/addons/portal/views/res_config_settings_views.xml
index 51c394b28bf..d456dbc8ad8 100644
--- a/addons/portal/views/res_config_settings_views.xml
+++ b/addons/portal/views/res_config_settings_views.xml
@@ -6,7 +6,7 @@
             <field name="name">res.config.settings.view.form.inherit.portal</field>
             <field name="model">res.config.settings</field>
             <field name="priority" eval="40"/>
-            <field name="inherit_id" ref="base.res_config_settings_view_form"/>
+            <field name="inherit_id" ref="base_setup.res_config_settings_view_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//button[@name=%(base.action_apikeys_admin)d]//ancestor::div[hasclass('o_setting_box')]" position="inside">
                     <div groups="base.group_no_one">
diff --git a/addons/website_event_track/views/res_config_settings_view.xml b/addons/website_event_track/views/res_config_settings_view.xml
index e1e3ef4e655..0d9c6ac6e6b 100644
--- a/addons/website_event_track/views/res_config_settings_view.xml
+++ b/addons/website_event_track/views/res_config_settings_view.xml
@@ -4,9 +4,10 @@
         <field name="name">res.config.settings.view.form.inherit.website</field>
         <field name="model">res.config.settings</field>
         <field name="priority" eval="20"/>
-        <field name="inherit_id" ref="base.res_config_settings_view_form"/>
+        <field name="inherit_id" ref="website.res_config_settings_view_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//div[hasclass('settings')]//div[@id='website_settings']" position="inside">
+            <!-- TODO TDE there are two div with website_settings id in the website settings view -->
+            <xpath expr="//div[@id='website_settings']" position="inside">
                 <div class="col-12 col-lg-6 o_setting_box" id="events_app_setting" groups="base.group_no_one">
                     <div class="o_setting_right_pane">
                         <label for="events_app_name" string="Events PWA"/>
diff --git a/addons/website_payment/views/res_config_settings_views.xml b/addons/website_payment/views/res_config_settings_views.xml
index c4809200f54..e2d2c96cbe3 100644
--- a/addons/website_payment/views/res_config_settings_views.xml
+++ b/addons/website_payment/views/res_config_settings_views.xml
@@ -4,7 +4,7 @@
         <field name="name">res.config.settings.view.form.inherit.website</field>
         <field name="model">res.config.settings</field>
         <field name="priority" eval="20"/>
-        <field name="inherit_id" ref="base.res_config_settings_view_form"/>
+        <field name="inherit_id" ref="website.res_config_settings_view_form"/>
         <field name="arch" type="xml">
             <div id="website_info_settings" position="after">
                 <h2>Shop - Payment</h2>
diff --git a/addons/website_payment_authorize/views/res_config_settings_views.xml b/addons/website_payment_authorize/views/res_config_settings_views.xml
index 20c709bfa28..907a495d75e 100644
--- a/addons/website_payment_authorize/views/res_config_settings_views.xml
+++ b/addons/website_payment_authorize/views/res_config_settings_views.xml
@@ -4,7 +4,7 @@
         <field name="name">res.config.settings.view.form.inherit.payment.authorize</field>
         <field name="model">res.config.settings</field>
         <field name="priority" eval="20"/>
-        <field name="inherit_id" ref="base.res_config_settings_view_form"/>
+        <field name="inherit_id" ref="website_payment.res_config_settings_view_form"/>
         <field name="arch" type="xml">
             <div id="paypal_settings" position="before">
                 <div class="col-12 col-lg-6 o_setting_box">