From 6a18bce7f32f1be3b80032503fe1bfb617769b10 Mon Sep 17 00:00:00 2001 From: behruz-dev Date: Wed, 5 Nov 2025 18:51:27 +0500 Subject: [PATCH] fix --- core/apps/counterparty/utils/counterparty.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/core/apps/counterparty/utils/counterparty.py b/core/apps/counterparty/utils/counterparty.py index 212ae2b..b41ca16 100644 --- a/core/apps/counterparty/utils/counterparty.py +++ b/core/apps/counterparty/utils/counterparty.py @@ -34,14 +34,13 @@ def update_counterparty_balance(counterparty): total=Sum('party_amount__paid_amount') )['total'] or 0 - # # total_price - paid_amount ni hisoblash - # party_remain_usd = parties.filter(currency='usd').aggregate( - # total=Sum(F('party_amount__total_price') - F('party_amount__paid_amount')) - # )['total'] or 0 + party_payment_amount_usd = parties.filter(currency='usd').aggregate( + total=Sum('party_amount__payment_amount') + )['total'] or 0 - # party_remain_uzs = parties.filter(currency='uzs').aggregate( - # total=Sum(F('party_amount__total_price') - F('party_amount__paid_amount')) - # )['total'] or 0 + party_payment_amount_uzs = parties.filter(currency='uzs').aggregate( + total=Sum('party_amount__payment_amount') + )['total'] or 0 debit_usd = debit_usd - party_payment_usd debit_uzs = debit_uzs - party_payment_uzs @@ -60,7 +59,8 @@ def update_counterparty_balance(counterparty): total=Sum('price') )['total'] or 0 - + kredit_usd += party_payment_amount_usd + kredit_uzs += party_payment_amount_uzs total_debit = debit_usd + debit_uzs total_kredit = kredit_usd + kredit_uzs