xoliqberdiyev/ibapp-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
behruz-dev
2025-11-12 15:21:02 +05:00
parent 51ec0a6a22
commit 8f47f65cb2
2 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/apps/counterparty/models/conterparty.py
View File

@@ -126,7 +126,7 @@ class CounterpartyBalance(BaseModel):
total_price=models.Sum("price") total_price=models.Sum("price")
)['total_price'] or 0 )['total_price'] or 0
party_amount = total_amount - paid_amount party_amount = total_amount - paid_amount
return (party_amount + income) - expence return (paid_amount + income) - expence
@property @property
@@ -149,8 +149,8 @@ class CounterpartyBalance(BaseModel):
total_price=models.Sum("price") total_price=models.Sum("price")
)['total_price'] or 0 )['total_price'] or 0
party_amount = total_amount - paid_amount party_amount = total_amount - paid_amount
print(party_amount) # print(party_amount)
return (party_amount + income) - expence return (paid_amount + income) - expence
def __str__(self): def __str__(self):
return f"{self.counterparty.name}" return f"{self.counterparty.name}"

10
core/apps/orders/models/party.py
View File

@@ -61,16 +61,6 @@ class Party(BaseModel):
return f'P - {self.number}' return f'P - {self.number}'
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
# if self.status in ['NEW', 'CANCELLED', 'DRAFT']:
# self.process = 0
# elif self.status == 'EXPECTED':
# self.process = 25
# elif self.status == 'PROCESS':
# self.process = 50
# elif self.status == 'PURCHASED':
# self.process = 75
# elif self.status == 'PARTY_IS_MADE':
# self.process == 100
percentage = 0 percentage = 0
count = 0 count = 0
for order in self.orders.all(): for order in self.orders.all():