diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index bdcf0ab02f5..fcaac08b70d 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -1003,6 +1003,8 @@ class mrp_production(osv.osv):
             'state': 'waiting',
             'company_id': production.company_id.id,
         }
+        if production.move_prod_id:
+            production.move_prod_id.write({'location_id': destination_location_id})
         move_id = stock_move.create(cr, uid, data, context=context)
         production.write({'move_created_ids': [(6, 0, [move_id])]}, context=context)
         return move_id
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 305cbcbd507..46cc7749936 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -4114,7 +4114,9 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({
         return _.every(this.records.records, function(record){
             r = record;
             _.each(self.editor.form.fields, function(field){
+                field._inhibit_on_change_flag = true;
                 field.set_value(r.attributes[field.name]);
+                field._inhibit_on_change_flag = false;
             });
             return _.every(self.editor.form.fields, function(field){
                 field.process_modifiers();