[MERGE] forward port of branch 7.0 up to cd69dee
This commit is contained in:
commit
c666030539
|
@ -1003,6 +1003,8 @@ class mrp_production(osv.osv):
|
||||||
'state': 'waiting',
|
'state': 'waiting',
|
||||||
'company_id': production.company_id.id,
|
'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)
|
move_id = stock_move.create(cr, uid, data, context=context)
|
||||||
production.write({'move_created_ids': [(6, 0, [move_id])]}, context=context)
|
production.write({'move_created_ids': [(6, 0, [move_id])]}, context=context)
|
||||||
return move_id
|
return move_id
|
||||||
|
|
|
@ -4114,7 +4114,9 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({
|
||||||
return _.every(this.records.records, function(record){
|
return _.every(this.records.records, function(record){
|
||||||
r = record;
|
r = record;
|
||||||
_.each(self.editor.form.fields, function(field){
|
_.each(self.editor.form.fields, function(field){
|
||||||
|
field._inhibit_on_change_flag = true;
|
||||||
field.set_value(r.attributes[field.name]);
|
field.set_value(r.attributes[field.name]);
|
||||||
|
field._inhibit_on_change_flag = false;
|
||||||
});
|
});
|
||||||
return _.every(self.editor.form.fields, function(field){
|
return _.every(self.editor.form.fields, function(field){
|
||||||
field.process_modifiers();
|
field.process_modifiers();
|
||||||
|
|
Loading…
Reference in New Issue