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

Merge pull request #183 from SchrodingersGat/tweaks

Browse Source 
Some small tweaks
This commit is contained in:
Oliver 2019-04-28 19:34:25 +10:00 committed by GitHub
commit 77f4717479
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
InvenTree/InvenTree/serializers.py
View File

@ -37,6 +37,11 @@ class InvenTreeModelSerializer(serializers.ModelSerializer):
""" """
def validate(self, data): def validate(self, data):
""" Perform serializer validation.
In addition to running validators on the serializer fields,
this class ensures that the underlying model is also validated.
"""
# Run any native validation checks first (may throw an ValidationError) # Run any native validation checks first (may throw an ValidationError)
data = super(serializers.ModelSerializer, self).validate(data) data = super(serializers.ModelSerializer, self).validate(data)

2
InvenTree/part/models.py
View File

@ -533,7 +533,7 @@ class SupplierPart(models.Model):
return cost + self.base_cost return cost + self.base_cost
def __str__(self): def __str__(self):
return "{sku} - {supplier}".format( return "{supplier} ({sku})".format(
sku=self.SKU, sku=self.SKU,
supplier=self.supplier.name) supplier=self.supplier.name)

8
InvenTree/stock/models.py
View File

@ -77,6 +77,14 @@ class StockItem(models.Model):
) )
def clean(self): def clean(self):
""" Validate the StockItem object (separate to field validation)
The following validation checks are performed:
- The 'part' and 'supplier_part.part' fields cannot point to the same Part object
- The 'part' does not belong to itself
- Quantity must be 1 if the StockItem has a serial number
"""
# The 'supplier_part' field must point to the same part! # The 'supplier_part' field must point to the same part!
try: try: