From 14cc9914873c7a358f1f475f6ae30b3cc41cf814 Mon Sep 17 00:00:00 2001
From: William Braeckman <wbr@odoo.com>
Date: Fri, 18 Jun 2021 09:33:39 +0000
Subject: [PATCH] [IMP] hr_timesheet: improve UX

Generic improvements of the timesheet app:
- Adds pivot and graph view to 'My Timesheets'
- Adds a graph view to 'All Timesheets'
- Rename 'Timesheet' menu to 'Timesheets'
- Remove unused submenu for configuration, directly leads to settings
  now.

Closes: odoo/odoo#72336

Task ID: 2531317

Related: odoo/enterprise#19101
Related: odoo/upgrade#2586
Signed-off-by: LTU-Odoo <IT-Ideas@users.noreply.github.com>
---
 .../hr_timesheet/views/hr_timesheet_views.xml | 77 +++++++++++++++++--
 .../views/res_config_settings_views.xml       |  7 +-
 2 files changed, 71 insertions(+), 13 deletions(-)

diff --git a/addons/hr_timesheet/views/hr_timesheet_views.xml b/addons/hr_timesheet/views/hr_timesheet_views.xml
index bf77d7855dc..7cb1feb765a 100644
--- a/addons/hr_timesheet/views/hr_timesheet_views.xml
+++ b/addons/hr_timesheet/views/hr_timesheet_views.xml
@@ -10,7 +10,7 @@
             web_icon="hr_timesheet,static/description/icon_timesheet.png"/>
 
         <menuitem id="menu_hr_time_tracking"
-            name="Timesheet"
+            name="Timesheets"
             parent="timesheet_menu_root"
             sequence="5"/>
 
@@ -62,6 +62,18 @@
             </field>
         </record>
 
+        <record id="view_my_timesheet_line_pivot" model="ir.ui.view">
+            <field name="name">account.analytic.line.pivot</field>
+            <field name="model">account.analytic.line</field>
+            <field name="arch" type="xml">
+                <pivot string="Timesheet" sample="1">
+                    <field name="date" interval="week" type="row"/>
+                    <field name="unit_amount" type="measure" widget="timesheet_uom"/>
+                    <field name="amount" string="Timesheet Costs"/>
+                </pivot>
+            </field>
+        </record>
+
         <record id="view_hr_timesheet_line_graph" model="ir.ui.view">
             <field name="name">account.analytic.line.graph</field>
             <field name="model">account.analytic.line</field>
@@ -75,6 +87,34 @@
             </field>
         </record>
 
+        <!-- For My Timesheet view, groups by week then project -->
+        <record id="view_hr_timesheet_line_graph_my" model="ir.ui.view">
+            <field name="name">account.analytic.line.graph</field>
+            <field name="model">account.analytic.line</field>
+            <field name="arch" type="xml">
+                <graph string="Timesheet" sample="1" js_class="hr_timesheet_graphview">
+                    <field name="date" interval="week" type="row"/>
+                    <field name="project_id" type="row"/>
+                    <field name="amount" type="measure" string="Timesheet Costs"/>
+                    <field name="unit_amount" type="measure" widget="timesheet_uom"/>
+                </graph>
+            </field>
+        </record>
+
+        <!-- For Other Timesheet view, groups by employee then project -->
+        <record id="view_hr_timesheet_line_graph_all" model="ir.ui.view">
+            <field name="name">account.analytic.line.graph</field>
+            <field name="model">account.analytic.line</field>
+            <field name="arch" type="xml">
+                <graph string="Timesheet" sample="1" js_class="hr_timesheet_graphview">
+                    <field name="employee_id" type="row"/>
+                    <field name="project_id" type="row"/>
+                    <field name="amount" type="measure" string="Timesheet Costs"/>
+                    <field name="unit_amount" type="measure" widget="timesheet_uom"/>
+                </graph>
+            </field>
+        </record>
+
         <record id="hr_timesheet_line_form" model="ir.ui.view">
             <field name="name">account.analytic.line.form</field>
             <field name="model">account.analytic.line</field>
@@ -211,7 +251,7 @@
         <record id="act_hr_timesheet_line" model="ir.actions.act_window">
             <field name="name">My Timesheets</field>
             <field name="res_model">account.analytic.line</field>
