From 4d253431de497fd9ac1a2d592c5dcd5f3e3a073e Mon Sep 17 00:00:00 2001
From: Yannick Tivisse <yti@odoo.com>
Date: Thu, 14 Jan 2016 14:13:47 +0100
Subject: [PATCH] [IMP] hr_timesheeet: Menus reorganisation + small
 improvements

+ Remove duplicated fields on res_company config view
+ Remove Timesheet range per 'Day' on res_company
+ Move Attendance information in the 'Attendances' notebook on timesheet view
---
 addons/hr_attendance/hr_attendance_view.xml        |  3 ++-
 addons/hr_timesheet/hr_timesheet_view.xml          |  3 ++-
 .../report/hr_timesheet_report_view.xml            |  4 ++--
 addons/hr_timesheet_sheet/hr_timesheet_sheet.py    |  3 +--
 .../hr_timesheet_sheet/hr_timesheet_sheet_view.xml | 14 ++++++--------
 5 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 51fa53a22ae..bed3aaa9550 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -121,7 +121,8 @@
         </record>
 
         <menuitem id="timesheet_menu_root" name="Timesheets" sequence="55" groups="base.group_user,base.group_hr_user,base.group_hr_manager" web_icon="hr_attendance,static/description/icon_timesheet.png"/>
-        <menuitem id="menu_hr_time_tracking" name="Time Tracking" parent="timesheet_menu_root" sequence="5" />
+        <menuitem id="menu_hr_time_tracking" name="My Timesheet" parent="timesheet_menu_root" sequence="5" />
+        <menuitem id="menu_hr_to_approve" name="To Approve" parent="timesheet_menu_root" sequence="7"/>
 
         <menuitem id="menu_hr_attendance_root" name="Attendances" sequence="90" groups="base.group_hr_attendance" web_icon="hr_attendance,static/description/icon.png"/>
 
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index bd9211dd254..a19c6070453 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -110,7 +110,8 @@
             <field name="act_window_id" ref="act_hr_timesheet_line_evry1_all_form"/>
         </record>
 
-        <menuitem id="menu_hr_working_hours" parent="hr_attendance.menu_hr_time_tracking" action="act_hr_timesheet_line_evry1_all_form"/>
+        <menuitem id="menu_hr_working_hours" parent="hr_attendance.menu_hr_time_tracking" action="act_hr_timesheet_line_evry1_all_form"
+            name="Detailed Activities"/>
 
 
     </data>
diff --git a/addons/hr_timesheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet/report/hr_timesheet_report_view.xml
index 3769e89255c..e6807b0a596 100644
--- a/addons/hr_timesheet/report/hr_timesheet_report_view.xml
+++ b/addons/hr_timesheet/report/hr_timesheet_report_view.xml
@@ -70,8 +70,8 @@
 
         <menuitem id="menu_timesheets_reports" name="Reports"
             parent="hr_attendance.timesheet_menu_root" sequence="99" groups="base.group_hr_manager"/>
-        <menuitem name="Timesheet" action="action_hr_timesheet_report_stat_all"  id="menu_hr_timesheet_report_all"
-            parent="menu_timesheets_reports"  sequence="3"/>
+        <menuitem name="Timesheets" action="action_hr_timesheet_report_stat_all"  id="menu_hr_timesheet_report_all"
+            parent="menu_timesheets_reports"  sequence="2"/>
 
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index 92625f278f8..2fd148e4232 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -623,8 +623,7 @@ class hr_timesheet_sheet_sheet_account(osv.osv):
 class res_company(osv.osv):
     _inherit = 'res.company'
     _columns = {
-        'timesheet_range': fields.selection(
-            [('day','Day'),('week','Week'),('month','Month')], 'Timesheet range',
+        'timesheet_range': fields.selection([('week','Week'),('month','Month')], 'Timesheet range',
             help="Periodicity on which you validate your timesheets."),
         'timesheet_max_difference': fields.float('Timesheet allowed difference(Hours)',
             help="Allowed difference in hours between the sign in/out and the timesheet " \
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index cf3f0a05399..7e0e693ec39 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -113,10 +113,6 @@
                             <field name="department_id" invisible="1"/>
                             <field name="company_id" groups="base.group_multi_company"/>
                         </group>
-                        <group groups="base.group_hr_attendance">
-                            <field name="total_attendance" widget="float_time"/>
-                            <field name="total_difference" widget="float_time"/>
-                        </group>
                     </group>
                     <notebook>
                         <page string="Summary">
@@ -155,6 +151,10 @@
                                         <button name="attendance_action_change" attrs="{'invisible': ['|', ('state_attendance','=',False), ('state_attendance', '=', 'absent')]}" type="object" string="Sign Out" class="oe_link"/>
                                     </div>
                                 </group>
+                                <group groups="base.group_hr_attendance">
+                                    <field name="total_attendance" widget="float_time"/>
+                                    <field name="total_difference" widget="float_time"/>
+                                </group>
                             </group>
                             <field name="period_ids">
                                 <tree decoration-danger="total_difference&lt;0.1" decoration-info="total_difference&gt;=0.1" string="Period">
@@ -215,7 +215,7 @@
             </field>
         </record>
 
-        <menuitem action="act_hr_timesheet_sheet_my_timesheets" id="menu_act_hr_timesheet_sheet_my_timesheets" parent="hr_attendance.menu_hr_time_tracking"
+        <menuitem action="act_hr_timesheet_sheet_my_timesheets" id="menu_act_hr_timesheet_sheet_my_timesheets" parent="hr_timesheet.menu_timesheets_reports"
              sequence="3"/>
 
         <record id="act_hr_timesheet_sheet_form" model="ir.actions.act_window">
@@ -247,7 +247,7 @@
             <field name="act_window_id" ref="act_hr_timesheet_sheet_form"/>
         </record>
 
-        <menuitem action="act_hr_timesheet_sheet_form" id="menu_act_hr_timesheet_sheet_form" parent="hr_attendance.menu_hr_time_tracking"
+        <menuitem action="act_hr_timesheet_sheet_form" id="menu_act_hr_timesheet_sheet_form" parent="hr_attendance.menu_hr_to_approve"
              sequence="11" groups="base.group_hr_user"/>
 
 
@@ -262,8 +262,6 @@
             <field name="arch" type="xml">
                 <xpath expr="//group[@name='account_grp']" position="after">
                     <group name="timesheets_grp" string="Timesheets">
-                        <field name="timesheet_range"/>
-                        <field name="timesheet_max_difference"/>
                         <div>
                             <label for="timesheet_range"/>
                             <field name="timesheet_range" required="1" class="oe_inline"/>