summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js
diff options
context:
space:
mode:
authorXavier Morel <xmo@openerp.com>2013-01-23 11:15:57 +0100
committerXavier Morel <xmo@openerp.com>2013-01-23 11:15:57 +0100
commitca038643b9ffd48e2d14206ad8b815b9e9f9da05 (patch)
treed35e9fcceac9c6492470e542557877d19abbf3f5 /addons/web/static/src/js
parentd5ab8a42416cc23702b9cf0d1de43d4183010e52 (diff)
parentbe9f4b43b79da75d029c75e6ce07d54a1a7ddb2a (diff)
[FIX] rounding of float_time to the next hour should bump the hour, nor display 60mn
bzr revid: xmo@openerp.com-20130123101557-v63oxes2emrwcz19
Diffstat (limited to 'addons/web/static/src/js')
-rw-r--r--addons/web/static/src/js/formats.js10
1 files changed, 7 insertions, 3 deletions
diff --git a/addons/web/static/src/js/formats.js b/addons/web/static/src/js/formats.js
index 9432b02826f..851b60af229 100644
--- a/addons/web/static/src/js/formats.js
+++ b/addons/web/static/src/js/formats.js
@@ -166,9 +166,13 @@ instance.web.format_value = function (value, descriptor, value_if_empty) {
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];