inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-07-01 11:10:54 +00:00
Code Activity

PEP fixes

Browse Source
This commit is contained in:
Oliver Walters
2020-05-16 17:52:25 +10:00
parent a6ad263ee7
commit 8a99062704
6 changed files with 26 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
InvenTree/stock/forms.py
View File

@ -9,9 +9,6 @@ from django import forms
from django.forms.utils import ErrorDict
from django.utils.translation import ugettext as _
from crispy_forms.layout import Field, Layout
from crispy_forms.bootstrap import PrependedText
from mptt.fields import TreeNodeChoiceField
from InvenTree.helpers import GetExportFormats
@ -111,23 +108,7 @@ class SerializeStockForm(HelperForm):
item = kwargs.pop('item', None)
if item:
# Pre-calculate what the serial numbers should be!
sn = item.part.getNextSerialNumber()
if item.quantity >= 2:
sn = "{n}-{m}".format(n=sn, m=int(sn+item.quantity-1))
else:
sn = str(sn)
self.field_placeholder = {
'serial_numbers': sn
}
self.field_prefix = {
'serial_numbers': 'fa-hashtag',
}
self.field_placeholder['serial_numbers'] = item.part.getSerialNumberString(item.quantity)
super().__init__(*args, **kwargs)

1
InvenTree/stock/tests.py
View File

@ -308,7 +308,6 @@ class StockTest(TestCase):
item.delete_on_deplete = True
item.save()
n = StockItem.objects.filter(part=25).count()
self.assertEqual(item.quantity, 10)

12
InvenTree/stock/views.py
View File

@ -755,7 +755,7 @@ class StockItemSerialize(AjaxUpdateView):
model = StockItem
ajax_template_name = 'stock/item_serialize.html'
ajax_form_title = _('Serialize Stock')
#form_class = SerializeStockForm
form_class = SerializeStockForm
def get_form(self):
@ -774,16 +774,8 @@ class StockItemSerialize(AjaxUpdateView):
item = self.get_object()
# Pre-calculate what the serial numbers should be!
sn = item.part.getNextSerialNumber()
if item.quantity >= 2:
sn = "{n}-{m}".format(n=sn, m=int(sn+item.quantity-1))
else:
sn = str(sn)
initials['quantity'] = item.quantity
initials['serial_numbers'] = sn
initials['serial_numbers'] = item.part.getSerialNumberString(item.quantity)
initials['destination'] = item.location.pk
return initials