[MERGE] forward port branch saas-16 up to 4ca3d9cadf9

1 files changed, 10 insertions, 2 deletions

diff --git a/addons/web/static/src/js/fields/relational_fields.js b/addons/web/static/src/js/fields/relational_fields.js
index 567c54abcb1..14512c02912 100644
--- a/addons/web/static/src/js/fields/relational_fields.js
+++ b/addons/web/static/src/js/fields/relational_fields.js
@@ -485,8 +485,16 @@ var FieldMany2One = AbstractField.extend({
     },
     /**
      * @private
+     *
+     * @param {OdooEvent} ev
      */
-    _onInputKeyup: function () {
+    _onInputKeyup: function (ev) {
+        if (ev.which === $.ui.keyCode.ENTER) {
+            // If we pressed enter, we want to prevent _onInputFocusout from
+            // executing since it would open a M2O dialog to request
+            // confirmation that the many2one is not properly set.
+            return;
+        }
         if (this.$input.val() === "") {
             this.reinitialize(false);
         } else if (this._getDisplayName(this.m2o_value) !== this.$input.val()) {
@@ -1909,7 +1917,7 @@ var FieldRadio = FieldSelection.extend({
         this._super.apply(this, arguments);
         if (this.mode === 'edit') {
             this.tagName = 'div';
-            this.className += this.nodeOptions.horizontal ? 'o_horizontal' : 'o_vertical';
+            this.className += this.nodeOptions.horizontal ? ' o_horizontal' : ' o_vertical';
         }
         this.unique_id = _.uniqueId("radio");
         this._setValues();