[MERGE] forward port of branch 9.0 up to 24eee9d

2 files changed, 5 insertions, 1 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 bc6bcb0ca57..66330006380 100644
--- a/addons/web/static/src/js/views/form_relational_widgets.js
+++ b/addons/web/static/src/js/views/form_relational_widgets.js
@@ -970,7 +970,10 @@ var X2ManyListView = ListView.extend({
         var valid = _.every(cached_records, function(record){
             _.each(fields, function(field){
                 var value = record.values[field.name];
+                var tmp = field.no_rerender;
+                field.no_rerender = true;
                 field.set_value(_.isArray(value) && _.isArray(value[0]) ? [COMMANDS.delete_all()].concat(value) : value);
+                field.no_rerender = tmp;
             });
             return _.every(fields, function(field){
                 field.process_modifiers();
diff --git a/addons/web/static/src/js/widgets/change_password.js b/addons/web/static/src/js/widgets/change_password.js
index a3654e6d0a1..658c7ee8e7d 100644
--- a/addons/web/static/src/js/widgets/change_password.js
+++ b/addons/web/static/src/js/widgets/change_password.js
@@ -4,6 +4,7 @@ odoo.define('web.ChangePassword', function (require) {
 var core = require('web.core');
 var Dialog = require('web.Dialog');
 var Widget = require('web.Widget');
+var web_client = require('web.web_client');
 
 var _t = core._t;
 
@@ -11,7 +12,7 @@ var ChangePassword = Widget.extend({ // FIXME
     template: "ChangePassword",
     start: function() {
         var self = this;
-        this.getParent().set_title(_t("Change Password"));
+        web_client.set_title(_t("Change Password"));
         var $button = self.$el.find('.oe_form_button');
         $button.appendTo(this.getParent().$footer);
         $button.eq(1).click(function(){