diff options
| author | Denis Ledoux <dle@odoo.com> | 2014-11-14 15:59:33 +0100 |
|---|---|---|
| committer | Denis Ledoux <dle@odoo.com> | 2014-11-14 15:59:33 +0100 |
| commit | 7ab413724acd917be5bfacf734ed4dbd9098102e (patch) | |
| tree | e892bc9f6b385878f072de964e0fe59520a5ebf1 /addons/web/static/src | |
| parent | e74fb09a0092526567896f7e645e956371960a88 (diff) | |
| parent | da15c9d27b420e7643048dfab07aebcf94b92b4a (diff) | |
[MERGE] forward port of branch 7.0 up to da15c9d
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/search.js | 6 | ||||
| -rw-r--r-- | addons/web/static/src/js/view_form.js | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 6b665262f2c..9f11fdf7412 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -1521,7 +1521,11 @@ instance.web.search.DateField = instance.web.search.Field.extend(/** @lends inst return instance.web.date_to_str(facetValue.get('value')); }, complete: function (needle) { - var d = Date.parse(needle); + try { + var d = instance.web.str_to_date(instance.web.parse_value(needle, {'widget': 'date'})); + } catch (e) { + return false; + } if (!d) { return $.when(null); } var date_string = instance.web.format_value(d, this.attrs); var label = _.str.sprintf(_.str.escapeHTML( diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 5607b8aa496..11ca49ead47 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -4109,7 +4109,6 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({ if (!this.fields_view || !this.editable()){ return true; } - this.o2m._dirty_flag = true; var r; return _.every(this.records.records, function(record){ r = record; |
