From 4cf0e01a3bafe0d6743622b185a07f992b826d49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florent=20Cayr=C3=A9?= <florent@commown.coop>
Date: Thu, 18 Dec 2025 09:19:04 +0100
Subject: [PATCH 1/3] [FIX] Surround setting view added fields by more standard
 markup

A `div` tag with the `o_setting_box` class is added around the
fields and their label.

This seems to be a more standard markup among the OCA.
At least the remove_odoo_enterprise module expects it, see issue
https://github.com/OCA/server-brand/issues/116
---
 .../views/res_config_settings.xml             | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/contract_forecast/views/res_config_settings.xml b/contract_forecast/views/res_config_settings.xml
index 2231ff0b6d..e4cddab26e 100644
--- a/contract_forecast/views/res_config_settings.xml
+++ b/contract_forecast/views/res_config_settings.xml
@@ -25,13 +25,26 @@
                     class="row mt16 o_settings_container"
                     attrs="{'invisible': [('enable_contract_forecast', '=', False)]}"
                 >
-                    <label
-                        for="contract_forecast_interval"
-                        string="Forecast Interval"
-                        class="oe_inline"
-                    />
-                    <field name="contract_forecast_interval" class="oe_inline" />
-                    <field name="contract_forecast_rule_type" class="oe_inline" />
+                    <div class="col-12 col-lg-6 o_setting_box">
+                        <div class="o_setting_left_pane" />
+                        <div class="o_setting_right_pane">
+                            <label
+                                for="contract_forecast_interval"
+                                string="Forecast Interval"
+                                class="oe_inline"
+                            />
+                            <div>
+                                <field
+                                    name="contract_forecast_interval"
+                                    class="oe_inline"
+                                />
+                                <field
+                                    name="contract_forecast_rule_type"
+                                    class="oe_inline"
+                                />
+                            </div>
+                        </div>
+                    </div>
                 </div>
             </xpath>
         </field>

From 2d58f9b17b06b4cedb1f5555d23561313d7f19f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florent=20Cayr=C3=A9?= <florent@commown.coop>
Date: Fri, 19 Dec 2025 18:03:44 +0100
Subject: [PATCH 2/3] [IMP] Put all contract_forecast setting fields into a
 single o_settings_container div

This simplifies the markup and reduce useless vertical gaps between them.
---
 contract_forecast/views/res_config_settings.xml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/contract_forecast/views/res_config_settings.xml b/contract_forecast/views/res_config_settings.xml
index e4cddab26e..f50526ec75 100644
--- a/contract_forecast/views/res_config_settings.xml
+++ b/contract_forecast/views/res_config_settings.xml
@@ -20,12 +20,10 @@
                             <label for="enable_contract_forecast" />
                         </div>
                     </div>
-                </div>
-                <div
-                    class="row mt16 o_settings_container"
-                    attrs="{'invisible': [('enable_contract_forecast', '=', False)]}"
-                >
-                    <div class="col-12 col-lg-6 o_setting_box">
+                    <div
+                        class="col-12 col-lg-6 o_setting_box"
+                        attrs="{'invisible': [('enable_contract_forecast', '=', False)]}"
+                    >
                         <div class="o_setting_left_pane" />
                         <div class="o_setting_right_pane">
                             <label

From 9cb2cf10da461dc691a6bc82774ae15608cbf614 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florent=20Cayr=C3=A9?= <florent@commown.coop>
Date: Fri, 19 Dec 2025 18:13:36 +0100
Subject: [PATCH 3/3] [IMP] Improve xpath that adds the contract_forecast
 setting fields after the contract's

The new xpath is both:
- more robust as is does not depend on the intermediate tags between
  the targeted container and the field it contains
- more explicit as it selects explicitely a o_settings_container div
  before adding a similar container right after the targeted one.
---
 contract_forecast/views/res_config_settings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contract_forecast/views/res_config_settings.xml b/contract_forecast/views/res_config_settings.xml
index f50526ec75..b7cbf88fe6 100644
--- a/contract_forecast/views/res_config_settings.xml
+++ b/contract_forecast/views/res_config_settings.xml
@@ -8,7 +8,7 @@
         <field name="inherit_id" ref="contract.res_config_settings_form_view" />
         <field name="arch" type="xml">
             <xpath
-                expr="//field[@name='create_new_line_at_contract_line_renew']/parent::div/parent::div/parent::div"
+                expr="//field[@name='create_new_line_at_contract_line_renew']/ancestor::div[hasclass('o_settings_container')]"
                 position="after"
             >
                 <div class="row mt16 o_settings_container">