Merge lp:~therp-nl/ocb-addons/7.0-lp1303724 into lp:ocb-addons

Proposed by Holger Brunn (Therp)
Status: Rejected
Rejected by: Holger Brunn (Therp)
Proposed branch: lp:~therp-nl/ocb-addons/7.0-lp1303724
Merge into: lp:ocb-addons
Diff against target: 11 lines (+1/-0)
1 file modified
hr_holidays/ (+1/-0)
To merge this branch: bzr merge lp:~therp-nl/ocb-addons/7.0-lp1303724
Reviewer Review Type Date Requested Status
Pedro Manuel Baeza code review Approve
Omar (Pexego) code review Approve
Review via email:
To post a comment you must log in.
Revision history for this message
Omar (Pexego) (omar7r) wrote :


review: Approve (code review)
Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

Seems good. This type of by hand calculated fields are very dangerous...

review: Approve (code review)
Revision history for this message
Holger Brunn (Therp) (hbrunn) wrote :

Unmerged revisions

10078. By Holger Brunn (Therp)

[FIX] allow resetting refused vacation requests

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'hr_holidays/'
--- hr_holidays/ 2014-03-24 09:12:54 +0000
+++ hr_holidays/ 2014-04-07 10:48:34 +0000
@@ -314,6 +314,7 @@
314 'state': 'draft',314 'state': 'draft',
315 'manager_id': False,315 'manager_id': False,
316 'manager_id2': False,316 'manager_id2': False,
317 'number_of_days_temp': 0,
317 })318 })
318 wf_service = netsvc.LocalService("workflow")319 wf_service = netsvc.LocalService("workflow")
319 for id in ids:320 for id in ids: