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

change alot of things

Browse Source
This commit is contained in:
behruz-dev
2025-11-14 16:28:49 +05:00
parent cbcfa7893a
commit 204c39445e
6 changed files with 530 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

703
core/apps/counterparty/data/counterparty.json
View File

File diff suppressed because it is too large Load Diff

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

@@ -138,15 +138,12 @@ class CounterpartyBalance(BaseModel):
currency='uzs' currency='uzs'
).distinct() ).distinct()
total_amount = parties.aggregate(total_price=models.Sum('party_amount__calculated_amount'))['total_price'] or 0 total_amount = parties.aggregate(total_price=models.Sum('party_amount__calculated_amount'))['total_price'] or 0
print(total_amount)
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
print(income)
expence = Expence.objects.filter(currency='uzs', counterparty=self.counterparty).aggregate( expence = Expence.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
print(expence)
return (total_amount + income) - expence return (total_amount + income) - expence
def __str__(self): def __str__(self):

2
core/apps/finance/management/commands/import_expence.py
View File

@@ -19,7 +19,7 @@ from core.apps.orders.models import Party
headers = { headers = {
"Authorization": "Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwczovL2JhY2tlbmQuYXBwLnV5cXVyLnV6L21haW4vYXV0aC9sb2dpbiIsImlhdCI6MTc2Mjg2MzgyOCwiZXhwIjoxNzYyOTUwMjI4LCJuYmYiOjE3NjI4NjM4MjgsImp0aSI6IlBPd2xJd1kwQXZSQlE3UkoiLCJzdWIiOiIxMDQiLCJwcnYiOiIyM2JkNWM4OTQ5ZjYwMGFkYjM5ZTcwMWM0MDA4NzJkYjdhNTk3NmY3In0.1Pi_4vJaTqPRi92zsueZ-eGoTAiIJa-xd2AbRHvg5Gk" "Authorization": "Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwczovL2JhY2tlbmQuYXBwLnV5cXVyLnV6L21haW4vYXV0aC9sb2dpbiIsImlhdCI6MTc2MzExMzM1OSwiZXhwIjoxNzYzMTk5NzU5LCJuYmYiOjE3NjMxMTMzNTksImp0aSI6IlZyVU5BVE9IVmJBNnpLbW0iLCJzdWIiOiIxMDQiLCJwcnYiOiIyM2JkNWM4OTQ5ZjYwMGFkYjM5ZTcwMWM0MDA4NzJkYjdhNTk3NmY3In0.p4ndkWQYfXpftzUhgcxr3V9DQOarSz6Q0xbPhtezw70"
} }

2
core/apps/finance/management/commands/import_income.py
View File

@@ -19,7 +19,7 @@ from core.apps.orders.models import Party
headers = { headers = {
"Authorization": "Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwczovL2JhY2tlbmQuYXBwLnV5cXVyLnV6L21haW4vYXV0aC9sb2dpbiIsImlhdCI6MTc2Mjg2MzgyOCwiZXhwIjoxNzYyOTUwMjI4LCJuYmYiOjE3NjI4NjM4MjgsImp0aSI6IlBPd2xJd1kwQXZSQlE3UkoiLCJzdWIiOiIxMDQiLCJwcnYiOiIyM2JkNWM4OTQ5ZjYwMGFkYjM5ZTcwMWM0MDA4NzJkYjdhNTk3NmY3In0.1Pi_4vJaTqPRi92zsueZ-eGoTAiIJa-xd2AbRHvg5Gk" "Authorization": "Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwczovL2JhY2tlbmQuYXBwLnV5cXVyLnV6L21haW4vYXV0aC9sb2dpbiIsImlhdCI6MTc2MzExMzM1OSwiZXhwIjoxNzYzMTk5NzU5LCJuYmYiOjE3NjMxMTMzNTksImp0aSI6IlZyVU5BVE9IVmJBNnpLbW0iLCJzdWIiOiIxMDQiLCJwcnYiOiIyM2JkNWM4OTQ5ZjYwMGFkYjM5ZTcwMWM0MDA4NzJkYjdhNTk3NmY3In0.p4ndkWQYfXpftzUhgcxr3V9DQOarSz6Q0xbPhtezw70"
} }

2
core/apps/orders/management/commands/import_party.py
View File

@@ -11,7 +11,7 @@ from core.apps.products.models import Product, Unity
from core.apps.projects.models import Project, ProjectFolder from core.apps.projects.models import Project, ProjectFolder
from core.apps.wherehouse.models import WhereHouse from core.apps.wherehouse.models import WhereHouse
token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwczovL2JhY2tlbmQuYXBwLnV5cXVyLnV6L21haW4vYXV0aC9sb2dpbiIsImlhdCI6MTc2Mjk1MjUxNiwiZXhwIjoxNzYzMDM4OTE2LCJuYmYiOjE3NjI5NTI1MTYsImp0aSI6IkVlcW1lVVluMUR0VTNvUDciLCJzdWIiOiIxMDQiLCJwcnYiOiIyM2JkNWM4OTQ5ZjYwMGFkYjM5ZTcwMWM0MDA4NzJkYjdhNTk3NmY3In0.64QPbq6CeJqXubai4nMfH9RlJIJ0YUPFfJ298ar4YGQ" token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwczovL2JhY2tlbmQuYXBwLnV5cXVyLnV6L21haW4vYXV0aC9sb2dpbiIsImlhdCI6MTc2MzExMzM1OSwiZXhwIjoxNzYzMTk5NzU5LCJuYmYiOjE3NjMxMTMzNTksImp0aSI6IlZyVU5BVE9IVmJBNnpLbW0iLCJzdWIiOiIxMDQiLCJwcnYiOiIyM2JkNWM4OTQ5ZjYwMGFkYjM5ZTcwMWM0MDA4NzJkYjdhNTk3NmY3In0.p4ndkWQYfXpftzUhgcxr3V9DQOarSz6Q0xbPhtezw70"
headers = {"Authorization": f"Bearer {token}"} headers = {"Authorization": f"Bearer {token}"}

2
core/apps/orders/management/commands/import_party_by_number.py
View File

@@ -11,7 +11,7 @@ from core.apps.products.models import Product, Unity
from core.apps.projects.models import Project, ProjectFolder from core.apps.projects.models import Project, ProjectFolder
from core.apps.wherehouse.models import WhereHouse from core.apps.wherehouse.models import WhereHouse
token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwczovL2JhY2tlbmQuYXBwLnV5cXVyLnV6L21haW4vYXV0aC9sb2dpbiIsImlhdCI6MTc2Mjk1MjUxNiwiZXhwIjoxNzYzMDM4OTE2LCJuYmYiOjE3NjI5NTI1MTYsImp0aSI6IkVlcW1lVVluMUR0VTNvUDciLCJzdWIiOiIxMDQiLCJwcnYiOiIyM2JkNWM4OTQ5ZjYwMGFkYjM5ZTcwMWM0MDA4NzJkYjdhNTk3NmY3In0.64QPbq6CeJqXubai4nMfH9RlJIJ0YUPFfJ298ar4YGQ" token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwczovL2JhY2tlbmQuYXBwLnV5cXVyLnV6L21haW4vYXV0aC9sb2dpbiIsImlhdCI6MTc2MzExMzM1OSwiZXhwIjoxNzYzMTk5NzU5LCJuYmYiOjE3NjMxMTMzNTksImp0aSI6IlZyVU5BVE9IVmJBNnpLbW0iLCJzdWIiOiIxMDQiLCJwcnYiOiIyM2JkNWM4OTQ5ZjYwMGFkYjM5ZTcwMWM0MDA4NzJkYjdhNTk3NmY3In0.p4ndkWQYfXpftzUhgcxr3V9DQOarSz6Q0xbPhtezw70"
headers = {"Authorization": f"Bearer {token}"} headers = {"Authorization": f"Bearer {token}"}