Merge lp:~openerp-dev/openobject-addons/trunk-bug-1259971-ssh into lp:openobject-addons

Proposed by Sunil Sharma(OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-1259971-ssh
Merge into: lp:openobject-addons
Diff against target: 11 lines (+1/-1)
1 file modified
hr_holidays/hr_holidays.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-1259971-ssh
Reviewer Review Type Date Requested Status
Alexandre Fayolle - camptocamp (community) code review, no test Needs Fixing
OpenERP Core Team Pending
Review via email: mp+201720@code.launchpad.net

Description of the change

Hello,

       I have fix this bug, remaining days unable to handle float in hr_holidays.

Thanks
Sunil Sharma (SSH)

To post a comment you must log in.
Revision history for this message
Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c) wrote :

you should handle float values in record.max_leaves too

review: Needs Fixing (code review, no test)

Unmerged revisions

9050. By Sunil Sharma(OpenERP)

[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 2014-01-14 13:52:40 +0000
3+++ hr_holidays/hr_holidays.py 2014-01-15 06:58:54 +0000
4@@ -94,7 +94,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/%d)' % (record.leaves_taken or 0.0, record.max_leaves or 0.0))
10 res.append((record.id, name))
11 return res
12

Subscribers

People subscribed via source and target branches

to all changes: