diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-05-13 14:08:51 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-05-13 14:08:51 +0200 |
| commit | 7f2a9e77b6dbe65e3977f8a3b15de1785bc5d7d3 (patch) | |
| tree | 9a6232b1dcf1f0435b1332c126a8d9cfdc683e64 /addons/web/static/src/js/framework | |
| parent | 89873cbed5fb31547843a7a135145d46986431af (diff) | |
| parent | dcab356b38aad5d6c7940c0211a3a940a8be9a65 (diff) | |
[MERGE] forward port of branch 9.0 up to dcab356
Diffstat (limited to 'addons/web/static/src/js/framework')
| -rw-r--r-- | addons/web/static/src/js/framework/formats.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/web/static/src/js/framework/formats.js b/addons/web/static/src/js/framework/formats.js index 4b5ff8b4048..52a2fa5b0b0 100644 --- a/addons/web/static/src/js/framework/formats.js +++ b/addons/web/static/src/js/framework/formats.js @@ -160,17 +160,17 @@ function parse_value (value, descriptor, value_if_empty) { case 'progressbar': return parse_value(value, {type: "float"}); case 'datetime': - var datetime = moment(value, [date_pattern + ' ' + time_pattern, date_pattern_wo_zero + ' ' + time_pattern_wo_zero], true); + var datetime = moment(value, [date_pattern + ' ' + time_pattern, date_pattern_wo_zero + ' ' + time_pattern_wo_zero, moment.ISO_8601], true); if (datetime.isValid()) return time.datetime_to_str(datetime.toDate()); throw new Error(_.str.sprintf(_t("'%s' is not a correct datetime"), value)); case 'date': - var date = moment(value, [date_pattern, date_pattern_wo_zero], true); + var date = moment(value, [date_pattern, date_pattern_wo_zero, moment.ISO_8601], true); if (date.isValid()) return time.date_to_str(date.toDate()); throw new Error(_.str.sprintf(_t("'%s' is not a correct date"), value)); case 'time': - var _time = moment(value, [time_pattern, time_pattern_wo_zero], true); + var _time = moment(value, [time_pattern, time_pattern_wo_zero, moment.ISO_8601], true); if (_time.isValid()) return time.time_to_str(_time.toDate()); throw new Error(_.str.sprintf(_t("'%s' is not a correct time"), value)); |