Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1315 from SchrodingersGat/copy-bom-fix

Browse Source 
Fix for duplicating BOM
This commit is contained in:
Oliver 2021-02-18 08:22:05 +11:00 committed by GitHub
commit 25ada20a19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
InvenTree/InvenTree/static/css/inventree.css
View File

@ -304,11 +304,11 @@
.rowinvalid { .rowinvalid {
color: #A00; color: #A00;
font-style: italic;
} }
.rowinherited { .rowinherited {
background-color: #dde; background-color: #eee;
font-style: italic;
} }
.dropdown { .dropdown {

6
InvenTree/part/models.py
View File

@ -1524,7 +1524,7 @@ class Part(MPTTModel):
# Copy existing BOM items from another part # Copy existing BOM items from another part
# Note: Inherited BOM Items will *not* be duplicated!! # 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, # If this part already has a BomItem pointing to the same sub-part,
# delete that BomItem from this part first! # delete that BomItem from this part first!
@ -2094,6 +2094,8 @@ class BomItem(models.Model):
- Quantity - Quantity
- Reference field - Reference field
- Note 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.quantity).encode())
hash.update(str(self.note).encode()) hash.update(str(self.note).encode())
hash.update(str(self.reference).encode()) hash.update(str(self.reference).encode())
hash.update(str(self.optional).encode())
hash.update(str(self.inherited).encode())
return str(hash.digest()) return str(hash.digest())