Merge lp:~camptocamp/openobject-addons/7.0-fix_1259971-ssh+afe into lp:openobject-addons/7.0

Proposed by Alexandre Fayolle - camptocamp
Status: Needs review
Proposed branch: lp:~camptocamp/openobject-addons/7.0-fix_1259971-ssh+afe
Merge into: lp:openobject-addons/7.0
Diff against target: 11 lines (+1/-1)
1 file modified
hr_holidays/hr_holidays.py (+1/-1)
To merge this branch: bzr merge lp:~camptocamp/openobject-addons/7.0-fix_1259971-ssh+afe
Reviewer Review Type Date Requested Status
Pedro Manuel Baeza (community) code review Approve
OpenERP Core Team Pending
Review via email: mp+208743@code.launchpad.net

Description of the change

Fix the display of holidays which was truncated to integer values.

Port https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-1259971-ssh to 7.0 and small enhancement of that branch to handle floats in the total holiday amount

To post a comment you must log in.
Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

LGTM

Regards.

review: Approve (code review)

Unmerged revisions

9859. By Alexandre Fayolle - camptocamp on 2014-02-28

[FIX] push sunil sharma's fix one step further and also account for float values in the total leave allocation

9858. By Sunil Sharma(OpenERP) on 2014-01-15

[FIX] hr_holidays:remaining days unable to handle float

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hr_holidays/hr_holidays.py'
2--- hr_holidays/hr_holidays.py 2013-04-15 15:06:55 +0000
3+++ hr_holidays/hr_holidays.py 2014-02-28 08:02:20 +0000
4@@ -99,7 +99,7 @@
5 for record in self.browse(cr, uid, ids, context=context):
6 name = record.name
7 if not record.limit:
8- name = name + (' (%d/%d)' % (record.leaves_taken or 0.0, record.max_leaves or 0.0))
9+ name = name + (' (%g/%g)' % (record.leaves_taken or 0.0, record.max_leaves or 0.0))
10 res.append((record.id, name))
11 return res
12