summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2014-08-28 15:22:29 +0200
committerChristophe Simonis <chs@odoo.com>2014-08-28 15:23:14 +0200
commitcf4cbd5d3b240756fece7d4f65038ff531f7c730 (patch)
tree3dbd888850dbe6426bd7a89d873d78e3ca31427b
parentd662aeaa275d0516367758e5e51387eac11fb68f (diff)
parenta65a95fbf7db3c61a5752a574de774ba4bc8e30f (diff)
[MERGE] last forward port of branch saas-4 up to a65a95f
-rw-r--r--addons/web/static/src/js/view_form.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 6de36bed1e3..45aa4959bae 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3676,10 +3676,10 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
focusout: anyoneLoosesFocus,
focus: function () { self.trigger('focused'); },
autocompleteopen: function () { ignore_blur = true; },
- autocompleteclose: function () { ignore_blur = false; },
+ autocompleteclose: function () { setTimeout(function() {ignore_blur = false;},0); },
blur: function () {
// autocomplete open
- if (ignore_blur) { return; }
+ if (ignore_blur) { $(this).focus(); return; }
if (_(self.getChildren()).any(function (child) {
return child instanceof instance.web.form.AbstractFormPopup;
})) { return; }