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

Support non-integer serial numbers

Browse Source
This commit is contained in:
Ben Charlton 2020-08-21 17:36:49 +01:00
parent eeca3effee
commit f7ed48809c
5 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
InvenTree/InvenTree/helpers.py
View File

@ -371,14 +371,10 @@ def ExtractSerialNumbers(serials, expected_quantity):
continue continue
else: else:
try: if group in numbers:
n = int(group) errors.append(_("Duplicate serial: {g}".format(g=group)))
if n in numbers: else:
errors.append(_("Duplicate serial: {n}".format(n=n))) numbers.append(group)
else:
numbers.append(n)
except ValueError:
errors.append(_("Invalid group: {g}".format(g=group)))
if len(errors) > 0: if len(errors) > 0:
raise ValidationError(errors) raise ValidationError(errors)

4
InvenTree/part/models.py
View File

@ -346,8 +346,10 @@ class Part(MPTTModel):
if n is None: if n is None:
return 1 return 1
else: elif n is int:
return n + 1 return n + 1
else:
return None
def getSerialNumberString(self, quantity): def getSerialNumberString(self, quantity):
""" """

18
InvenTree/stock/migrations/0050_auto_20200821_1403.py Normal file
View File

@ -0,0 +1,18 @@
# Generated by Django 3.0.7 on 2020-08-21 14:03
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('stock', '0049_auto_20200820_0454'),
]
operations = [
migrations.AlterField(
model_name='stockitem',
name='serial',
field=models.CharField(blank=True, help_text='Serial number for this item', max_length=100, null=True, verbose_name='Serial Number'),
),
]

7
InvenTree/stock/models.py
View File

@ -355,9 +355,9 @@ class StockItem(MPTTModel):
verbose_name=_("Customer"), verbose_name=_("Customer"),
) )
serial = models.PositiveIntegerField( serial = models.CharField(
verbose_name=_('Serial Number'), verbose_name=_('Serial Number'),
blank=True, null=True, max_length=100, blank=True, null=True,
help_text=_('Serial number for this item') help_text=_('Serial number for this item')
) )
@ -687,9 +687,6 @@ class StockItem(MPTTModel):
if not type(serials) in [list, tuple]: if not type(serials) in [list, tuple]:
raise ValidationError({"serial_numbers": _("Serial numbers must be a list of integers")}) raise ValidationError({"serial_numbers": _("Serial numbers must be a list of integers")})
if any([type(i) is not int for i in serials]):
raise ValidationError({"serial_numbers": _("Serial numbers must be a list of integers")})
if not quantity == len(serials): if not quantity == len(serials):
raise ValidationError({"quantity": _("Quantity does not match serial numbers")}) raise ValidationError({"quantity": _("Quantity does not match serial numbers")})

2
InvenTree/stock/serializers.py
View File

@ -129,7 +129,7 @@ class StockItemSerializer(InvenTreeModelSerializer):
allocated = serializers.FloatField(source='allocation_count', required=False) allocated = serializers.FloatField(source='allocation_count', required=False)
serial = serializers.IntegerField(required=False) serial = serializers.CharField(required=False)
required_tests = serializers.IntegerField(source='required_test_count', read_only=True, required=False) required_tests = serializers.IntegerField(source='required_test_count', read_only=True, required=False)