Merge pull request #56721 from frappe/chore/test-payment-period-based-on-invoice-date

fix: Payment Period ages by payment period + test coverage

erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py

@@ -21,6 +21,8 @@ def execute(filters=None):
 	entries = get_entries(filters)
 	invoice_details = get_invoice_posting_date_map(filters)
 
+	report = ReceivablePayableReport(filters)
+
 	data = []
 	for d in entries:
 		invoice = invoice_details.get(d.against_voucher_no) or frappe._dict()
@@ -29,7 +31,9 @@ def execute(filters=None):
 		d.update({"range1": 0, "range2": 0, "range3": 0, "range4": 0, "outstanding": payment_amount})
 
 		if d.against_voucher_no:
-			ReceivablePayableReport(filters).get_ageing_data(invoice.posting_date, d)
+			# age the payment by how long after the invoice it was made (payment date - invoice date)
+			report.age_as_on = getdate(d.posting_date)
+			report.get_ageing_data(invoice.posting_date, d)
 
 		row = [
 			d.voucher_type,

erpnext/accounts/report/payment_period_based_on_invoice_date/test_payment_period_based_on_invoice_date.py

@@ -0,0 +1,122 @@
+# Copyright (c) 2026, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+
+import frappe
+from frappe.utils import getdate
+
+from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry
+from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
+from erpnext.accounts.report.payment_period_based_on_invoice_date.payment_period_based_on_invoice_date import (
+	execute,
+)
+from erpnext.tests.utils import ERPNextTestSuite
+
+
+class TestPaymentPeriodBasedOnInvoiceDate(ERPNextTestSuite):
+	"""Depth tests for the Payment Period Based On Invoice Date report.
+
+	The report lists Payment Ledger Entries against invoices and buckets the paid
+	amount by the payment period -- how long after the invoice the payment was made
+	(payment date - invoice date) -- into ranges: range1 (0-30), range2 (30-60),
+	range3 (60-90), range4 (90 Above).
+	"""
+
+	def run_report(self, **extra):
+		filters = frappe._dict(
+			{
+				"company": "_Test Company",
+				"payment_type": "Incoming",
+				"party_type": "Customer",
+				"from_date": "2026-01-01",
+				"to_date": "2026-12-31",
+			}
+		)
+		filters.update(extra)
+		return execute(filters)
+
+	def find_payment_row(self, data, payment_name):
+		# Row shape (positional): payment_document, payment_entry(voucher_no),
+		# party_type, party, posting_date, invoice(against_voucher_no),
+		# invoice_posting_date, due_date, amount, remarks, age,
+		# range1, range2, range3, range4, [delay_in_payment]
+		for row in data:
+			if row[1] == payment_name:
+				return row
+		return None
+
+	def pay_invoice(self, invoice, payment_date):
+		pe = get_payment_entry("Sales Invoice", invoice.name)
+		pe.posting_date = payment_date
+		pe.reference_no = "1"
+		pe.reference_date = payment_date
+		pe.submit()
+		return pe
+
+	def test_paid_amount_lands_in_0_30_bucket(self):
+		# invoice 2026-06-01, paid 2026-06-20 -> 19 days after -> 0-30 bucket
+		invoice = create_sales_invoice(customer="_Test Customer", rate=1000, posting_date="2026-06-01")
+		payment = self.pay_invoice(invoice, "2026-06-20")
+
+		columns, data = self.run_report()
+
+		row = self.find_payment_row(data, payment.name)
+		self.assertIsNotNone(row, "Payment row not found in report output")
+
+		# Positional assertions on the row shape.
+		self.assertEqual(row[2], "Customer")
+		self.assertEqual(row[4], getdate("2026-06-20"))  # payment posting date
+		self.assertEqual(row[5], invoice.name)  # against invoice
+		self.assertEqual(row[6], getdate("2026-06-01"))  # invoice posting date
+		self.assertEqual(row[8], 1000)  # amount
+		self.assertEqual(row[10], 19)  # age = payment date - invoice date
+
+		# Buckets: 0-30 filled, others empty.
+		self.assertEqual(row[11], 1000)  # range1 (0-30)
+		self.assertEqual(row[12], 0)  # range2 (30-60)
+		self.assertEqual(row[13], 0)  # range3 (60-90)
+		self.assertEqual(row[14], 0)  # range4 (90 Above)
+
+	def test_paid_amount_lands_in_30_60_bucket(self):
+		# invoice 2026-06-01, paid 2026-07-16 -> 45 days after -> 30-60 bucket
+		invoice = create_sales_invoice(customer="_Test Customer 1", rate=1000, posting_date="2026-06-01")
+		payment = self.pay_invoice(invoice, "2026-07-16")
+
+		columns, data = self.run_report()
+
+		row = self.find_payment_row(data, payment.name)
+		self.assertIsNotNone(row, "Payment row not found in report output")
+
+		self.assertEqual(row[8], 1000)  # amount
+		self.assertEqual(row[10], 45)  # age = payment date - invoice date
+		# Buckets: 30-60 filled, others empty.
+		self.assertEqual(row[11], 0)  # range1 (0-30)
+		self.assertEqual(row[12], 1000)  # range2 (30-60)
+		self.assertEqual(row[13], 0)  # range3 (60-90)
+		self.assertEqual(row[14], 0)  # range4 (90 Above)
+
+	def test_columns_expose_expected_age_buckets(self):
+		columns, _data = self.run_report()
+		labels_by_fieldname = {c["fieldname"]: c["label"] for c in columns}
+		self.assertEqual(labels_by_fieldname["range1"], "0-30")
+		self.assertEqual(labels_by_fieldname["range2"], "30-60")
+		self.assertEqual(labels_by_fieldname["range3"], "60-90")
+		self.assertEqual(labels_by_fieldname["range4"], "90 Above")
+		# Sales Invoice link for Incoming payments.
+		invoice_col = next(c for c in columns if c["fieldname"] == "invoice")
+		self.assertEqual(invoice_col["options"], "Sales Invoice")
+
+	def test_invalid_payment_type_party_type_combo_throws(self):
+		# Incoming + Supplier is invalid.
+		self.assertRaises(
+			frappe.ValidationError,
+			self.run_report,
+			payment_type="Incoming",
+			party_type="Supplier",
+		)
+		# Outgoing + Customer is invalid.
+		self.assertRaises(
+			frappe.ValidationError,
+			self.run_report,
+			payment_type="Outgoing",
+			party_type="Customer",
+		)