openerp-community-reviewer team mailing list archive

[Alexandre Fayolle - camptocamp <alexandre.fayolle@xxxxxxxxxxxxxx>]

Alexandre Fayolle - camptocamp has proposed merging lp:~camptocamp/ocb-addons/ocb-7.0-fix_1259971-ssh+afe into lp:ocb-addons.

Requested reviews:
  OpenERP Community Backports Team (ocb)
Related bugs:
  Bug #1259971 in OpenERP Community Backports (Addons): "HR Holiday remaining days unable to handle float"
  https://bugs.launchpad.net/ocb-addons/+bug/1259971

For more details, see:
https://code.launchpad.net/~camptocamp/ocb-addons/ocb-7.0-fix_1259971-ssh+afe/+merge/208744

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

Port of https://code.launchpad.net/~camptocamp/openobject-addons/7.0-fix_1259971-ssh+afe/+merge/208743 to OCB
-- 
https://code.launchpad.net/~camptocamp/ocb-addons/ocb-7.0-fix_1259971-ssh+afe/+merge/208744
Your team OpenERP Community Backports Team is requested to review the proposed merge of lp:~camptocamp/ocb-addons/ocb-7.0-fix_1259971-ssh+afe into lp:ocb-addons.

=== modified file 'hr_holidays/hr_holidays.py'
--- hr_holidays/hr_holidays.py	2012-10-23 16:05:04 +0000
+++ hr_holidays/hr_holidays.py	2014-02-28 08:03:06 +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