projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f05f913
)
[ADD] fallback float_time parsing on float parsing if the value does not match float_...
author
Xavier Morel
<xmo@openerp.com>
Thu, 10 Nov 2011 13:31:00 +0000
(14:31 +0100)
committer
Xavier Morel
<xmo@openerp.com>
Thu, 10 Nov 2011 13:31:00 +0000
(14:31 +0100)
bzr revid: xmo@openerp.com-
20111110133100
-sp4ttbfy90cz9kjq
addons/web/static/src/js/formats.js
patch
|
blob
|
history
diff --git
a/addons/web/static/src/js/formats.js
b/addons/web/static/src/js/formats.js
index
bf25f55
..
ae40981
100644
(file)
--- a/
addons/web/static/src/js/formats.js
+++ b/
addons/web/static/src/js/formats.js
@@
-112,7
+112,7
@@
openerp.web.parse_value = function (value, descriptor, value_if_empty) {
case 'float_time':
var float_time_pair = value.split(":");
if (float_time_pair.length != 2)
- throw new Error(value + " is not a correct float_time");
+ return openerp.web.parse_value(value, {type: "float"});
var hours = openerp.web.parse_value(float_time_pair[0], {type: "integer"});
var minutes = openerp.web.parse_value(float_time_pair[1], {type: "integer"});
return hours + (minutes / 60);