Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/7.0-bug-1259971-avo into lp:openobject-addons/7.0

  1. 7.0-bug-1259971-avo
  2. Merge into 7.0
Proposed by Amit Vora(OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/7.0-bug-1259971-avo
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:~openerp-dev/openobject-addons/7.0-bug-1259971-avo
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+208739@code.launchpad.net

Description of the change

Hello,
I have fixed HR Holiday remaining days unable to handle float.
Thanks
avo

To post a comment you must log in.
lp:~openerp-dev/openobject-addons/7.0-bug-1259971-avo updated
9858. By Amit Vora(OpenERP)

[IMP] improve code

9859. By Amit Vora(OpenERP)

[MERGE] merge with main branch

9860. By Amit Vora(OpenERP)

[MRG] merge with main branch

9861. By Amit Vora(OpenERP)

[MRG] merge with main branch

9862. By Amit Vora(OpenERP)

[MERGE] merge with main branch

Unmerged revisions

9862. By Amit Vora(OpenERP)

[MERGE] merge with main branch

9861. By Amit Vora(OpenERP)

[MRG] merge with main branch

9860. By Amit Vora(OpenERP)

[MRG] merge with main branch

9859. By Amit Vora(OpenERP)

[MERGE] merge with main branch

9858. By Amit Vora(OpenERP)

[IMP] improve code

9857. By Amit Vora(OpenERP)

[FIX] Holiday 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-05-06 09:37:14 +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