diff options
| author | Fabien Pinckaers <fp@tinyerp.com> | 2010-10-04 21:49:13 +0200 |
|---|---|---|
| committer | Fabien Pinckaers <fp@tinyerp.com> | 2010-10-04 21:49:13 +0200 |
| commit | ed47d40ae4e2f2a4cc5fbd9f8e6cfc46bacc163a (patch) | |
| tree | 1406485ff3eaab3b69aaab74f6c504183c66ff9f /addons | |
| parent | 727fe160420244326af0c594f90b7d5f93a7836c (diff) | |
fix
bzr revid: fp@tinyerp.com-20101004194913-w636uh20qumfz7fx
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml | 3 | ||||
| -rw-r--r-- | addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml | 10 |
2 files changed, 8 insertions, 5 deletions
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml index f078be2dbe1..27c706cfe5a 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml @@ -201,8 +201,7 @@ id="base.menu_project_management_time_tracking" name="Time Tracking" parent="base.menu_main_pm" sequence="5"/> - <menuitem action="hr_timesheet_sheet.act_hr_timesheet_sheet_form" id="menu_act_project_management_timesheet_sheet_form" parent="base.menu_project_management_time_tracking" - sequence="5"/> + <menuitem action="act_hr_timesheet_sheet_form" id="menu_act_hr_timesheet_sheet_form" parent="hr_attendance.menu_hr_time_tracking" sequence="2"/> diff --git a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml index 19eacdae472..f9944d0949f 100644 --- a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml +++ b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml @@ -6,7 +6,7 @@ <field name="model">hr.timesheet.current.open</field> <field name="type">form</field> <field name="arch" type="xml"> - <form string="Current Timesheet"> + <form string="My Timesheet"> <separator string="It will open the your current timesheet" colspan="4" /> <group colspan="4" col="6"> <button icon="gtk-cancel" special="cancel" string="Cancel"/> @@ -17,7 +17,7 @@ </record> <record id="action_hr_timesheet_current_open" model="ir.actions.act_window"> - <field name="name">Current Timesheet</field> + <field name="name">My Timesheet</field> <field name="res_model">hr.timesheet.current.open</field> <field name="view_type">form</field> <field name="view_mode">tree,form</field> @@ -25,7 +25,11 @@ <field name="target">new</field> </record> - <menuitem action="action_hr_timesheet_current_open" icon="STOCK_NEW" id="menu_act_hr_timesheet_sheet_form_my_current" name="Current Timesheet" parent="hr_attendance.menu_hr_time_tracking" sequence="1"/> + <menuitem action="action_hr_timesheet_current_open" icon="STOCK_NEW" id="menu_act_hr_timesheet_sheet_form_my_current" name="My Timesheet" parent="hr_attendance.menu_hr_time_tracking" sequence="1"/> + + <menuitem action="action_hr_timesheet_current_open" + id="menu_act_project_management_timesheet_sheet_form" parent="base.menu_project_management_time_tracking" + sequence="5"/> </data> </openerp> |