Merge remote-tracking branch 'inventree/master' into multi-db-unit-test

# Conflicts:
#	InvenTree/build/test_build.py
This commit is contained in:
Oliver Walters committed 2020-09-02 20:02:22 +10:00
commit bb9e8fa97b
10 files changed
+100 -64

No files matched your search

+1 -5
View File
@@ -197,12 +197,8 @@ class BuildComplete(AjaxUpdateView):
if not build.part.trackable:
form.fields.pop('serial_numbers')
else:
if build.quantity == 1:
text = _('Next available serial number is')
else:
text = _('Next available serial numbers are')
form.field_placeholder['serial_numbers'] = text + " " + build.part.getSerialNumberString(build.quantity)
form.field_placeholder['serial_numbers'] = build.part.getSerialNumberString(build.quantity)
form.rebuild_layout()