Merge lp:~openerp-dev/openerp-web/7.0-opw-581438-port-pan into lp:openerp-web/7.0

[Anand]

Hello,

Float_time widget show wrong format of time.

Demo: Human Resources > Time Tracking > Time sheets
1) Create new record.
3) Enter 5.9999 quantity in Time-sheet Lines record and save.

Observed: "Difference" field value "05:60".
Expected: "Difference" field value "06:00".

And i used Math.round,
because Math.floor is not solving the problem.
 if we uses Math.floor(4.9999) output is ==> 04:59 and
 if we uses Math.round(4.9999) output is ==> 05:00

Attached video for that:-https://docs.google.com/open?id=0B0jT5NnR2uk-UzBNTGQ1UFRHcjg

Thanks.

[Xavier (Open ERP) (xmo-deactivatedaccount)]

Please add tests for behavior on boundaries of float_time. There are already some tests for this, can add new ones.

review: Needs Fixing

[lp:~openerp-dev/openerp-web/7.0-opw-581438-port-pan]

3710. By Anand on 2013-01-23

[IMP] Added some test cases for the float_time

[Anand (anand-m-patel)]

> Please add tests for behavior on boundaries of float_time. There are already
> some tests for this, can add new ones.
Hello,

I have added some test cases for the float_time.

Thanks,
PAN

[Xavier (Open ERP) (xmo-deactivatedaccount)]

thanks

review: Approve

=== modified file 'addons/web/static/src/js/formats.js'
--- addons/web/static/src/js/formats.js	2012-11-29 00:22:00 +0000
+++ addons/web/static/src/js/formats.js	2013-01-23 09:35:24 +0000
@@ -166,9 +166,13 @@
                 value = Math.abs(value);
                 pattern = '-' + pattern;
             }
-            return _.str.sprintf(pattern,
-                    Math.floor(value),
-                    Math.round((value % 1) * 60));
+            var hour = Math.floor(value);
+            var min = Math.round((value % 1) * 60);
+            if (min == 60){
+                min = 0;
+                hour = hour + 1;
+            }
+            return _.str.sprintf(pattern, hour, min);
         case 'many2one':
             // name_get value format
             return value[1] ? value[1].split("\n")[0] : value[1];

=== modified file 'addons/web/static/test/formats.js'
--- addons/web/static/test/formats.js	2012-10-26 09:21:44 +0000
+++ addons/web/static/test/formats.js	2013-01-23 09:35:24 +0000
@@ -68,6 +68,12 @@
         strictEqual(
             instance.web.format_value(-0.0085, {type:'float', widget:'float_time'}),
             '-00:01');
+        strictEqual(
+            instance.web.format_value(4.9999, {type:'float', widget:'float_time'}),
+            '05:00');
+        strictEqual(
+            instance.web.format_value(-6.9999, {type:'float', widget:'float_time'}),
+            '-07:00');
     });
     test("format_float", function (instance) {
         var fl = 12.1234;