diff options
| author | Denis Ledoux <dle@odoo.com> | 2015-02-06 14:02:43 +0100 |
|---|---|---|
| committer | Denis Ledoux <dle@odoo.com> | 2015-02-06 14:02:43 +0100 |
| commit | f92b2f8d4d246ec65fe4a15e871a6d7d8da6921f (patch) | |
| tree | d1545b0b9ca577396634a4f8d7b131ee1149d14a /addons/web/static/src/js | |
| parent | 0c9b8cd7af478e9f105534627fdb2be38d8c92f0 (diff) | |
| parent | 0b7db5583f9b3b40c94ff7ed81cfb6bc2f3bd37e (diff) | |
[MERGE] forward port of branch 7.0 up to 0b7db55
Diffstat (limited to 'addons/web/static/src/js')
| -rw-r--r-- | addons/web/static/src/js/formats.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/web/static/src/js/formats.js b/addons/web/static/src/js/formats.js index 3cff2a4b4f4..7831d2ba868 100644 --- a/addons/web/static/src/js/formats.js +++ b/addons/web/static/src/js/formats.js @@ -196,7 +196,7 @@ instance.web.format_value = function (value, descriptor, value_if_empty) { + ' ' + normalize_format(l10n.time_format)); case 'date': if (typeof(value) == "string") - value = instance.web.str_to_date(value.substring(0,10)); + value = instance.web.auto_str_to_date(value); return value.toString(normalize_format(l10n.date_format)); case 'time': if (typeof(value) == "string") |