inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-18 04:55:44 +00:00
Code Activity

Cleanup get_required_parts function

Browse Source
This commit is contained in:
Oliver Walters
2020-10-23 22:49:46 +11:00
parent 5db043ab4b
commit 076d5c4f7f
4 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
InvenTree/build/models.py
View File

@ -584,7 +584,7 @@ class BuildItem(models.Model):
errors = {}
try:
if self.stock_item.part not in self.build.part.required_parts():
if self.stock_item.part not in self.build.part.getRequiredParts(recursive=False):
errors['stock_item'] = [_("Selected stock item not found in BOM for part '{p}'".format(p=self.build.part.full_name))]
if self.quantity > self.stock_item.quantity:

18
InvenTree/build/views.py
View File

@ -493,7 +493,7 @@ class BuildItemDelete(AjaxDeleteView):
class BuildItemCreate(AjaxCreateView):
"""
View for allocating a StockItems to a build output.
View for allocating a StockItems to a build output.
"""
model = BuildItem
@ -591,13 +591,20 @@ class BuildItemCreate(AjaxCreateView):
pass
# Exclude StockItem objects which are already allocated to this build and part
stock_filter = stock_filter.exclude(id__in=[item.stock_item.id for item in BuildItem.objects.filter(build=build_id, stock_item__part=part_id)])
stock_filter = stock_filter.exclude(
id__in=[
item.stock_item.id for item in BuildItem.objects.filter(build=build_id, stock_item__part=part_id)
]
)
except Part.DoesNotExist:
self.part = None
pass
form.fields['stock_item'].query = stock_filter
else:
self.part = None
form.fields['stock_item'].queryset = stock_filter
self.available_stock = stock_filter.all()
@ -708,13 +715,12 @@ class BuildItemEdit(AjaxUpdateView):
}
def get_form(self):
""" Create form for editing a BuildItem.
"""
Create form for editing a BuildItem.
- Limit the StockItem options to items that match the part
"""
build_item = self.get_object()
form = super(BuildItemEdit, self).get_form()
# Hide fields which we do not wish the user to edit