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

5 files changed, 27 insertions, 21 deletions

diff --git a/addons/web/static/src/js/chrome/action_manager.js b/addons/web/static/src/js/chrome/action_manager.js
index 280a90cec8d..5d4a44ba420 100644
--- a/addons/web/static/src/js/chrome/action_manager.js
+++ b/addons/web/static/src/js/chrome/action_manager.js
@@ -420,16 +420,20 @@ var ActionManager = Widget.extend({
         return this.inner_widget;
     },
     history_back: function() {
-        var nb_views = this.inner_action.get_nb_views();
-        if (nb_views > 1) {
+        var nbViews = this.inner_action.get_nb_views();
+        if (nbViews > 1) {
             // Stay on this action, but select the previous view
-            return this.select_action(this.inner_action, nb_views - 2);
+            return this.select_action(this.inner_action, nbViews - 2);
         }
-        if (this.action_stack.length > 1) {
+        var nbActions = this.action_stack.length;
+        if (nbActions > 1) {
             // Select the previous action
-            var action = this.action_stack[this.action_stack.length - 2];
-            nb_views = action.get_nb_views();
-            return this.select_action(action, nb_views - 1);
+            var action = this.action_stack[nbActions - 2];
+            nbViews = action.get_nb_views();
+            return this.select_action(action, nbViews - 1);
+        }
+        else if (nbActions === 1 && nbViews === 1) {
+            return this.select_action(this.action_stack[0], 0);
         }
         return $.Deferred().reject();
     },
diff --git a/addons/web/static/src/js/chrome/view_manager.js b/addons/web/static/src/js/chrome/view_manager.js
index 14ed4bdebc7..9b431d3e57a 100644
--- a/addons/web/static/src/js/chrome/view_manager.js
+++ b/addons/web/static/src/js/chrome/view_manager.js
@@ -561,7 +561,8 @@ var ViewManager = Widget.extend(ControlPanelMixin, {
         var self = this;
         var result_handler = on_closed || function () {};
         var context = new Context(this.env.context, action_data.context || {});
-        var record_id = res_ids && res_ids[0];
+        // OR NULL hereunder: pyeval waits specifically for a null value, different from undefined
+        var record_id = res_ids && res_ids[0] || null;
 
         // response handler
         var handler = function (action) {
@@ -651,18 +652,10 @@ var ViewManager = Widget.extend(ControlPanelMixin, {
      * will call this very view manager to activate the previous view.
      * @todo: directly switch to previous view
      *
-     * A special case is done in the case that there is no previous view.  When
-     * that happens, we simply rerender the current view.
-     *
      * @private
      */
     _onSwitchToPreviousView: function () {
-        if (this.view_stack.length === 1) {
-            var currentView = this.view_stack[0].controller;
-            currentView.update({}, {reload: false});
-        } else {
-            this.do_action('history_back');
-        }
+        this.trigger_up('history_back');
     }
 });
 
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();
diff --git a/addons/web/static/src/js/views/basic/basic_controller.js b/addons/web/static/src/js/views/basic/basic_controller.js
index 82dc6f90d26..cc72816a85d 100644
--- a/addons/web/static/src/js/views/basic/basic_controller.js
+++ b/addons/web/static/src/js/views/basic/basic_controller.js
@@ -250,7 +250,7 @@ var BasicController = AbstractController.extend(FieldManagerMixin, {
             on_fail: function (reason) {
                 reload().always(function() {
                     def.reject(reason);
-                })
+                });
             },
             on_success: def.resolve.bind(def),
         });
diff --git a/addons/web/static/src/js/views/basic/basic_model.js b/addons/web/static/src/js/views/basic/basic_model.js
index 906464a5a26..c562fa388f0 100644
--- a/addons/web/static/src/js/views/basic/basic_model.js
+++ b/addons/web/static/src/js/views/basic/basic_model.js
@@ -1187,7 +1187,8 @@ var BasicModel = AbstractModel.extend({
         }
 
         var self = this;
-        var list = this.localData[record._changes[fieldName] || record.data[fieldName]];
+        var localID = (record._changes && record._changes[fieldName]) || record.data[fieldName];
+        var list = this.localData[localID];
         var field = record.fields[fieldName];
         var fieldInfo = record.fieldsInfo[viewType || record.viewType][fieldName];
         var view = fieldInfo.views && fieldInfo.views[fieldInfo.mode];