Merge lp:~openerp-dev/openobject-addons/trunk-bug-1082324-hip into lp:openobject-addons

[Hiral Patel (OpenERP)]

Hello,

Rounding of total in timesheet lines is not correct.

Thanks.

Unmerged revisions

8307. By Hiral Patel (OpenERP) on 2012-12-17

[MERGE] Merge with lp:openobject-addons

8306. By Hiral Patel (OpenERP) on 2012-12-17

[FIX][trunk] In Timesheet, the total of timesheet lines is not rounding.

=== modified file 'hr_timesheet_sheet/static/src/js/timesheet.js'
--- hr_timesheet_sheet/static/src/js/timesheet.js	2012-11-22 13:06:56 +0000
+++ hr_timesheet_sheet/static/src/js/timesheet.js	2012-12-17 09:08:03 +0000
@@ -266,12 +266,12 @@
                     day_tots[day_count] += sum;
                     super_tot += sum;
                 });
-                self.get_total(account).html(acc_tot);
+                self.get_total(account).html(Math.round(acc_tot));
             });
             _.each(_.range(self.dates.length), function(day_count) {
-                self.get_day_total(day_count).html(day_tots[day_count]);
+                self.get_day_total(day_count).html(Math.round(day_tots[day_count]));
             });
-            self.get_super_total().html(super_tot);
+            self.get_super_total().html(Math.round(super_tot));
         },
         sync: function() {
             var self = this;