From 5242cfceeaf02ae363414741ba2e61d235a51e62 Mon Sep 17 00:00:00 2001 From: Josse Colpaert Date: Mon, 25 Aug 2014 09:23:05 +0200 Subject: [PATCH 1/2] [FIX] Make sure packages are not shown when the setting is not checked --- addons/stock/wizard/stock_transfer_details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/stock/wizard/stock_transfer_details.xml b/addons/stock/wizard/stock_transfer_details.xml index c4528a0439f..d492f8eb54d 100644 --- a/addons/stock/wizard/stock_transfer_details.xml +++ b/addons/stock/wizard/stock_transfer_details.xml @@ -37,7 +37,7 @@ The source package will be moved entirely. If you specify a destination package, the source package will be put in the destination package. - + From 924ebcf04b8deb882e4dfe949b2faf9333bbf7fa Mon Sep 17 00:00:00 2001 From: Josse Colpaert Date: Mon, 25 Aug 2014 10:07:41 +0200 Subject: [PATCH 2/2] [IMP] No propagation when destination move is done/cancel --- addons/stock/stock.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 68f1e342554..bbfa193b748 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -2414,7 +2414,7 @@ class stock_move(osv.osv): 'product_uos_qty': move.product_uos_qty - uos_qty, }, context=ctx) - if move.move_dest_id and move.propagate: + if move.move_dest_id and move.propagate and move.move_dest_id.state not in ('done', 'cancel'): new_move_prop = self.split(cr, uid, move.move_dest_id, qty, context=context) self.write(cr, uid, [new_move], {'move_dest_id': new_move_prop}, context=context) #returning the first element of list returned by action_confirm is ok because we checked it wouldn't be exploded (and