From ceba8b648fbc24bf34e1134d80db7fdd4ea64120 Mon Sep 17 00:00:00 2001
From: Simon Lejeune <sle@openerp.com>
Date: Mon, 9 May 2016 14:34:02 +0200
Subject: [PATCH] [FIX] hr_timesheet_sheet: "weekly" menuitem wrongly set as no
 update

The loading order of the data files has to be modified, as this menuitem
uses an action defined in hr_timesheet_sheet_data.xml.
---
 addons/hr_timesheet_sheet/__openerp__.py              | 2 +-
 addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml | 2 --
 addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml | 2 ++
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/hr_timesheet_sheet/__openerp__.py b/addons/hr_timesheet_sheet/__openerp__.py
index a4f43b71eda..b8db18925cb 100644
--- a/addons/hr_timesheet_sheet/__openerp__.py
+++ b/addons/hr_timesheet_sheet/__openerp__.py
@@ -30,10 +30,10 @@ The validation can be configured in the company:
     'data': [
         'security/ir.model.access.csv',
         'security/hr_timesheet_sheet_security.xml',
-        'hr_timesheet_sheet_view.xml',
         'hr_timesheet_workflow.xml',
         'hr_timesheet_sheet_data.xml',
         'views/hr_timesheet_sheet.xml',
+        'hr_timesheet_sheet_view.xml',
         'hr_dashboard.xml',
     ],
     'test':['../account/test/account_minimal_test.xml', 'test/test_hr_timesheet_sheet.yml'],
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
index 14d86a73d25..ae4a13efa2e 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
@@ -21,8 +21,6 @@
             <field name="name">My Timesheet</field>
         </record>
 
-        <menuitem name="Weekly" id="menu_act_hr_timesheet_sheet_form_my_current" parent="hr_timesheet.menu_hr_time_tracking" action="ir_actions_server_timsheet_sheet" sequence="2"/>
-
         <!-- Timesheet sheet related subtypes for messaging / Chatter -->
         <record id="mt_timesheet_confirmed" model="mail.message.subtype">
             <field name="name">Waiting Approval</field>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 4001a4a212c..ddb4b33774c 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -216,6 +216,8 @@
             </field>
         </record>
 
+        <menuitem name="Weekly" id="menu_act_hr_timesheet_sheet_form_my_current" parent="hr_timesheet.menu_hr_time_tracking" action="ir_actions_server_timsheet_sheet" sequence="2"/>
+
         <menuitem action="act_hr_timesheet_sheet_my_timesheets" id="menu_act_hr_timesheet_sheet_my_timesheets" parent="hr_timesheet.menu_hr_time_tracking"
              sequence="3"/>