odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] forward port of branch saas-3 up to 0b1b820

This commit is contained in:
Denis Ledoux 2014-12-24 14:04:18 +01:00
parent 5a207fa08e 0b1b820677
commit 1684206122
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
addons/web/static/src/js/formats.js
View File

@ -271,9 +271,16 @@ 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.toString().replace(/\d+/g, function(m){
datetime = Date.parseExact(value, (date_pattern));
if (datetime !== null)
return instance.web.datetime_to_str(datetime);
var leading_zero_value = value.toString().replace(/\d+/g, function(m){
return m.length === 1 ? "0" + m : m ;
}), (date_pattern + ' ' + time_pattern));
});
datetime = Date.parseExact(leading_zero_value, (date_pattern + ' ' + time_pattern));
if (datetime !== null)
return instance.web.datetime_to_str(datetime);
datetime = Date.parseExact(leading_zero_value, (date_pattern));
if (datetime !== null)
return instance.web.datetime_to_str(datetime);
datetime = Date.parse(value);