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

[Alexandre Fayolle - camptocamp]

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

[Pedro Manuel Baeza (pedro.baeza)]

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

=== modified file 'hr_holidays/hr_holidays.py'
--- hr_holidays/hr_holidays.py	2013-04-15 15:06:55 +0000
+++ hr_holidays/hr_holidays.py	2014-02-28 08:02:20 +0000
@@ -99,7 +99,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/%g)' % (record.leaves_taken or 0.0, record.max_leaves or 0.0))
             res.append((record.id, name))
         return res