-            <field name="view_mode">tree,form,kanban</field>
+            <field name="view_mode">tree,form,kanban,pivot,graph</field>
             <field name="domain">[('project_id', '!=', False), ('user_id', '=', uid)]</field>
             <field name="context">{
                 "search_default_week":1,
@@ -248,6 +288,20 @@
             <field name="act_window_id" ref="act_hr_timesheet_line"/>
         </record>
 
+        <record id="act_hr_timesheet_line_view_pivot" model="ir.actions.act_window.view">
+            <field name="view_mode">pivot</field>
+            <field name="sequence">7</field>
+            <field name="view_id" ref="hr_timesheet.view_my_timesheet_line_pivot"/>
+            <field name="act_window_id" ref="act_hr_timesheet_line"/>
+        </record>
+
+        <record id="act_hr_timesheet_line_view_graph" model="ir.actions.act_window.view">
+            <field name="view_mode">graph</field>
+            <field name="sequence">8</field>
+            <field name="view_id" ref="hr_timesheet.view_hr_timesheet_line_graph_my"/>
+            <field name="act_window_id" ref="act_hr_timesheet_line"/>
+        </record>
+
         <menuitem id="timesheet_menu_activity_mine"
             name="My Timesheets"
             parent="menu_hr_time_tracking"
@@ -272,7 +326,7 @@
         <record id="timesheet_action_all" model="ir.actions.act_window">
             <field name="name">All Timesheets</field>
             <field name="res_model">account.analytic.line</field>
-            <field name="view_mode">tree,form,pivot,kanban</field>
+            <field name="view_mode">tree,form,kanban,pivot,graph</field>
             <field name="search_view_id" ref="hr_timesheet_line_search"/>
             <field name="domain">[('project_id', '!=', False)]</field>
             <field name="context">{
@@ -302,17 +356,24 @@
             <field name="act_window_id" ref="timesheet_action_all"/>
         </record>
 
+        <record id="timesheet_action_view_all_kanban" model="ir.actions.act_window.view">
+            <field name="view_mode">kanban</field>
+            <field name="sequence">6</field>
+            <field name="view_id" ref="hr_timesheet.view_kanban_account_analytic_line"/>
+            <field name="act_window_id" ref="timesheet_action_all"/>
+        </record>
+
         <record id="timesheet_action_view_all_pivot" model="ir.actions.act_window.view">
-            <field name="sequence" eval="6"/>
+            <field name="sequence" eval="7"/>
             <field name="view_mode">pivot</field>
             <field name="view_id" ref="view_hr_timesheet_line_pivot"/>
             <field name="act_window_id" ref="timesheet_action_all"/>
         </record>
 
-        <record id="timesheet_action_view_all_kanban" model="ir.actions.act_window.view">
-            <field name="view_mode">kanban</field>
-            <field name="sequence">7</field>
-            <field name="view_id" ref="hr_timesheet.view_kanban_account_analytic_line"/>
+        <record id="timesheet_action_view_all_graph" model="ir.actions.act_window.view">
+            <field name="sequence" eval="8"/>
+            <field name="view_mode">graph</field>
+            <field name="view_id" ref="view_hr_timesheet_line_graph_all"/>
             <field name="act_window_id" ref="timesheet_action_all"/>
         </record>
 
diff --git a/addons/hr_timesheet/views/res_config_settings_views.xml b/addons/hr_timesheet/views/res_config_settings_views.xml
index 4b181bc1f3d..937d677b41d 100644
--- a/addons/hr_timesheet/views/res_config_settings_views.xml
+++ b/addons/hr_timesheet/views/res_config_settings_views.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <odoo>
-    <menuitem id="hr_timesheet_menu_configuration" name="Configuration" parent="timesheet_menu_root"
-        groups="group_timesheet_manager" sequence="100"/>
-
     <record id="res_config_settings_view_form" model="ir.ui.view">
         <field name="name">res.config.settings.view.form.inherit.hr.timesheet</field>
         <field name="model">res.config.settings</field>
@@ -118,6 +115,6 @@
         <field name="context">{'module' : 'hr_timesheet', 'bin_size': False}</field>
     </record>
 
-    <menuitem id="hr_timesheet_config_settings_menu_action" name="Settings" parent="hr_timesheet_menu_configuration"
-        action="hr_timesheet_config_settings_action" sequence="0" groups="base.group_system"/>
+    <menuitem id="hr_timesheet_menu_configuration" name="Configuration" parent="timesheet_menu_root"
+        action="hr_timesheet_config_settings_action" groups="base.group_system" sequence="100"/>
 </odoo>