From 316470eee43e0b021bcbc5e9ed1d2750fb9b1af9 Mon Sep 17 00:00:00 2001 From: Devin Slauenwhite Date: Sat, 2 Aug 2025 11:14:55 -0400 Subject: [PATCH 1/4] Revert "fix: set proper currency format" This reverts PR https://github.com/frappe/erpnext/pull/42458 This reverts commit 2533808f1e457cc87e3bc41cd9c0c97ad1f0c771. --- erpnext/accounts/report/payment_ledger/payment_ledger.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/erpnext/accounts/report/payment_ledger/payment_ledger.py b/erpnext/accounts/report/payment_ledger/payment_ledger.py index 9dd5ae5c400..d4f0f0a107d 100644 --- a/erpnext/accounts/report/payment_ledger/payment_ledger.py +++ b/erpnext/accounts/report/payment_ledger/payment_ledger.py @@ -130,7 +130,6 @@ class PaymentLedger: ) def get_columns(self): - company_currency = frappe.get_cached_value("Company", self.filters.get("company"), "default_currency") options = None self.columns.append( dict( @@ -195,7 +194,7 @@ class PaymentLedger: label=_("Amount"), fieldname="amount", fieldtype="Currency", - options=company_currency, + options="Company:company:default_currency", width="100", ) ) From 7f3905185c7e3d0f5b5b5ceccbdc4c51a9248697 Mon Sep 17 00:00:00 2001 From: Devin Slauenwhite Date: Sat, 2 Aug 2025 11:38:47 -0400 Subject: [PATCH 2/4] fix: provide missing `company` in report records that require reference to `Company:company:default_currency` --- erpnext/accounts/report/non_billed_report.py | 1 + erpnext/accounts/report/payment_ledger/payment_ledger.py | 1 + 2 files changed, 2 insertions(+) diff --git a/erpnext/accounts/report/non_billed_report.py b/erpnext/accounts/report/non_billed_report.py index c0ca604cc6d..6a6f58c74bb 100644 --- a/erpnext/accounts/report/non_billed_report.py +++ b/erpnext/accounts/report/non_billed_report.py @@ -46,6 +46,7 @@ def get_ordered_to_be_billed_data(args, filters=None): child_doctype.item_name, child_doctype.description, project_field, + doctype.company, ) .where( (doctype.docstatus == 1) diff --git a/erpnext/accounts/report/payment_ledger/payment_ledger.py b/erpnext/accounts/report/payment_ledger/payment_ledger.py index d4f0f0a107d..03411cccd78 100644 --- a/erpnext/accounts/report/payment_ledger/payment_ledger.py +++ b/erpnext/accounts/report/payment_ledger/payment_ledger.py @@ -46,6 +46,7 @@ class PaymentLedger: against_voucher_no=ple.against_voucher_no, amount=ple.amount, currency=ple.account_currency, + company=ple.company, ) if self.filters.include_account_currency: From 97959dbe75f54d20489ba08680021a1e3fd073f3 Mon Sep 17 00:00:00 2001 From: Devin Slauenwhite Date: Sat, 2 Aug 2025 12:23:12 -0400 Subject: [PATCH 3/4] fix: provide company for outstanding record. --- erpnext/accounts/report/payment_ledger/payment_ledger.py | 1 + 1 file changed, 1 insertion(+) diff --git a/erpnext/accounts/report/payment_ledger/payment_ledger.py b/erpnext/accounts/report/payment_ledger/payment_ledger.py index 03411cccd78..03080aeeed0 100644 --- a/erpnext/accounts/report/payment_ledger/payment_ledger.py +++ b/erpnext/accounts/report/payment_ledger/payment_ledger.py @@ -78,6 +78,7 @@ class PaymentLedger: against_voucher_no="Outstanding:", amount=total, currency=voucher_data[0].currency, + company=voucher_data[0].company, ) if self.filters.include_account_currency: From c03f1c25cf23828bd6f9112a5a480e9aeafbfba2 Mon Sep 17 00:00:00 2001 From: Devin Slauenwhite Date: Sat, 2 Aug 2025 12:29:40 -0400 Subject: [PATCH 4/4] fix: payment ledger voucher seperator row currencies --- erpnext/accounts/report/payment_ledger/payment_ledger.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/erpnext/accounts/report/payment_ledger/payment_ledger.py b/erpnext/accounts/report/payment_ledger/payment_ledger.py index 03080aeeed0..7a2fdc4c925 100644 --- a/erpnext/accounts/report/payment_ledger/payment_ledger.py +++ b/erpnext/accounts/report/payment_ledger/payment_ledger.py @@ -87,7 +87,12 @@ class PaymentLedger: voucher_data.append(entry) # empty row - voucher_data.append(frappe._dict()) + voucher_data.append( + frappe._dict( + currency=voucher_data[0].currency, + company=voucher_data[0].company, + ) + ) self.data.extend(voucher_data) def build_conditions(self):