From 2e291708520a7f0fa50d6c2564074b8aceb58dbe Mon Sep 17 00:00:00 2001
From: "Hugo Carlier (Huca)" <huca@odoo.com>
Date: Wed, 4 Jan 2023 09:39:15 +0000
Subject: [PATCH] [IMP] {hr,sale}_timesheet,{sale_}project: modify task sharing
 form view

The form view of project.task in project sharing is modified to be
similar to the classical form view of tasks (in backend). A
priorititization is added to the views of project.task for project
sharing used in the following modules:
- project
- sale_project
- hr_timesheet
- sale_timesheet

task-3119935

closes odoo/odoo#109067

Related: odoo/enterprise#35421
Signed-off-by: Xavier Bol (xbo) <xbo@odoo.com>
---
 .../views/project_sharing_views.xml           | 33 +++++++++----------
 addons/hr_timesheet/views/project_views.xml   |  6 ++--
 .../project/views/project_sharing_views.xml   |  2 +-
 .../views/project_sharing_views.xml           |  1 +
 .../views/project_sharing_views.xml           |  1 +
 5 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/addons/hr_timesheet/views/project_sharing_views.xml b/addons/hr_timesheet/views/project_sharing_views.xml
index 2b6584b5fff..86692dd03b3 100644
--- a/addons/hr_timesheet/views/project_sharing_views.xml
+++ b/addons/hr_timesheet/views/project_sharing_views.xml
@@ -4,6 +4,7 @@
     <record id="project_sharing_inherit_project_task_view_form" model="ir.ui.view">
         <field name="name">project.sharing.project.task.view.form.inherit</field>
         <field name="model">project.task</field>
+        <field name="priority">500</field>
         <field name="inherit_id" ref="project.project_sharing_project_task_view_form"/>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='child_ids']/tree/field[@name='portal_user_names']" position="after">
@@ -14,28 +15,24 @@
                 <field name="remaining_hours" widget="timesheet_uom" sum="Remaining Hours" optional="hide" decoration-danger="progress &gt;= 100" decoration-warning="progress &gt;= 80 and progress &lt; 100"/>
                 <field name="progress" widget="progressbar" optional="hide"/>
             </xpath>
+            <xpath expr="//field[@name='date_deadline']" position="before">
+                <field name="encode_uom_in_days" invisible="1"/>
+                <field name="subtask_count" invisible="1"/>
+                <label for="planned_hours" string="Allocated Hours" attrs="{'invisible': ['|', ('allow_timesheets', '=', False), ('encode_uom_in_days', '=', True)]}"/>
+                <label for="planned_hours" string="Allocated Days" attrs="{'invisible': ['|', ('allow_timesheets', '=', False), ('encode_uom_in_days', '=', False)]}"/>
+                <div class="text-nowrap" attrs="{'invisible': [('allow_timesheets', '=', False)]}">
+                    <field name="planned_hours" class="oe_inline" widget="float_time"/>
+                    <span attrs="{'invisible': ['|', ('allow_subtasks', '=', False), ('subtask_count', '=', 0)]}">
+                        (incl. <field name="subtask_planned_hours" nolabel="1" groups="project.group_subtask_project" widget="timesheet_uom_no_toggle" class="oe_inline"/> on
+                        <span class="fw-bold text-dark"> Sub-tasks</span>)
+                    </span>
+                    <span>(<field name="progress" class="oe_inline" nolabel="1" widget="integer"/> %)</span>
+                </div>
+            </xpath>
             <xpath expr="//notebook/page[@name='description_page']" position="after">
                 <field name="analytic_account_active" invisible="1"/>
                 <field name="allow_timesheets" invisible="1"/>
-                <field name="encode_uom_in_days" invisible="1"/>
-                <field name="subtask_count" invisible="1"/>
                 <page string="Timesheets" id="timesheets_tab" attrs="{'invisible': [('allow_timesheets', '=', False)]}">
-                    <group>
-                        <group>
-                            <div class="o_td_label">
-                                <label for="planned_hours" string="Allocated Hours" class="me-2" attrs="{'invisible': [('encode_uom_in_days', '=', True)]}"/>
-                                <label for="planned_hours" string="Allocated Days" class="me-2" attrs="{'invisible': [('encode_uom_in_days', '=', False)]}"/>
-                                <field name="planned_hours" class="oe_inline" widget="timesheet_uom_no_toggle"/>
-                                <span attrs="{'invisible': ['|', ('allow_subtasks', '=', False), ('subtask_count', '=', 0)]}">
-                                    (incl. <field name="subtask_planned_hours" nolabel="1" groups="project.group_subtask_project" widget="timesheet_uom_no_toggle"/> on
-                                    <span class="fw-bold text-dark"> Sub-tasks</span>)
-                                </span>
-                            </div>
-                        </group>
-                        <group>
-                            <field name="progress" widget="progressbar"/>
-                        </group>
-                    </group>
                     <field name="timesheet_ids" mode="tree,kanban"
                           attrs="{'invisible': [('analytic_account_active', '=', False)]}">
                         <tree string="Timesheet Activities" default_order="date" no_open="1" create="false" delete="0">
