summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorMartin Trigaux <mat@openerp.com>2014-01-21 15:26:25 +0100
committerMartin Trigaux <mat@openerp.com>2014-01-21 15:26:25 +0100
commit3c3ab07e2fefdff743faf8ecffaf58e90c813c95 (patch)
tree0c20e4ba83bf4b9fbf89acbd9081bf293b48d582 /addons/web/static/src
parent36048a8442c89cf4f5811850c3e2c91d6eb862c7 (diff)
[FIX] format_value: correctly compose if block, we are doing python here...
bzr revid: mat@openerp.com-20140121142625-fy8zkafcvb9wwz88
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/js/formats.js4
1 files changed, 1 insertions, 3 deletions
diff --git a/addons/web/static/src/js/formats.js b/addons/web/static/src/js/formats.js
index 58a785b6083..3280b9f4f75 100644
--- a/addons/web/static/src/js/formats.js
+++ b/addons/web/static/src/js/formats.js
@@ -191,9 +191,7 @@ instance.web.format_value = function (value, descriptor, value_if_empty) {
+ ' ' + normalize_format(l10n.time_format));
case 'date':
if (typeof(value) == "string")
- // in case value is a datetime, strip to avoid time manipulation
- value = value.substring(0,10);
- value = instance.web.str_to_date(value);
+ value = instance.web.str_to_date(value.substring(0,10));
return value.toString(normalize_format(l10n.date_format));
case 'time':
if (typeof(value) == "string")