summaryrefslogtreecommitdiff
path: root/addons/web/static
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2018-01-24 18:12:53 +0100
committerChristophe Simonis <chs@odoo.com>2018-01-24 18:12:53 +0100
commit0c97be858c9e4eb149dd8439da2fc9ce223d794b (patch)
treede369b87e08a349b5faf77d91768d0004b1cc1bf /addons/web/static
parent50d87ae81b09fe9f621893eee8ccde4367e46c79 (diff)
parent4ea4f99df99e0f8d6e01b3116020cd1b525ec1fd (diff)
[MERGE] forward port branch saas-14 up to 4ea4f99df99
Diffstat (limited to 'addons/web/static')
-rw-r--r--addons/web/static/src/js/views/search_inputs.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/addons/web/static/src/js/views/search_inputs.js b/addons/web/static/src/js/views/search_inputs.js
index 6459fba77b8..91d85a1901a 100644
--- a/addons/web/static/src/js/views/search_inputs.js
+++ b/addons/web/static/src/js/views/search_inputs.js
@@ -354,7 +354,11 @@ var DateField = Field.extend(/** @lends instance.web.search.DateField# */{
}
// THIS SHOULD BE FORWARDPORTED UP TO SAAS-15, NOT LATER
- var m = moment.utc(v, t === 'datetime' ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD');
+ if (t === 'datetime') {
+ var m = moment.utc(v, 'YYYY-MM-DD HH:mm:ss');
+ } else {
+ var m = moment(v, 'YYYY-MM-DD');
+ }
if (!m.isValid()) { return $.when(null); }
var d = m.toDate();
var date_string = formats.format_value(d, this.attrs);