From b3cbbf2ce38e734ae6df27b415a01cba04180d5e Mon Sep 17 00:00:00 2001 From: ljain112 Date: Wed, 21 May 2025 13:18:09 +0530 Subject: [PATCH 1/2] fix: show general ledger in doc currency in Process Statement Of Accounts (cherry picked from commit 998f6a29a4acebf5b9373f8c8fa2d417a3f6d361) --- .../process_statement_of_accounts.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py index 1c4bb66357f..714ed623796 100644 --- a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py +++ b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py @@ -129,8 +129,8 @@ def get_statement_dict(doc, get_statement_dict=False): tax_id = frappe.get_doc("Customer", entry.customer).tax_id presentation_currency = ( - get_party_account_currency("Customer", entry.customer, doc.company) - or doc.currency + doc.currency + or get_party_account_currency("Customer", entry.customer, doc.company) or get_company_currency(doc.company) ) From 9d2f396d75b37f271d65f2b93d6945fc728682fe Mon Sep 17 00:00:00 2001 From: ljain112 Date: Wed, 21 May 2025 14:37:47 +0530 Subject: [PATCH 2/2] chore: update test case because currency is auto set to system currency (cherry picked from commit 22a94d6817fdeb8470228aaac45c007bebbe5438) --- .../test_process_statement_of_accounts.py | 1 + 1 file changed, 1 insertion(+) diff --git a/erpnext/accounts/doctype/process_statement_of_accounts/test_process_statement_of_accounts.py b/erpnext/accounts/doctype/process_statement_of_accounts/test_process_statement_of_accounts.py index 92dbb5ef273..ebfe96e771e 100644 --- a/erpnext/accounts/doctype/process_statement_of_accounts/test_process_statement_of_accounts.py +++ b/erpnext/accounts/doctype/process_statement_of_accounts/test_process_statement_of_accounts.py @@ -97,6 +97,7 @@ def create_process_soa(**args): company=args.company or "_Test Company", customers=args.customers or [{"customer": "_Test Customer"}], enable_auto_email=1 if args.enable_auto_email else 0, + currency=args.currency or "", frequency=args.frequency or "Weekly", report=args.report or "General Ledger", from_date=args.from_date or getdate(today()),