odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] forward port of branch saas-3 up to c666030

This commit is contained in:
Denis Ledoux 2014-11-05 13:40:30 +01:00
parent afce229e5a c666030539
commit 89716cb4d6
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/mrp/mrp.py
View File

@ -1053,6 +1053,8 @@ class mrp_production(osv.osv):
'production_id': production.id,
'origin': production.name,
}
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)
#a phantom bom cannot be used in mrp order so it's ok to assume the list returned by action_confirm
#is 1 element long, so we can take the first.

2
addons/web/static/src/js/view_form.js
View File

@ -4398,7 +4398,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();