fix
This commit is contained in:
@@ -10,7 +10,7 @@ def update_counterparty_balance(counterparty):
|
|||||||
expences = Expence.objects.filter(
|
expences = Expence.objects.filter(
|
||||||
counterparty=counterparty,
|
counterparty=counterparty,
|
||||||
is_deleted=False,
|
is_deleted=False,
|
||||||
status='CONFIRMED'
|
# status='CONFIRMED'
|
||||||
)
|
)
|
||||||
|
|
||||||
debit_usd = expences.filter(currency='usd').aggregate(
|
debit_usd = expences.filter(currency='usd').aggregate(
|
||||||
@@ -34,17 +34,17 @@ def update_counterparty_balance(counterparty):
|
|||||||
total=Sum('party_amount__paid_amount')
|
total=Sum('party_amount__paid_amount')
|
||||||
)['total'] or 0
|
)['total'] or 0
|
||||||
|
|
||||||
# total_price - paid_amount ni hisoblash
|
# # total_price - paid_amount ni hisoblash
|
||||||
party_remain_usd = parties.filter(currency='usd').aggregate(
|
# party_remain_usd = parties.filter(currency='usd').aggregate(
|
||||||
total=Sum(F('party_amount__total_price') - F('party_amount__paid_amount'))
|
# total=Sum(F('party_amount__total_price') - F('party_amount__paid_amount'))
|
||||||
)['total'] or 0
|
# )['total'] or 0
|
||||||
|
|
||||||
party_remain_uzs = parties.filter(currency='uzs').aggregate(
|
# party_remain_uzs = parties.filter(currency='uzs').aggregate(
|
||||||
total=Sum(F('party_amount__total_price') - F('party_amount__paid_amount'))
|
# total=Sum(F('party_amount__total_price') - F('party_amount__paid_amount'))
|
||||||
)['total'] or 0
|
# )['total'] or 0
|
||||||
|
|
||||||
debit_usd = debit_usd - party_payment_usd + party_remain_usd
|
debit_usd = debit_usd - party_payment_usd
|
||||||
debit_uzs = debit_uzs - party_payment_uzs + party_remain_uzs
|
debit_uzs = debit_uzs - party_payment_uzs
|
||||||
|
|
||||||
|
|
||||||
incomes = Income.objects.filter(
|
incomes = Income.objects.filter(
|
||||||
|
|||||||
Reference in New Issue
Block a user