From 8caf6bad1057e7a59cdcf7b16ace3cb29e732297 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 18 Feb 2021 00:38:40 +1100 Subject: [PATCH 1/4] Fix for duplicating BOM - Do not duplicate bom items which are "inherited" --- 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 911a2cdac4..06e0c9f078 100644 --- a/InvenTree/part/models.py +++ b/InvenTree/part/models.py @@ -1524,7 +1524,7 @@ class Part(MPTTModel): # Copy existing BOM items from another part # Note: Inherited BOM Items will *not* be duplicated!! - for bom_item in other.bom_items.all(): + for bom_item in other.get_bom_items(include_inherited=False).all(): # If this part already has a BomItem pointing to the same sub-part, # delete that BomItem from this part first! From abe1018abeafb53c37a0e21b6c3b979f1c4bb911 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 18 Feb 2021 00:40:30 +1100 Subject: [PATCH 2/4] Add new fields to BOM item hash --- InvenTree/part/models.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/InvenTree/part/models.py b/InvenTree/part/models.py index 06e0c9f078..a1d394ce7b 100644 --- a/InvenTree/part/models.py +++ b/InvenTree/part/models.py @@ -2094,6 +2094,8 @@ class BomItem(models.Model): - Quantity - Reference field - Note field + - Optional field + - Inherited field """ @@ -2106,6 +2108,8 @@ class BomItem(models.Model): hash.update(str(self.quantity).encode()) hash.update(str(self.note).encode()) hash.update(str(self.reference).encode()) + hash.update(str(self.optional).encode()) + hash.update(str(self.inherited).encode()) return str(hash.digest()) From 3822b60bb0826ca03e6e1faff9db0da9f8783ff5 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 18 Feb 2021 00:49:16 +1100 Subject: [PATCH 3/4] CSS tweaks --- InvenTree/InvenTree/static/css/inventree.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/InvenTree/InvenTree/static/css/inventree.css b/InvenTree/InvenTree/static/css/inventree.css index 50a24aa095..61697fafec 100644 --- a/InvenTree/InvenTree/static/css/inventree.css +++ b/InvenTree/InvenTree/static/css/inventree.css @@ -308,7 +308,7 @@ } .rowinherited { - background-color: #dde; + background-color: #eee; } .dropdown { From 07ee27ad9baf58de66fa5b9ccc0343bf7ef23ab8 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 18 Feb 2021 00:49:36 +1100 Subject: [PATCH 4/4] Another CSS tweak --- InvenTree/InvenTree/static/css/inventree.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/InvenTree/InvenTree/static/css/inventree.css b/InvenTree/InvenTree/static/css/inventree.css index 61697fafec..ac3d402c3b 100644 --- a/InvenTree/InvenTree/static/css/inventree.css +++ b/InvenTree/InvenTree/static/css/inventree.css @@ -304,11 +304,11 @@ .rowinvalid { color: #A00; - font-style: italic; } .rowinherited { background-color: #eee; + font-style: italic; } .dropdown {