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 5b90d82dd8..9deece4863 100644 --- a/InvenTree/part/serializers.py +++ b/InvenTree/part/serializers.py @@ -10,13 +10,12 @@ from django.db import models from django.db.models import Q from django.db.models.functions import Coalesce -from InvenTree.serializers import InvenTreeDecimalField - from rest_framework import serializers from sql_util.utils import SubqueryCount, SubquerySum from djmoney.contrib.django_rest_framework import MoneyField from InvenTree.serializers import (InvenTreeAttachmentSerializerField, + InvenTreeDecimalField, InvenTreeImageSerializerField, InvenTreeModelSerializer, InvenTreeAttachmentSerializer, @@ -122,7 +121,7 @@ class PartSalePriceSerializer(InvenTreeModelSerializer): Serializer for sale prices for Part model. """ - quantity = serializers.FloatField() + quantity = InvenTreeDecimalField() price = InvenTreeMoneySerializer( allow_null=True @@ -146,7 +145,7 @@ class PartInternalPriceSerializer(InvenTreeModelSerializer): Serializer for internal prices for Part model. """ - quantity = serializers.FloatField() + quantity = InvenTreeDecimalField() price = InvenTreeMoneySerializer( allow_null=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)