diff --git a/core/apps/counterparty/utils/counterparty.py b/core/apps/counterparty/utils/counterparty.py index be540f0..43ae98f 100644 --- a/core/apps/counterparty/utils/counterparty.py +++ b/core/apps/counterparty/utils/counterparty.py @@ -34,6 +34,14 @@ def update_counterparty_balance(counterparty): total=Sum('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_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 @@ -51,6 +59,11 @@ def update_counterparty_balance(counterparty): total=Sum('price') )['total'] or 0 + # Partyaning payment_amount ni kreditga qoshish + kredit_usd += party_payment_amount_usd + kredit_uzs += party_payment_amount_uzs + + total_debit = debit_usd + debit_uzs total_kredit = kredit_usd + kredit_uzs