From 9fed5964a64e2d50e4bcd2874e7893a4e25da082 Mon Sep 17 00:00:00 2001
From: "Xavier BOL (xbo)" <xbo@odoo.com>
Date: Mon, 1 Mar 2021 14:59:06 +0100
Subject: [PATCH] [IMP] {hr,sale}_timesheet: use the container for project
 settings

Before this commit, we create a container to add the new options in the
project settings.

This commit removes the container to put these options in the default
container.

task-2387984

closes #66740
---
 addons/hr_timesheet/views/project_views.xml   | 20 +++++++++----------
 .../views/project_task_views.xml              | 20 +++++++++----------
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/addons/hr_timesheet/views/project_views.xml b/addons/hr_timesheet/views/project_views.xml
index a54f429a15c..1ac8414c69b 100644
--- a/addons/hr_timesheet/views/project_views.xml
+++ b/addons/hr_timesheet/views/project_views.xml
@@ -51,17 +51,15 @@
                         </div>
                     </button>
                 </div>
-                <xpath expr="//div[@id='rating_settings']/.." position="before">
-                    <div class="row mt16 o_settings_container">
-                        <div class="col-lg-6 o_setting_box"  id="timesheet_settings">
-                            <div class="o_setting_left_pane">
-                                <field name="allow_timesheets"/>
-                            </div>
-                            <div class="o_setting_right_pane">
-                                <label for="allow_timesheets" string="Timesheets"/>
-                                <div class="text-muted">
-                                    Log time on tasks
-                                </div>
+                <xpath expr="//div[@id='rating_settings']" position="before">
+                    <div class="col-lg-6 o_setting_box"  id="timesheet_settings">
+                        <div class="o_setting_left_pane">
+                            <field name="allow_timesheets"/>
+                        </div>
+                        <div class="o_setting_right_pane">
+                            <label for="allow_timesheets" string="Timesheets"/>
+                            <div class="text-muted">
+                                Log time on tasks
                             </div>
                         </div>
                     </div>
diff --git a/addons/sale_timesheet/views/project_task_views.xml b/addons/sale_timesheet/views/project_task_views.xml
index c11c5e547b7..7c0405eee4c 100644
--- a/addons/sale_timesheet/views/project_task_views.xml
+++ b/addons/sale_timesheet/views/project_task_views.xml
@@ -40,17 +40,15 @@
                     </field>
                 </page>
             </xpath>
-            <xpath expr="//div[@id='timesheet_settings']/.." position="after">
-                <div class="row mt16 o_settings_container">
-                    <div class="col-lg-6 o_setting_box" id="allow_billable_container">
-                        <div class="o_setting_left_pane">
-                            <field name="allow_billable"/>
-                        </div>
-                        <div class="o_setting_right_pane">
-                            <label for="allow_billable"/>
-                            <div class="text-muted" id="allow_billable_setting">
-                                Invoice your time and material to customers
-                            </div>
+            <xpath expr="//div[@id='timesheet_settings']" position="after">
+                <div class="col-lg-6 o_setting_box" id="allow_billable_container">
+                    <div class="o_setting_left_pane">
+                        <field name="allow_billable"/>
+                    </div>
+                    <div class="o_setting_right_pane">
+                        <label for="allow_billable"/>
+                        <div class="text-muted" id="allow_billable_setting">
+                            Invoice your time and material to customers
                         </div>
                     </div>
                 </div>