[MERGE] Bug fix lp:692971

bzr revid: sbh@tinyerp.com-20101222051836-mugpek40a77ja311

addons/hr_timesheet/test/test_hr_timesheet.yml

@@ -94,7 +94,7 @@
 -
   !python {model: hr.sign.in.project}: |
     uid = ref('test_timesheet_user1')
-    self.check_state(cr, uid, [ref("hr_employee_fracline1")], {"active_ids": [ref("hr_timesheet.menu_hr_timesheet_sign_in")]})
+    self.check_state(cr, uid, [ref("hr_employee_fracline1")], {"active_ids": [ref("hr_timesheet.action_hr_timesheet_sign_in")]})
 -
   I select start date and Perform start work on project.
 -
@@ -110,7 +110,7 @@
   !python {model: hr.sign.in.project}: |
        uid = ref('test_timesheet_user1')
        ids = self.search(cr, uid, [('emp_id', '=', ref('hr_employee_fracline1')),('name', '=', 'Francline')])
-       self.check_state(cr, uid, ids, {"active_ids": [ref("hr_timesheet.menu_hr_timesheet_sign_in")]
+       self.check_state(cr, uid, ids, {"active_ids": [ref("hr_timesheet.action_hr_timesheet_sign_in")]
              })
 
 -

addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml

@@ -51,12 +51,6 @@
             <field name="help">Employees can encode their time spent on the different projects. A project is an analytic account and the time spent on a project generate costs on the analytic account. This feature allows to record at the same time the attendance and the timesheet.</field>
         </record>
 
-        <menuitem action="action_hr_timesheet_sign_in"
-            id="menu_hr_timesheet_sign_in"
-            groups="base.group_extended"
-            parent="hr_attendance.menu_hr_attendance"
-            sequence="5" />
-
         <record id="view_hr_timesheet_sign_out" model="ir.ui.view">
             <field name="name">hr.sign.out.project.form</field>
             <field name="model">hr.sign.out.project</field>

addons/project_timesheet/project_timesheet_view.xml

@@ -123,6 +123,11 @@
 			<field name="search_view_id" ref="view_account_analytic_line_filter_inherit_buttons"/>
             <field name="help">This lists show you every task work you can invoice to the customer. Select the lines in order to generate the invoices automatically.</field>
         </record>
+  		<menuitem action="hr_timesheet.action_hr_timesheet_sign_in"
+            id="menu_hr_timesheet_sign_in"
+            groups="base.group_extended"
+            parent="hr_attendance.menu_hr_attendance"
+            sequence="5" />
 
         <menuitem id="menu_project_billing" name="Invoicing"
                   parent="base.menu_main_pm" sequence="5"/>