inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-05-04 22:38:49 +00:00
Code

Better calculatation of placeholder text for serial number

Browse Source
This commit is contained in:
Oliver Walters 2020-05-16 16:42:34 +10:00
parent 3df8f33080
commit 6552d011a4
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
InvenTree/stock/views.py
View File

@ -864,6 +864,8 @@ class StockItemCreate(AjaxCreateView):
form = super().get_form() form = super().get_form()
part = None
# If the user has selected a Part, limit choices for SupplierPart # If the user has selected a Part, limit choices for SupplierPart
if form['part'].value(): if form['part'].value():
part_id = form['part'].value() part_id = form['part'].value()
@ -871,6 +873,9 @@ class StockItemCreate(AjaxCreateView):
try: try:
part = Part.objects.get(id=part_id) part = Part.objects.get(id=part_id)
sn = part.getNextSerialNumber()
form.field_placeholder['serial_numbers'] = _('Next available serial number is') + ' ' + str(sn)
# Hide the 'part' field (as a valid part is selected) # Hide the 'part' field (as a valid part is selected)
form.fields['part'].widget = HiddenInput() form.fields['part'].widget = HiddenInput()
@ -893,6 +898,7 @@ class StockItemCreate(AjaxCreateView):
# If there is one (and only one) supplier part available, pre-select it # If there is one (and only one) supplier part available, pre-select it
all_parts = parts.all() all_parts = parts.all()
if len(all_parts) == 1: if len(all_parts) == 1:
# TODO - This does NOT work for some reason? Ref build.views.BuildItemCreate # TODO - This does NOT work for some reason? Ref build.views.BuildItemCreate
@ -904,7 +910,7 @@ class StockItemCreate(AjaxCreateView):
# Otherwise if the user has selected a SupplierPart, we know what Part they meant! # Otherwise if the user has selected a SupplierPart, we know what Part they meant!
elif form['supplier_part'].value() is not None: elif form['supplier_part'].value() is not None:
pass pass
return form return form
def get_initial(self): def get_initial(self):
@ -975,6 +981,8 @@ class StockItemCreate(AjaxCreateView):
- Manage serial-number valdiation for tracked parts - Manage serial-number valdiation for tracked parts
""" """
part = None
form = self.get_form() form = self.get_form()
data = {} data = {}
@ -984,10 +992,14 @@ class StockItemCreate(AjaxCreateView):
if valid: if valid:
part_id = form['part'].value() part_id = form['part'].value()
try: try:
self.part = Part.objects.get(id=part_id) part = Part.objects.get(id=part_id)
quantity = Decimal(form['quantity'].value()) quantity = Decimal(form['quantity'].value())
sn = part.getNextSerialNumber()
form.field_placeholder['serial_numbers'] = _("Next available serial number is") + " " + str(sn)
except (Part.DoesNotExist, ValueError, InvalidOperation): except (Part.DoesNotExist, ValueError, InvalidOperation):
self.part = None part = None
quantity = 1 quantity = 1
valid = False valid = False
form.errors['quantity'] = [_('Invalid quantity')] form.errors['quantity'] = [_('Invalid quantity')]
@ -996,11 +1008,11 @@ class StockItemCreate(AjaxCreateView):
form.errors['quantity'] = [_('Quantity must be greater than zero')] form.errors['quantity'] = [_('Quantity must be greater than zero')]
valid = False valid = False
if self.part is None: if part is None:
form.errors['part'] = [_('Invalid part selection')] form.errors['part'] = [_('Invalid part selection')]
else: else:
# A trackable part must provide serial numbesr # A trackable part must provide serial numbesr
if self.part.trackable: if part.trackable:
sn = request.POST.get('serial_numbers', '') sn = request.POST.get('serial_numbers', '')
sn = str(sn).strip() sn = str(sn).strip()
@ -1013,7 +1025,7 @@ class StockItemCreate(AjaxCreateView):
existing = [] existing = []
for serial in serials: for serial in serials:
if self.part.checkIfSerialNumberExists(serial): if part.checkIfSerialNumberExists(serial):
existing.append(serial) existing.append(serial)
if len(existing) > 0: if len(existing) > 0:
@ -1033,7 +1045,7 @@ class StockItemCreate(AjaxCreateView):
for serial in serials: for serial in serials:
# Create a new stock item for each serial number # Create a new stock item for each serial number
item = StockItem( item = StockItem(
part=self.part, part=part,
quantity=1, quantity=1,
serial=serial, serial=serial,
supplier_part=form_data.get('supplier_part'), supplier_part=form_data.get('supplier_part'),