[MERGE] forward port branch saas-11 up to 659fb5d

2 files changed, 5 insertions, 3 deletions

diff --git a/addons/web/static/src/js/views/form_relational_widgets.js b/addons/web/static/src/js/views/form_relational_widgets.js
index 00bbd8b3c24..6fe184b2baf 100644
--- a/addons/web/static/src/js/views/form_relational_widgets.js
+++ b/addons/web/static/src/js/views/form_relational_widgets.js
@@ -1208,7 +1208,7 @@ var One2ManyListView = X2ManyListView.extend({
         this.dataset.x2m.internal_dataset_changed = false;
 
         var self = this;
-        return this.save_edition().done(function () {
+        return this.save_edition(true).done(function () {
             if (self._dataset_changed) {
                 self.dataset.trigger('dataset_changed');
             }
diff --git a/addons/web/static/src/js/views/list_view_editable.js b/addons/web/static/src/js/views/list_view_editable.js
index 234edb9e41e..3f5d39e60e1 100644
--- a/addons/web/static/src/js/views/list_view_editable.js
+++ b/addons/web/static/src/js/views/list_view_editable.js
@@ -448,7 +448,7 @@ ListView.include(/** @lends instance.web.ListView# */{
     /**
      * @return {jQuery.Deferred}
      */
-    save_edition: function () {
+    save_edition: function (cancel_onfail) {
         var self = this;
         return self.saving_mutex.exec(function() {
             if (!self.editor.is_editing()) {
@@ -483,7 +483,9 @@ ListView.include(/** @lends instance.web.ListView# */{
                             return {created: created, record: record};
                         });
                 }, function() {
-                    return self.cancel_edition();
+                    if (cancel_onfail) {
+                        return self.cancel_edition();
+                    }
                 });
             });
         });