fix
This commit is contained in:
@@ -34,14 +34,13 @@ 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
|
party_payment_amount_usd = parties.filter(currency='usd').aggregate(
|
||||||
# party_remain_usd = parties.filter(currency='usd').aggregate(
|
total=Sum('party_amount__payment_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_payment_amount_uzs = parties.filter(currency='uzs').aggregate(
|
||||||
# total=Sum(F('party_amount__total_price') - F('party_amount__paid_amount'))
|
total=Sum('party_amount__payment_amount')
|
||||||
# )['total'] or 0
|
)['total'] or 0
|
||||||
|
|
||||||
debit_usd = debit_usd - party_payment_usd
|
debit_usd = debit_usd - party_payment_usd
|
||||||
debit_uzs = debit_uzs - party_payment_uzs
|
debit_uzs = debit_uzs - party_payment_uzs
|
||||||
@@ -60,7 +59,8 @@ def update_counterparty_balance(counterparty):
|
|||||||
total=Sum('price')
|
total=Sum('price')
|
||||||
)['total'] or 0
|
)['total'] or 0
|
||||||
|
|
||||||
|
kredit_usd += party_payment_amount_usd
|
||||||
|
kredit_uzs += party_payment_amount_uzs
|
||||||
|
|
||||||
total_debit = debit_usd + debit_uzs
|
total_debit = debit_usd + debit_uzs
|
||||||
total_kredit = kredit_usd + kredit_uzs
|
total_kredit = kredit_usd + kredit_uzs
|
||||||
|
|||||||
Reference in New Issue
Block a user