[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.
2016-05-09 14:38:06 +02:00
parent 8ff9cbad2c
commit ceba8b648f
3 changed files with 3 additions and 3 deletions
@@ -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'],
@@ -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>
@@ -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"/>