diff --git a/InvenTree/InvenTree/metadata.py b/InvenTree/InvenTree/metadata.py index 4294c943ba..46b3acfc21 100644 --- a/InvenTree/InvenTree/metadata.py +++ b/InvenTree/InvenTree/metadata.py @@ -118,20 +118,31 @@ class InvenTreeMetadata(SimpleMetadata): # Iterate through simple fields for name, field in model_fields.fields.items(): - if field.has_default() and name in serializer_info.keys(): + if name in serializer_info.keys(): - default = field.default + if field.has_default(): - if callable(default): - try: - default = default() - except: - continue + default = field.default - serializer_info[name]['default'] = default + if callable(default): + try: + default = default() + except: + continue - elif name in model_default_values: - serializer_info[name]['default'] = model_default_values[name] + serializer_info[name]['default'] = default + + elif name in model_default_values: + serializer_info[name]['default'] = model_default_values[name] + + # Attributes to copy from the model to the field (if they don't exist) + attributes = ['help_text'] + + for attr in attributes: + if attr not in serializer_info[name]: + + if hasattr(field, attr): + serializer_info[name][attr] = getattr(field, attr) # Iterate through relations for name, relation in model_fields.relations.items(): diff --git a/InvenTree/InvenTree/serializers.py b/InvenTree/InvenTree/serializers.py index d2d00a932c..ab5a27594f 100644 --- a/InvenTree/InvenTree/serializers.py +++ b/InvenTree/InvenTree/serializers.py @@ -296,3 +296,17 @@ class InvenTreeImageSerializerField(serializers.ImageField): return None return os.path.join(str(settings.MEDIA_URL), str(value)) + + +class InvenTreeDecimalField(serializers.FloatField): + """ + Custom serializer for decimal fields. Solves the following issues: + + - The normal DRF DecimalField renders values with trailing zeros + - Using a FloatField can result in rounding issues: https://code.djangoproject.com/ticket/30290 + """ + + def to_internal_value(self, data): + + # Convert the value to a string, and then a decimal + return Decimal(str(data)) diff --git a/InvenTree/build/serializers.py b/InvenTree/build/serializers.py index a18f58fb76..e8c22e416e 100644 --- a/InvenTree/build/serializers.py +++ b/InvenTree/build/serializers.py @@ -18,8 +18,9 @@ from rest_framework.serializers import ValidationError from InvenTree.serializers import InvenTreeModelSerializer, InvenTreeAttachmentSerializer from InvenTree.serializers import InvenTreeAttachmentSerializerField, UserSerializerBrief -from InvenTree.status_codes import StockStatus import InvenTree.helpers +from InvenTree.serializers import InvenTreeDecimalField +from InvenTree.status_codes import StockStatus from stock.models import StockItem, StockLocation from stock.serializers import StockItemSerializerBrief, LocationSerializer @@ -41,7 +42,7 @@ class BuildSerializer(InvenTreeModelSerializer): part_detail = PartBriefSerializer(source='part', many=False, read_only=True) - quantity = serializers.FloatField() + quantity = InvenTreeDecimalField() overdue = serializers.BooleanField(required=False, read_only=True) @@ -473,7 +474,7 @@ class BuildItemSerializer(InvenTreeModelSerializer): stock_item_detail = StockItemSerializerBrief(source='stock_item', read_only=True) location_detail = LocationSerializer(source='stock_item.location', read_only=True) - quantity = serializers.FloatField() + quantity = InvenTreeDecimalField() def __init__(self, *args, **kwargs): diff --git a/InvenTree/company/serializers.py b/InvenTree/company/serializers.py index 719d94b0a6..a6303cc561 100644 --- a/InvenTree/company/serializers.py +++ b/InvenTree/company/serializers.py @@ -8,9 +8,10 @@ from rest_framework import serializers from sql_util.utils import SubqueryCount +from InvenTree.serializers import InvenTreeDecimalField +from InvenTree.serializers import InvenTreeImageSerializerField from InvenTree.serializers import InvenTreeModelSerializer from InvenTree.serializers import InvenTreeMoneySerializer -from InvenTree.serializers import InvenTreeImageSerializerField from part.serializers import PartBriefSerializer @@ -255,7 +256,7 @@ class SupplierPartSerializer(InvenTreeModelSerializer): class SupplierPriceBreakSerializer(InvenTreeModelSerializer): """ Serializer for SupplierPriceBreak object """ - quantity = serializers.FloatField() + quantity = InvenTreeDecimalField() price = InvenTreeMoneySerializer( allow_null=True, diff --git a/InvenTree/order/serializers.py b/InvenTree/order/serializers.py index 410ac02ddb..081a92bc70 100644 --- a/InvenTree/order/serializers.py +++ b/InvenTree/order/serializers.py @@ -17,8 +17,9 @@ from rest_framework.serializers import ValidationError from sql_util.utils import SubqueryCount -from InvenTree.serializers import InvenTreeModelSerializer from InvenTree.serializers import InvenTreeAttachmentSerializer +from InvenTree.serializers import InvenTreeModelSerializer +from InvenTree.serializers import InvenTreeDecimalField from InvenTree.serializers import InvenTreeMoneySerializer from InvenTree.serializers import InvenTreeAttachmentSerializerField @@ -551,8 +552,8 @@ class SOLineItemSerializer(InvenTreeModelSerializer): part_detail = PartBriefSerializer(source='part', many=False, read_only=True) allocations = SalesOrderAllocationSerializer(many=True, read_only=True, location_detail=True) - quantity = serializers.FloatField() - + quantity = InvenTreeDecimalField() + allocated = serializers.FloatField(source='allocated_quantity', read_only=True) fulfilled = serializers.FloatField(source='fulfilled_quantity', read_only=True) diff --git a/InvenTree/part/serializers.py b/InvenTree/part/serializers.py index 47ce3f66c8..9deece4863 100644 --- a/InvenTree/part/serializers.py +++ b/InvenTree/part/serializers.py @@ -15,6 +15,7 @@ from sql_util.utils import SubqueryCount, SubquerySum from djmoney.contrib.django_rest_framework import MoneyField from InvenTree.serializers import (InvenTreeAttachmentSerializerField, + InvenTreeDecimalField, InvenTreeImageSerializerField, InvenTreeModelSerializer, InvenTreeAttachmentSerializer, @@ -120,7 +121,7 @@ class PartSalePriceSerializer(InvenTreeModelSerializer): Serializer for sale prices for Part model. """ - quantity = serializers.FloatField() + quantity = InvenTreeDecimalField() price = InvenTreeMoneySerializer( allow_null=True @@ -144,7 +145,7 @@ class PartInternalPriceSerializer(InvenTreeModelSerializer): Serializer for internal prices for Part model. """ - quantity = serializers.FloatField() + quantity = InvenTreeDecimalField() price = InvenTreeMoneySerializer( allow_null=True @@ -428,7 +429,7 @@ class BomItemSerializer(InvenTreeModelSerializer): price_range = serializers.CharField(read_only=True) - quantity = serializers.FloatField() + quantity = InvenTreeDecimalField() part = serializers.PrimaryKeyRelatedField(queryset=Part.objects.filter(assembly=True)) diff --git a/InvenTree/stock/serializers.py b/InvenTree/stock/serializers.py index 850ebcea3b..c4b424bf25 100644 --- a/InvenTree/stock/serializers.py +++ b/InvenTree/stock/serializers.py @@ -32,6 +32,7 @@ from company.serializers import SupplierPartSerializer import InvenTree.helpers import InvenTree.serializers +from InvenTree.serializers import InvenTreeDecimalField from part.serializers import PartBriefSerializer @@ -55,7 +56,8 @@ class StockItemSerializerBrief(InvenTree.serializers.InvenTreeModelSerializer): location_name = serializers.CharField(source='location', read_only=True) part_name = serializers.CharField(source='part.full_name', read_only=True) - quantity = serializers.FloatField() + + quantity = InvenTreeDecimalField() class Meta: model = StockItem @@ -136,7 +138,7 @@ class StockItemSerializer(InvenTree.serializers.InvenTreeModelSerializer): tracking_items = serializers.IntegerField(source='tracking_info_count', read_only=True, required=False) - # quantity = serializers.FloatField() + quantity = InvenTreeDecimalField() allocated = serializers.FloatField(source='allocation_count', required=False)