diff --git a/addons/hr_timesheet/views/project_views.xml b/addons/hr_timesheet/views/project_views.xml
index c071993895e..887ddbdf40d 100644
--- a/addons/hr_timesheet/views/project_views.xml
+++ b/addons/hr_timesheet/views/project_views.xml
@@ -122,9 +122,9 @@
                 <xpath expr="//field[@name='date_deadline']" position="before" groups="hr_timesheet.group_hr_timesheet_user">
                     <field name="encode_uom_in_days" invisible="1"/>
                     <field name="subtask_count" invisible="1"/>
-                    <label for="planned_hours" string="Allocated Hours" attrs="{'invisible': [('encode_uom_in_days', '=', True)]}"/>
-                    <label for="planned_hours" string="Allocated Days" attrs="{'invisible': [('encode_uom_in_days', '=', False)]}"/>
-                    <div class="text-nowrap">
+                    <label for="planned_hours" string="Allocated Hours" attrs="{'invisible': ['|', ('allow_timesheets', '=', False), ('encode_uom_in_days', '=', True)]}"/>
+                    <label for="planned_hours" string="Allocated Days" attrs="{'invisible': ['|', ('allow_timesheets', '=', False), ('encode_uom_in_days', '=', False)]}"/>
+                    <div class="text-nowrap" attrs="{'invisible': [('allow_timesheets', '=', False)]}">
                         <field name="planned_hours" class="oe_inline" widget="float_time"/>
                         <span attrs="{'invisible': ['|', ('allow_subtasks', '=', False), ('subtask_count', '=', 0)]}">
                             (incl. <field name="subtask_planned_hours" nolabel="1" groups="project.group_subtask_project" widget="timesheet_uom_no_toggle" class="oe_inline"/> on
diff --git a/addons/project/views/project_sharing_views.xml b/addons/project/views/project_sharing_views.xml
index 4088cf05dbe..695919629ba 100644
--- a/addons/project/views/project_sharing_views.xml
+++ b/addons/project/views/project_sharing_views.xml
@@ -192,6 +192,7 @@
                             <field name="portal_user_names"
                                 string="Assignees"
                                 class="o_task_user_field"/>
+                            <field name="tag_ids" context="{'project_id': project_id}" widget="many2many_tags" options="{'color_field': 'color', 'no_create_edit': True, 'no_edit_color': True}"/>
                         </group>
                         <group>
                             <field name="active" invisible="1"/>
@@ -201,7 +202,6 @@
                             <field name="allow_subtasks" invisible="1" />
                             <field name="partner_id" options="{'no_open': True, 'no_create': True, 'no_edit': True}"/>
                             <field name="date_deadline" attrs="{'invisible': [('is_closed', '=', True)]}"/>
-                            <field name="tag_ids" context="{'project_id': project_id}" widget="many2many_tags" options="{'color_field': 'color', 'no_create_edit': True, 'no_edit_color': True}"/>
                         </group>
                     </group>
                     <notebook>
diff --git a/addons/sale_project/views/project_sharing_views.xml b/addons/sale_project/views/project_sharing_views.xml
index c1776db0e7f..4c3e2344e0b 100644
--- a/addons/sale_project/views/project_sharing_views.xml
+++ b/addons/sale_project/views/project_sharing_views.xml
@@ -4,6 +4,7 @@
     <record id="project_sharing_inherit_project_task_view_form" model="ir.ui.view">
         <field name="name">project.task.view.inherit</field>
         <field name="model">project.task</field>
+        <field name="priority">300</field>
         <field name="inherit_id" ref="project.project_sharing_project_task_view_form"/>
         <field name="arch" type="xml">
             <div name="button_box" position="inside">
diff --git a/addons/sale_timesheet/views/project_sharing_views.xml b/addons/sale_timesheet/views/project_sharing_views.xml
index 572fb6a76a0..eb7b87a5697 100644
--- a/addons/sale_timesheet/views/project_sharing_views.xml
+++ b/addons/sale_timesheet/views/project_sharing_views.xml
@@ -4,6 +4,7 @@
     <record id="project_sharing_inherit_project_task_view_form" model="ir.ui.view">
         <field name="name">project.task.form.inherit.timesheet</field>
         <field name="model">project.task</field>
+        <field name="priority">600</field>
         <field name="inherit_id" ref="project.project_sharing_project_task_view_form"/>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='timesheet_ids']/tree" position="attributes">