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

[FIX] When move is a return, assigned quants should have been processed by the original move 

bzr revid: jco@openerp.com-20140130095328-v63lo6dg1d951z2f
This commit is contained in:
Josse Colpaert 2014-01-30 10:53:28 +01:00
parent e89b9b8539
commit b62f8a6469
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/stock/stock.py
View File

@ -1727,6 +1727,8 @@ class stock_move(osv.osv):
fallback_domain = prev_quant_ids and [('id', 'not in', prev_quant_ids)] or []
#we always keep the quants already assigned and try to find the remaining quantity on quants not assigned only
main_domain = [('reservation_id', '=', False), ('qty', '>', 0)]
if move.origin_returned_move_id:
main_domain += [('history_ids', 'in', move.origin_returned_move_id.id)]
#first try to find quants based on specific domains given by linked operations
for record in move.linked_move_operation_ids:
domain = main_domain + self.pool.get('stock.move.operation.link').get_specific_domain(cr, uid, record, context=context)
@ -1792,6 +1794,8 @@ class stock_move(osv.osv):
pickings.add(move.picking_id.id)
qty = move.product_qty
main_domain = [('qty', '>', 0)]
if move.origin_returned_move_id:
main_domain += [('history_ids', 'in', move.origin_returned_move_id.id)]
prefered_domain = [('reservation_id', '=', move.id)]
fallback_domain = [('reservation_id', '=', False)]
#first, process the move per linked operation first because it may imply some specific domains to consider