diff --git a/addons/l10n_ro/__openerp__.py b/addons/l10n_ro/__openerp__.py index 388a6b2fc0f..09df09e65a8 100644 --- a/addons/l10n_ro/__openerp__.py +++ b/addons/l10n_ro/__openerp__.py @@ -21,7 +21,7 @@ { "name" : "Romania - Accounting", "version" : "1.0", - "author" : "TOTAL PC SYSTEMS", + "author" : "ERPsystems Solutions", "website": "http://www.erpsystems.ro", "category" : "Localization/Account Charts", "depends" : ['account','account_chart','base_vat'], diff --git a/addons/web/static/src/js/formats.js b/addons/web/static/src/js/formats.js index 3d7b574e56a..3cff2a4b4f4 100644 --- a/addons/web/static/src/js/formats.js +++ b/addons/web/static/src/js/formats.js @@ -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);