diff --git a/apps/herd/pos/api/v1/api.py b/apps/herd/pos/api/v1/api.py index 4938522..f0bafda 100644 --- a/apps/herd/pos/api/v1/api.py +++ b/apps/herd/pos/api/v1/api.py @@ -149,5 +149,5 @@ class RancherViewSet(viewsets.ModelViewSet, DynamicSearchMixin): return Response(serializer.data, status=status.HTTP_200_OK) else: return Response({ - "message": "rancher has not existence" + "message": "دامدار با کد ملی مد نظر وجود ندارد" # noqa }, status=status.HTTP_404_NOT_FOUND) diff --git a/apps/product/web/api/v1/serializers/quota_distribution_serializers.py b/apps/product/web/api/v1/serializers/quota_distribution_serializers.py index ef6eb93..ae0f739 100644 --- a/apps/product/web/api/v1/serializers/quota_distribution_serializers.py +++ b/apps/product/web/api/v1/serializers/quota_distribution_serializers.py @@ -66,7 +66,7 @@ class QuotaDistributionSerializer(serializers.ModelSerializer): if total + amount > quota.quota_weight: raise QuotaWeightException() else: - if parent_distribution.remaining_weight + amount > parent_distribution.remaining_weight: + if amount > parent_distribution.remaining_weight: raise QuotaWeightException() if self.instance: @@ -80,7 +80,7 @@ class QuotaDistributionSerializer(serializers.ModelSerializer): raise APIException("وزن وارد شده کمتر از وزن ورودی به انبار است", code=403) # noqa if self.instance.parent_distribution: - if self.instance.parent_distribution.remaining_weight + amount > self.instance.parent_distribution.remaining_weight: + if amount > self.instance.parent_distribution.remaining_weight: raise QuotaWeightException() # if weight is more than distribution remaining weight @@ -88,7 +88,7 @@ class QuotaDistributionSerializer(serializers.ModelSerializer): if amount + total > self.instance.quota.quota_weight: raise APIException("وزن وارد شده بیشتر از وزن باقیمانده است", code=403) # noqa else: - if self.instance.parent_distribution.remaining_weight + amount > self.instance.parent_distribution.remaining_weight: + if amount > self.instance.parent_distribution.remaining_weight: raise QuotaWeightException() return data