From 8108d7fdba96dfcef6f3c6252fbd8a4ac60794d0 Mon Sep 17 00:00:00 2001 From: ljain112 Date: Thu, 30 Jan 2025 12:32:14 +0530 Subject: [PATCH 1/2] fix: respect user set account if not advance account for getting outstanding invoices in payment entry (cherry picked from commit 9faf78d3e54c6f288dfb5715d06544827f6ab4fe) --- .../doctype/payment_entry/payment_entry.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py index ef76aa07c69..95e910d3efb 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.py +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py @@ -1798,7 +1798,7 @@ class PaymentEntry(AccountsController): paid_amount -= sum(flt(d.amount, precision) for d in self.deductions) for ref in self.references: - reference_outstanding_amount = ref.outstanding_amount + reference_outstanding_amount = flt(ref.outstanding_amount) abs_outstanding_amount = abs(reference_outstanding_amount) if reference_outstanding_amount > 0: @@ -2243,10 +2243,17 @@ def get_outstanding_reference_documents(args, validate=False): outstanding_invoices = [] negative_outstanding_invoices = [] + party_account = args.get("party_account") + + # get party account if advance account is set. if args.get("book_advance_payments_in_separate_party_account"): - party_account = get_party_account(args.get("party_type"), args.get("party"), args.get("company")) - else: - party_account = args.get("party_account") + accounts = get_party_account( + args.get("party_type"), args.get("party"), args.get("company"), include_advance=True + ) + advnace_account = accounts[1] if len(accounts) >= 1 else None + + if party_account == advnace_account: + party_account = accounts[0] if args.get("get_outstanding_invoices"): outstanding_invoices = get_outstanding_invoices( From b926b49afaf69123fde1b593feec5017bed2cd56 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Wed, 5 Feb 2025 11:52:52 +0530 Subject: [PATCH 2/2] chore: fix typo (cherry picked from commit 85378f9d1ae1ffa12f4ef1fe924a51865dbd5246) --- erpnext/accounts/doctype/payment_entry/payment_entry.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py index 95e910d3efb..a63d8d87807 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.py +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py @@ -2250,9 +2250,9 @@ def get_outstanding_reference_documents(args, validate=False): accounts = get_party_account( args.get("party_type"), args.get("party"), args.get("company"), include_advance=True ) - advnace_account = accounts[1] if len(accounts) >= 1 else None + advance_account = accounts[1] if len(accounts) >= 1 else None - if party_account == advnace_account: + if party_account == advance_account: party_account = accounts[0] if args.get("get_outstanding_invoices"):