From f8aa5514ae716b757e0f8362fd65e7e5038590c6 Mon Sep 17 00:00:00 2001 From: Oliver Date: Sat, 20 Nov 2021 17:44:54 +1100 Subject: [PATCH 1/2] Fix BOM export for multi-level BOMs --- InvenTree/part/bom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/InvenTree/part/bom.py b/InvenTree/part/bom.py index fd31aba339..1fc747655d 100644 --- a/InvenTree/part/bom.py +++ b/InvenTree/part/bom.py @@ -59,7 +59,7 @@ def ExportBom(part, fmt='csv', cascade=False, max_levels=None, parameter_data=Fa uids = [] - def add_items(items, level, cascade): + def add_items(items, level, cascade=True): # Add items at a given layer for item in items: From 6a6eae7e5435beac35c64c0f4af2a9b23c73104f Mon Sep 17 00:00:00 2001 From: Oliver Date: Sat, 20 Nov 2021 18:07:39 +1100 Subject: [PATCH 2/2] Bug fix for BOM uploading (cherry picked from commit 2e04b311306259e0ead07de9e08b3ba376caf4e4) --- InvenTree/part/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/InvenTree/part/models.py b/InvenTree/part/models.py index cec21becc2..638c956ffa 100644 --- a/InvenTree/part/models.py +++ b/InvenTree/part/models.py @@ -1587,7 +1587,7 @@ class Part(MPTTModel): # Exclude any parts that this part is used *in* (to prevent recursive BOMs) used_in = self.get_used_in().all() - parts = parts.exclude(id__in=[item.part.id for item in used_in]) + parts = parts.exclude(id__in=[part.id for part in used_in]) return parts