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

[MERGE] forward port of branch 7.0 up to cd69dee

This commit is contained in:
Denis Ledoux 2014-11-05 13:39:41 +01:00
parent c11451c7e8 cd69dee3f2
commit c666030539
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

@ -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

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

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