From 496d7fad747b605019c143384eaa6f2f61cbc29f Mon Sep 17 00:00:00 2001
From: Geoffroy Larue <gla@odoo.com>
Date: Mon, 18 Feb 2019 14:48:29 +0000
Subject: [PATCH] [IMP] project: edit project form small reorg

Add a new group in the settings page, allowing to put some others
settings on the right side of the page (needed in enterprise).

Task-1942377 Closes #31212
---
 addons/hr_timesheet/views/project_views.xml |  7 ++---
 addons/project/views/project_views.xml      | 30 ++++++++++++---------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/addons/hr_timesheet/views/project_views.xml b/addons/hr_timesheet/views/project_views.xml
index 04061f79ed1..5941ed6a8d0 100644
--- a/addons/hr_timesheet/views/project_views.xml
+++ b/addons/hr_timesheet/views/project_views.xml
@@ -42,11 +42,8 @@
                 <button name="toggle_active" position="before">
                     <button class="oe_stat_button" name="%(act_hr_timesheet_line_by_project)d" type="action" icon="fa-calendar" string="Timesheets" attrs="{'invisible': [('allow_timesheets', '=', False)]}" groups="hr_timesheet.group_hr_timesheet_user"/>
                 </button>
-                <xpath expr="//div[@name='options_active']" position="inside">
-                    <div>
-                        <field name="allow_timesheets" class="oe_inline" string="Allow timesheets"/>
-                        <label for="allow_timesheets"/>
-                    </div>
+                <xpath expr="//group[@name='extra_settings']" position="inside">
+                    <field name="allow_timesheets"/>
                 </xpath>
                 <xpath expr="//field[@name='partner_id']" position="after">
                     <field name="analytic_account_id"/>
diff --git a/addons/project/views/project_views.xml b/addons/project/views/project_views.xml
index 9fda66fda88..b97443b410f 100644
--- a/addons/project/views/project_views.xml
+++ b/addons/project/views/project_views.xml
@@ -132,20 +132,24 @@
                     <notebook>
                         <page name="settings" string="Settings">
                             <group>
-                                <field name="user_id" string="Project Manager"
+                                <group>
+                                    <field name="user_id" string="Project Manager"
                                         attrs="{'readonly':[('active','=',False)]}"/>
-                                <field name="privacy_visibility" widget="radio"/>
-                                <field name="partner_id" string="Customer"/>
-                                <label for="rating_status" groups="project.group_project_rating"/>
-                                <div groups="project.group_project_rating">
-                                    <field name="rating_status" widget="radio"/>
-                                    <p attrs="{'invisible': [('rating_status','not in',('periodic','stage'))]}" class="text-muted oe_edit_only">
-                                        Edit project's stages and set an email template on the stages on which you want to activate the rating.
-                                    </p>
-                                </div>
-                                <field name="rating_status_period"  class="oe_inline" attrs="{'required': [('rating_status','=','periodic')], 'invisible': [('rating_status','!=','periodic')]}" groups="project.group_project_rating"/>
-                                <field name="portal_show_rating" attrs="{'invisible': [('rating_status','==','no')]}" groups="project.group_project_rating"/>
-                                <field name="subtask_project_id" groups="project.group_subtask_project"/>
+                                    <field name="privacy_visibility" widget="radio"/>
+                                    <field name="partner_id" string="Customer"/>
+                                    <label for="rating_status" groups="project.group_project_rating"/>
+                                    <div groups="project.group_project_rating">
+                                        <field name="rating_status" widget="radio"/>
+                                        <p attrs="{'invisible': [('rating_status','not in',('periodic','stage'))]}" class="text-muted oe_edit_only">
+                                            Edit project's stages and set an email template on the stages on which you want to activate the rating.
+                                        </p>
+                                    </div>
+                                    <field name="rating_status_period"  class="oe_inline" attrs="{'required': [('rating_status','=','periodic')], 'invisible': [('rating_status','!=','periodic')]}" groups="project.group_project_rating"/>
+                                    <field name="portal_show_rating" attrs="{'invisible': [('rating_status','==','no')]}" groups="project.group_project_rating"/>
+                                    <field name="subtask_project_id" groups="project.group_subtask_project"/>
+                                </group>
+                                <group name="extra_settings">
+                                </group>
                             </group>
                             <group name="misc">
                                 <group string="Configuration" groups="base.group_no_one" name="configuration">