diff --git a/core/apps/counterparty/models/conterparty.py b/core/apps/counterparty/models/conterparty.py index d72253b..31c1266 100644 --- a/core/apps/counterparty/models/conterparty.py +++ b/core/apps/counterparty/models/conterparty.py @@ -157,14 +157,13 @@ class CounterpartyBalance(BaseModel): orders__counterparty=self.counterparty, is_deleted=False, currency='uzs' - ).aggregate(total_price=models.Sum('party_amount__paid_amount'))['total_price'] or 0 + ).distinct().aggregate(total_price=models.Sum('party_amount__paid_amount'))['total_price'] or 0 income = Income.objects.filter(currency='uzs', counterparty=self.counterparty).aggregate( total_price=models.Sum("price") )['total_price'] or 0 expence = Expence.objects.filter(currency='uzs', counterparty=self.counterparty).aggregate( total_price=models.Sum("price") )['total_price'] or 0 - print(party_total_amount, income, expence) return (party_total_amount + income) - expence def __str__(self): diff --git a/core/apps/finance/serializers/deleted_expence.py b/core/apps/finance/serializers/deleted_expence.py index 18ae30c..70cf5f1 100644 --- a/core/apps/finance/serializers/deleted_expence.py +++ b/core/apps/finance/serializers/deleted_expence.py @@ -23,5 +23,5 @@ class DeletedExpenceListSerializer(serializers.ModelSerializer): return { "id": obj.user.id, "full_name": obj.user.full_name, - "profile_image": obj.user.profile_image - } if obj.user else None \ No newline at end of file + "profile_image": obj.user.profile_image.url or None + } if obj.user else {} \ No newline at end of file diff --git a/core/apps/orders/serializers/party.py b/core/apps/orders/serializers/party.py index 836f06c..d8709fe 100644 --- a/core/apps/orders/serializers/party.py +++ b/core/apps/orders/serializers/party.py @@ -253,7 +253,7 @@ class DeletedPartyListSerializer(serializers.ModelSerializer): return { "id": obj.user.id, "full_name": obj.user.full_name, - "profile_image": obj.user.profile_image, + "profile_image": obj.user.profile_image.url or None, } if obj.user else {} def get_mediator(self, obj):