[MERGE] forward port of branch 7.0 up to 6372313
This commit is contained in:
commit
0b1b820677
|
@ -21,7 +21,7 @@
|
||||||
{
|
{
|
||||||
"name" : "Romania - Accounting",
|
"name" : "Romania - Accounting",
|
||||||
"version" : "1.0",
|
"version" : "1.0",
|
||||||
"author" : "TOTAL PC SYSTEMS",
|
"author" : "ERPsystems Solutions",
|
||||||
"website": "http://www.erpsystems.ro",
|
"website": "http://www.erpsystems.ro",
|
||||||
"category" : "Localization/Account Charts",
|
"category" : "Localization/Account Charts",
|
||||||
"depends" : ['account','account_chart','base_vat'],
|
"depends" : ['account','account_chart','base_vat'],
|
||||||
|
|
|
@ -271,9 +271,16 @@ instance.web.parse_value = function (value, descriptor, value_if_empty) {
|
||||||
value, (date_pattern + ' ' + time_pattern));
|
value, (date_pattern + ' ' + time_pattern));
|
||||||
if (datetime !== null)
|
if (datetime !== null)
|
||||||
return instance.web.datetime_to_str(datetime);
|
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 ;
|
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)
|
if (datetime !== null)
|
||||||
return instance.web.datetime_to_str(datetime);
|
return instance.web.datetime_to_str(datetime);
|
||||||
datetime = Date.parse(value);
|
datetime = Date.parse(value);
|
||||||
|
|
Loading…
Reference in New Issue