diff --git a/core/apps/counterparty/models/conterparty.py b/core/apps/counterparty/models/conterparty.py index 7765782..9d87a8c 100644 --- a/core/apps/counterparty/models/conterparty.py +++ b/core/apps/counterparty/models/conterparty.py @@ -126,8 +126,10 @@ class CounterpartyBalance(BaseModel): total_price=models.Sum("price") )['total_price'] or 0 party_amount = total_amount - paid_amount - return (paid_amount + income) - expence - + if expence != paid_amount: + return (party_amount + income) - expence + else: + return (total_amount + income) - expence @property def total_balance_uzs(self): @@ -149,8 +151,10 @@ class CounterpartyBalance(BaseModel): total_price=models.Sum("price") )['total_price'] or 0 party_amount = total_amount - paid_amount - # print(party_amount) - return (paid_amount + income) - expence + if expence != paid_amount: + return (party_amount + income) - expence + else: + return (total_amount + income) - expence def __str__(self): return f"{self.counterparty.name}"