[MERGE] forward port of branch saas-9 up to 087729f

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));