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

[Sunil Sharma(OpenERP)]

Hello,

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

Thanks
Sunil Sharma (SSH)

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

you should handle float values in record.max_leaves too

review: Needs Fixing (code review, no test)

Unmerged revisions

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

[FIX] hr_holidays:remaining days unable to handle float

=== modified file 'hr_holidays/hr_holidays.py'
--- hr_holidays/hr_holidays.py	2014-01-14 13:52:40 +0000
+++ hr_holidays/hr_holidays.py	2014-01-15 06:58:54 +0000
@@ -94,7 +94,7 @@
         for record in self.browse(cr, uid, ids, context=context):
             name = record.name
             if not record.limit:
-                name = name + ('  (%d/%d)' % (record.leaves_taken or 0.0, record.max_leaves or 0.0))
+                name = name + ('  (%g/%d)' % (record.leaves_taken or 0.0, record.max_leaves or 0.0))
             res.append((record.id, name))
         return res