diff options
| author | Denis Ledoux <dle@odoo.com> | 2014-06-24 13:56:51 +0200 |
|---|---|---|
| committer | Denis Ledoux <dle@odoo.com> | 2014-06-24 13:56:51 +0200 |
| commit | e1e0cfbba83bc5e91216338ccf9f09f289f9e845 (patch) | |
| tree | fe32a04e2e365ba7e4c0eeea8b1497bb9bf64f31 /addons/web/static/src | |
| parent | 8e83dbff5d4a000aaa55ce0f95f76b8b460e1794 (diff) | |
| parent | e2201369a314feaec70a485f0459c1dcdcecd82b (diff) | |
[MERGE] Forward-port of 7.0 bugfixes up to e2201369a314feaec70a485f0459c1dcdcecd82b
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/formats.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/web/static/src/js/formats.js b/addons/web/static/src/js/formats.js index f08dc31021a..3d7b574e56a 100644 --- a/addons/web/static/src/js/formats.js +++ b/addons/web/static/src/js/formats.js @@ -271,7 +271,7 @@ 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){ + datetime = Date.parseExact(value.toString().replace(/\d+/g, function(m){ return m.length === 1 ? "0" + m : m ; }), (date_pattern + ' ' + time_pattern)); if (datetime !== null) @@ -284,7 +284,7 @@ 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){ + date = Date.parseExact(value.toString().replace(/\d+/g, function(m){ return m.length === 1 ? "0" + m : m ; }), date_pattern); if (date !== null) |