diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-11-15 15:20:52 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-11-15 15:20:52 +0100 |
| commit | 73e4dacf78a840acbd2bac1dc42ae790f58225aa (patch) | |
| tree | 757e097020cda582d7ead25bbdae03cd9d3ada9d /addons/web/static/src | |
| parent | 0e1ac93e2d78c9b486d331377654dc1d4ae510dd (diff) | |
| parent | 0bf7ab45119e7b441dd071118b2dfa4db9e3b90d (diff) | |
[MERGE] forward port branch saas-14 up to 0bf7ab45119
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/framework/crash_manager.js | 2 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/search_inputs.js | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/addons/web/static/src/js/framework/crash_manager.js b/addons/web/static/src/js/framework/crash_manager.js index efd4bcc979c..baf577b578d 100644 --- a/addons/web/static/src/js/framework/crash_manager.js +++ b/addons/web/static/src/js/framework/crash_manager.js @@ -54,7 +54,7 @@ var CrashManager = core.Class.extend({ new (handler)(this, error).display(); return; } - if (error.data.name === "openerp.http.SessionExpiredException" || error.data.name === "werkzeug.exceptions.Forbidden") { + if (error.data.name === "odoo.http.SessionExpiredException" || error.data.name === "werkzeug.exceptions.Forbidden") { this.show_warning({type: _t("Odoo Session Expired"), data: {message: _t("Your Odoo session expired. Please refresh the current web page.")}}); return; } diff --git a/addons/web/static/src/js/views/search_inputs.js b/addons/web/static/src/js/views/search_inputs.js index 99535f29797..c4478956499 100644 --- a/addons/web/static/src/js/views/search_inputs.js +++ b/addons/web/static/src/js/views/search_inputs.js @@ -353,7 +353,8 @@ var DateField = Field.extend(/** @lends instance.web.search.DateField# */{ return $.when(null); } - var m = moment(v, t === 'datetime' ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD'); + // 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 (!m.isValid()) { return $.when(null); } var d = m.toDate(); var date_string = formats.format_value(d, this.attrs); |