summaryrefslogtreecommitdiff
path: root/addons/purchase_mrp
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2018-10-17 10:54:19 +0200
committerChristophe Simonis <chs@odoo.com>2018-10-17 10:54:19 +0200
commite9ae419fca0a9ebd0071c280bd98fc84f268bb74 (patch)
tree8f33c2a81a60133b04df10d7e81afbc9d54c20a6 /addons/purchase_mrp
parent156d099e328304d0f19146f4714d13b7b572358a (diff)
parent0de06a41326662d4505401764035bf9ddf31fc8b (diff)
[MERGE] forward port branch saas-11.3 up to 0de06a41326
Diffstat (limited to 'addons/purchase_mrp')
-rw-r--r--addons/purchase_mrp/models/purchase_mrp.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/addons/purchase_mrp/models/purchase_mrp.py b/addons/purchase_mrp/models/purchase_mrp.py
index b498f4a63e5..ebfb1f0bc10 100644
--- a/addons/purchase_mrp/models/purchase_mrp.py
+++ b/addons/purchase_mrp/models/purchase_mrp.py
@@ -21,7 +21,8 @@ class PurchaseOrderLine(models.Model):
# In the case of a kit, we need to check if all components are shipped. Since the BOM might
# have changed, we don't compute the quantities but verify the move state.
if bom:
- bom_delivered = all([move.state == 'done' for move in self.move_ids])
+ moves = self.move_ids.filtered(lambda m: m.picking_id and m.picking_id.state != 'cancel')
+ bom_delivered = all([move.state == 'done' for move in moves])
if bom_delivered:
return self.product_qty
else: