[MERGE] forward port of branch 7.0 up to e5533d0

[odoo/odoo.git] / addons / web / static / src / js / formats.js

diff --git a/addons/web/static/src/js/formats.js b/addons/web/static/src/js/formats.js
index a56ab6b..f08dc31 100644 (file)
--- a/addons/web/static/src/js/formats.js
+++ b/addons/web/static/src/js/formats.js
@@ -271,6 +271,11 @@ instance.web.parse_value = function (value, descriptor, value_if_empty) {
                     value, (date_pattern + ' ' + time_pattern));
             if (datetime !== null)
                 return instance.web.datetime_to_str(datetime);
+            datetime = Date.parseExact(value.replace(/\d+/g, function(m){
+                return m.length === 1 ? "0" + m : m ;
+            }), (date_pattern + ' ' + time_pattern));
+            if (datetime !== null)
+                return instance.web.datetime_to_str(datetime);
             datetime = Date.parse(value);
             if (datetime !== null)
                 return instance.web.datetime_to_str(datetime);
@@ -279,6 +284,11 @@ instance.web.parse_value = function (value, descriptor, value_if_empty) {
             var date = Date.parseExact(value, date_pattern);
             if (date !== null)
                 return instance.web.date_to_str(date);
+            date = Date.parseExact(value.replace(/\d+/g, function(m){
+                return m.length === 1 ? "0" + m : m ;
+            }), date_pattern);
+            if (date !== null)
+                return instance.web.date_to_str(date);
             date = Date.parse(value);
             if (date !== null)
                 return instance.web.date_to_str(date);