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

[MERGE] forward port of branch 7.0 up to 5872c24

This commit is contained in:
Denis Ledoux 2014-09-04 12:31:14 +02:00
parent e1e928ef86 5872c2485d
commit a587e1bc17
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/stock/wizard/stock_partial_picking.py
View File

@ -218,6 +218,8 @@ class stock_partial_picking(osv.osv_memory):
# We don't need to find which view is required, stock.picking does it.
done = stock_picking.do_partial(
cr, uid, [partial.picking_id.id], partial_data, context=context)
if done[partial.picking_id.id]['delivered_picking'] == partial.picking_id.id:
return {'type': 'ir.actions.act_window_close'}
return {
'type': 'ir.actions.act_window',
'res_model': context.get('active_model', 'stock.picking'),