fix
This commit is contained in:
@@ -3,7 +3,7 @@ from decimal import Decimal
|
||||
from django.db import models
|
||||
from django.apps import apps
|
||||
|
||||
from core.apps.shared.models import BaseModel, Region, District
|
||||
from core.apps.shared.models import BaseModel, Region, District, UsdCourse
|
||||
|
||||
|
||||
class CounterpartyFolder(BaseModel):
|
||||
@@ -69,20 +69,6 @@ class CounterpartyBalance(BaseModel):
|
||||
debit_uzs = models.DecimalField(max_digits=15, decimal_places=2, default=0.00)
|
||||
|
||||
def save(self, *args, **kwargs):
|
||||
# if self.balance_usd > 0:
|
||||
# self.debit_usd = self.balance_usd
|
||||
# self.kredit_usd = Decimal('0.00')
|
||||
# elif self.balance_usd < 0:
|
||||
# self.kredit_usd = abs(self.balance_usd)
|
||||
# self.debit_usd = Decimal('0.00')
|
||||
|
||||
# if self.balance_uzs > 0:
|
||||
# self.debit_uzs = self.balance_uzs
|
||||
# self.kredit_uzs = Decimal('0.00')
|
||||
# elif self.balance_uzs < 0:
|
||||
# self.kredit_uzs = abs(self.balance_uzs)
|
||||
# self.debit_uzs = Decimal('0.00')
|
||||
|
||||
if self.total_balance_usd >= 0:
|
||||
self.kredit_usd = self.total_balance_usd
|
||||
elif self.total_balance_usd <= 0:
|
||||
@@ -145,6 +131,12 @@ class CounterpartyBalance(BaseModel):
|
||||
total_price=models.Sum("price")
|
||||
)['total_price'] or 0
|
||||
return (total_amount + income) - expence
|
||||
|
||||
@property
|
||||
def total_balance(self):
|
||||
usd_course = Decimal(UsdCourse.objects.first().value) if UsdCourse.objects.exists() else Decimal(12000)
|
||||
return self.total_balance_usd + (self.total_balance_usd * usd_course)
|
||||
|
||||
|
||||
def __str__(self):
|
||||
return f"{self.counterparty.name}"
|
||||
|
||||
Reference in New Issue
Block a user