fi
This commit is contained in:
@@ -118,7 +118,7 @@ class CounterpartyBalance(BaseModel):
|
|||||||
currency='usd'
|
currency='usd'
|
||||||
).distinct()
|
).distinct()
|
||||||
paid_amount = parties.aggregate(total_price=models.Sum('party_amount__paid_amount'))['total_price'] or 0
|
paid_amount = parties.aggregate(total_price=models.Sum('party_amount__paid_amount'))['total_price'] or 0
|
||||||
total_amount = parties.aggregate(total_price=models.Sum('party_amount__calculated_price'))['total_price'] or 0
|
total_amount = parties.aggregate(total_price=models.Sum('party_amount__calculated_amount'))['total_price'] or 0
|
||||||
income = Income.objects.filter(currency='usd', counterparty=self.counterparty).aggregate(
|
income = Income.objects.filter(currency='usd', counterparty=self.counterparty).aggregate(
|
||||||
total_price=models.Sum("price")
|
total_price=models.Sum("price")
|
||||||
)['total_price'] or 0
|
)['total_price'] or 0
|
||||||
@@ -141,7 +141,7 @@ class CounterpartyBalance(BaseModel):
|
|||||||
currency='uzs'
|
currency='uzs'
|
||||||
).distinct()
|
).distinct()
|
||||||
paid_amount = parties.aggregate(total_price=models.Sum('party_amount__paid_amount'))['total_price'] or 0
|
paid_amount = parties.aggregate(total_price=models.Sum('party_amount__paid_amount'))['total_price'] or 0
|
||||||
total_amount = parties.aggregate(total_price=models.Sum('party_amount__calculated_price'))['total_price'] or 0
|
total_amount = parties.aggregate(total_price=models.Sum('party_amount__calculated_amount'))['total_price'] or 0
|
||||||
income = Income.objects.filter(currency='uzs', counterparty=self.counterparty).aggregate(
|
income = Income.objects.filter(currency='uzs', counterparty=self.counterparty).aggregate(
|
||||||
total_price=models.Sum("price")
|
total_price=models.Sum("price")
|
||||||
)['total_price'] or 0
|
)['total_price'] or 0
|
||||||
|
|||||||
Reference in New Issue
Block a user