Merge lp:~laetitia-gangloff/openobject-addons/7.0_fix_1200611 into lp:openobject-addons/7.0

Proposed by Laetitia Gangloff (Acsone)
Status: Needs review
Proposed branch: lp:~laetitia-gangloff/openobject-addons/7.0_fix_1200611
Merge into: lp:openobject-addons/7.0
Diff against target: 12 lines (+1/-1)
1 file modified
hr_timesheet_sheet/hr_timesheet_sheet_view.xml (+1/-1)
To merge this branch: bzr merge lp:~laetitia-gangloff/openobject-addons/7.0_fix_1200611
Reviewer Review Type Date Requested Status
Stéphane Bidoul (Acsone) (community) Approve
Review via email: mp+174774@code.launchpad.net

Description of the change

fix bug 1200611 by setting default value for employee_id in the context

To post a comment you must log in.
Revision history for this message
Stéphane Bidoul (Acsone) (sbi) wrote :

code looks good, no test

review: Approve

Unmerged revisions

9296. By Laetitia Gangloff (Acsone)

hr_timesheet_sheet: for attendance, set default value for employee_id in the context

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'hr_timesheet_sheet/hr_timesheet_sheet_view.xml'
--- hr_timesheet_sheet/hr_timesheet_sheet_view.xml 2012-12-17 11:14:02 +0000
+++ hr_timesheet_sheet/hr_timesheet_sheet_view.xml 2013-07-15 14:28:32 +0000
@@ -134,7 +134,7 @@
134 </page>134 </page>
135 <page string="Attendances" groups="base.group_hr_attendance">135 <page string="Attendances" groups="base.group_hr_attendance">
136 <group>136 <group>
137 <field context="{'employee_id': employee_id, 'user_id':user_id}" name="attendances_ids" nolabel="1">137 <field context="{'default_employee_id': employee_id}" name="attendances_ids" nolabel="1">
138 <tree string="Attendances" editable="bottom">138 <tree string="Attendances" editable="bottom">
139 <field name="name"/>139 <field name="name"/>
140 <field name="action"/>140 <field name="action"/>