diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-07-05 23:42:12 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-07-05 23:42:12 +0200 |
| commit | e7190cbbbf78eac105f708113db8ef1516d517d3 (patch) | |
| tree | fe215027642cba020ad613a20c7babcd4dcfe079 /addons/web/static/src/js/framework/formats.js | |
| parent | a764474193ac874c9dd6a602be575b9615f11984 (diff) | |
| parent | 74b51d3d973469c31459236663f0b4dce0f4c4dc (diff) | |
[MERGE] forward port of branch saas-10 up to 74b51d3
Diffstat (limited to 'addons/web/static/src/js/framework/formats.js')
| -rw-r--r-- | addons/web/static/src/js/framework/formats.js | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/addons/web/static/src/js/framework/formats.js b/addons/web/static/src/js/framework/formats.js index 52a2fa5b0b0..8a5a8ffedb7 100644 --- a/addons/web/static/src/js/framework/formats.js +++ b/addons/web/static/src/js/framework/formats.js @@ -163,11 +163,17 @@ function parse_value (value, descriptor, value_if_empty) { 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()); + datetime = moment(value, [date_pattern + ' ' + time_pattern, date_pattern_wo_zero + ' ' + time_pattern_wo_zero, moment.ISO_8601]); + 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, moment.ISO_8601], true); if (date.isValid()) return time.date_to_str(date.toDate()); + date = moment(value, [date_pattern, date_pattern_wo_zero, moment.ISO_8601]); + 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, moment.ISO_8601], true); |