chore(release): Bumped to Version 16.20.1

## [16.20.1](https://github.com/frappe/erpnext/compare/v16.20.0...v16.20.1) (2026-06-01)

### Bug Fixes

* billing address does not belongs to the company error ([d6b7791](d6b7791f18))

.github/workflows/server-tests-mariadb.yml

@@ -41,6 +41,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 60
     env:
+      TZ: 'Asia/Kolkata'
       NODE_ENV: "production"
       WITH_COVERAGE: ${{ github.event_name != 'pull_request' }}
 
@@ -56,6 +57,7 @@ jobs:
       mysql:
         image: mariadb:10.6
         env:
+          TZ: 'Asia/Kolkata'
           MARIADB_ROOT_PASSWORD: 'root'
         ports:
           - 3306:3306

erpnext/__init__.py

@@ -6,7 +6,7 @@ import frappe
 from frappe.model.document import Document
 from frappe.utils.user import is_website_user
 
-__version__ = "16.15.1"
+__version__ = "16.20.1"
 
 
 def get_default_company(user=None):

erpnext/accounts/custom/address.json

@@ -1,126 +0,0 @@
-{
- "custom_fields": [
-  {
-   "_assign": null,
-   "_comments": null,
-   "_liked_by": null,
-   "_user_tags": null,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "collapsible_depends_on": null,
-   "columns": 0,
-   "creation": "2018-12-28 22:29:21.828090",
-   "default": null,
-   "depends_on": null,
-   "description": null,
-   "docstatus": 0,
-   "dt": "Address",
-   "fetch_from": null,
-   "fetch_if_empty": 0,
-   "fieldname": "tax_category",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "hide_border": 0,
-   "hide_days": 0,
-   "hide_seconds": 0,
-   "idx": 15,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_preview": 0,
-   "in_standard_filter": 0,
-   "insert_after": "fax",
-   "label": "Tax Category",
-   "length": 0,
-   "mandatory_depends_on": null,
-   "modified": "2018-12-28 22:29:21.828090",
-   "modified_by": "Administrator",
-   "name": "Address-tax_category",
-   "no_copy": 0,
-   "options": "Tax Category",
-   "owner": "Administrator",
-   "parent": null,
-   "parentfield": null,
-   "parenttype": null,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "print_width": null,
-   "read_only": 0,
-   "read_only_depends_on": null,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "translatable": 0,
-   "unique": 0,
-   "width": null
-  },
-  {
-   "_assign": null,
-   "_comments": null,
-   "_liked_by": null,
-   "_user_tags": null,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "collapsible_depends_on": null,
-   "columns": 0,
-   "creation": "2020-10-14 17:41:40.878179",
-   "default": "0",
-   "depends_on": null,
-   "description": null,
-   "docstatus": 0,
-   "dt": "Address",
-   "fetch_from": null,
-   "fetch_if_empty": 0,
-   "fieldname": "is_your_company_address",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "hide_border": 0,
-   "hide_days": 0,
-   "hide_seconds": 0,
-   "idx": 20,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_preview": 0,
-   "in_standard_filter": 0,
-   "insert_after": "linked_with",
-   "label": "Is Your Company Address",
-   "length": 0,
-   "mandatory_depends_on": null,
-   "modified": "2020-10-14 17:41:40.878179",
-   "modified_by": "Administrator",
-   "name": "Address-is_your_company_address",
-   "no_copy": 0,
-   "options": null,
-   "owner": "Administrator",
-   "parent": null,
-   "parentfield": null,
-   "parenttype": null,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "print_width": null,
-   "read_only": 0,
-   "read_only_depends_on": null,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "translatable": 0,
-   "unique": 0,
-   "width": null
-  }
- ],
- "custom_perms": [],
- "doctype": "Address",
- "property_setters": [],
- "sync_on_migrate": 1
-}

erpnext/accounts/doctype/account/account.js

@@ -5,8 +5,7 @@ frappe.ui.form.on("Account", {
 	setup: function (frm) {
 		frm.add_fetch("parent_account", "report_type", "report_type");
 		frm.add_fetch("parent_account", "root_type", "root_type");
-	},
-	onload: function (frm) {
+
 		frm.set_query("parent_account", function (doc) {
 			return {
 				filters: {
@@ -15,7 +14,18 @@ frappe.ui.form.on("Account", {
 				},
 			};
 		});
+
+		frm.set_query("account_category", function () {
+			if (!frm.doc.root_type) return;
+
+			return {
+				filters: {
+					root_type: ["in", [frm.doc.root_type, ""]],
+				},
+			};
+		});
 	},
+
 	refresh: function (frm) {
 		frm.toggle_display("account_name", frm.is_new());
 
@@ -58,12 +68,20 @@ frappe.ui.form.on("Account", {
 			}
 		}
 	},
+
 	account_type: function (frm) {
 		if (frm.doc.is_group == 0) {
 			frm.toggle_display(["tax_rate"], frm.doc.account_type == "Tax");
 			frm.toggle_display("warehouse", frm.doc.account_type == "Stock");
 		}
 	},
+
+	root_type: function (frm) {
+		if (frm.doc.account_category) {
+			frm.set_value("account_category", "");
+		}
+	},
+
 	add_toolbar_buttons: function (frm) {
 		frm.add_custom_button(
 			__("Chart of Accounts"),

erpnext/accounts/doctype/account/chart_of_accounts/verified/de_kontenplan_SKR03.json

@@ -34,6 +34,13 @@
 					"account_number": "0430",
 					"account_type": "Fixed Asset"
 				},
+				"Anlagen im Bau": {
+					"is_group": 1,
+					"Andere Anlagen, Betriebs- und Geschäftsausstattung im Bau": {
+						"account_number": "0498",
+						"account_type": "Capital Work in Progress"
+					}
+				},
 				"Accumulated Depreciation": {
 					"account_type": "Accumulated Depreciation"
 				}
@@ -317,13 +324,21 @@
 				"account_number": "3800",
 				"account_type": "Expenses Included In Asset Valuation"
 			},
+			"Bestandsveränderungen Roh-, Hilfs- und Betriebsstoffe sowie bezogene Waren": {
+				"account_number": "3960",
+				"account_type": "Stock Adjustment"
+			},
 			"Herstellungskosten": {
 				"account_number": "4996",
 				"account_type": "Cost of Goods Sold"
 			},
+			"Anlagenabgänge Sachanlagen (Restbuchwert bei Buchverlust)": {
+				"account_number": "2310",
+				"account_type": "Expense Account"
+			},
 			"Verluste aus dem Abgang von Gegenständen des Anlagevermögens": {
 				"account_number": "2320",
-				"account_type": "Stock Adjustment"
+				"account_type": "Expense Account"
 			},
 			"Verwaltungskosten": {
 				"account_number": "4997",
@@ -340,7 +355,7 @@
 				"is_group": 1,
 				"Abschreibungen auf Sachanlagen (ohne AfA auf Kfz und Gebäude)": {
 					"account_number": "4830",
-					"account_type": "Accumulated Depreciation"
+					"account_type": "Depreciation"
 				},
 				"Abschreibungen auf Gebäude": {
 					"account_number": "4831",

erpnext/accounts/doctype/account/chart_of_accounts/verified/philippines.json

@@ -0,0 +1,840 @@
+{
+	"name": "Philippines",
+	"country": "Philippines",
+	"tree": {
+		"Asset": {
+			"account_number": "1000",
+			"is_group": 1,
+			"root_type": "Asset",
+			"Current Assets": {
+				"account_number": "1001",
+				"is_group": 1,
+				"root_type": "Asset",
+				"Cash": {
+					"account_number": "1100",
+					"is_group": 1,
+					"root_type": "Asset",
+					"account_type": "Cash",
+					"Cash on Hand": {
+						"account_number": "1101",
+						"is_group": 0,
+						"root_type": "Asset",
+						"account_type": "Cash"
+					},
+					"Petty Cash Fund": {
+						"account_number": "1200",
+						"is_group": 1,
+						"root_type": "Asset",
+						"account_type": "Cash",
+						"Petty Cash Fund": {
+							"account_number": "1201",
+							"is_group": 0,
+							"root_type": "Asset",
+							"account_type": "Cash"
+						}
+					}
+				},
+				"Bank Accounts": {
+					"account_number": "1102",
+					"is_group": 1,
+					"root_type": "Asset",
+					"account_type": "Bank"
+				},
+				"Advances to Officers & Employees": {
+					"account_number": "1290",
+					"is_group": 1,
+					"root_type": "Asset",
+					"Advances to Officers & Employees": {
+						"account_number": "1291",
+						"is_group": 0,
+						"root_type": "Asset"
+					}
+				},
+				"Accounts Receivable Trade": {
+					"account_number": "1300",
+					"is_group": 1,
+					"root_type": "Asset",
+					"Accounts Receivable - Trade": {
+						"account_number": "1301",
+						"is_group": 0,
+						"root_type": "Asset",
+						"account_type": "Receivable"
+					}
+				},
+				"Accounts Receivable - Affiliates": {
+					"account_number": "1310",
+					"is_group": 1,
+					"root_type": "Asset",
+					"Due from Company": {
+						"account_number": "1311",
+						"is_group": 0,
+						"root_type": "Asset"
+					}
+				},
+				"Accounts Receivable - Others": {
+					"account_number": "1400",
+					"is_group": 1,
+					"root_type": "Asset",
+					"Accounts Receivable - Others": {
+						"account_number": "1401",
+						"is_group": 0,
+						"root_type": "Asset"
+					}
+				},
+				"Parts, Materials and Supplies": {
+					"account_number": "1500",
+					"is_group": 1,
+					"root_type": "Asset",
+					"Parts, Materials and Supplies": {
+						"account_number": "1501",
+						"is_group": 0,
+						"root_type": "Asset"
+					},
+					"Raw Materials - Demo": {
+						"account_number": "1502",
+						"is_group": 0,
+						"root_type": "Asset"
+					}
+				},
+				"Project in Progress": {
+					"account_number": "1510",
+					"is_group": 1,
+					"root_type": "Asset",
+					"Project in Progress": {
+						"account_number": "1511",
+						"is_group": 0,
+						"root_type": "Asset"
+					},
+					"Factory Overhead Variance": {
+						"account_number": "1512",
+						"is_group": 0,
+						"root_type": "Asset"
+					}
+				},
+				"Finished Goods": {
+					"account_number": "1520",
+					"is_group": 1,
+					"root_type": "Asset",
+					"Finished Goods Inventory": {
+						"account_number": "1531",
+						"is_group": 0,
+						"root_type": "Asset",
+						"account_type": "Stock"
+					},
+					"Inventory in Transit": {
+						"account_number": "1532",
+						"is_group": 0,
+						"root_type": "Asset",
+						"account_type": "Stock Adjustment"
+					}
+				},
+				"Prepayments": {
+					"account_number": "1600",
+					"is_group": 1,
+					"root_type": "Asset",
+					"Prepaid Insurance & Bonds": {
+						"account_number": "1601",
+						"is_group": 0,
+						"root_type": "Asset"
+					},
+					"Prepaid Rent": {
+						"account_number": "1602",
+						"is_group": 0,
+						"root_type": "Asset"
+					}
+				},
+				"VAT Input Tax": {
+					"account_number": "1610",
+					"is_group": 1,
+					"root_type": "Asset",
+					"VAT Input Tax - Goods": {
+						"account_number": "1611",
+						"is_group": 0,
+						"root_type": "Asset",
+						"account_type": "Tax"
+					}
+				}
+			},
+			"Non - Current Assets": {
+				"account_number": "1002",
+				"is_group": 1,
+				"root_type": "Asset",
+				"Property, Plants And Equipments": {
+					"account_number": "1700",
+					"is_group": 1,
+					"root_type": "Asset",
+					"Land": {
+						"account_number": "1701",
+						"is_group": 0,
+						"root_type": "Asset",
+						"account_type": "Fixed Asset"
+					},
+					"Buildings & Improvements": {
+						"account_number": "1702",
+						"is_group": 0,
+						"root_type": "Asset",
+						"account_type": "Fixed Asset"
+					},
+					"Delivery & Trans Equipment": {
+						"account_number": "1703",
+						"is_group": 0,
+						"root_type": "Asset",
+						"account_type": "Fixed Asset"
+					},
+					"Furniture & Fixtures": {
+						"account_number": "1704",
+						"is_group": 0,
+						"root_type": "Asset",
+						"account_type": "Fixed Asset"
+					},
+					"Machinery & Equipment": {
+						"account_number": "1705",
+						"is_group": 0,
+						"root_type": "Asset",
+						"account_type": "Fixed Asset"
+					}
+				},
+				"Accum Depr. - Property, Plants and Equipment": {
+					"account_number": "1800",
+					"is_group": 1,
+					"root_type": "Asset",
+					"Accumulated Dep Bdgs & Improv": {
+						"account_number": "1801",
+						"is_group": 0,
+						"root_type": "Asset",
+						"account_type": "Accumulated Depreciation"
+					},
+					"Accumulated Dep Delivery & Trans": {
+						"account_number": "1802",
+						"is_group": 0,
+						"root_type": "Asset",
+						"account_type": "Accumulated Depreciation"
+					},
+					"Accumulated Dep Furniture & Fixture": {
+						"account_number": "1803",
+						"is_group": 0,
+						"root_type": "Asset",
+						"account_type": "Accumulated Depreciation"
+					},
+					"Accumulated Depreciation - Machinery & Equipment": {
+						"account_number": "1804",
+						"is_group": 0,
+						"root_type": "Asset",
+						"account_type": "Accumulated Depreciation"
+					}
+				}
+			},
+			"Other Assets": {
+				"account_number": "1003",
+				"is_group": 1,
+				"root_type": "Asset",
+				"Advances To Supplier": {
+					"account_number": "1900",
+					"is_group": 1,
+					"root_type": "Asset",
+					"Advances To Supplier": {
+						"account_number": "1901",
+						"is_group": 0,
+						"root_type": "Asset"
+					}
+				},
+				"Miscellaneous Deposits": {
+					"account_number": "1910",
+					"is_group": 1,
+					"root_type": "Asset",
+					"Miscellaneous Deposits": {
+						"account_number": "1911",
+						"is_group": 0,
+						"root_type": "Asset"
+					}
+				},
+				"Retirement Fund": {
+					"account_number": "1920",
+					"is_group": 1,
+					"root_type": "Asset",
+					"Retirement Fund": {
+						"account_number": "1921",
+						"is_group": 0,
+						"root_type": "Asset"
+					}
+				},
+				"Investment": {
+					"account_number": "1930",
+					"is_group": 1,
+					"root_type": "Asset",
+					"Investment": {
+						"account_number": "1931",
+						"is_group": 0,
+						"root_type": "Asset"
+					}
+				},
+				"System Development": {
+					"account_number": "1940",
+					"is_group": 1,
+					"root_type": "Asset",
+					"System Development": {
+						"account_number": "1941",
+						"is_group": 0,
+						"root_type": "Asset"
+					}
+				}
+			}
+		},
+		"Liability": {
+			"account_number": "2000",
+			"is_group": 1,
+			"root_type": "Liability",
+			"Current Liabilities": {
+				"account_number": "2001",
+				"is_group": 1,
+				"root_type": "Liability",
+				"Accounts Payable Trade": {
+					"account_number": "2100",
+					"is_group": 1,
+					"root_type": "Liability",
+					"Accounts Payable - Trade": {
+						"account_number": "2101",
+						"is_group": 0,
+						"root_type": "Liability",
+						"account_type": "Payable"
+					}
+				},
+				"Accounts Payable Others": {
+					"account_number": "2110",
+					"is_group": 1,
+					"root_type": "Liability",
+					"Accounts Payable - Payroll": {
+						"account_number": "2111",
+						"is_group": 0,
+						"root_type": "Liability"
+					}
+				},
+				"VAT Output Tax": {
+					"account_number": "2200",
+					"is_group": 1,
+					"root_type": "Liability",
+					"VAT Output Tax": {
+						"account_number": "2201",
+						"is_group": 0,
+						"root_type": "Liability",
+						"account_type": "Tax"
+					}
+				},
+				"Withholding Taxes Payable Wages": {
+					"account_number": "2210",
+					"is_group": 1,
+					"root_type": "Liability",
+					"Withholding Taxes Payable Wages": {
+						"account_number": "2211",
+						"is_group": 0,
+						"root_type": "Liability",
+						"account_type": "Tax"
+					}
+				},
+				"Withholding Taxes Payable Expanded": {
+					"account_number": "2220",
+					"is_group": 1,
+					"root_type": "Liability",
+					"Withholding Taxes Payable Expanded": {
+						"account_number": "2221",
+						"is_group": 0,
+						"root_type": "Liability",
+						"account_type": "Tax"
+					}
+				},
+				"Accruals And Other Current Payables": {
+					"account_number": "2300",
+					"is_group": 1,
+					"root_type": "Liability",
+					"Stock Received But Not Billed": {
+						"account_number": "2301",
+						"is_group": 0,
+						"root_type": "Liability",
+						"account_type": "Stock Received But Not Billed"
+					}
+				},
+				"Payable to Government and Other Institutions": {
+					"account_number": "2400",
+					"is_group": 1,
+					"root_type": "Liability",
+					"SSS Premium Payable": {
+						"account_number": "2401",
+						"is_group": 0,
+						"root_type": "Liability"
+					},
+					"SSS Salary Loan Payable": {
+						"account_number": "2402",
+						"is_group": 0,
+						"root_type": "Liability"
+					},
+					"PhilHealth Premium": {
+						"account_number": "2403",
+						"is_group": 0,
+						"root_type": "Liability"
+					},
+					"Pag-ibig Loan Payable": {
+						"account_number": "2404",
+						"is_group": 0,
+						"root_type": "Liability"
+					},
+					"Coop Loans": {
+						"account_number": "2405",
+						"is_group": 0,
+						"root_type": "Liability"
+					},
+					"Coop Contributions": {
+						"account_number": "2406",
+						"is_group": 0,
+						"root_type": "Liability"
+					},
+					"Canteen": {
+						"account_number": "2407",
+						"is_group": 0,
+						"root_type": "Liability"
+					},
+					"AUB Loan Payable": {
+						"account_number": "2408",
+						"is_group": 0,
+						"root_type": "Liability"
+					},
+					"HSBC Loan Payable": {
+						"account_number": "2409",
+						"is_group": 0,
+						"root_type": "Liability"
+					}
+				},
+				"Customer Deposits": {
+					"account_number": "2500",
+					"is_group": 0,
+					"root_type": "Liability",
+					"account_type": "Payable"
+				}
+			},
+			"Non Current Liabilities": {
+				"account_number": "2002",
+				"is_group": 1,
+				"root_type": "Liability",
+				"Due To Associated Company": {
+					"account_number": "2600",
+					"is_group": 1,
+					"root_type": "Liability",
+					"Due To Associated Company": {
+						"account_number": "2601",
+						"is_group": 0,
+						"root_type": "Liability"
+					}
+				},
+				"Deferred Income": {
+					"account_number": "2700",
+					"is_group": 1,
+					"root_type": "Liability",
+					"Deferred Income": {
+						"account_number": "2701",
+						"is_group": 0,
+						"root_type": "Liability"
+					}
+				},
+				"Notes Payable": {
+					"account_number": "2800",
+					"is_group": 1,
+					"root_type": "Liability",
+					"Notes Payable": {
+						"account_number": "2801",
+						"is_group": 0,
+						"root_type": "Liability"
+					}
+				},
+				"Dividends Payable": {
+					"account_number": "2900",
+					"is_group": 0,
+					"root_type": "Liability"
+				}
+			}
+		},
+		"Equity": {
+			"account_number": "3000",
+			"is_group": 1,
+			"root_type": "Equity",
+			"STOCKHOLDER'S EQUITY": {
+				"account_number": "3001",
+				"is_group": 1,
+				"root_type": "Equity",
+				"Capital Stocks": {
+					"account_number": "3100",
+					"is_group": 1,
+					"root_type": "Equity",
+					"Capital Stocks": {
+						"account_number": "3101",
+						"is_group": 0,
+						"root_type": "Equity"
+					}
+				},
+				"Subscription Receivable": {
+					"account_number": "3200",
+					"is_group": 1,
+					"root_type": "Equity",
+					"Subscription Receivable": {
+						"account_number": "3201",
+						"is_group": 0,
+						"root_type": "Equity"
+					}
+				},
+				"Retained Earnings": {
+					"account_number": "3300",
+					"is_group": 1,
+					"root_type": "Equity",
+					"Retained Earnings": {
+						"account_number": "3301",
+						"is_group": 0,
+						"root_type": "Equity"
+					}
+				},
+				"Current Year (Profit/Loss)": {
+					"account_number": "3400",
+					"is_group": 0,
+					"root_type": "Equity"
+				},
+				"Drawings": {
+					"account_number": "3500",
+					"is_group": 1,
+					"root_type": "Equity",
+					"Drawings": {
+						"account_number": "3501",
+						"is_group": 0,
+						"root_type": "Equity"
+					}
+				}
+			}
+		},
+		"Income": {
+			"account_number": "4000",
+			"is_group": 1,
+			"root_type": "Income",
+			"Gross Sales": {
+				"account_number": "4100",
+				"is_group": 1,
+				"root_type": "Income",
+				"Sales": {
+					"account_number": "4101",
+					"is_group": 0,
+					"root_type": "Income"
+				}
+			},
+			"Sales Adjustment": {
+				"account_number": "4200",
+				"is_group": 1,
+				"root_type": "Income",
+				"Sales Return And Allowance": {
+					"account_number": "4201",
+					"is_group": 0,
+					"root_type": "Income"
+				}
+			},
+			"Sales Discount": {
+				"account_number": "4300",
+				"is_group": 1,
+				"root_type": "Income",
+				"Sales Discount": {
+					"account_number": "4301",
+					"is_group": 0,
+					"root_type": "Income"
+				}
+			},
+			"Other Income": {
+				"account_number": "6000",
+				"is_group": 1,
+				"root_type": "Income",
+				"Interest Income Bank": {
+					"account_number": "6010",
+					"is_group": 1,
+					"root_type": "Income",
+					"Interest Income Bank": {
+						"account_number": "6011",
+						"is_group": 0,
+						"root_type": "Income"
+					}
+				},
+				"Dividend Income": {
+					"account_number": "6020",
+					"is_group": 1,
+					"root_type": "Income",
+					"Dividend Income": {
+						"account_number": "6021",
+						"is_group": 0,
+						"root_type": "Income"
+					}
+				}
+			}
+		},
+		"Expense": {
+			"account_number": "5000",
+			"is_group": 1,
+			"root_type": "Expense",
+			"Operating Expenses": {
+				"account_number": "5100",
+				"is_group": 1,
+				"root_type": "Expense",
+				"Salaries, Wages": {
+					"account_number": "5101",
+					"is_group": 0,
+					"root_type": "Expense"
+				},
+				"13th Month Pay & Bonus": {
+					"account_number": "5102",
+					"is_group": 0,
+					"root_type": "Expense"
+				},
+				"Overtime & Night Diff": {
+					"account_number": "5103",
+					"is_group": 0,
+					"root_type": "Expense"
+				},
+				"Incentive/Performance Bonus": {
+					"account_number": "5104",
+					"is_group": 0,
+					"root_type": "Expense"
+				},
+				"Employees Benefits": {
+					"account_number": "5105",
+					"is_group": 0,
+					"root_type": "Expense"
+				},
+				"Advertising & Promotions": {
+					"account_number": "5106",
+					"is_group": 0,
+					"root_type": "Expense"
+				},
+				"Amortization of Leasehold Improvement": {
+					"account_number": "5107",
+					"is_group": 0,
+					"root_type": "Expense"
+				},
+				"Amortization of Pre-Operating": {
+					"account_number": "5108",
+					"is_group": 0,
+					"root_type": "Expense"
+				},
+				"Amortization of System Development": {
+					"account_number": "5109",
+					"is_group": 0,
+					"root_type": "Expense"
+				},
+				"Audit & Legal Fee": {
+					"account_number": "5110",
+					"is_group": 0,
+					"root_type": "Expense"
+				},
+				"Bad Debts Expenses": {
+					"account_number": "5111",
+					"is_group": 0,
+					"root_type": "Expense"
+				},
+				"Client Service & Maintenance": {
+					"account_number": "5112",
+					"is_group": 0,
+					"root_type": "Expense"
+				},
+				"Commission Expenses": {
+					"account_number": "5113",
+					"is_group": 0,
+					"root_type": "Expense"
+				},
+				"Communications": {
+					"account_number": "5114",
+					"is_group": 0,
+					"root_type": "Expense"
+				},
+				"Contractual Services": {
+					"account_number": "5115",
+					"is_group": 0,
+					"root_type": "Expense"
+				},
+				"Depreciation Expenses": {
+					"account_number": "5116",
+					"is_group": 0,
+					"root_type": "Expense",
+					"account_type": "Depreciation"
+				},
+				"Donation & Contribution": {
+					"account_number": "5117",
+					"is_group": 0,
+					"root_type": "Expense"
+				},
+				"Dues & Subscription": {
+					"account_number": "5118",
+					"is_group": 0,
+					"root_type": "Expense"
+				},
+				"Employee Med/Dental/Hosp Expenses": {
+					"account_number": "5119",
+					"is_group": 0,
+					"root_type": "Expense"
+				},
+				"Employee Uniforms": {
+					"account_number": "5120",
+					"is_group": 0,
+					"root_type": "Expense"
+				},
+				"Equipage": {
+					"account_number": "5121",
+					"is_group": 0,
+					"root_type": "Expense"
+				},
+				"Expenses for Reclassification": {
+					"account_number": "5122",
+					"is_group": 0,
+					"root_type": "Expense"
+				},
+				"Gas & Oil": {
+					"account_number": "5123",
+					"is_group": 0,
+					"root_type": "Expense"
+				},
+				"Insurance Expenses": {
+					"account_number": "5124",
+					"is_group": 0,
+					"root_type": "Expense"
+				},
+				"Light & Water": {
+					"account_number": "5125",
+					"is_group": 0,
+					"root_type": "Expense"
+				},
+				"Local/Overseas Travel": {
+					"account_number": "5126",
+					"is_group": 0,
+					"root_type": "Expense"
+				},
+				"Meals & Transportation Expenses": {
+					"account_number": "5127",
+					"is_group": 0,
+					"root_type": "Expense"
+				},
+				"Meeting & Conferences": {
+					"account_number": "5128",
+					"is_group": 0,
+					"root_type": "Expense"
+				},
+				"Miscellaneous Expenses": {
+					"account_number": "5129",
+					"is_group": 0,
+					"root_type": "Expense"
+				},
+				"Mockup Expenses": {
+					"account_number": "5130",
+					"is_group": 0,
+					"root_type": "Expense"
+				},
+				"Obsolescence Expenses": {
+					"account_number": "5131",
+					"is_group": 0,
+					"root_type": "Expense"
+				},
+				"Other Support Cost": {
+					"account_number": "5132",
+					"is_group": 0,
+					"root_type": "Expense"
+				},
+				"Pag-ibig Contribution": {
+					"account_number": "5133",
+					"is_group": 0,
+					"root_type": "Expense"
+				},
+				"Performance Bonds": {
+					"account_number": "5134",
+					"is_group": 0,
+					"root_type": "Expense"
+				},
+				"Pre Employment Expenses": {
+					"account_number": "5135",
+					"is_group": 0,
+					"root_type": "Expense"
+				},
+				"Professional Fees": {
+					"account_number": "5136",
+					"is_group": 0,
+					"root_type": "Expense"
+				},
+				"Recruitment & Employment": {
+					"account_number": "5137",
+					"is_group": 0,
+					"root_type": "Expense"
+				},
+				"Rent Expenses": {
+					"account_number": "5138",
+					"is_group": 0,
+					"root_type": "Expense"
+				},
+				"Rent Expenses Others": {
+					"account_number": "5139",
+					"is_group": 0,
+					"root_type": "Expense"
+				},
+				"Repairs & Maintenance": {
+					"account_number": "5140",
+					"is_group": 0,
+					"root_type": "Expense"
+				},
+				"Representation Expenses": {
+					"account_number": "5141",
+					"is_group": 0,
+					"root_type": "Expense"
+				},
+				"Research & Development": {
+					"account_number": "5142",
+					"is_group": 0,
+					"root_type": "Expense"
+				},
+				"Security Expenses": {
+					"account_number": "5143",
+					"is_group": 0,
+					"root_type": "Expense"
+				},
+				"Shared Services Fee": {
+					"account_number": "5144",
+					"is_group": 0,
+					"root_type": "Expense"
+				},
+				"SSS/Medicare/EC Contributions": {
+					"account_number": "5145",
+					"is_group": 0,
+					"root_type": "Expense"
+				},
+				"Stationery & Supplies": {
+					"account_number": "5146",
+					"is_group": 0,
+					"root_type": "Expense"
+				},
+				"Taxes & Licenses": {
+					"account_number": "5147",
+					"is_group": 0,
+					"root_type": "Expense",
+					"account_type": "Tax"
+				},
+				"Training & Seminar": {
+					"account_number": "5148",
+					"is_group": 0,
+					"root_type": "Expense"
+				}
+			},
+			"Stock Adjustment": {
+				"account_number": "5200",
+				"is_group": 0,
+				"root_type": "Expense",
+				"account_type": "Stock Adjustment"
+			},
+			"Round Off": {
+				"account_number": "5300",
+				"is_group": 0,
+				"root_type": "Expense",
+				"account_type": "Round Off"
+			},
+			"Expenses Included In Valuation": {
+				"account_number": "5400",
+				"is_group": 0,
+				"root_type": "Expense",
+				"account_type": "Expenses Included In Valuation"
+			}
+		}
+	}
+}

erpnext/accounts/doctype/account_category/account_category.json

@@ -7,6 +7,8 @@
  "engine": "InnoDB",
  "field_order": [
   "account_category_name",
+  "root_type",
+  "column_break_qluu",
   "description"
  ],
  "fields": [
@@ -14,6 +16,7 @@
    "fieldname": "account_category_name",
    "fieldtype": "Data",
    "in_list_view": 1,
+   "in_standard_filter": 1,
    "label": "Account Category Name",
    "reqd": 1,
    "unique": 1
@@ -22,6 +25,18 @@
    "fieldname": "description",
    "fieldtype": "Small Text",
    "label": "Description"
+  },
+  {
+   "fieldname": "column_break_qluu",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "root_type",
+   "fieldtype": "Select",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Root Type",
+   "options": "\nAsset\nLiability\nIncome\nExpense\nEquity"
   }
  ],
  "grid_page_length": 50,
@@ -32,7 +47,7 @@
    "link_fieldname": "account_category"
   }
  ],
- "modified": "2026-02-23 01:19:49.589393",
+ "modified": "2026-03-05 06:49:34.430723",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Account Category",
@@ -69,7 +84,7 @@
   }
  ],
  "row_format": "Dynamic",
- "search_fields": "account_category_name, description",
+ "search_fields": "account_category_name, root_type",
  "sort_field": "creation",
  "sort_order": "DESC",
  "states": []

erpnext/accounts/doctype/account_category/account_category.py

@@ -21,6 +21,7 @@ class AccountCategory(Document):
 
 		account_category_name: DF.Data
 		description: DF.SmallText | None
+		root_type: DF.Literal["", "Asset", "Liability", "Income", "Expense", "Equity"]
 	# end: auto-generated types
 
 	def after_rename(self, old_name, new_name, merge):

erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py

@@ -43,6 +43,7 @@ class AccountingDimension(Document):
 	def validate(self):
 		self.validate_doctype()
 		validate_column_name(self.fieldname)
+		self.validate_fieldname_conflict()
 		self.validate_dimension_defaults()
 
 	def validate_doctype(self):
@@ -74,6 +75,27 @@ class AccountingDimension(Document):
 			message += _("Please create a new Accounting Dimension if required.")
 			frappe.throw(message)
 
+	def validate_fieldname_conflict(self):
+		conflicting_doctypes = []
+		for doctype in get_doctypes_with_dimensions():
+			meta = frappe.get_meta(doctype, cached=False)
+			if any(f.fieldname == self.fieldname for f in meta.get("fields")):
+				conflicting_doctypes.append(doctype)
+
+		if conflicting_doctypes:
+			frappe.msgprint(
+				_(
+					"Fieldname {0} already exists in the following doctypes: {1}. "
+					"A separate dimension field will not be added to these doctypes. "
+					"GL Entries will use the value of the existing field as the dimension value."
+				).format(
+					frappe.bold(self.fieldname),
+					", ".join(frappe.bold(d) for d in conflicting_doctypes),
+				),
+				title=_("Fieldname Conflict"),
+				indicator="orange",
+			)
+
 	def validate_dimension_defaults(self):
 		companies = []
 		for default in self.get("dimension_defaults"):

erpnext/accounts/doctype/accounts_settings/accounts_settings.js

@@ -38,16 +38,6 @@ frappe.ui.form.on("Accounts Settings", {
 	add_taxes_from_item_tax_template(frm) {
 		toggle_tax_settings(frm, "add_taxes_from_item_tax_template");
 	},
-
-	drop_ar_procedures: function (frm) {
-		frm.call({
-			doc: frm.doc,
-			method: "drop_ar_sql_procedures",
-			callback: function (r) {
-				frappe.show_alert(__("Procedures dropped"), 5);
-			},
-		});
-	},
 });
 
 function toggle_tax_settings(frm, field_name) {

erpnext/accounts/doctype/accounts_settings/accounts_settings.json

@@ -16,6 +16,7 @@
   "invoicing_features_section",
   "check_supplier_invoice_uniqueness",
   "automatically_fetch_payment_terms",
+  "enable_subscription",
   "column_break_17",
   "enable_common_party_accounting",
   "allow_multi_currency_invoices_against_single_party_account",
@@ -95,7 +96,6 @@
   "receivable_payable_fetch_method",
   "default_ageing_range",
   "column_break_ntmi",
-  "drop_ar_procedures",
   "legacy_section",
   "ignore_is_opening_check_for_reporting",
   "tab_break_dpet",
@@ -522,7 +522,7 @@
    "fieldname": "receivable_payable_fetch_method",
    "fieldtype": "Select",
    "label": "Data Fetch Method",
-   "options": "Buffered Cursor\nUnBuffered Cursor\nRaw SQL"
+   "options": "Buffered Cursor\nUnBuffered Cursor"
   },
   {
    "fieldname": "accounts_receivable_payable_tuning_section",
@@ -591,13 +591,6 @@
    "fieldname": "column_break_ntmi",
    "fieldtype": "Column Break"
   },
-  {
-   "depends_on": "eval:doc.receivable_payable_fetch_method == \"Raw SQL\"",
-   "description": "Drops existing SQL Procedures and Function setup by Accounts Receivable report",
-   "fieldname": "drop_ar_procedures",
-   "fieldtype": "Button",
-   "label": "Drop Procedures"
-  },
   {
    "default": "0",
    "fieldname": "fetch_valuation_rate_for_internal_transaction",
@@ -724,7 +717,7 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2026-04-13 15:30:28.729627",
+ "modified": "2026-05-18 12:16:33.679345",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Accounts Settings",

erpnext/accounts/doctype/accounts_settings/accounts_settings.py

@@ -77,6 +77,7 @@ class AccountsSettings(Document):
 		enable_immutable_ledger: DF.Check
 		enable_loyalty_point_program: DF.Check
 		enable_party_matching: DF.Check
+		enable_subscription: DF.Check
 		exchange_gain_loss_posting_date: DF.Literal["Invoice", "Payment", "Reconciliation Date"]
 		fetch_payment_schedule_in_payment_request: DF.Check
 		fetch_valuation_rate_for_internal_transaction: DF.Check
@@ -88,7 +89,7 @@ class AccountsSettings(Document):
 		make_payment_via_journal_entry: DF.Check
 		merge_similar_account_heads: DF.Check
 		over_billing_allowance: DF.Currency
-		receivable_payable_fetch_method: DF.Literal["Buffered Cursor", "UnBuffered Cursor", "Raw SQL"]
+		receivable_payable_fetch_method: DF.Literal["Buffered Cursor", "UnBuffered Cursor"]
 		receivable_payable_remarks_length: DF.Int
 		reconciliation_queue_size: DF.Int
 		repost_allowed_types: DF.Table[RepostAllowedTypes]
@@ -142,6 +143,10 @@ class AccountsSettings(Document):
 			toggle_loyalty_point_program_section(not self.enable_loyalty_point_program)
 			clear_cache = True
 
+		if old_doc.enable_subscription != self.enable_subscription:
+			toggle_subscription_sections(not self.enable_subscription)
+			clear_cache = True
+
 		if clear_cache:
 			frappe.clear_cache()
 
@@ -204,13 +209,6 @@ class AccountsSettings(Document):
 
 		set_allow_on_submit_for_dimension_fields(doctypes)
 
-	@frappe.whitelist()
-	def drop_ar_sql_procedures(self):
-		from erpnext.accounts.report.accounts_receivable.accounts_receivable import InitSQLProceduresForAR
-
-		frappe.db.sql(f"drop procedure if exists {InitSQLProceduresForAR.init_procedure_name}")
-		frappe.db.sql(f"drop procedure if exists {InitSQLProceduresForAR.allocate_procedure_name}")
-
 
 def toggle_accounting_dimension_sections(hide):
 	accounting_dimension_doctypes = frappe.get_hooks("accounting_dimension_doctypes")
@@ -234,6 +232,12 @@ def toggle_loyalty_point_program_section(hide):
 			create_property_setter_for_hiding_field(doctype, "loyalty_points_redemption", hide)
 
 
+def toggle_subscription_sections(hide):
+	subscription_doctypes = frappe.get_hooks("subscription_doctypes")
+	for doctype in subscription_doctypes:
+		create_property_setter_for_hiding_field(doctype, "subscription_section", hide)
+
+
 def create_property_setter_for_hiding_field(doctype, field_name, hide):
 	make_property_setter(
 		doctype,

erpnext/accounts/doctype/financial_report_template/financial_report_engine.py

@@ -6,7 +6,7 @@ import json
 import math
 from abc import ABC, abstractmethod
 from dataclasses import dataclass, field
-from functools import reduce
+from functools import cache, reduce
 from typing import Any, Union
 
 import frappe
@@ -15,6 +15,7 @@ from frappe.database.operator_map import OPERATOR_MAP
 from frappe.query_builder import Case
 from frappe.query_builder.functions import Sum
 from frappe.utils import cstr, date_diff, flt, getdate
+from frappe.utils.xlsxutils import XLSXMetadata, XLSXStyleBuilder
 from pypika.terms import Bracket, LiteralValue
 
 from erpnext import get_company_currency
@@ -38,6 +39,9 @@ from erpnext.accounts.report.financial_statements import (
 )
 from erpnext.accounts.utils import get_children, get_currency_precision
 
+DEFAULT_BULLET_PREFIX = "• "
+SEGMENT_PREFIX = "seg_"
+
 # ============================================================================
 # DATA MODELS
 # ============================================================================
@@ -141,7 +145,7 @@ class SegmentData:
 
 	@property
 	def id(self) -> str:
-		return f"seg_{self.index}"
+		return f"{SEGMENT_PREFIX}{self.index}"
 
 
 @dataclass
@@ -222,14 +226,38 @@ class FinancialReportEngine:
 		return context.get_result()
 
 	def _validate_filters(self, filters: dict[str, Any]) -> None:
-		required_filters = ["report_template", "period_start_date", "period_end_date"]
+		filter_labels = {
+			"report_template": _("Report Template"),
+			"filter_based_on": _("Filter Based On"),
+			"period_start_date": _("Start Date"),
+			"period_end_date": _("End Date"),
+			"from_fiscal_year": _("Start Year"),
+			"to_fiscal_year": _("End Year"),
+		}
+
+		required_filters_by_basis = {
+			"Date Range": ("period_start_date", "period_end_date"),
+			"Fiscal Year": ("from_fiscal_year", "to_fiscal_year"),
+		}
+
+		required_filters = ["report_template", "filter_based_on"]
+		required_filters.extend(required_filters_by_basis.get(filters.get("filter_based_on"), ()))
 
 		for filter_key in required_filters:
 			if not filters.get(filter_key):
-				frappe.throw(_("Missing required filter: {0}").format(filter_key))
+				frappe.throw(
+					title=_("Missing Required Filter"),
+					msg=_("Missing required filter: {0}").format(
+						frappe.bold(filter_labels.get(filter_key, filter_key))
+					),
+				)
 
 		if filters.get("presentation_currency"):
-			frappe.msgprint(_("Currency filters are currently unsupported in Custom Financial Report."))
+			frappe.msgprint(
+				title=_("Unsupported Feature"),
+				msg=_("Currency filters are currently unsupported in Custom Financial Report."),
+				indicator="orange",
+			)
 
 		# Margin view is dependent on first row being an income account. Hence not supported.
 		# Way to implement this would be using calculated rows with formulas.
@@ -464,6 +492,7 @@ class FinancialQueryBuilder:
 		self.periods = periods
 		self.company = filters.get("company")
 		self.account_meta = {}  # {name: {account_name, account_number}}
+		self.ignore_opening_entries = False
 
 	def fetch_account_balances(self, accounts: list[dict]) -> dict[str, AccountData]:
 		"""
@@ -501,6 +530,8 @@ class FinancialQueryBuilder:
 		"""
 		Return opening balances for *all accounts* defaulting to zero.
 		"""
+		self.ignore_opening_entries = False
+
 		if frappe.get_single_value("Accounts Settings", "ignore_account_closing_balance"):
 			return self._get_opening_balances_from_gl(accounts)
 
@@ -520,9 +551,9 @@ class FinancialQueryBuilder:
 		if last_closing_voucher:
 			closing_voucher = last_closing_voucher[0]
 			closing_data = self._get_closing_balances(accounts, closing_voucher.name)
+			self.ignore_opening_entries = True  # Else it will double count
 
-			if sum(closing_data.values()) != 0.0:
-				return self._rebase_closing_balances(closing_data, closing_voucher.period_end_date)
+			return self._rebase_closing_balances(closing_data, closing_voucher.period_end_date)
 
 		return self._get_opening_balances_from_gl(accounts)
 
@@ -616,7 +647,12 @@ class FinancialQueryBuilder:
 			.groupby(gl_table.account)
 		)
 
-		if not frappe.get_single_value("Accounts Settings", "ignore_is_opening_check_for_reporting"):
+		ignore_is_opening = frappe.get_single_value(
+			"Accounts Settings", "ignore_is_opening_check_for_reporting"
+		)
+		if self.ignore_opening_entries and not ignore_is_opening:
+			# This filter here applies to all accounts (BS & PL)
+			# However, in legacy query, this filter only applies to BS accounts
 			query = query.where(gl_table.is_opening == "No")
 
 		# Add period-specific columns
@@ -680,11 +716,18 @@ class FinancialQueryBuilder:
 				account_data.unaccumulate_values()
 
 	def _apply_standard_filters(self, query, table, doctype: str = "GL Entry"):
-		if self.filters.get("ignore_closing_entries"):
-			if doctype == "GL Entry":
-				query = query.where(table.voucher_type != "Period Closing Voucher")
-			else:
-				query = query.where(table.is_period_closing_voucher_entry == 0)
+		# Exclude PCV-generated entries except those posted to a closing-account-head
+		# so BS retained earnings survive while P&L reversal entries are filtered out
+		pcv = frappe.qb.DocType("Period Closing Voucher")
+		closing_heads = frappe.qb.from_(pcv).select(pcv.closing_account_head).where(pcv.docstatus == 1)
+
+		if doctype == "GL Entry":
+			is_pcv = table.voucher_type == "Period Closing Voucher"
+		else:
+			# Account Closing Balance
+			is_pcv = table.is_period_closing_voucher_entry == 1
+
+		query = query.where(~is_pcv | table.account.isin(closing_heads))
 
 		if self.filters.get("project"):
 			projects = self.filters.get("project")
@@ -1392,7 +1435,8 @@ class FormattingEngine:
 				condition=lambda rd: getattr(rd.row, "italic_text", False), format_properties={"italic": True}
 			),
 			FormattingRule(
-				condition=lambda rd: rd.is_detail_row, format_properties={"is_detail": True, "prefix": "• "}
+				condition=lambda rd: rd.is_detail_row,
+				format_properties={"is_detail": True, "prefix": DEFAULT_BULLET_PREFIX},
 			),
 			FormattingRule(
 				condition=lambda rd: getattr(rd.row, "warn_if_negative", False),
@@ -1838,3 +1882,124 @@ class GrowthViewTransformer:
 			return 0.0
 		else:
 			return flt(((current_value - previous_value) / abs(previous_value)) * 100, 2)
+
+
+# ============================================================================
+# XLSX EXPORT STYLING
+# ============================================================================
+
+
+def get_xlsx_styles(metadata: XLSXMetadata) -> dict | None:
+	"""
+	Generate XLSX styles for financial report templates.
+
+	NOTE: Currently only custom report generated with "Report Template" filter will have styles applied.
+	"""
+	# skip styling
+	if not metadata.filters.get("report_template"):
+		return
+
+	builder = XLSXStyleBuilder(metadata, default_styling=False)
+	builder.apply_default_styles(currency_formatting=False)
+
+	# currency is fixed for all columns (only if report template filter is applied)
+	currency = get_company_currency(metadata.filters.get("company"))
+
+	styles = {
+		"bold": builder.register_style({"bold": True}),
+		"italic": builder.register_style({"italic": True}),
+		"warning": builder.register_style({"font_color": "#dc3545"}),  # text-danger
+	}
+
+	fieldtype_formats = {
+		"Int": builder.register_style({"num_format": "General"}),
+		"Float": builder.register_style({"num_format": builder.get_number_format("Float")}),
+		"Percent": builder.register_style({"num_format": builder.get_number_format("Percent")}),
+		"Currency": builder.register_style({"num_format": builder.get_number_format("Currency", currency)}),
+	}
+
+	# quick access for hot loop
+	style_cell = builder.style_cell
+
+	@cache
+	def get_color_style(color: str) -> int:
+		return builder.register_style({"font_color": color})
+
+	@cache
+	def get_prefix_style(prefix: str) -> int:
+		prefix = f"{prefix or DEFAULT_BULLET_PREFIX}@"
+
+		return builder.register_style({"num_format": prefix})
+
+	@cache
+	def get_indent_style(indent: int) -> int:
+		return builder.register_style({"align": "left", "indent": indent})
+
+	# column level styling of currency columns
+	for col_idx, col in metadata.column_map.items():
+		if col.get("fieldtype") != "Currency":
+			continue
+
+		builder.style_column(col_idx, fieldtype_formats["Currency"])
+
+	# cell level styling
+	for row_idx, row in metadata.row_map.items():
+		# skip total row
+		if metadata.has_total_row and row_idx == builder.last_row_index:
+			continue
+
+		is_segmented = (row.get("_segment_info", {}).get("total_segments", 1) or 1) > 1
+		segment_values = row.get("segment_values", {}) or {}
+
+		for col_idx, col in metadata.column_map.items():
+			fieldname = col.get("fieldname")
+			is_account = fieldname == "account"
+
+			# determine formatting bucket
+			if is_segmented and fieldname.startswith(SEGMENT_PREFIX):
+				formatting = row.copy()
+
+				_, seg_idx, seg_fieldname = fieldname.split("_", 2)
+				is_account = seg_fieldname == "account"
+				formatting.update(segment_values.get(f"{SEGMENT_PREFIX}{seg_idx}", {}) or {})
+			else:
+				formatting = row  # default formatting bucket.
+
+			if not is_account and formatting.get("is_blank_line"):
+				continue
+
+			col_fieldtype = col.get("fieldtype")
+			cell_fieldtype = formatting.get("fieldtype") or col_fieldtype
+			cell_value = row.get(fieldname)
+
+			if cell_value in (None, ""):
+				continue
+
+			# account column and other fieldtype styling
+			if is_account:
+				if formatting.get("is_detail") or (prefix := formatting.get("prefix")):
+					style_cell(row_idx, col_idx, get_prefix_style(prefix))
+
+				# custom indentation (different segment might have different indentation levels)
+				if is_segmented and (indent := formatting.get("indent")) and indent > 0:
+					style_cell(row_idx, col_idx, get_indent_style(indent))
+			else:
+				if col_fieldtype != cell_fieldtype and cell_fieldtype in fieldtype_formats:
+					style_cell(row_idx, col_idx, fieldtype_formats[cell_fieldtype])
+
+			# text styles
+			for style_key in ("bold", "italic"):
+				if formatting.get(style_key):
+					style_cell(row_idx, col_idx, styles[style_key])
+
+			# color styles
+			if (
+				formatting.get("warn_if_negative")
+				and cell_fieldtype in frappe.model.numeric_fieldtypes
+				and flt(cell_value) < 0
+			):
+				style_cell(row_idx, col_idx, styles["warning"])
+			elif color := formatting.get("color"):
+				style_cell(row_idx, col_idx, get_color_style(color))
+
+	return builder.result

erpnext/accounts/doctype/financial_report_template/test_financial_report_engine.py

@@ -10,6 +10,7 @@ from erpnext.accounts.doctype.financial_report_template.financial_report_engine
 	DependencyResolver,
 	FilterExpressionParser,
 	FinancialQueryBuilder,
+	FinancialReportEngine,
 	FormulaCalculator,
 	PeriodValue,
 )
@@ -1952,6 +1953,159 @@ class TestFinancialQueryBuilder(FinancialReportTemplateTestCase):
 
 			jv_2023.cancel()
 
+	def test_opening_entries_roll_into_opening_after_period_closing(self):
+		"""
+		Sequence:
+		    1. is_opening JV of 3000 in current year (FY 2024)
+		    2. is_opening JV of 5000 in next year (FY 2025)
+		    3. Period Closing Voucher for previous year (FY 2023)
+
+		Expected (BS report for FY 2024):
+		    opening of FY 2024 = 3000 + 5000 = 8000
+		    (all is_opening entries roll into opening irrespective of fiscal year,
+		    on top of the PCV carry-forward — here PCV closing for cash is 0).
+		"""
+		company = "_Test Company"
+		cash_account = "_Test Cash - _TC"
+		# Opening JVs cannot post against P&L accounts; use a Balance Sheet offset.
+		opening_offset_account = "Temporary Opening - _TC"
+
+		pcv = None
+		jv_current_year = None
+		jv_next_year = None
+		original_pcv_setting = frappe.db.get_single_value(
+			"Accounts Settings", "use_legacy_controller_for_pcv"
+		)
+
+		try:
+			# Step 1: opening JV in current year (FY 2024) — must be posted before PCV
+			# exists, else `validate_against_pcv` rejects it.
+			jv_current_year = make_journal_entry(
+				account1=cash_account,
+				account2=opening_offset_account,
+				amount=3000,
+				posting_date="2024-06-15",
+				company=company,
+				save=False,
+			)
+			jv_current_year.is_opening = "Yes"
+			jv_current_year.insert()
+			jv_current_year.submit()
+
+			# Step 2: opening JV in next year (FY 2025)
+			jv_next_year = make_journal_entry(
+				account1=cash_account,
+				account2=opening_offset_account,
+				amount=5000,
+				posting_date="2025-06-15",
+				company=company,
+				save=False,
+			)
+			jv_next_year.is_opening = "Yes"
+			jv_next_year.insert()
+			jv_next_year.submit()
+
+			# Step 3: book Period Closing Voucher for previous year (FY 2023)
+			closing_account = frappe.db.get_value(
+				"Account",
+				{
+					"company": company,
+					"root_type": "Liability",
+					"is_group": 0,
+					"account_type": ["not in", ["Payable", "Receivable"]],
+				},
+				"name",
+			)
+			fy_2023 = get_fiscal_year("2023-06-15", company=company)
+
+			frappe.db.set_single_value("Accounts Settings", "use_legacy_controller_for_pcv", 1)
+
+			pcv = frappe.get_doc(
+				{
+					"doctype": "Period Closing Voucher",
+					"transaction_date": "2023-12-31",
+					"period_start_date": fy_2023[1],
+					"period_end_date": fy_2023[2],
+					"company": company,
+					"fiscal_year": fy_2023[0],
+					"cost_center": "_Test Cost Center - _TC",
+					"closing_account_head": closing_account,
+					"remarks": "Test Period Closing",
+				}
+			)
+			pcv.insert()
+			pcv.submit()
+			pcv.reload()
+
+			# Run BS report for FY 2024
+			filters = {
+				"company": company,
+				"from_fiscal_year": "2024",
+				"to_fiscal_year": "2024",
+				"period_start_date": "2024-01-01",
+				"period_end_date": "2024-12-31",
+				"filter_based_on": "Date Range",
+				"periodicity": "Yearly",
+				"ignore_closing_entries": True,
+			}
+
+			periods = [{"key": "2024", "from_date": "2024-01-01", "to_date": "2024-12-31"}]
+
+			query_builder = FinancialQueryBuilder(filters, periods)
+			accounts = [
+				frappe._dict({"name": cash_account, "account_name": "Cash", "account_number": "1001"}),
+				frappe._dict(
+					{
+						"name": opening_offset_account,
+						"account_name": "Temporary Opening",
+						"account_number": "1900",
+					}
+				),
+			]
+
+			balances_data = query_builder.fetch_account_balances(accounts)
+			cash_data = balances_data.get(cash_account)
+			offset_data = balances_data.get(opening_offset_account)
+			self.assertIsNotNone(cash_data, "Cash account should exist in results")
+			self.assertIsNotNone(offset_data, "Offset account should exist in results")
+
+			year_2024_cash = cash_data.get_period("2024")
+			year_2024_offset = offset_data.get_period("2024")
+			self.assertIsNotNone(year_2024_cash, "FY 2024 period should exist for cash")
+			self.assertIsNotNone(year_2024_offset, "FY 2024 period should exist for offset")
+
+			# All is_opening JVs (current + next year) roll into FY 2024 opening
+			self.assertEqual(
+				year_2024_cash.opening,
+				8000.0,
+				"FY 2024 cash opening must combine is_opening JVs from current and next year",
+			)
+			self.assertEqual(
+				year_2024_offset.opening,
+				-8000.0,
+				"FY 2024 offset opening must combine is_opening JVs from current and next year",
+			)
+			self.assertEqual(
+				year_2024_cash.movement, 0.0, "Opening JVs must not be counted as period movement"
+			)
+			self.assertEqual(year_2024_cash.closing, 8000.0, "Closing = opening when no non-opening movement")
+
+		finally:
+			frappe.db.set_single_value(
+				"Accounts Settings", "use_legacy_controller_for_pcv", original_pcv_setting or 0
+			)
+
+			if pcv:
+				pcv.reload()
+				if pcv.docstatus == 1:
+					pcv.cancel()
+
+			if jv_next_year and jv_next_year.docstatus == 1:
+				jv_next_year.cancel()
+
+			if jv_current_year and jv_current_year.docstatus == 1:
+				jv_current_year.cancel()
+
 	def test_account_with_gl_entries_but_no_prior_closing_balance(self):
 		company = "_Test Company"
 		cash_account = "_Test Cash - _TC"
@@ -2025,3 +2179,210 @@ class TestFinancialQueryBuilder(FinancialReportTemplateTestCase):
 
 		finally:
 			jv.cancel()
+
+	def test_pl_pcv_exclusion_and_growth_view_year_over_year(self):
+		"""
+		Sequence:
+		    1. Expense JV 2000 in FY 2024, PCV for FY 2024
+		       → assert FY 2024 movement = 2000 via FinancialQueryBuilder
+		    2. Expense JV 3000 in FY 2025, PCV for FY 2025
+		    3. Run FinancialReportEngine with selected_view="Growth"
+		       → assert col_2024 = 2000 (raw), col_2025 = 50.0 (% growth)
+		"""
+		company = "_Test Company"
+		expense_account = "Administrative Expenses - _TC"
+		bank_account = "_Test Bank - _TC"
+
+		template = None
+		pcv_2024 = None
+		pcv_2025 = None
+		jv_2024 = None
+		jv_2025 = None
+		original_pcv_setting = frappe.db.get_single_value(
+			"Accounts Settings", "use_legacy_controller_for_pcv"
+		)
+
+		try:
+			closing_account = frappe.db.get_value(
+				"Account",
+				{
+					"company": company,
+					"root_type": "Liability",
+					"is_group": 0,
+					"account_type": ["not in", ["Payable", "Receivable"]],
+				},
+				"name",
+			)
+
+			frappe.db.set_single_value("Accounts Settings", "use_legacy_controller_for_pcv", 1)
+
+			accounts = [
+				frappe._dict(
+					{
+						"name": expense_account,
+						"account_name": "Administrative Expenses",
+						"account_number": "5001",
+					}
+				),
+			]
+
+			# --- Step 1: FY 2024 expense + PCV, assert PCV reversal excluded ---
+			jv_2024 = make_journal_entry(
+				account1=expense_account,
+				account2=bank_account,
+				amount=2000,
+				posting_date="2024-06-15",
+				company=company,
+				submit=True,
+			)
+			fy_2024 = get_fiscal_year("2024-06-15", company=company)
+			pcv_2024 = frappe.get_doc(
+				{
+					"doctype": "Period Closing Voucher",
+					"transaction_date": "2024-12-31",
+					"period_start_date": fy_2024[1],
+					"period_end_date": fy_2024[2],
+					"company": company,
+					"fiscal_year": fy_2024[0],
+					"cost_center": "_Test Cost Center - _TC",
+					"closing_account_head": closing_account,
+					"remarks": "Test PCV FY 2024",
+				}
+			)
+			pcv_2024.insert()
+			pcv_2024.submit()
+			pcv_2024.reload()
+
+			builder_2024 = FinancialQueryBuilder(
+				{
+					"company": company,
+					"from_fiscal_year": "2024",
+					"to_fiscal_year": "2024",
+					"period_start_date": "2024-01-01",
+					"period_end_date": "2024-12-31",
+					"filter_based_on": "Date Range",
+					"periodicity": "Yearly",
+				},
+				[{"key": "2024", "from_date": "2024-01-01", "to_date": "2024-12-31"}],
+			)
+			data_2024 = builder_2024.fetch_account_balances(accounts)
+			expense_2024 = data_2024.get(expense_account)
+			self.assertIsNotNone(expense_2024, "Expense account must appear in FY 2024 results")
+			year_2024 = expense_2024.get_period("2024")
+			self.assertEqual(
+				year_2024.movement,
+				2000.0,
+				"FY 2024 expense movement must equal real expense (PCV reversal excluded)",
+			)
+
+			# --- Step 2: FY 2025 expense + PCV ---
+			jv_2025 = make_journal_entry(
+				account1=expense_account,
+				account2=bank_account,
+				amount=3000,
+				posting_date="2025-06-15",
+				company=company,
+				submit=True,
+			)
+			fy_2025 = get_fiscal_year("2025-06-15", company=company)
+			pcv_2025 = frappe.get_doc(
+				{
+					"doctype": "Period Closing Voucher",
+					"transaction_date": "2025-12-31",
+					"period_start_date": fy_2025[1],
+					"period_end_date": fy_2025[2],
+					"company": company,
+					"fiscal_year": fy_2025[0],
+					"cost_center": "_Test Cost Center - _TC",
+					"closing_account_head": closing_account,
+					"remarks": "Test PCV FY 2025",
+				}
+			)
+			pcv_2025.insert()
+			pcv_2025.submit()
+			pcv_2025.reload()
+
+			# --- Step 3: full pipeline with Growth view across both years ---
+			template_name = f"Test Growth Template {frappe.generate_hash()[:8]}"
+			template = frappe.get_doc(
+				{
+					"doctype": "Financial Report Template",
+					"template_name": template_name,
+					"report_type": "Profit and Loss Statement",
+					"rows": [
+						{
+							"reference_code": "EXP_ADMIN",
+							"display_name": "Administrative Expenses",
+							"indentation_level": 0,
+							"data_source": "Account Data",
+							"balance_type": "Closing Balance",
+							"calculation_formula": f'["name", "=", "{expense_account}"]',
+						},
+					],
+				}
+			)
+			template.insert()
+
+			filters = frappe._dict(
+				{
+					"company": company,
+					"report_template": template_name,
+					"from_fiscal_year": fy_2024[0],
+					"to_fiscal_year": fy_2025[0],
+					"period_start_date": "2024-01-01",
+					"period_end_date": "2025-12-31",
+					"filter_based_on": "Date Range",
+					"periodicity": "Yearly",
+					"accumulated_values": 0,
+					"selected_view": "Growth",
+				}
+			)
+
+			_columns, formatted_data, _msg, _chart = FinancialReportEngine().execute(filters)
+
+			expense_row = next(
+				(row for row in formatted_data if row.get("account_name") == "Administrative Expenses"),
+				None,
+			)
+			self.assertIsNotNone(expense_row, "Administrative Expenses row must appear in growth view")
+
+			period_keys = expense_row.get("_segment_info", {}).get("period_keys", [])
+			self.assertEqual(len(period_keys), 2, "Yearly view must yield exactly two periods")
+			first_period_key, second_period_key = period_keys
+
+			# First column: raw absolute value (FY 2024 expense)
+			self.assertEqual(
+				flt(expense_row[first_period_key]),
+				2000.0,
+				"First column in growth view must keep raw FY 2024 expense value",
+			)
+			# Second column: ((3000 - 2000) / 2000) * 100 = 50.0
+			self.assertEqual(
+				flt(expense_row[second_period_key]),
+				50.0,
+				"Second column must be % growth FY 2024 → FY 2025",
+			)
+
+		finally:
+			frappe.db.set_single_value(
+				"Accounts Settings", "use_legacy_controller_for_pcv", original_pcv_setting or 0
+			)
+
+			if pcv_2025:
+				pcv_2025.reload()
+				if pcv_2025.docstatus == 1:
+					pcv_2025.cancel()
+
+			if jv_2025 and jv_2025.docstatus == 1:
+				jv_2025.cancel()
+
+			if pcv_2024:
+				pcv_2024.reload()
+				if pcv_2024.docstatus == 1:
+					pcv_2024.cancel()
+
+			if jv_2024 and jv_2024.docstatus == 1:
+				jv_2024.cancel()
+
+			if template and frappe.db.exists("Financial Report Template", template.name):
+				frappe.delete_doc("Financial Report Template", template.name, force=1)

erpnext/accounts/doctype/journal_entry/journal_entry.js

@@ -70,6 +70,10 @@ frappe.ui.form.on("Journal Entry", {
 	},
 
 	refresh: function (frm) {
+		if (frm.doc.reversal_of && (frm.is_new() || frm.doc.docstatus == 0)) {
+			frm.set_read_only();
+		}
+
 		erpnext.toggle_naming_series();
 
 		if (frm.doc.docstatus > 0) {

erpnext/accounts/doctype/journal_entry/journal_entry.json

@@ -39,7 +39,7 @@
   "clearance_date",
   "column_break_oizh",
   "user_remark",
-  "subscription_section",
+  "auto_repeat_section",
   "auto_repeat",
   "tax_withholding_tab",
   "section_tax_withholding_entry",
@@ -477,11 +477,6 @@
    "options": "Stock Entry",
    "read_only": 1
   },
-  {
-   "fieldname": "subscription_section",
-   "fieldtype": "Section Break",
-   "label": "Subscription"
-  },
   {
    "allow_on_submit": 1,
    "fieldname": "auto_repeat",

erpnext/accounts/doctype/payment_entry/payment_entry.js

@@ -710,31 +710,12 @@ frappe.ui.form.on("Payment Entry", {
 		if (!frm.doc.paid_from_account_currency || !frm.doc.company) return;
 		let company_currency = frappe.get_doc(":Company", frm.doc.company).default_currency;
 
-		if (frm.doc.paid_from_account_currency == company_currency) {
-			frm.set_value("source_exchange_rate", 1);
-		} else if (frm.doc.paid_from) {
-			if (["Internal Transfer", "Pay"].includes(frm.doc.payment_type)) {
-				let company_currency = frappe.get_doc(":Company", frm.doc.company)?.default_currency;
-				frappe.call({
-					method: "erpnext.setup.utils.get_exchange_rate",
-					args: {
-						from_currency: frm.doc.paid_from_account_currency,
-						to_currency: company_currency,
-						transaction_date: frm.doc.posting_date,
-					},
-					callback: function (r, rt) {
-						frm.set_value("source_exchange_rate", r.message);
-					},
-				});
-			} else {
-				frm.events.set_current_exchange_rate(
-					frm,
-					"source_exchange_rate",
-					frm.doc.paid_from_account_currency,
-					company_currency
-				);
-			}
-		}
+		frm.events.set_current_exchange_rate(
+			frm,
+			"source_exchange_rate",
+			frm.doc.paid_from_account_currency,
+			company_currency
+		);
 	},
 
 	paid_to_account_currency: function (frm) {
@@ -766,49 +747,24 @@ frappe.ui.form.on("Payment Entry", {
 
 	posting_date: function (frm) {
 		frm.events.paid_from_account_currency(frm);
+		frm.events.paid_to_account_currency(frm);
 	},
 
 	source_exchange_rate: function (frm) {
-		let company_currency = frappe.get_doc(":Company", frm.doc.company).default_currency;
-		if (frm.doc.paid_amount) {
-			frm.set_value("base_paid_amount", flt(frm.doc.paid_amount) * flt(frm.doc.source_exchange_rate));
-			// target exchange rate should always be same as source if both account currencies is same
-			if (frm.doc.paid_from_account_currency == frm.doc.paid_to_account_currency) {
-				frm.set_value("target_exchange_rate", frm.doc.source_exchange_rate);
-				frm.set_value("base_received_amount", frm.doc.base_paid_amount);
-			} else if (company_currency == frm.doc.paid_to_account_currency) {
-				frm.set_value("received_amount", frm.doc.base_paid_amount);
-				frm.set_value("base_received_amount", frm.doc.base_paid_amount);
-			}
-
-			// set_unallocated_amount is called by below method,
-			// no need trigger separately
-			frm.events.set_total_allocated_amount(frm);
-		}
-
-		// Make read only if Accounts Settings doesn't allow stale rates
-		frm.set_df_property("source_exchange_rate", "read_only", erpnext.stale_rate_allowed() ? 0 : 1);
-	},
-
-	target_exchange_rate: function (frm) {
 		frm.set_paid_amount_based_on_received_amount = true;
 		let company_currency = frappe.get_doc(":Company", frm.doc.company).default_currency;
 
-		if (frm.doc.received_amount) {
-			frm.set_value(
-				"base_received_amount",
-				flt(frm.doc.received_amount) * flt(frm.doc.target_exchange_rate)
-			);
+		if (frm.doc.base_received_amount && frm.doc.source_exchange_rate) {
+			frm.set_value("base_paid_amount", frm.doc.base_received_amount);
 
-			if (
-				!frm.doc.source_exchange_rate &&
-				frm.doc.paid_from_account_currency == frm.doc.paid_to_account_currency
-			) {
-				frm.set_value("source_exchange_rate", frm.doc.target_exchange_rate);
-				frm.set_value("base_paid_amount", frm.doc.base_received_amount);
-			} else if (company_currency == frm.doc.paid_from_account_currency) {
-				frm.set_value("paid_amount", frm.doc.base_received_amount);
-				frm.set_value("base_paid_amount", frm.doc.base_received_amount);
+			// target exchange rate should always be same as source if both account currencies is same
+			if (frm.doc.paid_from_account_currency == frm.doc.paid_to_account_currency) {
+				frm.set_value("target_exchange_rate", frm.doc.source_exchange_rate);
+			} else {
+				frm.set_value(
+					"paid_amount",
+					flt(frm.doc.base_paid_amount) / flt(frm.doc.source_exchange_rate)
+				);
 			}
 
 			// set_unallocated_amount is called by below method,
@@ -817,6 +773,32 @@ frappe.ui.form.on("Payment Entry", {
 		}
 		frm.set_paid_amount_based_on_received_amount = false;
 
+		// Make read only if Accounts Settings doesn't allow stale rates
+		frm.set_df_property("source_exchange_rate", "read_only", erpnext.stale_rate_allowed() ? 0 : 1);
+	},
+
+	target_exchange_rate: function (frm) {
+		let company_currency = frappe.get_doc(":Company", frm.doc.company).default_currency;
+
+		if (frm.doc.base_paid_amount && frm.doc.target_exchange_rate) {
+			frm.set_value("base_received_amount", frm.doc.base_paid_amount);
+			if (
+				!frm.doc.source_exchange_rate &&
+				frm.doc.paid_from_account_currency == frm.doc.paid_to_account_currency
+			) {
+				frm.set_value("source_exchange_rate", frm.doc.target_exchange_rate);
+			} else {
+				frm.set_value(
+					"received_amount",
+					flt(frm.doc.base_received_amount) / flt(frm.doc.target_exchange_rate)
+				);
+			}
+
+			// set_unallocated_amount is called by below method,
+			// no need trigger separately
+			frm.events.set_total_allocated_amount(frm);
+		}
+
 		// Make read only if Accounts Settings doesn't allow stale rates
 		frm.set_df_property("target_exchange_rate", "read_only", erpnext.stale_rate_allowed() ? 0 : 1);
 	},
@@ -825,11 +807,14 @@ frappe.ui.form.on("Payment Entry", {
 		frm.set_value("base_paid_amount", flt(frm.doc.paid_amount) * flt(frm.doc.source_exchange_rate));
 		let company_currency = frappe.get_doc(":Company", frm.doc.company).default_currency;
 		if (!frm.doc.received_amount) {
-			if (frm.doc.paid_from_account_currency == frm.doc.paid_to_account_currency) {
-				frm.set_value("received_amount", frm.doc.paid_amount);
-			} else if (company_currency == frm.doc.paid_to_account_currency) {
+			frm.set_value("base_received_amount", frm.doc.base_paid_amount);
+			if (company_currency == frm.doc.paid_to_account_currency) {
 				frm.set_value("received_amount", frm.doc.base_paid_amount);
-				frm.set_value("base_received_amount", frm.doc.base_paid_amount);
+			} else if (frm.doc.target_exchange_rate) {
+				frm.set_value(
+					"received_amount",
+					flt(frm.doc.base_paid_amount) / flt(frm.doc.target_exchange_rate)
+				);
 			}
 		}
 		frm.trigger("reset_received_amount");
@@ -846,15 +831,14 @@ frappe.ui.form.on("Payment Entry", {
 		);
 
 		if (!frm.doc.paid_amount) {
-			if (frm.doc.paid_from_account_currency == frm.doc.paid_to_account_currency) {
-				frm.set_value("paid_amount", frm.doc.received_amount);
-				if (frm.doc.target_exchange_rate) {
-					frm.set_value("source_exchange_rate", frm.doc.target_exchange_rate);
-				}
-				frm.set_value("base_paid_amount", frm.doc.base_received_amount);
-			} else if (company_currency == frm.doc.paid_from_account_currency) {
+			frm.set_value("base_paid_amount", frm.doc.base_received_amount);
+			if (company_currency == frm.doc.paid_from_account_currency) {
 				frm.set_value("paid_amount", frm.doc.base_received_amount);
-				frm.set_value("base_paid_amount", frm.doc.base_received_amount);
+			} else if (frm.doc.source_exchange_rate) {
+				frm.set_value(
+					"paid_amount",
+					flt(frm.doc.base_received_amount) / flt(frm.doc.source_exchange_rate)
+				);
 			}
 		}
 

erpnext/accounts/doctype/payment_entry/payment_entry.json

@@ -89,6 +89,7 @@
   "remarks",
   "base_in_words",
   "is_opening",
+  "title",
   "column_break_16",
   "letter_head",
   "print_heading",
@@ -96,10 +97,9 @@
   "bank_account_no",
   "payment_order",
   "in_words",
-  "subscription_section",
-  "auto_repeat",
   "amended_from",
-  "title"
+  "auto_repeat_section",
+  "auto_repeat"
  ],
  "fields": [
   {
@@ -322,7 +322,7 @@
    "reqd": 1
   },
   {
-   "depends_on": "doc.received_amount",
+   "depends_on": "eval:doc.received_amount;",
    "fieldname": "base_received_amount",
    "fieldtype": "Currency",
    "label": "Received Amount (Company Currency)",
@@ -503,11 +503,6 @@
    "print_hide": 1,
    "read_only": 1
   },
-  {
-   "fieldname": "subscription_section",
-   "fieldtype": "Section Break",
-   "label": "Subscription Section"
-  },
   {
    "allow_on_submit": 1,
    "fieldname": "auto_repeat",
@@ -781,6 +776,11 @@
    "fieldname": "override_tax_withholding_entries",
    "fieldtype": "Check",
    "label": "Edit Tax Withholding Entries"
+  },
+  {
+   "fieldname": "auto_repeat_section",
+   "fieldtype": "Section Break",
+   "label": "Auto Repeat"
   }
  ],
  "grid_page_length": 50,
@@ -795,7 +795,7 @@
    "table_fieldname": "payment_entries"
   }
  ],
- "modified": "2026-03-09 17:15:30.453920",
+ "modified": "2026-05-15 13:31:01.166010",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Entry",

erpnext/accounts/doctype/payment_entry/payment_entry.py

@@ -1238,9 +1238,9 @@ class PaymentEntry(AccountsController):
 		else:
 			remarks = [
 				_("Amount {0} {1} {2} {3}").format(
-					_(self.paid_to_account_currency)
+					_(self.paid_from_account_currency)
 					if self.payment_type == "Receive"
-					else _(self.paid_from_account_currency),
+					else _(self.paid_to_account_currency),
 					self.paid_amount if self.payment_type == "Receive" else self.received_amount,
 					_("received from") if self.payment_type == "Receive" else _("paid to"),
 					self.party,
@@ -1256,7 +1256,7 @@ class PaymentEntry(AccountsController):
 			for d in self.get("references"):
 				if d.allocated_amount:
 					remarks.append(
-						_("Amount {0} {1} against {2} {3}").format(
+						_("Amount {0} {1} adjusted against {2} {3}").format(
 							_(self.party_account_currency),
 							d.allocated_amount,
 							d.reference_doctype,
@@ -1267,7 +1267,7 @@ class PaymentEntry(AccountsController):
 		for d in self.get("deductions"):
 			if d.amount:
 				remarks.append(
-					_("Amount {0} {1} deducted against {2}").format(
+					_("Amount {0} {1} as adjustment to {2}").format(
 						_(self.company_currency), d.amount, d.account
 					)
 				)
@@ -2306,22 +2306,20 @@ def get_outstanding_reference_documents(args, validate=False):
 	# Get positive outstanding sales /purchase invoices
 	condition = ""
 	if args.get("voucher_type") and args.get("voucher_no"):
-		condition = " and voucher_type={} and voucher_no={}".format(
-			frappe.db.escape(args["voucher_type"]), frappe.db.escape(args["voucher_no"])
-		)
+		condition = f" and voucher_type={frappe.db.escape(args['voucher_type'])} and voucher_no={frappe.db.escape(args['voucher_no'])}"
 		common_filter.append(ple.voucher_type == args["voucher_type"])
 		common_filter.append(ple.voucher_no == args["voucher_no"])
 
 	# Add cost center condition
 	if args.get("cost_center"):
-		condition += " and cost_center='%s'" % args.get("cost_center")
+		condition += f" and cost_center={frappe.db.escape(args.get('cost_center'))}"
 		accounting_dimensions_filter.append(ple.cost_center == args.get("cost_center"))
 
 	# dynamic dimension filters
 	active_dimensions = get_dimensions()[0]
 	for dim in active_dimensions:
 		if args.get(dim.fieldname):
-			condition += f" and {dim.fieldname}='{args.get(dim.fieldname)}'"
+			condition += f" and {dim.fieldname}={frappe.db.escape(args.get(dim.fieldname))}"
 			accounting_dimensions_filter.append(ple[dim.fieldname] == args.get(dim.fieldname))
 
 	date_fields_dict = {
@@ -2330,18 +2328,19 @@ def get_outstanding_reference_documents(args, validate=False):
 	}
 
 	for fieldname, date_fields in date_fields_dict.items():
+		from_date = frappe.db.escape(str(args.get(date_fields[0]))) if args.get(date_fields[0]) else None
+		to_date = frappe.db.escape(str(args.get(date_fields[1]))) if args.get(date_fields[1]) else None
+
 		if args.get(date_fields[0]) and args.get(date_fields[1]):
-			condition += " and {} between '{}' and '{}'".format(
-				fieldname, args.get(date_fields[0]), args.get(date_fields[1])
-			)
+			condition += f" and {fieldname} between {from_date} and {to_date}"
 			posting_and_due_date.append(ple[fieldname][args.get(date_fields[0]) : args.get(date_fields[1])])
 		elif args.get(date_fields[0]):
 			# if only from date is supplied
-			condition += f" and {fieldname} >= '{args.get(date_fields[0])}'"
+			condition += f" and {fieldname} >= {from_date}"
 			posting_and_due_date.append(ple[fieldname].gte(args.get(date_fields[0])))
 		elif args.get(date_fields[1]):
 			# if only to date is supplied
-			condition += f" and {fieldname} <= '{args.get(date_fields[1])}'"
+			condition += f" and {fieldname} <= {to_date}"
 			posting_and_due_date.append(ple[fieldname].lte(args.get(date_fields[1])))
 
 	if args.get("company"):
@@ -2561,7 +2560,7 @@ def get_orders_to_be_billed(
 	active_dimensions = get_dimensions(True)[0]
 	for dim in active_dimensions:
 		if filters.get(dim.fieldname):
-			condition += f" and {dim.fieldname}='{filters.get(dim.fieldname)}'"
+			condition += f" and {dim.fieldname}={frappe.db.escape(filters.get(dim.fieldname))}"
 
 	if party_account_currency == company_currency:
 		grand_total_field = "base_grand_total"

erpnext/accounts/doctype/payment_entry/test_payment_entry.py

@@ -195,6 +195,30 @@ class TestPaymentEntry(ERPNextTestSuite):
 		outstanding_amount = flt(frappe.db.get_value("Sales Invoice", si.name, "outstanding_amount"))
 		self.assertEqual(outstanding_amount, 100)
 
+	def test_reference_outstanding_amount_on_advance_pull(self):
+		from erpnext.selling.doctype.sales_order.sales_order import make_sales_invoice
+
+		so = make_sales_order(qty=1, rate=1000)
+		pe = get_payment_entry("Sales Order", so.name, bank_account="_Test Cash - _TC")
+		pe.paid_amount = pe.received_amount = 500
+		pe.references[0].allocated_amount = 500
+		pe.insert()
+		pe.submit()
+
+		so.reload()
+		self.assertEqual(so.advance_paid, 500)
+
+		si = make_sales_invoice(so.name)
+		si.allocate_advances_automatically = 1
+		si.save()
+		self.assertEqual(si.get("advances")[0].allocated_amount, 500)
+		self.assertEqual(si.get("advances")[0].reference_name, pe.name)
+		si.submit()
+
+		pe.load_from_db()
+		self.assertEqual(pe.references[0].reference_name, si.name)
+		self.assertEqual(pe.references[0].outstanding_amount, si.outstanding_amount)
+
 	def test_payment_entry_against_pi(self):
 		pi = make_purchase_invoice(
 			supplier="_Test Supplier USD",

erpnext/accounts/doctype/payment_ledger_entry/test_payment_ledger_entry.py

@@ -3,7 +3,8 @@
 
 import frappe
 from frappe import qb
-from frappe.utils import nowdate
+from frappe.query_builder.functions import Count, Sum
+from frappe.utils import add_days, nowdate
 
 from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry
 from erpnext.accounts.doctype.payment_entry.test_payment_entry import create_payment_entry
@@ -90,6 +91,7 @@ class TestPaymentLedgerEntry(ERPNextTestSuite):
 			posting_date = nowdate()
 
 		sinv = create_sales_invoice(
+			posting_date=posting_date,
 			qty=qty,
 			rate=rate,
 			company=self.company,
@@ -531,3 +533,82 @@ class TestPaymentLedgerEntry(ERPNextTestSuite):
 		# with references removed, deletion should be possible
 		so.delete()
 		self.assertRaises(frappe.DoesNotExistError, frappe.get_doc, so.doctype, so.name)
+
+	@ERPNextTestSuite.change_settings(
+		"Accounts Settings",
+		{"enable_immutable_ledger": 1},
+	)
+	def test_reverse_entries_on_cancel_for_immutable_ledger(self):
+		invoice_posting_date = add_days(nowdate(), -5)
+		gle = qb.DocType("GL Entry")
+		ple = qb.DocType("Payment Ledger Entry")
+
+		si = self.create_sales_invoice(qty=1, rate=100, posting_date=invoice_posting_date)
+
+		gles_before = (
+			qb.from_(gle)
+			.select(
+				Count(gle.name),
+			)
+			.where((gle.voucher_type == si.doctype) & (gle.voucher_no == si.name) & (gle.is_cancelled == 0))
+			.run()[0][0]
+		)
+		ples_before = (
+			qb.from_(ple)
+			.select(
+				Count(ple.name),
+			)
+			.where((ple.voucher_type == si.doctype) & (ple.voucher_no == si.name) & (ple.delinked.eq(0)))
+			.run()[0][0]
+		)
+
+		si.cancel()
+
+		gles_after = (
+			qb.from_(gle)
+			.select(Count(gle.account))
+			.where((gle.voucher_type == si.doctype) & (gle.voucher_no == si.name) & (gle.is_cancelled == 0))
+			.run()[0][0]
+		)
+		self.assertEqual(gles_after, gles_before * 2)
+
+		ples_after = (
+			qb.from_(ple)
+			.select(
+				Count(ple.name),
+			)
+			.where((ple.voucher_type == si.doctype) & (ple.voucher_no == si.name) & (ple.delinked.eq(0)))
+			.run()[0][0]
+		)
+		self.assertEqual(ples_after, ples_before * 2)
+
+		# assert debit/credit are reversed
+		gl_entries = (
+			qb.from_(gle)
+			.select(gle.account, Sum(gle.debit).as_("total_debit"), Sum(gle.credit).as_("total_credit"))
+			.where((gle.voucher_type == si.doctype) & (gle.voucher_no == si.name) & (gle.is_cancelled == 0))
+			.groupby(gle.account)
+			.run(as_dict=True)
+		)
+		for gl in gl_entries:
+			with self.subTest(gl=gl):
+				self.assertEqual(gl.total_debit, gl.total_credit)
+
+		# assert amounts are reversed
+		pl_entries = (
+			qb.from_(ple)
+			.select(ple.account, Sum(ple.amount).as_("total_amount"))
+			.where((ple.voucher_type == si.doctype) & (ple.voucher_no == si.name) & (ple.delinked == 0))
+			.groupby(ple.account)
+			.run(as_dict=True)
+		)
+		for pl in pl_entries:
+			with self.subTest(pl=pl):
+				self.assertEqual(pl.total_amount, 0)
+
+		self.assertFalse(
+			frappe.db.exists(
+				"Payment Ledger Entry",
+				{"voucher_type": si.doctype, "voucher_no": si.name, "delinked": 1},
+			)
+		)

erpnext/accounts/doctype/payment_reconciliation/test_payment_reconciliation.py

@@ -21,122 +21,23 @@ from erpnext.tests.utils import ERPNextTestSuite
 
 class TestPaymentReconciliation(ERPNextTestSuite):
 	def setUp(self):
-		self.create_company()
-		self.create_item()
-		self.create_customer()
-		self.create_account()
-		self.create_cost_center()
-		self.clear_old_entries()
-
-	def create_company(self):
-		company = None
-		if frappe.db.exists("Company", "_Test Payment Reconciliation"):
-			company = frappe.get_doc("Company", "_Test Payment Reconciliation")
-		else:
-			company = frappe.get_doc(
-				{
-					"doctype": "Company",
-					"company_name": "_Test Payment Reconciliation",
-					"country": "India",
-					"default_currency": "INR",
-					"create_chart_of_accounts_based_on": "Standard Template",
-					"chart_of_accounts": "Standard",
-				}
-			)
-			company = company.save()
-
-		self.company = company.name
-		self.cost_center = company.cost_center
-		self.warehouse = "All Warehouses - _PR"
-		self.income_account = "Sales - _PR"
-		self.expense_account = "Cost of Goods Sold - _PR"
-		self.debit_to = "Debtors - _PR"
-		self.creditors = "Creditors - _PR"
-		self.cash = "Cash - _PR"
-
-		# create bank account
-		if frappe.db.exists("Account", "HDFC - _PR"):
-			self.bank = "HDFC - _PR"
-		else:
-			bank_acc = frappe.get_doc(
-				{
-					"doctype": "Account",
-					"account_name": "HDFC",
-					"parent_account": "Bank Accounts - _PR",
-					"company": self.company,
-				}
-			)
-			bank_acc.save()
-			self.bank = bank_acc.name
-
-	def create_item(self):
-		item = create_item(
-			item_code="_Test PR Item", is_stock_item=0, company=self.company, warehouse=self.warehouse
-		)
-		self.item = item if isinstance(item, str) else item.item_code
-
-	def create_customer(self):
-		self.customer = make_customer("_Test PR Customer")
-		self.customer2 = make_customer("_Test PR Customer 2")
-		self.customer3 = make_customer("_Test PR Customer 3", "EUR")
-		self.customer4 = make_customer("_Test PR Customer 4", "EUR")
-		self.customer5 = make_customer("_Test PR Customer 5", "EUR")
-
-	def create_account(self):
-		accounts = [
-			{
-				"attribute": "debtors_eur",
-				"account_name": "Debtors EUR",
-				"parent_account": "Accounts Receivable - _PR",
-				"account_currency": "EUR",
-				"account_type": "Receivable",
-			},
-			{
-				"attribute": "creditors_usd",
-				"account_name": "Payable USD",
-				"parent_account": "Accounts Payable - _PR",
-				"account_currency": "USD",
-				"account_type": "Payable",
-			},
-			# 'Payable' account for capturing advance paid, under 'Assets' group
-			{
-				"attribute": "advance_payable_account",
-				"account_name": "Advance Paid",
-				"parent_account": "Current Assets - _PR",
-				"account_currency": "INR",
-				"account_type": "Payable",
-			},
-			# 'Receivable' account for capturing advance received, under 'Liabilities' group
-			{
-				"attribute": "advance_receivable_account",
-				"account_name": "Advance Received",
-				"parent_account": "Current Liabilities - _PR",
-				"account_currency": "INR",
-				"account_type": "Receivable",
-			},
-		]
-
-		for x in accounts:
-			x = frappe._dict(x)
-			if not frappe.db.get_value(
-				"Account", filters={"account_name": x.account_name, "company": self.company}
-			):
-				acc = frappe.new_doc("Account")
-				acc.account_name = x.account_name
-				acc.parent_account = x.parent_account
-				acc.company = self.company
-				acc.account_currency = x.account_currency
-				acc.account_type = x.account_type
-				acc.insert()
-			else:
-				name = frappe.db.get_value(
-					"Account",
-					filters={"account_name": x.account_name, "company": self.company},
-					fieldname="name",
-					pluck=True,
-				)
-				acc = frappe.get_doc("Account", name)
-			setattr(self, x.attribute, acc.name)
+		self.company = "_Test Company"
+		self.debit_to = "Debtors - _TC"
+		self.creditors = "Creditors - _TC"
+		self.bank = "HDFC - _TC"
+		self.cash = "Cash - _TC"
+		self.item = "_Test Item"
+		self.cost_center = self.main_cc = "Main - _TC"
+		self.sub_cc = "Sub - _TC"
+		self.customer = "_Test Customer"
+		self.advance_receivable_account = "Advance Received - _TC"
+		self.advance_payable_account = "Advance Paid - _TC"
+		self.income_account = "Sales - _TC"
+		self.expense_account = "Cost of Goods Sold - _TC"
+		self.warehouse = "All Warehouses - _TC"
+		self.customer_usd = "_Test Customer USD"
+		self.debtors_usd = "_Test Receivable USD - _TC"
+		self.creditors_usd = "_Test Payable USD - _TC"
 
 	def create_sales_invoice(
 		self, qty=1, rate=100, posting_date=None, do_not_save=False, do_not_submit=False
@@ -253,18 +154,6 @@ class TestPaymentReconciliation(ERPNextTestSuite):
 		)
 		return pord
 
-	def clear_old_entries(self):
-		doctype_list = [
-			"GL Entry",
-			"Payment Ledger Entry",
-			"Sales Invoice",
-			"Purchase Invoice",
-			"Payment Entry",
-			"Journal Entry",
-		]
-		for doctype in doctype_list:
-			qb.from_(qb.DocType(doctype)).delete().where(qb.DocType(doctype).company == self.company).run()
-
 	def create_payment_reconciliation(self, party_is_customer=True):
 		pr = frappe.new_doc("Payment Reconciliation")
 		pr.company = self.company
@@ -300,22 +189,6 @@ class TestPaymentReconciliation(ERPNextTestSuite):
 		)
 		return je
 
-	def create_cost_center(self):
-		# Setup cost center
-		cc_name = "Sub"
-
-		self.main_cc = frappe.get_doc("Cost Center", get_default_cost_center(self.company))
-
-		cc_exists = frappe.db.get_list("Cost Center", filters={"cost_center_name": cc_name})
-		if cc_exists:
-			self.sub_cc = frappe.get_doc("Cost Center", cc_exists[0].name)
-		else:
-			sub_cc = frappe.new_doc("Cost Center")
-			sub_cc.cost_center_name = "Sub"
-			sub_cc.parent_cost_center = self.main_cc.parent_cost_center
-			sub_cc.company = self.main_cc.company
-			self.sub_cc = sub_cc.save()
-
 	def test_filter_min_max(self):
 		# check filter condition minimum and maximum amount
 		self.create_sales_invoice(qty=1, rate=300)
@@ -478,7 +351,7 @@ class TestPaymentReconciliation(ERPNextTestSuite):
 	def test_payment_against_journal(self):
 		transaction_date = nowdate()
 
-		sales = "Sales - _PR"
+		sales = "Sales - _TC"
 		amount = 921
 		# debit debtors account to record an invoice
 		je = self.create_journal_entry(self.debit_to, sales, amount, transaction_date)
@@ -513,7 +386,7 @@ class TestPaymentReconciliation(ERPNextTestSuite):
 		transaction_date = nowdate()
 
 		self.supplier = "_Test Supplier USD"
-		self.supplier2 = make_supplier("_Test Supplier2 USD", "USD")
+		self.supplier2 = "_Test Another Supplier USD"
 		amount = 100
 		exc_rate1 = 80
 		exc_rate2 = 83
@@ -666,7 +539,7 @@ class TestPaymentReconciliation(ERPNextTestSuite):
 
 	def test_journal_against_journal(self):
 		transaction_date = nowdate()
-		sales = "Sales - _PR"
+		sales = "Sales - _TC"
 		amount = 100
 
 		# debit debtors account to simulate a invoice
@@ -841,47 +714,49 @@ class TestPaymentReconciliation(ERPNextTestSuite):
 	def test_pr_output_foreign_currency_and_amount(self):
 		# test for currency and amount invoices and payments
 		transaction_date = nowdate()
-		# In EUR
+		# In USD
 		amount = 100
 		exchange_rate = 80
 
 		si = self.create_sales_invoice(
 			qty=1, rate=amount, posting_date=transaction_date, do_not_save=True, do_not_submit=True
 		)
-		si.customer = self.customer3
-		si.currency = "EUR"
+		si.customer = self.customer_usd
+		si.currency = "USD"
 		si.conversion_rate = exchange_rate
-		si.debit_to = self.debtors_eur
+		si.debit_to = self.debtors_usd
 		si = si.save().submit()
 
 		cr_note = self.create_sales_invoice(
 			qty=-1, rate=amount, posting_date=transaction_date, do_not_save=True, do_not_submit=True
 		)
-		cr_note.customer = self.customer3
+		cr_note.customer = self.customer_usd
 		cr_note.is_return = 1
-		cr_note.currency = "EUR"
+		cr_note.currency = "USD"
 		cr_note.conversion_rate = exchange_rate
-		cr_note.debit_to = self.debtors_eur
+		cr_note.debit_to = self.debtors_usd
 		cr_note = cr_note.save().submit()
 
 		pr = self.create_payment_reconciliation()
-		pr.party = self.customer3
-		pr.receivable_payable_account = self.debtors_eur
+		pr.party = self.customer_usd
+		pr.receivable_payable_account = self.debtors_usd
 		pr.get_unreconciled_entries()
 
 		self.assertEqual(len(pr.invoices), 1)
 		self.assertEqual(len(pr.payments), 1)
 
 		self.assertEqual(pr.invoices[0].amount, amount)
-		self.assertEqual(pr.invoices[0].currency, "EUR")
+		self.assertEqual(pr.invoices[0].currency, "USD")
 		self.assertEqual(pr.payments[0].amount, amount)
-		self.assertEqual(pr.payments[0].currency, "EUR")
+		self.assertEqual(pr.payments[0].currency, "USD")
 
 		cr_note.cancel()
 
-		pay = self.create_payment_entry(amount=amount, posting_date=transaction_date, customer=self.customer3)
-		pay.paid_from = self.debtors_eur
-		pay.paid_from_account_currency = "EUR"
+		pay = self.create_payment_entry(
+			amount=amount, posting_date=transaction_date, customer=self.customer_usd
+		)
+		pay.paid_from = self.debtors_usd
+		pay.paid_from_account_currency = "USD"
 		pay.source_exchange_rate = exchange_rate
 		pay.received_amount = exchange_rate * amount
 		pay = pay.save().submit()
@@ -890,21 +765,21 @@ class TestPaymentReconciliation(ERPNextTestSuite):
 		self.assertEqual(len(pr.invoices), 1)
 		self.assertEqual(len(pr.payments), 1)
 		self.assertEqual(pr.payments[0].amount, amount)
-		self.assertEqual(pr.payments[0].currency, "EUR")
+		self.assertEqual(pr.payments[0].currency, "USD")
 
 	def test_difference_amount_via_journal_entry(self):
 		# Make Sale Invoice
 		si = self.create_sales_invoice(
 			qty=1, rate=100, posting_date=nowdate(), do_not_save=True, do_not_submit=True
 		)
-		si.customer = self.customer4
-		si.currency = "EUR"
+		si.customer = self.customer_usd
+		si.currency = "USD"
 		si.conversion_rate = 85
-		si.debit_to = self.debtors_eur
+		si.debit_to = self.debtors_usd
 		si.save().submit()
 
 		# Make payment using Journal Entry
-		je1 = self.create_journal_entry("HDFC - _PR", self.debtors_eur, 100, nowdate())
+		je1 = self.create_journal_entry("HDFC - _TC", self.debtors_usd, 100, nowdate())
 		je1.multi_currency = 1
 		je1.accounts[0].exchange_rate = 1
 		je1.accounts[0].credit_in_account_currency = 0
@@ -912,7 +787,7 @@ class TestPaymentReconciliation(ERPNextTestSuite):
 		je1.accounts[0].debit_in_account_currency = 8000
 		je1.accounts[0].debit = 8000
 		je1.accounts[1].party_type = "Customer"
-		je1.accounts[1].party = self.customer4
+		je1.accounts[1].party = self.customer_usd
 		je1.accounts[1].exchange_rate = 80
 		je1.accounts[1].credit_in_account_currency = 100
 		je1.accounts[1].credit = 8000
@@ -921,7 +796,7 @@ class TestPaymentReconciliation(ERPNextTestSuite):
 		je1.save()
 		je1.submit()
 
-		je2 = self.create_journal_entry("HDFC - _PR", self.debtors_eur, 200, nowdate())
+		je2 = self.create_journal_entry("HDFC - _TC", self.debtors_usd, 200, nowdate())
 		je2.multi_currency = 1
 		je2.accounts[0].exchange_rate = 1
 		je2.accounts[0].credit_in_account_currency = 0
@@ -929,7 +804,7 @@ class TestPaymentReconciliation(ERPNextTestSuite):
 		je2.accounts[0].debit_in_account_currency = 16000
 		je2.accounts[0].debit = 16000
 		je2.accounts[1].party_type = "Customer"
-		je2.accounts[1].party = self.customer4
+		je2.accounts[1].party = self.customer_usd
 		je2.accounts[1].exchange_rate = 80
 		je2.accounts[1].credit_in_account_currency = 200
 		je1.accounts[1].credit = 16000
@@ -939,8 +814,8 @@ class TestPaymentReconciliation(ERPNextTestSuite):
 		je2.submit()
 
 		pr = self.create_payment_reconciliation()
-		pr.party = self.customer4
-		pr.receivable_payable_account = self.debtors_eur
+		pr.party = self.customer_usd
+		pr.receivable_payable_account = self.debtors_usd
 		pr.get_unreconciled_entries()
 
 		self.assertEqual(len(pr.invoices), 1)
@@ -960,7 +835,7 @@ class TestPaymentReconciliation(ERPNextTestSuite):
 		invoices = [x.as_dict() for x in pr.invoices]
 		payments = [pr.payments[1].as_dict()]
 		pr.allocate_entries(frappe._dict({"invoices": invoices, "payments": payments}))
-		pr.allocation[0].difference_account = "Exchange Gain/Loss - _PR"
+		pr.allocation[0].difference_account = "Exchange Gain/Loss - _TC"
 
 		self.assertEqual(pr.allocation[0].allocated_amount, 100)
 		self.assertEqual(pr.allocation[0].difference_amount, -500)
@@ -969,7 +844,7 @@ class TestPaymentReconciliation(ERPNextTestSuite):
 		pr.reconcile()
 		total_credit_amount = frappe.db.get_all(
 			"Journal Entry Account",
-			{"account": self.debtors_eur, "docstatus": 1, "reference_name": si.name},
+			{"account": self.debtors_usd, "docstatus": 1, "reference_name": si.name},
 			[{"SUM": "credit", "as": "amount"}],
 			group_by="reference_name",
 		)[0].amount
@@ -979,7 +854,7 @@ class TestPaymentReconciliation(ERPNextTestSuite):
 
 		jea_parent = frappe.db.get_all(
 			"Journal Entry Account",
-			filters={"account": self.debtors_eur, "docstatus": 1, "reference_name": si.name, "credit": 500},
+			filters={"account": self.debtors_usd, "docstatus": 1, "reference_name": si.name, "credit": 500},
 			fields=["parent"],
 		)[0]
 		self.assertEqual(
@@ -991,14 +866,14 @@ class TestPaymentReconciliation(ERPNextTestSuite):
 		si = self.create_sales_invoice(
 			qty=1, rate=100, posting_date=nowdate(), do_not_save=True, do_not_submit=True
 		)
-		si.customer = self.customer4
-		si.currency = "EUR"
+		si.customer = self.customer_usd
+		si.currency = "USD"
 		si.conversion_rate = 85
-		si.debit_to = self.debtors_eur
+		si.debit_to = self.debtors_usd
 		si.save().submit()
 
 		# Make payment using Journal Entry
-		je1 = self.create_journal_entry("HDFC - _PR", self.debtors_eur, 100, nowdate())
+		je1 = self.create_journal_entry("HDFC - _TC", self.debtors_usd, 100, nowdate())
 		je1.multi_currency = 1
 		je1.accounts[0].exchange_rate = 1
 		je1.accounts[0].credit_in_account_currency = -8000
@@ -1006,7 +881,7 @@ class TestPaymentReconciliation(ERPNextTestSuite):
 		je1.accounts[0].debit_in_account_currency = 0
 		je1.accounts[0].debit = 0
 		je1.accounts[1].party_type = "Customer"
-		je1.accounts[1].party = self.customer4
+		je1.accounts[1].party = self.customer_usd
 		je1.accounts[1].exchange_rate = 80
 		je1.accounts[1].credit_in_account_currency = 100
 		je1.accounts[1].credit = 8000
@@ -1015,7 +890,7 @@ class TestPaymentReconciliation(ERPNextTestSuite):
 		je1.save()
 		je1.submit()
 
-		je2 = self.create_journal_entry("HDFC - _PR", self.debtors_eur, 200, nowdate())
+		je2 = self.create_journal_entry("HDFC - _TC", self.debtors_usd, 200, nowdate())
 		je2.multi_currency = 1
 		je2.accounts[0].exchange_rate = 1
 		je2.accounts[0].credit_in_account_currency = -16000
@@ -1023,7 +898,7 @@ class TestPaymentReconciliation(ERPNextTestSuite):
 		je2.accounts[0].debit_in_account_currency = 0
 		je2.accounts[0].debit = 0
 		je2.accounts[1].party_type = "Customer"
-		je2.accounts[1].party = self.customer4
+		je2.accounts[1].party = self.customer_usd
 		je2.accounts[1].exchange_rate = 80
 		je2.accounts[1].credit_in_account_currency = 200
 		je1.accounts[1].credit = 16000
@@ -1033,8 +908,8 @@ class TestPaymentReconciliation(ERPNextTestSuite):
 		je2.submit()
 
 		pr = self.create_payment_reconciliation()
-		pr.party = self.customer4
-		pr.receivable_payable_account = self.debtors_eur
+		pr.party = self.customer_usd
+		pr.receivable_payable_account = self.debtors_usd
 		pr.get_unreconciled_entries()
 
 		self.assertEqual(len(pr.invoices), 1)
@@ -1054,7 +929,7 @@ class TestPaymentReconciliation(ERPNextTestSuite):
 		invoices = [x.as_dict() for x in pr.invoices]
 		payments = [pr.payments[1].as_dict()]
 		pr.allocate_entries(frappe._dict({"invoices": invoices, "payments": payments}))
-		pr.allocation[0].difference_account = "Exchange Gain/Loss - _PR"
+		pr.allocation[0].difference_account = "Exchange Gain/Loss - _TC"
 
 		self.assertEqual(pr.allocation[0].allocated_amount, 100)
 		self.assertEqual(pr.allocation[0].difference_amount, -500)
@@ -1063,7 +938,7 @@ class TestPaymentReconciliation(ERPNextTestSuite):
 		pr.reconcile()
 		total_credit_amount = frappe.db.get_all(
 			"Journal Entry Account",
-			{"account": self.debtors_eur, "docstatus": 1, "reference_name": si.name},
+			{"account": self.debtors_usd, "docstatus": 1, "reference_name": si.name},
 			[{"SUM": "credit", "as": "amount"}],
 			group_by="reference_name",
 		)[0].amount
@@ -1073,7 +948,7 @@ class TestPaymentReconciliation(ERPNextTestSuite):
 
 		jea_parent = frappe.db.get_all(
 			"Journal Entry Account",
-			filters={"account": self.debtors_eur, "docstatus": 1, "reference_name": si.name, "credit": 500},
+			filters={"account": self.debtors_usd, "docstatus": 1, "reference_name": si.name, "credit": 500},
 			fields=["parent"],
 		)[0]
 		self.assertEqual(
@@ -1085,10 +960,10 @@ class TestPaymentReconciliation(ERPNextTestSuite):
 		si = self.create_sales_invoice(
 			qty=1, rate=100, posting_date=nowdate(), do_not_save=True, do_not_submit=True
 		)
-		si.customer = self.customer5
-		si.currency = "EUR"
+		si.customer = self.customer_usd
+		si.currency = "USD"
 		si.conversion_rate = 85
-		si.debit_to = self.debtors_eur
+		si.debit_to = self.debtors_usd
 		si.save().submit()
 
 		# Make payment using Payment Entry
@@ -1096,8 +971,8 @@ class TestPaymentReconciliation(ERPNextTestSuite):
 			company=self.company,
 			payment_type="Receive",
 			party_type="Customer",
-			party=self.customer5,
-			paid_from=self.debtors_eur,
+			party=self.customer_usd,
+			paid_from=self.debtors_usd,
 			paid_to=self.bank,
 			paid_amount=100,
 		)
@@ -1111,8 +986,8 @@ class TestPaymentReconciliation(ERPNextTestSuite):
 			company=self.company,
 			payment_type="Receive",
 			party_type="Customer",
-			party=self.customer5,
-			paid_from=self.debtors_eur,
+			party=self.customer_usd,
+			paid_from=self.debtors_usd,
 			paid_to=self.bank,
 			paid_amount=200,
 		)
@@ -1123,8 +998,8 @@ class TestPaymentReconciliation(ERPNextTestSuite):
 		pe2.submit()
 
 		pr = self.create_payment_reconciliation()
-		pr.party = self.customer5
-		pr.receivable_payable_account = self.debtors_eur
+		pr.party = self.customer_usd
+		pr.receivable_payable_account = self.debtors_usd
 		pr.get_unreconciled_entries()
 
 		self.assertEqual(len(pr.invoices), 1)
@@ -1152,14 +1027,14 @@ class TestPaymentReconciliation(ERPNextTestSuite):
 		"""
 
 		si = self.create_sales_invoice(qty=1, rate=100, do_not_submit=True)
-		si.cost_center = self.main_cc.name
+		si.cost_center = self.main_cc
 		si.submit()
 		pr = get_payment_entry(si.doctype, si.name)
-		pr.cost_center = self.sub_cc.name
+		pr.cost_center = self.sub_cc
 		pr = pr.save().submit()
 
 		pr = self.create_payment_reconciliation()
-		pr.cost_center = self.main_cc.name
+		pr.cost_center = self.main_cc
 
 		pr.get_unreconciled_entries()
 
@@ -1176,38 +1051,38 @@ class TestPaymentReconciliation(ERPNextTestSuite):
 
 		# 'Main - PR' Cost Center
 		si1 = self.create_sales_invoice(qty=1, rate=rate, posting_date=transaction_date, do_not_submit=True)
-		si1.cost_center = self.main_cc.name
+		si1.cost_center = self.main_cc
 		si1.submit()
 
 		pe1 = self.create_payment_entry(posting_date=transaction_date, amount=rate)
-		pe1.cost_center = self.main_cc.name
+		pe1.cost_center = self.main_cc
 		pe1 = pe1.save().submit()
 
 		je1 = self.create_journal_entry(self.bank, self.debit_to, 100, transaction_date)
-		je1.accounts[0].cost_center = self.main_cc.name
-		je1.accounts[1].cost_center = self.main_cc.name
+		je1.accounts[0].cost_center = self.main_cc
+		je1.accounts[1].cost_center = self.main_cc
 		je1.accounts[1].party_type = "Customer"
 		je1.accounts[1].party = self.customer
 		je1 = je1.save().submit()
 
 		# 'Sub - PR' Cost Center
 		si2 = self.create_sales_invoice(qty=1, rate=rate, posting_date=transaction_date, do_not_submit=True)
-		si2.cost_center = self.sub_cc.name
+		si2.cost_center = self.sub_cc
 		si2.submit()
 
 		pe2 = self.create_payment_entry(posting_date=transaction_date, amount=rate)
-		pe2.cost_center = self.sub_cc.name
+		pe2.cost_center = self.sub_cc
 		pe2 = pe2.save().submit()
 
 		je2 = self.create_journal_entry(self.bank, self.debit_to, 100, transaction_date)
-		je2.accounts[0].cost_center = self.sub_cc.name
-		je2.accounts[1].cost_center = self.sub_cc.name
+		je2.accounts[0].cost_center = self.sub_cc
+		je2.accounts[1].cost_center = self.sub_cc
 		je2.accounts[1].party_type = "Customer"
 		je2.accounts[1].party = self.customer
 		je2 = je2.save().submit()
 
 		pr = self.create_payment_reconciliation()
-		pr.cost_center = self.main_cc.name
+		pr.cost_center = self.main_cc
 
 		pr.get_unreconciled_entries()
 
@@ -1219,7 +1094,7 @@ class TestPaymentReconciliation(ERPNextTestSuite):
 		self.assertCountEqual(payment_vouchers, [pe1.name, je1.name])
 
 		# Change cost center
-		pr.cost_center = self.sub_cc.name
+		pr.cost_center = self.sub_cc
 
 		pr.get_unreconciled_entries()
 
@@ -1242,7 +1117,7 @@ class TestPaymentReconciliation(ERPNextTestSuite):
 			qty=1, rate=1, posting_date=nowdate(), do_not_save=True, do_not_submit=True
 		)
 		si.customer = self.customer
-		si.currency = "EUR"
+		si.currency = "USD"
 		si.conversion_rate = 85
 		si.debit_to = self.debit_to
 		si.save().submit()
@@ -1624,7 +1499,7 @@ class TestPaymentReconciliation(ERPNextTestSuite):
 				"credit": 0.0,
 			},
 			{
-				"account": "Cash - _PR",
+				"account": "Cash - _TC",
 				"voucher_no": pe.name,
 				"against_voucher": None,
 				"debit": 0.0,
@@ -1782,10 +1657,10 @@ class TestPaymentReconciliation(ERPNextTestSuite):
 		)
 		amount = 200.0
 		je = self.create_journal_entry(self.debit_to, self.bank, amount)
-		je.accounts[0].cost_center = self.main_cc.name
+		je.accounts[0].cost_center = self.main_cc
 		je.accounts[0].party_type = "Customer"
 		je.accounts[0].party = self.customer
-		je.accounts[1].cost_center = self.main_cc.name
+		je.accounts[1].cost_center = self.main_cc
 		je = je.save().submit()
 
 		pe = self.create_payment_entry(amount=amount).save().submit()
@@ -1879,7 +1754,7 @@ class TestPaymentReconciliation(ERPNextTestSuite):
 		self.assertEqual(pl_entries, expected_ple)
 
 	def test_advance_payment_reconciliation_against_journal_for_supplier(self):
-		self.supplier = make_supplier("_Test Supplier")
+		self.supplier = "_Test Supplier"
 		frappe.db.set_value(
 			"Company",
 			self.company,
@@ -1891,10 +1766,10 @@ class TestPaymentReconciliation(ERPNextTestSuite):
 		)
 		amount = 200.0
 		je = self.create_journal_entry(self.creditors, self.bank, -amount)
-		je.accounts[0].cost_center = self.main_cc.name
+		je.accounts[0].cost_center = self.main_cc
 		je.accounts[0].party_type = "Supplier"
 		je.accounts[0].party = self.supplier
-		je.accounts[1].cost_center = self.main_cc.name
+		je.accounts[1].cost_center = self.main_cc
 		je = je.save().submit()
 
 		pe = self.create_payment_entry(amount=amount)
@@ -2062,13 +1937,13 @@ class TestPaymentReconciliation(ERPNextTestSuite):
 				},
 				{
 					"account": self.bank,
-					"cost_center": self.sub_cc.name,
+					"cost_center": self.sub_cc,
 					"credit_in_account_currency": 0,
 					"debit_in_account_currency": 500,
 				},
 				{
 					"account": self.cash,
-					"cost_center": self.sub_cc.name,
+					"cost_center": self.sub_cc,
 					"credit_in_account_currency": 0,
 					"debit_in_account_currency": 500,
 				},
@@ -2337,7 +2212,7 @@ class TestPaymentReconciliation(ERPNextTestSuite):
 
 	def test_foreign_currency_reverse_payment_entry_against_payment_entry_for_customer(self):
 		transaction_date = nowdate()
-		customer = self.customer3
+		customer = self.customer_usd
 		amount = 1000
 		exchange_rate_at_payment = 100
 		exchange_rate_at_reverse_payment = 95
@@ -2345,8 +2220,8 @@ class TestPaymentReconciliation(ERPNextTestSuite):
 		# Receive amount from customer - 1,00,000
 		pe = self.create_payment_entry(amount=amount, posting_date=transaction_date, customer=customer)
 		pe.payment_type = "Receive"
-		pe.paid_from = self.debtors_eur
-		pe.paid_from_account_currency = "EUR"
+		pe.paid_from = self.debtors_usd
+		pe.paid_from_account_currency = "USD"
 		pe.source_exchange_rate = exchange_rate_at_payment
 		pe.paid_amount = amount
 		pe.received_amount = exchange_rate_at_payment * amount
@@ -2364,14 +2239,14 @@ class TestPaymentReconciliation(ERPNextTestSuite):
 		reverse_pe.target_exchange_rate = exchange_rate_at_reverse_payment
 		reverse_pe.paid_amount = exchange_rate_at_reverse_payment * amount
 		reverse_pe.received_amount = amount
-		reverse_pe.paid_to = self.debtors_eur
-		reverse_pe.paid_to_account_currency = "EUR"
+		reverse_pe.paid_to = self.debtors_usd
+		reverse_pe.paid_to_account_currency = "USD"
 		reverse_pe.save().submit()
 
 		# Reconcile payments
 		pr = self.create_payment_reconciliation()
 		pr.party = customer
-		pr.receivable_payable_account = self.debtors_eur
+		pr.receivable_payable_account = self.debtors_usd
 		pr.get_unreconciled_entries()
 		invoices = [invoice.as_dict() for invoice in pr.invoices]
 		payments = [payment.as_dict() for payment in pr.payments]
@@ -2436,13 +2311,13 @@ class TestPaymentReconciliation(ERPNextTestSuite):
 
 	def test_foreign_currency_reverse_journal_entry_against_journal_entry_for_customer(self):
 		transaction_date = nowdate()
-		customer = self.customer3
+		customer = self.customer_usd
 		amount = 1000
 		exchange_rate_at_payment = 95
 		exchange_rate_at_reverse_payment = 100
 
 		# Receive amount from customer - 95,000
-		je1 = self.create_journal_entry(self.cash, self.debtors_eur, amount, transaction_date)
+		je1 = self.create_journal_entry(self.cash, self.debtors_usd, amount, transaction_date)
 		je1.multi_currency = 1
 		je1.accounts[0].exchange_rate = 1
 		je1.accounts[0].debit_in_account_currency = exchange_rate_at_payment * amount
@@ -2456,7 +2331,7 @@ class TestPaymentReconciliation(ERPNextTestSuite):
 		je1.submit()
 
 		# Pay amount to customer - 1,00,000
-		je2 = self.create_journal_entry(self.debtors_eur, self.cash, amount, transaction_date)
+		je2 = self.create_journal_entry(self.debtors_usd, self.cash, amount, transaction_date)
 		je2.multi_currency = 1
 		je2.accounts[0].party_type = "Customer"
 		je2.accounts[0].party = customer
@@ -2472,7 +2347,7 @@ class TestPaymentReconciliation(ERPNextTestSuite):
 		# Reconcile payments
 		pr = self.create_payment_reconciliation()
 		pr.party = customer
-		pr.receivable_payable_account = self.debtors_eur
+		pr.receivable_payable_account = self.debtors_usd
 		pr.get_unreconciled_entries()
 
 		self.assertEqual(len(pr.invoices), 1)
@@ -2540,34 +2415,6 @@ class TestPaymentReconciliation(ERPNextTestSuite):
 		pr.reconcile()
 
 
-def make_customer(customer_name, currency=None):
-	if not frappe.db.exists("Customer", customer_name):
-		customer = frappe.new_doc("Customer")
-		customer.customer_name = customer_name
-		customer.type = "Individual"
-
-		if currency:
-			customer.default_currency = currency
-		customer.save()
-		return customer.name
-	else:
-		return customer_name
-
-
-def make_supplier(supplier_name, currency=None):
-	if not frappe.db.exists("Supplier", supplier_name):
-		supplier = frappe.new_doc("Supplier")
-		supplier.supplier_name = supplier_name
-		supplier.type = "Individual"
-
-		if currency:
-			supplier.default_currency = currency
-		supplier.save()
-		return supplier.name
-	else:
-		return supplier_name
-
-
 def create_fiscal_year(company, year_start_date, year_end_date):
 	fy_docname = frappe.db.exists(
 		"Fiscal Year", {"year_start_date": year_start_date, "year_end_date": year_end_date}

erpnext/accounts/doctype/payment_request/payment_request.json

@@ -183,7 +183,7 @@
    "depends_on": "eval:doc.is_a_subscription",
    "fieldname": "subscription_section",
    "fieldtype": "Section Break",
-   "label": "Subscription Section"
+   "label": "Subscription"
   },
   {
    "fieldname": "subscription_plans",
@@ -478,7 +478,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2026-01-13 12:53:00.963274",
+ "modified": "2026-02-27 19:11:03.308896",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Request",

erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.js

@@ -46,8 +46,8 @@ frappe.ui.form.on("Period Closing Voucher", {
 				function () {
 					frappe.route_options = {
 						voucher_no: frm.doc.name,
-						from_date: frm.doc.posting_date,
-						to_date: moment(frm.doc.modified).format("YYYY-MM-DD"),
+						from_date: frm.doc.period_start_date,
+						to_date: frm.doc.period_end_date,
 						company: frm.doc.company,
 						categorize_by: "",
 						show_cancelled_entries: frm.doc.docstatus === 2,

erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py

@@ -8,6 +8,7 @@ from frappe.utils import today
 from erpnext.accounts.doctype.finance_book.test_finance_book import create_finance_book
 from erpnext.accounts.doctype.journal_entry.test_journal_entry import make_journal_entry
 from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
+from erpnext.accounts.general_ledger import make_reverse_gl_entries
 from erpnext.accounts.utils import get_fiscal_year
 from erpnext.tests.utils import ERPNextTestSuite
 
@@ -18,9 +19,6 @@ class TestPeriodClosingVoucher(ERPNextTestSuite):
 		frappe.db.set_single_value("Accounts Settings", "use_legacy_controller_for_pcv", 1)
 
 	def test_closing_entry(self):
-		frappe.db.sql("delete from `tabGL Entry` where company='Test PCV Company'")
-		frappe.db.sql("delete from `tabPeriod Closing Voucher` where company='Test PCV Company'")
-
 		company = create_company()
 		cost_center = create_cost_center("Test Cost Center 1")
 
@@ -70,9 +68,6 @@ class TestPeriodClosingVoucher(ERPNextTestSuite):
 		self.assertEqual(pcv_gle, expected_gle)
 
 	def test_cost_center_wise_posting(self):
-		frappe.db.sql("delete from `tabGL Entry` where company='Test PCV Company'")
-		frappe.db.sql("delete from `tabPeriod Closing Voucher` where company='Test PCV Company'")
-
 		company = create_company()
 		surplus_account = create_account()
 
@@ -136,9 +131,6 @@ class TestPeriodClosingVoucher(ERPNextTestSuite):
 		)
 
 	def test_period_closing_with_finance_book_entries(self):
-		frappe.db.sql("delete from `tabGL Entry` where company='Test PCV Company'")
-		frappe.db.sql("delete from `tabPeriod Closing Voucher` where company='Test PCV Company'")
-
 		company = create_company()
 		surplus_account = create_account()
 		cost_center = create_cost_center("Test Cost Center 1")
@@ -190,9 +182,6 @@ class TestPeriodClosingVoucher(ERPNextTestSuite):
 		self.assertSequenceEqual(pcv_gle, expected_gle)
 
 	def test_gl_entries_restrictions(self):
-		frappe.db.sql("delete from `tabGL Entry` where company='Test PCV Company'")
-		frappe.db.sql("delete from `tabPeriod Closing Voucher` where company='Test PCV Company'")
-
 		company = create_company()
 		cost_center = create_cost_center("Test Cost Center 1")
 
@@ -213,10 +202,6 @@ class TestPeriodClosingVoucher(ERPNextTestSuite):
 		self.assertRaises(frappe.ValidationError, jv1.submit)
 
 	def test_closing_balance_with_dimensions_and_test_reposting_entry(self):
-		frappe.db.sql("delete from `tabGL Entry` where company='Test PCV Company'")
-		frappe.db.sql("delete from `tabPeriod Closing Voucher` where company='Test PCV Company'")
-		frappe.db.sql("delete from `tabAccount Closing Balance` where company='Test PCV Company'")
-
 		company = create_company()
 		cost_center1 = create_cost_center("Test Cost Center 1")
 		cost_center2 = create_cost_center("Test Cost Center 2")
@@ -350,6 +335,48 @@ class TestPeriodClosingVoucher(ERPNextTestSuite):
 
 		return pcv
 
+	@ERPNextTestSuite.change_settings(
+		"Accounts Settings",
+		{"enable_immutable_ledger": 1},
+	)
+	def test_immutable_ledger_reverse_entry_uses_passed_posting_date_after_pcv(self):
+		company = create_company()
+		cost_center = create_cost_center("Test Cost Center 1")
+
+		jv = make_journal_entry(
+			posting_date="2021-03-15",
+			amount=400,
+			account1="Cash - TPC",
+			account2="Sales - TPC",
+			cost_center=cost_center,
+			company=company,
+			save=False,
+		)
+		jv.company = company
+		jv.save()
+		jv.submit()
+
+		self.make_period_closing_voucher(posting_date="2021-03-31")
+
+		# Passed posting_date is after PCV end date, so cancellation should not fail.
+		make_reverse_gl_entries(
+			voucher_type="Journal Entry",
+			voucher_no=jv.name,
+			posting_date="2022-01-01",
+		)
+
+		totals_after_cancel = frappe.db.sql(
+			"""
+				select sum(debit) as total_debit, sum(credit) as total_credit
+				from `tabGL Entry`
+				where voucher_type=%s and voucher_no=%s and is_cancelled=0
+			""",
+			("Journal Entry", jv.name),
+			as_dict=True,
+		)[0]
+
+		self.assertEqual(totals_after_cancel.total_debit, totals_after_cancel.total_credit)
+
 
 def create_company():
 	company = frappe.get_doc(

erpnext/accounts/doctype/pos_closing_entry/test_pos_closing_entry.py

@@ -201,7 +201,6 @@ class TestPOSClosingEntry(ERPNextTestSuite):
 		)
 		from erpnext.stock.doctype.batch.batch import get_batch_qty
 
-		frappe.db.sql("delete from `tabPOS Invoice`")
 		item_doc = make_item(
 			"_Test Item With Batch FOR POS Merge Test",
 			properties={

erpnext/accounts/doctype/pos_invoice/pos_invoice.json

@@ -26,6 +26,8 @@
   "due_date",
   "amended_from",
   "return_against",
+  "section_break_abck",
+  "title",
   "accounting_dimensions_section",
   "project",
   "dimension_col_break",
@@ -187,7 +189,7 @@
   "subscription_section",
   "from_date",
   "to_date",
-  "column_break_140",
+  "auto_repeat_section",
   "auto_repeat",
   "update_auto_repeat_reference",
   "against_income_account"
@@ -662,6 +664,7 @@
    "fieldname": "total_billing_amount",
    "fieldtype": "Currency",
    "label": "Total Billing Amount",
+   "options": "currency",
    "print_hide": 1,
    "read_only": 1
   },
@@ -1462,7 +1465,7 @@
   {
    "fieldname": "subscription_section",
    "fieldtype": "Section Break",
-   "label": "Subscription Section"
+   "label": "Subscription"
   },
   {
    "allow_on_submit": 1,
@@ -1480,10 +1483,6 @@
    "no_copy": 1,
    "print_hide": 1
   },
-  {
-   "fieldname": "column_break_140",
-   "fieldtype": "Column Break"
-  },
   {
    "allow_on_submit": 1,
    "fieldname": "auto_repeat",
@@ -1533,6 +1532,7 @@
    "fieldname": "amount_eligible_for_commission",
    "fieldtype": "Currency",
    "label": "Amount Eligible for Commission",
+   "options": "Company:company:default_currency",
    "read_only": 1
   },
   {
@@ -1619,12 +1619,29 @@
   {
    "fieldname": "column_break_bhao",
    "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "auto_repeat_section",
+   "fieldtype": "Section Break",
+   "label": "Auto Repeat"
+  },
+  {
+   "fieldname": "section_break_abck",
+   "fieldtype": "Section Break"
+  },
+  {
+   "allow_on_submit": 1,
+   "fieldname": "title",
+   "fieldtype": "Data",
+   "label": "Title",
+   "no_copy": 1,
+   "print_hide": 1
   }
  ],
  "icon": "fa fa-file-text",
  "is_submittable": 1,
  "links": [],
- "modified": "2026-02-10 14:23:07.181782",
+ "modified": "2026-05-01 02:37:30.580568",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "POS Invoice",

erpnext/accounts/doctype/pos_invoice/pos_invoice.py

@@ -172,6 +172,7 @@ class POSInvoice(SalesInvoice):
 		terms: DF.TextEditor | None
 		territory: DF.Link | None
 		timesheets: DF.Table[SalesInvoiceTimesheet]
+		title: DF.Data | None
 		to_date: DF.Date | None
 		total: DF.Currency
 		total_advance: DF.Currency

erpnext/accounts/doctype/pos_invoice/test_pos_invoice.py

@@ -37,7 +37,6 @@ class POSInvoiceTestMixin(ERPNextTestSuite):
 		frappe.db.set_single_value("Selling Settings", "validate_selling_price", 0)
 		frappe.db.set_single_value("POS Settings", "invoice_type", "POS Invoice")
 		make_stock_entry(target="_Test Warehouse - _TC", item_code="_Test Item", qty=800, basic_rate=100)
-		frappe.db.sql("delete from `tabTax Rule`")
 
 		mode_of_payment = frappe.get_doc("Mode of Payment", "Bank Draft")
 		set_default_account_for_mode_of_payment(mode_of_payment, "_Test Company", "_Test Bank - _TC")

erpnext/accounts/doctype/pos_invoice/test_pos_invoice_merge.py

@@ -34,7 +34,6 @@ class TestPOSInvoiceMerging(POSInvoiceTestMixin):
 			consolidate_pos_invoices,
 		)
 
-		frappe.db.sql("delete from `tabPOS Invoice`")
 		test_user, pos_profile = init_user_and_profile()
 		pos_inv = create_pos_invoice(rate=300, additional_discount_percentage=10, do_not_submit=1)
 		pos_inv.append("payments", {"mode_of_payment": "Cash", "amount": 270})
@@ -64,7 +63,6 @@ class TestPOSInvoiceMerging(POSInvoiceTestMixin):
 			consolidate_pos_invoices,
 		)
 
-		frappe.db.sql("delete from `tabPOS Invoice`")
 		test_user, pos_profile = init_user_and_profile()
 		pos_inv = create_pos_invoice(rate=300, do_not_submit=1)
 		pos_inv.append("payments", {"mode_of_payment": "Cash", "amount": 300})
@@ -123,7 +121,7 @@ class TestPOSInvoiceMerging(POSInvoiceTestMixin):
 		item = "Test Selling Price Validation"
 		make_item(item, {"is_stock_item": 1})
 		make_purchase_receipt(item_code=item, warehouse="_Test Warehouse - _TC", qty=1, rate=300)
-		frappe.db.sql("delete from `tabPOS Invoice`")
+
 		test_user, pos_profile = init_user_and_profile()
 		pos_inv = create_pos_invoice(item=item, rate=300, do_not_submit=1)
 		pos_inv.append("payments", {"mode_of_payment": "Cash", "amount": 300})

erpnext/accounts/doctype/pos_profile/pos_profile.json

@@ -13,52 +13,69 @@
   "column_break_9",
   "warehouse",
   "company_address",
-  "section_break_15",
-  "applicable_for_users",
+  "accounting_tab",
   "section_break_11",
   "payments",
+  "set_grand_total_to_default_mop",
+  "price_list_and_currency_section",
+  "currency",
+  "column_break_bptt",
+  "selling_price_list",
+  "write_off_section",
+  "write_off_account",
+  "column_break_ukpz",
+  "write_off_cost_center",
+  "column_break_pkca",
+  "write_off_limit",
+  "income_and_expense_account",
+  "income_account",
+  "column_break_byzk",
+  "expense_account",
+  "taxes_section",
+  "taxes_and_charges",
+  "column_break_cjpp",
+  "tax_category",
+  "section_break_19",
+  "account_for_change_amount",
+  "disable_rounded_total",
+  "column_break_23",
+  "apply_discount_on",
+  "allow_partial_payment",
+  "accounting_dimensions_section",
+  "cost_center",
+  "dimension_col_break",
+  "project",
+  "pos_configurations_tab",
   "section_break_14",
-  "hide_images",
-  "hide_unavailable_items",
-  "auto_add_item_to_cart",
-  "validate_stock_on_save",
-  "print_receipt_on_order_complete",
   "action_on_new_invoice",
+  "validate_stock_on_save",
   "column_break_16",
   "update_stock",
   "ignore_pricing_rule",
+  "print_receipt_on_order_complete",
+  "pos_item_selector_section",
+  "hide_images",
+  "column_break_rpny",
+  "hide_unavailable_items",
+  "column_break_stcl",
+  "auto_add_item_to_cart",
+  "pos_item_details_section",
   "allow_rate_change",
+  "column_break_hwfg",
   "allow_discount_change",
-  "set_grand_total_to_default_mop",
-  "allow_partial_payment",
+  "section_break_15",
+  "applicable_for_users",
   "section_break_23",
   "item_groups",
   "column_break_25",
   "customer_groups",
+  "more_info_tab",
   "section_break_16",
   "print_format",
   "letter_head",
   "column_break0",
   "tc_name",
   "select_print_heading",
-  "section_break_19",
-  "selling_price_list",
-  "currency",
-  "write_off_account",
-  "write_off_cost_center",
-  "write_off_limit",
-  "account_for_change_amount",
-  "disable_rounded_total",
-  "column_break_23",
-  "income_account",
-  "expense_account",
-  "taxes_and_charges",
-  "tax_category",
-  "apply_discount_on",
-  "accounting_dimensions_section",
-  "cost_center",
-  "dimension_col_break",
-  "project",
   "utm_analytics_section",
   "utm_source",
   "column_break_tvls",
@@ -133,8 +150,7 @@
   },
   {
    "fieldname": "section_break_14",
-   "fieldtype": "Section Break",
-   "label": "Configuration"
+   "fieldtype": "Section Break"
   },
   {
    "description": "Only show Items from these Item Groups",
@@ -155,6 +171,7 @@
    "options": "POS Customer Group"
   },
   {
+   "collapsible": 1,
    "fieldname": "section_break_16",
    "fieldtype": "Section Break",
    "label": "Print Settings"
@@ -194,7 +211,7 @@
   {
    "fieldname": "section_break_19",
    "fieldtype": "Section Break",
-   "label": "Accounting"
+   "label": "Miscellaneous"
   },
   {
    "fieldname": "selling_price_list",
@@ -430,6 +447,7 @@
   },
   {
    "default": "0",
+   "description": "Applicable on POS Invoice",
    "fieldname": "allow_partial_payment",
    "fieldtype": "Check",
    "label": "Allow Partial Payment"
@@ -447,6 +465,83 @@
    "fieldname": "utm_analytics_section",
    "fieldtype": "Section Break",
    "label": "Campaign"
+  },
+  {
+   "fieldname": "accounting_tab",
+   "fieldtype": "Tab Break",
+   "label": "Accounting"
+  },
+  {
+   "fieldname": "more_info_tab",
+   "fieldtype": "Tab Break",
+   "label": "More Info"
+  },
+  {
+   "fieldname": "pos_configurations_tab",
+   "fieldtype": "Tab Break",
+   "label": "POS Configurations"
+  },
+  {
+   "fieldname": "price_list_and_currency_section",
+   "fieldtype": "Section Break",
+   "label": "Price List & Currency"
+  },
+  {
+   "fieldname": "column_break_bptt",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "write_off_section",
+   "fieldtype": "Section Break",
+   "label": "Write Off"
+  },
+  {
+   "fieldname": "column_break_ukpz",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "column_break_pkca",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "income_and_expense_account",
+   "fieldtype": "Section Break",
+   "label": "Income and Expense"
+  },
+  {
+   "fieldname": "column_break_byzk",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "taxes_section",
+   "fieldtype": "Section Break",
+   "label": "Taxes"
+  },
+  {
+   "fieldname": "column_break_cjpp",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "pos_item_selector_section",
+   "fieldtype": "Section Break",
+   "label": "POS Item Selector"
+  },
+  {
+   "fieldname": "column_break_rpny",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "column_break_stcl",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "pos_item_details_section",
+   "fieldtype": "Section Break",
+   "label": "POS Item Details"
+  },
+  {
+   "fieldname": "column_break_hwfg",
+   "fieldtype": "Column Break"
   }
  ],
  "grid_page_length": 50,
@@ -475,7 +570,7 @@
    "link_fieldname": "pos_profile"
   }
  ],
- "modified": "2026-02-10 14:24:48.597412",
+ "modified": "2026-05-26 12:07:48.597412",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "POS Profile",

erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py

@@ -17,7 +17,6 @@ from erpnext.tests.utils import ERPNextTestSuite
 
 class TestPricingRule(ERPNextTestSuite):
 	def setUp(self):
-		delete_existing_pricing_rules()
 		setup_pricing_rule_data()
 		self.enterClassContext(self.change_settings("Selling Settings", validate_selling_price=0))
 
@@ -1586,16 +1585,6 @@ def setup_pricing_rule_data():
 		).insert()
 
 
-def delete_existing_pricing_rules():
-	for doctype in [
-		"Pricing Rule",
-		"Pricing Rule Item Code",
-		"Pricing Rule Item Group",
-		"Pricing Rule Brand",
-	]:
-		frappe.db.sql(f"delete from `tab{doctype}`")
-
-
 def make_item_price(item, price_list_name, item_price):
 	frappe.get_doc(
 		{

erpnext/accounts/doctype/process_period_closing_voucher/process_period_closing_voucher.py

@@ -72,8 +72,8 @@ class ProcessPeriodClosingVoucher(Document):
 		pcv = frappe.get_doc("Period Closing Voucher", self.parent_pcv)
 		if pcv.is_first_period_closing_voucher():
 			gl = qb.DocType("GL Entry")
-			min = qb.from_(gl).select(Min(gl.posting_date)).where(gl.company.eq(pcv.company)).run()[0][0]
-			max = qb.from_(gl).select(Max(gl.posting_date)).where(gl.company.eq(pcv.company)).run()[0][0]
+			min = qb.from_(gl).select(Min(gl.posting_date)).run()[0][0]
+			max = qb.from_(gl).select(Max(gl.posting_date)).run()[0][0]
 
 			dates = self.get_dates(get_datetime(min), get_datetime(max))
 			for x in dates:
@@ -93,12 +93,16 @@ class ProcessPeriodClosingVoucher(Document):
 def start_pcv_processing(docname: str):
 	if frappe.db.get_value("Process Period Closing Voucher", docname, "status") in ["Queued", "Running"]:
 		frappe.db.set_value("Process Period Closing Voucher", docname, "status", "Running")
-		if normal_balances := frappe.db.get_all(
-			"Process Period Closing Voucher Detail",
-			filters={"parent": docname, "status": "Queued"},
-			fields=["processing_date", "report_type", "parentfield"],
-			order_by="parentfield, idx, processing_date",
-			limit=4,
+
+		ppcvd = qb.DocType("Process Period Closing Voucher Detail")
+		if normal_balances := (
+			qb.from_(ppcvd)
+			.select(ppcvd.processing_date, ppcvd.report_type, ppcvd.parentfield)
+			.where(ppcvd.parent.eq(docname) & ppcvd.status.eq("Queued"))
+			.orderby(ppcvd.parentfield, ppcvd.idx, ppcvd.processing_date)
+			.limit(4)
+			.for_update(skip_locked=True)
+			.run(as_dict=True)
 		):
 			if not is_scheduler_inactive():
 				for x in normal_balances:
@@ -133,9 +137,10 @@ def pause_pcv_processing(docname: str):
 	ppcv = qb.DocType("Process Period Closing Voucher")
 	qb.update(ppcv).set(ppcv.status, "Paused").where(ppcv.name.eq(docname)).run()
 
+	# If a date is stuck in 'Running' state, this will allow it to procced.
 	if queued_dates := frappe.db.get_all(
 		"Process Period Closing Voucher Detail",
-		filters={"parent": docname, "status": "Queued"},
+		filters={"parent": docname, "status": ["in", ["Queued", "Running"]]},
 		pluck="name",
 	):
 		ppcvd = qb.DocType("Process Period Closing Voucher Detail")
@@ -169,6 +174,9 @@ def resume_pcv_processing(docname: str):
 		ppcvd = qb.DocType("Process Period Closing Voucher Detail")
 		qb.update(ppcvd).set(ppcvd.status, "Queued").where(ppcvd.name.isin(paused_dates)).run()
 		start_pcv_processing(docname)
+	else:
+		# If a parent doc is stuck in 'Running' state, will allow it to proceed.
+		schedule_next_date(docname)
 
 
 def update_default_dimensions(dimension_fields, gl_entry, dimension_values):
@@ -238,12 +246,15 @@ def get_gle_for_closing_account(pcv, dimension_balance, dimensions):
 
 @frappe.whitelist()
 def schedule_next_date(docname: str):
-	if to_process := frappe.db.get_all(
-		"Process Period Closing Voucher Detail",
-		filters={"parent": docname, "status": "Queued"},
-		fields=["processing_date", "report_type", "parentfield"],
-		order_by="parentfield, idx, processing_date",
-		limit=1,
+	ppcvd = qb.DocType("Process Period Closing Voucher Detail")
+	if to_process := (
+		qb.from_(ppcvd)
+		.select(ppcvd.processing_date, ppcvd.report_type, ppcvd.parentfield)
+		.where(ppcvd.parent.eq(docname) & ppcvd.status.eq("Queued"))
+		.orderby(ppcvd.parentfield, ppcvd.idx, ppcvd.processing_date)
+		.limit(1)
+		.for_update(skip_locked=True)
+		.run(as_dict=True)
 	):
 		if not is_scheduler_inactive():
 			frappe.db.set_value(
@@ -281,7 +292,21 @@ def schedule_next_date(docname: str):
 		)
 		# Ensure both normal and opening balances are processed for all dates
 		if total_no_of_dates == completed:
-			summarize_and_post_ledger_entries(docname)
+			from erpnext.accounts.doctype.process_payment_reconciliation.process_payment_reconciliation import (
+				is_job_running,
+			)
+
+			job_name = f"summarize_{docname}"
+			if not is_job_running(job_name):
+				frappe.enqueue(
+					method="erpnext.accounts.doctype.process_period_closing_voucher.process_period_closing_voucher.summarize_and_post_ledger_entries",
+					queue="long",
+					timeout="3600",
+					is_async=True,
+					job_name=job_name,
+					enqueue_after_commit=True,
+					docname=docname,
+				)
 
 
 def make_dict_json_compliant(dimension_wise_balance) -> dict:

erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js

@@ -115,7 +115,12 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
 			}
 		}
 
-		if (doc.docstatus == 1 && doc.outstanding_amount != 0 && !doc.on_hold) {
+		if (
+			doc.docstatus == 1 &&
+			doc.outstanding_amount != 0 &&
+			!doc.on_hold &&
+			frappe.model.can_create("Payment Entry")
+		) {
 			this.frm.add_custom_button(__("Payment"), () => this.make_payment_entry(), __("Create"));
 			this.frm.page.set_inner_btn_group_as_primary(__("Create"));
 		}
@@ -130,7 +135,13 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
 			}
 		}
 
-		if (doc.docstatus == 1 && doc.outstanding_amount > 0 && !cint(doc.is_return) && !doc.on_hold) {
+		if (
+			doc.docstatus == 1 &&
+			doc.outstanding_amount > 0 &&
+			!cint(doc.is_return) &&
+			!doc.on_hold &&
+			frappe.boot.user.in_create.includes("Payment Request")
+		) {
 			this.frm.add_custom_button(
 				__("Payment Request"),
 				function () {
@@ -443,13 +454,14 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
 	}
 
 	items_add(doc, cdt, cdn) {
-		var row = frappe.get_doc(cdt, cdn);
-		this.frm.script_manager.copy_from_first_row("items", row, [
-			"expense_account",
-			"discount_account",
-			"cost_center",
-			"project",
-		]);
+		const row = frappe.get_doc(cdt, cdn);
+		const field_copy = ["expense_account", "discount_account", "cost_center"];
+		if (doc.project) {
+			frappe.model.set_value(cdt, cdn, "project", doc.project);
+		} else {
+			field_copy.push("project");
+		}
+		this.frm.script_manager.copy_from_first_row("items", row, field_copy);
 	}
 
 	on_submit() {
@@ -558,12 +570,6 @@ cur_frm.fields_dict["items"].grid.get_field("cost_center").get_query = function
 	};
 };
 
-cur_frm.fields_dict["items"].grid.get_field("project").get_query = function (doc, cdt, cdn) {
-	return {
-		filters: [["Project", "status", "not in", "Completed, Cancelled"]],
-	};
-};
-
 frappe.ui.form.on("Purchase Invoice", {
 	setup: function (frm) {
 		frm.custom_make_buttons = {

erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json

@@ -27,6 +27,8 @@
   "update_billed_amount_in_purchase_receipt",
   "apply_tds",
   "amended_from",
+  "section_break_hzux",
+  "title",
   "supplier_invoice_details",
   "bill_no",
   "column_break_15",
@@ -180,11 +182,12 @@
   "unrealized_profit_loss_account",
   "subscription_section",
   "subscription",
-  "auto_repeat",
-  "update_auto_repeat_reference",
   "column_break_114",
   "from_date",
   "to_date",
+  "automation_section",
+  "auto_repeat",
+  "update_auto_repeat_reference",
   "printing_settings",
   "letter_head",
   "group_same_items",
@@ -1675,6 +1678,24 @@
    "fieldname": "totals_section",
    "fieldtype": "Section Break",
    "label": "Totals"
+  },
+  {
+   "collapsible": 1,
+   "fieldname": "automation_section",
+   "fieldtype": "Section Break",
+   "label": "Automation"
+  },
+  {
+   "fieldname": "section_break_hzux",
+   "fieldtype": "Section Break"
+  },
+  {
+   "allow_on_submit": 1,
+   "fieldname": "title",
+   "fieldtype": "Data",
+   "label": "Title",
+   "no_copy": 1,
+   "print_hide": 1
   }
  ],
  "grid_page_length": 50,
@@ -1682,7 +1703,7 @@
  "idx": 204,
  "is_submittable": 1,
  "links": [],
- "modified": "2026-03-25 11:45:38.696888",
+ "modified": "2026-04-28 07:15:31.062404",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Purchase Invoice",

erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py

@@ -203,6 +203,7 @@ class PurchaseInvoice(BuyingController):
 		taxes_and_charges_deducted: DF.Currency
 		tc_name: DF.Link | None
 		terms: DF.TextEditor | None
+		title: DF.Data | None
 		to_date: DF.Date | None
 		total: DF.Currency
 		total_advance: DF.Currency

erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json

@@ -110,6 +110,7 @@
   "sales_invoice_item",
   "material_request",
   "material_request_item",
+  "delivered_by_supplier",
   "item_weight_details",
   "weight_per_unit",
   "total_weight",
@@ -1001,13 +1002,22 @@
    "label": "Tax Withholding Category",
    "options": "Tax Withholding Category",
    "print_hide": 1
+  },
+  {
+   "default": "0",
+   "fieldname": "delivered_by_supplier",
+   "fieldtype": "Check",
+   "hidden": 1,
+   "label": "Delivered by Supplier",
+   "print_hide": 1,
+   "read_only": 1
   }
  ],
  "grid_page_length": 50,
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2026-04-07 15:40:45.687554",
+ "modified": "2026-05-06 08:08:40.782395",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Purchase Invoice Item",

erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.py

@@ -31,6 +31,7 @@ class PurchaseInvoiceItem(Document):
 		conversion_factor: DF.Float
 		cost_center: DF.Link | None
 		deferred_expense_account: DF.Link | None
+		delivered_by_supplier: DF.Check
 		description: DF.TextEditor | None
 		discount_amount: DF.Currency
 		discount_percentage: DF.Percent

erpnext/accounts/doctype/sales_invoice/sales_invoice.js

@@ -94,7 +94,7 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends (
 			erpnext.accounts.ledger_preview.show_stock_ledger_preview(this.frm);
 		}
 
-		if (doc.docstatus == 1 && doc.outstanding_amount != 0) {
+		if (doc.docstatus == 1 && doc.outstanding_amount != 0 && frappe.model.can_create("Payment Entry")) {
 			this.frm.add_custom_button(__("Payment"), () => this.make_payment_entry(), __("Create"));
 			this.frm.page.set_inner_btn_group_as_primary(__("Create"));
 		}
@@ -135,13 +135,15 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends (
 			}
 
 			if (doc.outstanding_amount > 0) {
-				this.frm.add_custom_button(
-					__("Payment Request"),
-					function () {
-						me.make_payment_request_with_schedule();
-					},
-					__("Create")
-				);
+				if (frappe.boot.user.in_create.includes("Payment Request")) {
+					this.frm.add_custom_button(
+						__("Payment Request"),
+						function () {
+							me.make_payment_request_with_schedule();
+						},
+						__("Create")
+					);
+				}
 				this.frm.add_custom_button(
 					__("Invoice Discounting"),
 					this.make_invoice_discounting.bind(this),
@@ -552,12 +554,14 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends (
 	}
 
 	items_add(doc, cdt, cdn) {
-		var row = frappe.get_doc(cdt, cdn);
-		this.frm.script_manager.copy_from_first_row("items", row, [
-			"income_account",
-			"discount_account",
-			"cost_center",
-		]);
+		const row = frappe.get_doc(cdt, cdn);
+		const field_copy = ["income_account", "discount_account", "cost_center"];
+		if (doc.project) {
+			frappe.model.set_value(cdt, cdn, "project", doc.project);
+		} else {
+			field_copy.push("project");
+		}
+		this.frm.script_manager.copy_from_first_row("items", row, field_copy);
 	}
 
 	set_dynamic_labels() {

erpnext/accounts/doctype/sales_invoice/sales_invoice.json

@@ -33,6 +33,8 @@
   "is_created_using_pos",
   "pos_closing_entry",
   "has_subcontracted",
+  "section_break_qllv",
+  "title",
   "accounting_dimensions_section",
   "cost_center",
   "dimension_col_break",
@@ -91,9 +93,9 @@
   "column_break_xjag",
   "base_rounding_adjustment",
   "base_rounded_total",
-  "section_break_vacb",
+  "section_break_pxwz",
   "total_advance",
-  "column_break_rdks",
+  "column_break_iaso",
   "outstanding_amount",
   "section_tax_withholding_entry",
   "tax_withholding_group",
@@ -199,6 +201,7 @@
   "unrealized_profit_loss_account",
   "against_income_account",
   "commission_section",
+  "column_break_rdiw",
   "sales_partner",
   "amount_eligible_for_commission",
   "column_break10",
@@ -214,12 +217,14 @@
   "language",
   "subscription_section",
   "subscription",
-  "from_date",
-  "auto_repeat",
   "column_break_140",
+  "from_date",
   "to_date",
+  "automation_section",
+  "auto_repeat",
   "update_auto_repeat_reference",
   "utm_analytics_section",
+  "column_break_rdke",
   "utm_source",
   "utm_medium",
   "column_break_ixxw",
@@ -1147,6 +1152,7 @@
    "hide_seconds": 1,
    "label": "Rounding Adjustment",
    "no_copy": 1,
+   "options": "Company:company:default_currency",
    "print_hide": 1,
    "read_only": 1
   },
@@ -1159,6 +1165,7 @@
    "label": "Rounded Total",
    "oldfieldname": "rounded_total",
    "oldfieldtype": "Currency",
+   "options": "Company:company:default_currency",
    "print_hide": 1,
    "read_only": 1
   },
@@ -1914,7 +1921,7 @@
   {
    "default": "0",
    "depends_on": "eval: !doc.is_return",
-   "description": "Issue a debit note with 0 qty against an existing Sales Invoice",
+   "description": "Issue a debit note against an existing Sales Invoice to adjust the rate. The quantity will be retained from the original invoice.",
    "fieldname": "is_debit_note",
    "fieldtype": "Check",
    "label": "Is Rate Adjustment Entry (Debit Note)"
@@ -2304,14 +2311,6 @@
    "options": "fa fa-group",
    "print_hide": 1
   },
-  {
-   "fieldname": "section_break_vacb",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "column_break_rdks",
-   "fieldtype": "Column Break"
-  },
   {
    "fieldname": "column_break_ixxw",
    "fieldtype": "Column Break"
@@ -2321,6 +2320,40 @@
    "fieldname": "utm_analytics_section",
    "fieldtype": "Section Break",
    "label": "UTM Analytics"
+  },
+  {
+   "collapsible": 1,
+   "fieldname": "automation_section",
+   "fieldtype": "Section Break",
+   "label": "Automation"
+  },
+  {
+   "fieldname": "section_break_pxwz",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "column_break_rdke",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "column_break_rdiw",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "column_break_iaso",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "section_break_qllv",
+   "fieldtype": "Section Break"
+  },
+  {
+   "allow_on_submit": 1,
+   "fieldname": "title",
+   "fieldtype": "Data",
+   "label": "Title",
+   "no_copy": 1,
+   "print_hide": 1
   }
  ],
  "grid_page_length": 50,
@@ -2334,7 +2367,7 @@
    "link_fieldname": "consolidated_invoice"
   }
  ],
- "modified": "2026-03-09 17:15:30.931929",
+ "modified": "2026-05-21 17:31:11.190958",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Sales Invoice",

erpnext/accounts/doctype/sales_invoice/sales_invoice.py

@@ -225,6 +225,7 @@ class SalesInvoice(SellingController):
 		terms: DF.TextEditor | None
 		territory: DF.Link | None
 		timesheets: DF.Table[SalesInvoiceTimesheet]
+		title: DF.Data | None
 		to_date: DF.Date | None
 		total: DF.Currency
 		total_advance: DF.Currency
@@ -967,9 +968,6 @@ class SalesInvoice(SellingController):
 			if selling_price_list:
 				self.set("selling_price_list", selling_price_list)
 
-			if not for_validate:
-				self.update_stock = cint(pos.get("update_stock"))
-
 			# set pos values in items
 			for item in self.get("items"):
 				if item.get("item_code"):
@@ -980,6 +978,10 @@ class SalesInvoice(SellingController):
 						if (not for_validate) or (for_validate and not item.get(fname)):
 							item.set(fname, val)
 
+			if not for_validate:
+				dn_flag = any(d.get("dn_detail") for d in self.get("items"))
+				self.update_stock = 0 if dn_flag else cint(pos.get("update_stock"))
+
 			# fetch terms
 			if self.tc_name and not self.terms:
 				self.terms = frappe.db.get_value("Terms and Conditions", self.tc_name, "terms")

erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py

@@ -2025,10 +2025,6 @@ class TestSalesInvoice(ERPNextTestSuite):
 		)
 
 	def test_multiple_uom_in_selling(self):
-		frappe.db.sql(
-			"""delete from `tabItem Price`
-			where price_list='_Test Price List' and item_code='_Test Item'"""
-		)
 		item_price = frappe.new_doc("Item Price")
 		item_price.price_list = "_Test Price List"
 		item_price.item_code = "_Test Item"

erpnext/accounts/doctype/share_transfer/test_share_transfer.py

@@ -10,8 +10,6 @@ from erpnext.tests.utils import ERPNextTestSuite
 
 class TestShareTransfer(ERPNextTestSuite):
 	def setUp(self):
-		frappe.db.sql("delete from `tabShare Transfer`")
-		frappe.db.sql("delete from `tabShare Balance`")
 		share_transfers = [
 			{
 				"doctype": "Share Transfer",

erpnext/accounts/doctype/tax_rule/tax_rule.py

@@ -14,6 +14,7 @@ from frappe.utils import cstr
 from frappe.utils.nestedset import get_root_of
 
 from erpnext.setup.doctype.customer_group.customer_group import get_parent_customer_groups
+from erpnext.setup.doctype.supplier_group.supplier_group import get_parent_supplier_groups
 
 
 class IncorrectCustomerGroup(frappe.ValidationError):
@@ -176,38 +177,44 @@ def get_party_details(party, party_type, args=None):
 def get_tax_template(posting_date, args):
 	"""Get matching tax rule"""
 	args = frappe._dict(args)
-	conditions = []
+
+	TaxRule = DocType("Tax Rule")
+	query = frappe.qb.from_(TaxRule).select("*")
 
 	if posting_date:
-		conditions.append(
-			f"""(from_date is null or from_date <= '{posting_date}')
-			and (to_date is null or to_date >= '{posting_date}')"""
+		query = query.where(
+			(TaxRule.from_date.isnull() | (TaxRule.from_date <= posting_date))
+			& (TaxRule.to_date.isnull() | (TaxRule.to_date >= posting_date))
 		)
 	else:
-		conditions.append("(from_date is null) and (to_date is null)")
+		query = query.where(TaxRule.from_date.isnull() & TaxRule.to_date.isnull())
 
-	conditions.append(
-		"ifnull(tax_category, '') = {}".format(frappe.db.escape(cstr(args.get("tax_category")), False))
-	)
-	if "tax_category" in args.keys():
-		del args["tax_category"]
+	def get_group_ancestors(doctype, get_parents, value):
+		if not value:
+			value = get_root_of(doctype)
+		return [""] + [d.name for d in get_parents(value)]
+
+	group_fields = {
+		"customer_group": ("Customer Group", get_parent_customer_groups),
+		"supplier_group": ("Supplier Group", get_parent_supplier_groups),
+	}
+
+	args.setdefault("tax_category", "")
 
 	for key, value in args.items():
 		if key == "use_for_shopping_cart":
-			conditions.append(f"use_for_shopping_cart = {1 if value else 0}")
-		elif key == "customer_group":
-			if not value:
-				value = get_root_of("Customer Group")
-			customer_group_condition = get_customer_group_condition(value)
-			conditions.append(f"ifnull({key}, '') in ('', {customer_group_condition})")
+			query = query.where(TaxRule.use_for_shopping_cart == value)
+		elif key == "tax_category":
+			query = query.where(IfNull(TaxRule.tax_category, "") == (value or ""))
+		elif key in group_fields:
+			doctype, get_parents = group_fields[key]
+			query = query.where(
+				IfNull(TaxRule[key], "").isin(get_group_ancestors(doctype, get_parents, value))
+			)
 		else:
-			conditions.append(f"ifnull({key}, '') in ('', {frappe.db.escape(cstr(value))})")
+			query = query.where(IfNull(TaxRule[key], "").isin(["", value or ""]))
 
-	tax_rule = frappe.db.sql(
-		"""select * from `tabTax Rule`
-		where {}""".format(" and ".join(conditions)),
-		as_dict=True,
-	)
+	tax_rule = query.run(as_dict=True)
 
 	if not tax_rule:
 		return None
@@ -236,11 +243,3 @@ def get_tax_template(posting_date, args):
 		return None
 
 	return tax_template
-
-
-def get_customer_group_condition(customer_group):
-	condition = ""
-	customer_groups = ["%s" % (frappe.db.escape(d.name)) for d in get_parent_customer_groups(customer_group)]
-	if customer_groups:
-		condition = ",".join(["%s"] * len(customer_groups)) % (tuple(customer_groups))
-	return condition

erpnext/accounts/doctype/tax_rule/test_tax_rule.py

@@ -62,6 +62,117 @@ class TestTaxRule(ERPNextTestSuite):
 			"_Test Sales Taxes and Charges Template - _TC",
 		)
 
+	def test_for_parent_supplier_group(self):
+		purchase_template = "_Test Purchase Taxes and Charges Template - _TC"
+		if not frappe.db.exists("Purchase Taxes and Charges Template", purchase_template):
+			frappe.get_doc(
+				{
+					"doctype": "Purchase Taxes and Charges Template",
+					"title": "_Test Purchase Taxes and Charges Template",
+					"company": "_Test Company",
+					"taxes": [
+						{
+							"account_head": "_Test Account VAT - _TC",
+							"charge_type": "On Net Total",
+							"description": "VAT",
+							"doctype": "Purchase Taxes and Charges",
+							"cost_center": "Main - _TC",
+							"rate": 6,
+						}
+					],
+				}
+			).insert()
+
+		make_tax_rule(
+			supplier_group="All Supplier Groups",
+			tax_type="Purchase",
+			purchase_tax_template=purchase_template,
+			priority=1,
+			use_for_shopping_cart=0,
+			from_date="2015-01-01",
+			save=1,
+		)
+
+		# "_Test Supplier Group" has "All Supplier Groups" as its parent — should match hierarchically
+		self.assertEqual(
+			get_tax_template(
+				"2015-01-01",
+				{
+					"supplier_group": "_Test Supplier Group",
+					"tax_type": "Purchase",
+					"use_for_shopping_cart": 0,
+				},
+			),
+			purchase_template,
+		)
+
+	def test_use_for_shopping_cart_filter(self):
+		city = "Test Cart City"
+		# higher priority ensures this rule wins when use_for_shopping_cart is not filtered
+		make_tax_rule(
+			customer="_Test Customer",
+			billing_city=city,
+			sales_tax_template="_Test Sales Taxes and Charges Template - _TC",
+			use_for_shopping_cart=0,
+			priority=2,
+			save=1,
+		)
+		make_tax_rule(
+			customer="_Test Customer",
+			billing_city=city,
+			sales_tax_template="_Test Sales Taxes and Charges Template 1 - _TC",
+			use_for_shopping_cart=1,
+			priority=1,
+			save=1,
+		)
+
+		# Cart request (use_for_shopping_cart=1) filters to cart rules only
+		self.assertEqual(
+			get_tax_template(
+				"2015-01-01",
+				{"customer": "_Test Customer", "billing_city": city, "use_for_shopping_cart": 1},
+			),
+			"_Test Sales Taxes and Charges Template 1 - _TC",
+		)
+
+		# Non-cart request omits use_for_shopping_cart — no filter is applied, both rules
+		# are candidates; non-cart rule wins by higher priority
+		self.assertEqual(
+			get_tax_template(
+				"2015-01-01",
+				{"customer": "_Test Customer", "billing_city": city},
+			),
+			"_Test Sales Taxes and Charges Template - _TC",
+		)
+
+	def test_use_for_shopping_cart_default(self):
+		city = "Test Default Cart City"
+		# use_for_shopping_cart not set — Check field defaults to 0
+		make_tax_rule(
+			customer="_Test Customer",
+			billing_city=city,
+			sales_tax_template="_Test Sales Taxes and Charges Template - _TC",
+			use_for_shopping_cart=0,  # Default is set to 1.
+			save=1,
+		)
+
+		# Non-cart request (no use_for_shopping_cart in args) matches the rule
+		self.assertEqual(
+			get_tax_template(
+				"2015-01-01",
+				{"customer": "_Test Customer", "billing_city": city},
+			),
+			"_Test Sales Taxes and Charges Template - _TC",
+		)
+
+		# Cart request (use_for_shopping_cart=1) does not match — rule has default 0
+		self.assertIsNone(
+			get_tax_template(
+				"2015-01-01",
+				{"customer": "_Test Customer", "billing_city": city, "use_for_shopping_cart": 1},
+			)
+		)
+
 	def test_conflict_with_overlapping_dates(self):
 		tax_rule1 = make_tax_rule(
 			customer="_Test Customer",

erpnext/accounts/doctype/tax_withholding_category/test_tax_withholding_category.py

@@ -5,8 +5,7 @@ import datetime
 from unittest.mock import patch
 
 import frappe
-from frappe.custom.doctype.custom_field.custom_field import create_custom_fields
-from frappe.utils import add_days, add_months, today
+from frappe.utils import add_days, add_months, getdate, today
 
 from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry
 from erpnext.accounts.utils import get_fiscal_year
@@ -1922,7 +1921,6 @@ class TestTaxWithholdingCategory(ERPNextTestSuite):
 
 	def set_previous_fy_and_tax_category(self):
 		test_company = "_Test Company"
-		category = "Cumulative Threshold TDS"
 
 		def add_company_to_fy(fy, company):
 			if not [x.company for x in fy.companies if x.company == company]:
@@ -1948,20 +1946,6 @@ class TestTaxWithholdingCategory(ERPNextTestSuite):
 			)
 			self.prev_fy.save()
 
-		# setup tax withholding category for previous fiscal year
-		cat = frappe.get_doc("Tax Withholding Category", category)
-		cat.append(
-			"rates",
-			{
-				"from_date": self.prev_fy.year_start_date,
-				"to_date": self.prev_fy.year_end_date,
-				"tax_withholding_rate": 10,
-				"single_threshold": 0,
-				"cumulative_threshold": 30000,
-			},
-		)
-		cat.save()
-
 	def test_tds_across_fiscal_year(self):
 		"""
 		Advance TDS on previous fiscal year should be properly allocated on Invoices in upcoming fiscal year
@@ -1972,6 +1956,14 @@ class TestTaxWithholdingCategory(ERPNextTestSuite):
 		supplier = "Test TDS Supplier"
 		# Cumulative threshold 30000 and tax rate 10%
 		category = "Cumulative Threshold TDS"
+		create_tax_withholding_category(
+			category_name=category,
+			rate=10,
+			from_date=self.prev_fy.year_start_date,
+			to_date=self.prev_fy.year_end_date,
+			account="TDS - _TC",
+			cumulative_threshold=30000,
+		)
 		frappe.db.set_value(
 			"Supplier",
 			supplier,
@@ -2043,6 +2035,158 @@ class TestTaxWithholdingCategory(ERPNextTestSuite):
 		self.assertEqual(pi2.taxes, [])
 		self.assertEqual(payment.taxes[0].tax_amount, 6000)
 
+	def test_threshold_resets_in_new_fiscal_year(self):
+		"""
+		Threshold entries from a previous FY must not carry over into the new FY.
+		"""
+		self.set_previous_fy_and_tax_category()
+		invoices = []
+		supplier = "Test TDS Supplier"
+		category = "Cumulative Threshold TDS"
+		create_tax_withholding_category(
+			category_name=category,
+			rate=10,
+			from_date=self.prev_fy.year_start_date,
+			to_date=self.prev_fy.year_end_date,
+			account="TDS - _TC",
+			cumulative_threshold=30000,
+		)
+		self.setup_party_with_category("Supplier", supplier, category)
+		prev_fy_date = add_days(self.prev_fy.year_end_date, -10)
+
+		# Previous FY: 3 invoices to cross the 30000 cumulative threshold
+		for _ in range(3):
+			pi = create_purchase_invoice(supplier=supplier, posting_date=prev_fy_date, set_posting_time=True)
+			pi.submit()
+			invoices.append(pi)
+
+		# Third invoice crosses the threshold - 3000 TDS deducted across all three
+		self.validate_tax_deduction(invoices[-1], 3000)
+
+		# Current FY: 10000 invoice - must be Under Withheld, threshold resets
+		pi_curr = create_purchase_invoice(supplier=supplier)
+		pi_curr.submit()
+		invoices.append(pi_curr)
+		self.validate_tax_deduction(pi_curr, 0)
+
+		self.validate_tax_withholding_entries(
+			"Purchase Invoice",
+			pi_curr.name,
+			[
+				self.get_tax_withholding_entry(
+					tax_withholding_category=category,
+					party_type="Supplier",
+					party=supplier,
+					taxable_doctype="Purchase Invoice",
+					taxable_name=pi_curr.name,
+					tax_rate=10.0,
+					taxable_amount=10000.0,
+					withholding_amount=0.0,
+					status="Under Withheld",
+					withholding_doctype=None,
+					withholding_name=None,
+					under_withheld_reason=None,
+				)
+			],
+		)
+		self.cleanup_invoices(invoices)
+
+	def test_tax_on_excess_threshold_resets_in_new_fiscal_year(self):
+		"""
+		For tax-on-excess categories, unused threshold must reset each FY.
+		"""
+		self.set_previous_fy_and_tax_category()
+		invoices = []
+		supplier = "Test TDS Supplier3"
+		category = "New TDS Category"
+		create_tax_withholding_category(
+			category_name=category,
+			rate=10,
+			from_date=self.prev_fy.year_start_date,
+			to_date=self.prev_fy.year_end_date,
+			account="TDS - _TC",
+			cumulative_threshold=30000,
+			tax_on_excess_amount=1,
+			round_off_tax_amount=1,
+		)
+		self.setup_party_with_category("Supplier", supplier, category)
+		prev_fy_date = add_days(self.prev_fy.year_end_date, -10)
+
+		for _ in range(2):
+			pi = create_purchase_invoice(supplier=supplier, posting_date=prev_fy_date, set_posting_time=True)
+			pi.submit()
+			invoices.append(pi)
+
+		pi3 = create_purchase_invoice(
+			supplier=supplier, rate=20000, posting_date=prev_fy_date, set_posting_time=True
+		)
+		pi3.submit()
+		invoices.append(pi3)
+
+		self.validate_tax_deduction(pi3, 1000)
+		self.validate_tax_withholding_entries(
+			"Purchase Invoice",
+			pi3.name,
+			[
+				self.get_tax_withholding_entry(
+					tax_withholding_category=category,
+					party_type="Supplier",
+					party=supplier,
+					taxable_doctype="Purchase Invoice",
+					taxable_name=pi3.name,
+					tax_rate=10.0,
+					taxable_amount=10000.0,
+					withholding_amount=0.0,
+					status="Settled",
+					withholding_doctype="Purchase Invoice",
+					withholding_name=pi3.name,
+					under_withheld_reason="Threshold Exemption",
+				),
+				self.get_tax_withholding_entry(
+					tax_withholding_category=category,
+					party_type="Supplier",
+					party=supplier,
+					taxable_doctype="Purchase Invoice",
+					taxable_name=pi3.name,
+					tax_rate=10.0,
+					taxable_amount=10000.0,
+					withholding_amount=1000.0,
+					status="Settled",
+					withholding_doctype="Purchase Invoice",
+					withholding_name=pi3.name,
+					under_withheld_reason=None,
+				),
+			],
+		)
+
+		# no excess, so no TDS
+		pi_curr = create_purchase_invoice(supplier=supplier, rate=30000)
+		pi_curr.submit()
+		invoices.append(pi_curr)
+		self.validate_tax_deduction(pi_curr, 0)
+
+		self.validate_tax_withholding_entries(
+			"Purchase Invoice",
+			pi_curr.name,
+			[
+				self.get_tax_withholding_entry(
+					tax_withholding_category=category,
+					party_type="Supplier",
+					party=supplier,
+					taxable_doctype="Purchase Invoice",
+					taxable_name=pi_curr.name,
+					tax_rate=10.0,
+					taxable_amount=30000.0,
+					withholding_amount=0.0,
+					status="Settled",
+					withholding_doctype="Purchase Invoice",
+					withholding_name=pi_curr.name,
+					under_withheld_reason="Threshold Exemption",
+				),
+			],
+		)
+		self.cleanup_invoices(invoices)
+
 	@ERPNextTestSuite.change_settings("Accounts Settings", {"delete_linked_ledger_entries": 1})
 	def test_tds_payment_entry_cancellation(self):
 		"""
@@ -3997,7 +4141,7 @@ def create_tax_withholding_category(
 	tax_deduction_basis="Net Total",
 ):
 	if not frappe.db.exists("Tax Withholding Category", category_name):
-		frappe.get_doc(
+		doc = frappe.get_doc(
 			{
 				"doctype": "Tax Withholding Category",
 				"name": category_name,
@@ -4018,6 +4162,22 @@ def create_tax_withholding_category(
 				"accounts": [{"company": "_Test Company", "account": account}],
 			}
 		).insert()
+	else:
+		doc = frappe.get_doc("Tax Withholding Category", category_name)
+		if not any(getdate(r.from_date) == getdate(from_date) for r in doc.rates):
+			doc.append(
+				"rates",
+				{
+					"from_date": from_date,
+					"to_date": to_date,
+					"tax_withholding_rate": rate,
+					"single_threshold": single_threshold,
+					"cumulative_threshold": cumulative_threshold,
+				},
+			)
+			doc.save()
+
+	return doc
 
 
 def create_lower_deduction_certificate(

erpnext/accounts/doctype/tax_withholding_entry/tax_withholding_entry.py

@@ -640,6 +640,7 @@ class TaxWithholdingController:
 			.where(entry.tax_withholding_category == category.name)
 			.where(entry.company == self.doc.company)
 			.where(entry.docstatus == 1)
+			.where(entry.taxable_date.between(category.from_date, category.to_date))
 			.groupby(entry.status)
 		)
 

erpnext/accounts/financial_report_template/account_categories.json

@@ -1,118 +1,147 @@
 [
   {
     "account_category_name": "Cash and Cash Equivalents",
+    "root_type": "Asset",
     "description": "Cash on hand, demand deposits, and short-term highly liquid investments readily convertible to cash with original maturities of three months or less. Examples: Cash in hand, bank current accounts, money market funds, treasury bills \u22643 months."
   },
   {
     "account_category_name": "Cost of Goods Sold",
+    "root_type": "Expense",
     "description": "Direct costs attributable to cost of goods sold. Examples: Raw materials, stock in trade."
   },
   {
     "account_category_name": "Current Tax Liabilities",
+    "root_type": "Liability",
     "description": "Income tax obligations for current and prior periods. Examples: Provision for income tax, advance tax paid, tax deducted at source."
   },
   {
     "account_category_name": "Finance Costs",
+    "root_type": "Expense",
     "description": "Interest and financing-related expenses. Examples: Interest on borrowings, bank charges, lease interest, foreign exchange losses."
   },
   {
     "account_category_name": "Intangible Assets",
+    "root_type": "Asset",
     "description": "Identifiable non-monetary assets without physical substance. Examples: Software, patents, trademarks, licenses, development costs."
   },
   {
     "account_category_name": "Investment Income",
+    "root_type": "Income",
     "description": "Returns generated from financial investments and cash management. Examples: Interest income, dividend income, rental income, fair value gains."
   },
   {
     "account_category_name": "Long-term Borrowings",
+    "root_type": "Liability",
     "description": "Interest-bearing debt obligations with maturity beyond one year. Examples: Term loans, bonds, debentures, mortgages."
   },
   {
     "account_category_name": "Long-term Investments",
+    "root_type": "Asset",
     "description": "Investments held for strategic purposes or extended periods. Examples: Equity investments, bonds, associates, joint ventures, deposits."
   },
   {
     "account_category_name": "Long-term Provisions",
+    "root_type": "Liability",
     "description": "Present obligations beyond one year with uncertain timing/amount. Examples: Asset retirement obligations, environmental remediation, legal settlements."
   },
   {
     "account_category_name": "Operating Expenses",
+    "root_type": "Expense",
     "description": "Costs incurred in ordinary business operations excluding direct costs. Examples: Selling expenses, administrative costs, marketing, utilities, rent."
   },
   {
     "account_category_name": "Other Current Assets",
+    "root_type": "Asset",
     "description": "Current assets not classified elsewhere including prepaid expenses and advances. Examples: Prepaid insurance, prepaid rent, advance to suppliers, security deposits recoverable within one year."
   },
   {
     "account_category_name": "Other Current Liabilities",
+    "root_type": "Liability",
     "description": "Short-term obligations not classified elsewhere. Examples: Accrued expenses, statutory liabilities, employee payables."
   },
   {
     "account_category_name": "Other Direct Costs",
+    "root_type": "Expense",
     "description": "Direct costs excluding cost of goods sold. Examples: Direct labor, manufacturing overhead, freight inward."
   },
   {
     "account_category_name": "Other Non-current Assets",
+    "root_type": "Asset",
     "description": "Long-term assets not classified elsewhere. Examples: Security deposits, long-term prepayments, advances for capital goods."
   },
   {
     "account_category_name": "Other Non-current Liabilities",
+    "root_type": "Liability",
     "description": "Long-term obligations not classified elsewhere. Examples: Long-term deposits, deferred income, government grants."
   },
   {
     "account_category_name": "Other Operating Income",
+    "root_type": "Income",
     "description": "Incidental income related to business operations but not core revenue. Examples: Scrap sales, government grants, insurance claims, foreign exchange gains."
   },
   {
     "account_category_name": "Other Payables",
+    "root_type": "Liability",
     "description": "Non-trade payables and obligations to parties other than suppliers. Examples: Employee payables, accrued expenses, customer advances, security deposits received."
   },
   {
     "account_category_name": "Other Receivables",
+    "root_type": "Asset",
     "description": "Non-trade amounts due to the entity excluding financing arrangements. Examples: Employee advances, insurance claims, tax refunds, deposits recoverable."
   },
   {
     "account_category_name": "Reserves and Surplus",
+    "root_type": "Equity",
     "description": "Accumulated profits and other reserves created from profits or share premium. Examples: General reserves, retained earnings, statutory reserves, share premium."
   },
   {
     "account_category_name": "Revenue from Operations",
+    "root_type": "Income",
     "description": "Income from primary business activities in ordinary course. Examples: Sales of goods, service revenue, commission income, royalty income."
   },
   {
     "account_category_name": "Share Capital",
+    "root_type": "Equity",
     "description": "Nominal value of issued and paid-up equity shares. Examples: Common stock, ordinary shares, preference shares."
   },
   {
     "account_category_name": "Short-term Borrowings",
+    "root_type": "Liability",
     "description": "Interest-bearing debt obligations due within one year. Examples: Bank overdrafts, short-term loans, current portion of long-term debt."
   },
   {
     "account_category_name": "Short-term Investments",
+    "root_type": "Asset",
     "description": "Financial instruments held for short-term investment purposes, readily convertible to cash. Examples: Marketable securities, fixed deposits >3 months, mutual funds."
   },
   {
     "account_category_name": "Short-term Provisions",
+    "root_type": "Liability",
     "description": "Present obligations due within one year with uncertain timing or amount. Examples: Warranty provisions, legal claims, restructuring costs."
   },
   {
     "account_category_name": "Stock Assets",
+    "root_type": "Asset",
     "description": "Inventory and stock-related assets including raw materials, work in progress, finished goods, and stock in trade. Examples: Raw materials, finished goods, trading merchandise, consumables."
   },
   {
     "account_category_name": "Tangible Assets",
+    "root_type": "Asset",
     "description": "Physical assets used in business operations including property, plant, and equipment. Examples: Land, buildings, machinery, equipment, vehicles, furniture, capital work in progress."
   },
   {
     "account_category_name": "Tax Expense",
+    "root_type": "Expense",
     "description": "Current and deferred income tax obligations. Examples: Current tax provision, deferred tax expense, withholding taxes."
   },
   {
     "account_category_name": "Trade Payables",
+    "root_type": "Liability",
     "description": "Amounts owed to suppliers. Examples: Supplier invoices, accrued purchases, bills payable."
   },
   {
     "account_category_name": "Trade Receivables",
+    "root_type": "Asset",
     "description": "Amounts due from customers for goods sold or services provided in ordinary course of business. Examples: Accounts receivable, notes receivable from customers, unbilled revenue."
   }
-]
+]

erpnext/accounts/general_ledger.py

@@ -36,7 +36,8 @@ def make_gl_entries(
 ):
 	if gl_map:
 		if (
-			not cint(frappe.get_single_value("Accounts Settings", "use_legacy_budget_controller"))
+			not cancel
+			and not cint(frappe.get_single_value("Accounts Settings", "use_legacy_budget_controller"))
 			and gl_map[0].voucher_type != "Period Closing Voucher"
 		):
 			bud_val = BudgetValidation(gl_map=gl_map)
@@ -430,6 +431,8 @@ def make_entry(args, adv_adj, update_outstanding, from_repost=False):
 	gle.flags.adv_adj = adv_adj
 	gle.flags.update_outstanding = update_outstanding or "Yes"
 	gle.flags.notify_update = False
+	if gle.is_cancelled or is_immutable_ledger_enabled():
+		gle.flags.ignore_links = True
 	gle.submit()
 
 	if (
@@ -716,7 +719,12 @@ def make_reverse_gl_entries(
 		check_freezing_date(gl_entries[0]["posting_date"], adv_adj)
 
 		is_opening = any(d.get("is_opening") == "Yes" for d in gl_entries)
-		validate_against_pcv(is_opening, gl_entries[0]["posting_date"], gl_entries[0]["company"])
+
+		# For reverse entries, use the posting_date parameter if provided and valid
+		# Otherwise fall back to original posting_date
+		validation_date = posting_date if posting_date else gl_entries[0]["posting_date"]
+		validate_against_pcv(is_opening, validation_date, gl_entries[0]["company"])
+
 		if partial_cancel:
 			# Partial cancel is only used by `Advance` in separate account feature.
 			# Only cancel GL entries for unlinked reference using `voucher_detail_no`

erpnext/accounts/party.py

@@ -677,7 +677,7 @@ def validate_due_date_with_template(posting_date, due_date, bill_date, template_
 	if not default_due_date:
 		return
 
-	if default_due_date != posting_date and getdate(due_date) > getdate(default_due_date):
+	if getdate(default_due_date) != getdate(posting_date) and getdate(due_date) > getdate(default_due_date):
 		if frappe.get_single_value("Accounts Settings", "credit_controller") in frappe.get_roles():
 			party_type = "supplier" if doctype == "Purchase Invoice" else "customer"
 
@@ -750,7 +750,7 @@ def set_taxes(
 		args.update({"tax_type": "Purchase"})
 
 	if use_for_shopping_cart:
-		args.update({"use_for_shopping_cart": use_for_shopping_cart})
+		args.update({"use_for_shopping_cart": cint(use_for_shopping_cart)})
 
 	return get_tax_template(posting_date, args)
 

erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html

@@ -1,161 +0,0 @@
-{%- macro add_header(page_num, max_pages, doc, letter_head, no_letterhead, footer, print_settings=None, print_heading_template=None) -%}
-	{% if letter_head and not no_letterhead %}
-		<div class="letter-head">{{ letter_head }}</div>
-	{% endif %}
-	{% if print_heading_template %}
-		{{ frappe.render_template(print_heading_template, {"doc":doc}) }}
-	{% else %}
-	{% endif %}
-	{%- if doc.meta.is_submittable and doc.docstatus==2-%}
-	<div class="text-center" document-status="cancelled">
-		<h4 style="margin: 0px;">{{ _("CANCELLED") }}</h4>
-	</div>
-	{%- endif -%}
-{%- endmacro -%}
-{% for page in layout %}
-<div class="page-break">
-	<div {% if print_settings.repeat_header_footer %} id="header-html" class="hidden-pdf" {% endif %}>
-		{{ add_header(loop.index, layout|len, doc, letter_head, no_letterhead, footer, print_settings) }}
-	</div>
-	<style>
-		.taxes-section .order-taxes.mt-5{
-			margin-top: 0px !important;
-		}
-		.taxes-section .order-taxes .border-btm.pb-5{
-			padding-bottom: 0px !important;
-		}
-		.print-format label{
-			color: #74808b;
-			font-size: 12px;
-			margin-bottom: 4px;
-		}
-
-	</style>
-
-	{% if print_settings.repeat_header_footer %}
-	<div id="footer-html" class="visible-pdf">
-		{% if not no_letterhead and footer %}
-		<div class="letter-head-footer">
-			{{ footer }}
-		</div>
-		{% endif %}
-		<p class="text-center small page-number visible-pdf">
-			{{ _("Page {0} of {1}").format('<span class="page"></span>', '<span class="topage"></span>') }}
-		</p>
-	</div>
-	{% endif %}
-
-	<div class="row section-break" style="margin-bottom: 10px;">
-		<div class="col-xs-6 p-0">
-			<div class="col-xs-12 value text-uppercase"><b>{{ doc.customer }}</b></div>
-			<div class="col-xs-12">
-				{{ doc.address_display }}
-			</div>
-			<div class="col-xs-12">
-				{{ _("Contact: ")+doc.contact_display if doc.contact_display else '' }}
-			</div>
-			<div class="col-xs-12">
-				{{ _("Mobile: ")+doc.contact_mobile if doc.contact_mobile else '' }}
-			</div>
-		</div>
-		<div class="col-xs-3"></div>
-		<div class="col-xs-3" style="padding-left: 5px;">
-			<div>
-				<div><label>{{ _("Invoice ID") }}</label></div>
-				<div>{{ doc.name }}</div>
-			</div>
-			<div style="margin-top: 20px;">
-				<div><label>{{ _("Invoice Date") }}</label></div>
-				<div>{{ frappe.utils.format_date(doc.posting_date) }}</div>
-			</div>
-			<div style="margin-top: 20px;">
-				<div><label>{{ _("Due Date") }}</label></div>
-				<div>{{ frappe.utils.format_date(doc.due_date) }}</div>
-			</div>
-		</div>
-	</div>
-
-	<div class="section-break">
-		<table class="table table-bordered table-condensed mb-0" style="width: 100%; border-collapse: collapse; font-size: 12px;">
-			<colgroup>
-				<col style="width: 5%">
-				<col style="width: 45%">
-				<col style="width: 10%">
-				<col style="width: 20%">
-				<col style="width: 20%">
-			</colgroup>
-			<thead>
-				<tr>
-					<th class="text-uppercase" style="text-align:center">{{ _("Sr") }}</th>
-					<th class="text-uppercase" style="text-align:center">{{ _("Details") }}</th>
-					<th class="text-uppercase" style="text-align:center">{{ _("Qty") }}</th>
-					<th class="text-uppercase" style="text-align:right">{{ _("Rate") }}</th>
-					<th class="text-uppercase" style="text-align:right">{{ _("Amount") }}</th>
-				</tr>
-			</thead>
-			{% for item in doc.items %}
-			<tr>
-				<td style="text-align:center">{{ loop.index }}</td>
-				<td>
-					<b>{{ item.item_code }}: {{ item.item_name }}</b>
-					{% if (item.description != item.item_name) %}
-						<br>{{ item.description }}
-					{% endif %}
-				</td>
-				<td style="text-align: center;">
-					{{ item.get_formatted("qty", 0) }}
-					{{ item.get_formatted("uom", 0) }}
-				</td>
-				<td style="text-align: right;">{{ item.get_formatted("net_rate", doc) }}</td>
-				<td style="text-align: right;">{{ item.get_formatted("net_amount", doc) }}</td>
-			</tr>
-			{% endfor %}
-		</table>
-		<!-- total -->
-		<div class="row">
-
-			<div class="col-xs-6">
-				<div>
-					<label>{{ _("Amount in Words") }}</label>
-					{{ doc.in_words }}
-				</div>
-				<div style="margin-top: 20px;">
-					<label>{{ _("Payment Status") }}</label>
-					{{ doc.status }}
-				</div>
-			</div>
-			<div class="col-xs-6">
-				<div class="row section-break">
-					<div class="col-xs-7"><div>{{ _("Sub Total") }}</div></div>
-					<div class="col-xs-5" style="text-align: right;">{{ doc.get_formatted("net_total", doc) }}</div>
-				</div>
-				<div>
-					{% for d in doc.taxes %}
-						{% if d.tax_amount %}
-							<div class="row">
-								<div class="col-xs-8"><div>{{ _(d.description) }}</div></div>
-								<div class="col-xs-4" style="text-align: right;">{{ d.get_formatted("tax_amount") }}</div>
-							</div>
-						{% endif %}
-					{% endfor %}
-				</div>
-				<div class="row">
-					<div class="col-xs-7"><div>{{ _("Total") }}</div></div>
-					<div class="col-xs-5" style="text-align: right;">{{ doc.get_formatted("grand_total", doc) }}</div>
-				</div>
-			</div>
-
-		</div>
-	</div>
-
-
-	<div class="row">
-		<div class="col-xs-12">
-			<div class="row important data-field">
-				<div class="col-xs-12"><label>{{ _("Terms and Conditions") }}: </label></div>
-				<div class="col-xs-12">{{ doc.terms if doc.terms else '' }}</div>
-			</div>
-		</div>
-	</div>
-</div>
-{% endfor %}

erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.json

@@ -1,32 +0,0 @@
-{
- "absolute_value": 0,
- "align_labels_right": 0,
- "creation": "2025-01-22 16:23:51.012200",
- "css": "",
- "custom_format": 0,
- "default_print_language": "en",
- "disabled": 0,
- "doc_type": "Sales Invoice",
- "docstatus": 0,
- "doctype": "Print Format",
- "font": "",
- "font_size": 14,
- "idx": 0,
- "line_breaks": 0,
- "margin_bottom": 0.0,
- "margin_left": 0.0,
- "margin_right": 0.0,
- "margin_top": 0.0,
- "modified": "2025-01-22 16:23:51.012200",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Sales Invoice Print",
- "owner": "Administrator",
- "page_number": "Hide",
- "print_format_builder": 0,
- "print_format_builder_beta": 0,
- "print_format_type": "Jinja",
- "raw_printing": 0,
- "show_section_headings": 0,
- "standard": "Yes"
-}

erpnext/accounts/report/account_balance/test_account_balance.py

@@ -10,9 +10,6 @@ from erpnext.tests.utils import ERPNextTestSuite
 
 class TestAccountBalance(ERPNextTestSuite):
 	def test_account_balance(self):
-		frappe.db.sql("delete from `tabSales Invoice` where company='_Test Company 2'")
-		frappe.db.sql("delete from `tabGL Entry` where company='_Test Company 2'")
-
 		filters = {
 			"company": "_Test Company 2",
 			"report_date": getdate(),

erpnext/accounts/report/accounts_payable/accounts_payable.html

@@ -1 +1,227 @@
-{% include "accounts/report/accounts_receivable/accounts_receivable.html" %}
+<style type="text/css">
+    body, html {
+        margin-top: 10px;
+        padding: 0;
+        width: 100%;
+        height: auto;
+        font-family: Inter, sans-serif;
+        font-size: 14px;
+        line-height: 21px;
+        color: #171717;
+    }
+
+    .title-letter-spacing {
+        font-size: 15px;
+        font-weight: 600;
+        color: #171717;
+    }
+
+    .report-table table {
+        width: 100%;
+        table-layout: fixed;
+        border-collapse: collapse;
+    }
+
+    .report-table thead th {
+        background: #f8f8f8;
+        text-align: center;
+        font-size: 14px;
+        font-weight: 500;
+        color: #7c7c7c;
+        border-top: 1px solid #ededed;
+        border-bottom: 1px solid #ededed;
+        padding: 6px 8px;
+    }
+
+    .report-table tbody td {
+        padding: 6px 8px;
+        border-top: 1px solid #ededed;
+        border-bottom: 1px solid #ededed;
+        vertical-align: top;
+        word-wrap: break-word;
+        font-size: 14px;
+    }
+
+    .report-table thead th:first-child {
+        border-left: 1px solid #ededed;
+    }
+
+    .report-table thead th:last-child {
+        border-right: 1px solid #ededed;
+    }
+
+    .report-table tbody tr:last-child td {
+        border-bottom: none;
+    }
+
+    .text-center { text-align: center; }
+    .text-right { text-align: right; font-variant-numeric: tabular-nums; }
+    .text-left { text-align: left; }
+    .text-bold { font-weight: 700; }
+
+    .report-meta {
+        margin: 10px 0 14px;
+        padding: 8px 10px;
+        font-size: 14px;
+        display: flex;
+        justify-content: space-between;
+    }
+
+    .report-meta .left,
+    .report-meta .right {
+        display: flex;
+        flex-direction: column;
+    }
+
+    .report-meta strong {
+        color: #7c7c7c;
+        font-weight: 500;
+    }
+
+    .report-subtitle {
+        margin: 10px 0 14px;
+    }
+
+    @media print {
+        @page {
+            size: A4;
+            margin-top: 10mm;
+        }
+        thead { display: table-header-group; }
+        tr { page-break-inside: avoid; }
+    }
+</style>
+
+<br>
+
+<div>
+
+    <div class="text-center" style="margin-bottom: 12px;">
+        <div class="title-letter-spacing">
+            {%= __(report.report_name) %}
+        </div>
+    </div>
+
+    {% if (subtitle && subtitle.trim()) { %}
+        <div class="report-subtitle">
+            {{ subtitle }}
+        </div>
+    {% } else { %}
+        <div class="report-meta">
+            <div class="left">
+                <div>
+                    <strong>{%= __("Supplier") %}:</strong>
+                    {%= (filters.party.length && filters.party.join(", ")) || __("All Parties") %}
+                </div>
+            </div>
+
+            <div class="right text-right">
+                <div>
+                    <strong>{%= __("Report Date") %}:</strong>
+                    {%= frappe.datetime.str_to_user(filters.report_date) %}
+                </div>
+            </div>
+        </div>
+    {% } %}
+
+    <div class="report-table">
+        <table>
+            <thead>
+                <tr>
+                    <th style="width: 8em; text-align: left;">{%= __("Date") %}</th>
+                    <th style="text-align: left;">{%= __("Reference") %}</th>
+
+                    {% if(filters.show_remarks) { %}
+                        <th style="text-align: left;">{%= __("Remarks") %}</th>
+                    {% } %}
+
+                    <th style="width: 10em; text-align: right;">{%= __("Age (Days)") %}</th>
+                    <th style="width: 10em; text-align: right;">{%= __("Invoiced Amount") %}</th>
+                    <th style="width: 11em; text-align: right;">{%= __("Outstanding Amount") %}</th>
+                </tr>
+            </thead>
+
+            <tbody>
+                {% for(var i=0, l=data.length; i<l; i++) { %}
+                    <tr>
+                        <td class="text-left">{%= frappe.datetime.str_to_user(data[i]["posting_date"]) %}</td>
+
+                        <td class="{% if(i == data.length - 1) { %}text-left text-bold{% } %}">
+                            {% if(i == data.length - 1) { %}
+                                {%= __("Total") %}
+                            {% } else { %}
+                                {%= data[i]["voucher_no"] %}
+                            {% } %}
+                        </td>
+
+                        {% if(filters.show_remarks) { %}
+                            <td class="text-left">
+                                {% if(data[i]["remarks"] && data[i]["remarks"] != "No Remarks") { %}
+                                    {%= data[i]["remarks"] %}
+                                {% } %}
+                            </td>
+                        {% } %}
+
+                        <td class="text-right">{%= data[i]["age"] %}</td>
+                        <td class="text-right">{%= format_currency(data[i]["invoiced"], data[i]["currency"]) %}</td>
+                        <td class="text-right">{%= format_currency(data[i]["outstanding"], data[i]["currency"]) %}</td>
+                    </tr>
+                {% } %}
+            </tbody>
+        </table>
+    </div>
+
+    &nbsp;
+
+    {% if(filters.show_future_payments) { %}
+        {%
+            var balance_row = data.slice(-1).pop();
+            var start = report.columns.findIndex(e => e.fieldname == 'age');
+            var currency = data[data.length - 1]["currency"];
+
+            var ranges = [
+                report.columns[start].label,
+                report.columns[start+1].label,
+                report.columns[start+2].label,
+                report.columns[start+3].label,
+                report.columns[start+4].label,
+                report.columns[start+5].label
+            ];
+        %}
+
+        {% if(balance_row) { %}
+        <div class="report-table">
+            <table>
+                <thead>
+                    <tr>
+                        <th style="text-align: right;"></th>
+                        {% for(var i = 0; i < ranges.length; i++) { %}
+                            <th style="text-align: right;">{%= __(ranges[i]) %}</th>
+                        {% } %}
+                        <th style="text-align: right;">{%= __("Total") %}</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td>{%= __("Total Outstanding") %}</td>
+                        <td class="text-right">{%= format_number(balance_row["age"], null, 2) %}</td>
+                        <td class="text-right">{%= format_currency(balance_row["range1"], currency) %}</td>
+                        <td class="text-right">{%= format_currency(balance_row["range2"], currency) %}</td>
+                        <td class="text-right">{%= format_currency(balance_row["range3"], currency) %}</td>
+                        <td class="text-right">{%= format_currency(balance_row["range4"], currency) %}</td>
+                        <td class="text-right">{%= format_currency(balance_row["range5"], currency) %}</td>
+                        <td class="text-right">{%= format_currency(flt(balance_row["outstanding"]), currency) %}</td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+        {% } %}
+    {% } %}
+
+    <p class="text-right">
+        {%= __("Printed on {0}", [
+            frappe.datetime.str_to_user(frappe.datetime.get_datetime_as_string())
+        ]) %}
+    </p>
+
+</div>

erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.html

@@ -1 +1,180 @@
-{% include "accounts/report/accounts_receivable/accounts_receivable.html" %}
+<style type="text/css">
+    body, html {
+        margin-top: 10px;
+        padding: 0;
+        width: 100%;
+        height: auto;
+        font-family: Inter, sans-serif;
+        font-size: 14px;
+        line-height: 21px;
+        color: #171717;
+    }
+
+    .title-letter-spacing {
+        font-size: 15px;
+        font-weight: 600;
+        color: #171717;
+    }
+
+    .report-table table {
+        width: 100%;
+        table-layout: fixed;
+        border-collapse: collapse;
+    }
+
+    .report-table thead th {
+        background: #f8f8f8;
+        font-size: 14px;
+        font-weight: 500;
+        color: #7c7c7c;
+        border-top: 1px solid #ededed;
+        border-bottom: 1px solid #ededed;
+        padding: 6px 8px;
+    }
+
+    .report-table tbody td {
+        padding: 6px 8px;
+        border-top: 1px solid #ededed;
+        border-bottom: 1px solid #ededed;
+        vertical-align: top;
+        word-wrap: break-word;
+        font-size: 14px;
+    }
+
+    .report-table thead th:first-child {
+        border-left: 1px solid #ededed;
+    }
+
+    .report-table thead th:last-child {
+        border-right: 1px solid #ededed;
+    }
+
+    .report-table tbody tr:last-child td {
+        border-bottom: none;
+    }
+
+    .report-meta {
+        margin: 10px 0 14px;
+        padding: 8px 10px;
+        font-size: 14px;
+        display: flex;
+        justify-content: space-between;
+    }
+
+    .report-meta .left,
+    .report-meta .right {
+        display: flex;
+        flex-direction: column;
+    }
+
+    .report-meta strong {
+        color: #7c7c7c;
+        font-weight: 500;
+    }
+
+    .report-subtitle {
+        margin: 10px 0 14px;
+    }
+
+    .text-center { text-align: center; }
+    .text-right { text-align: right; font-variant-numeric: tabular-nums; }
+    .text-left { text-align: left; }
+    .text-bold { font-weight: 700; }
+
+    @media print {
+        @page {
+            size: A4;
+            margin-top: 10mm;
+        }
+        thead { display: table-header-group; }
+        tr { page-break-inside: avoid; }
+    }
+</style>
+
+<br>
+
+<div>
+
+    <div class="text-center" style="margin-bottom: 12px;">
+        <div class="title-letter-spacing">
+            {%= __(report.report_name) %}
+        </div>
+    </div>
+
+    {% if (subtitle && subtitle.trim()) { %}
+        <div class="report-subtitle">
+            {{ subtitle }}
+        </div>
+    {% } else { %}
+    <div class="report-meta">
+            <div class="left">
+                <div>
+                    <strong>{%= __("Supplier") %}:</strong>
+                    {%= (filters.party && filters.party.length && filters.party.join(", ")) || __("All Parties") %}
+                </div>
+            </div>
+
+            <div class="right text-right">
+                <div>
+                    <strong>{%= __("Ageing Based On") %}:</strong>
+                    {%= __(filters.ageing_based_on) %}
+                </div>
+                <div>
+                    <strong>{%= __("As on Date") %}:</strong>
+                    {%= frappe.datetime.str_to_user(filters.report_date) %}
+                </div>
+            </div>
+        </div>
+    {% } %}
+
+    <div class="report-table">
+        <table>
+            <thead>
+                <tr>
+                    <th class="text-left">{%= __("Supplier") %}</th>
+                    <th class="text-right">{%= __("Total Invoiced Amount") %}</th>
+                    <th class="text-right">{%= __("Total Paid Amount") %}</th>
+                    <th class="text-right">{%= __("Debit Note Amount") %}</th>
+                    <th class="text-right">{%= __("Total Outstanding Amount") %}</th>
+                </tr>
+            </thead>
+
+            <tbody>
+                {% for (var i = 0, l = data.length; i < l; i++) {
+                    var row = data[i];
+                    if (!(row.party || row.is_total_row)) continue;
+                %}
+                    <tr>
+                        <td class="{% if (row.is_total_row) { %}text-bold{% } %}">
+                            {% if (row.is_total_row) { %}
+                                {%= __("Total") %}
+                            {% } else { %}
+                                {%= row.party %}
+                            {% } %}
+                        </td>
+
+                        <td class="text-right">
+                            {%= format_currency(row.invoiced, row.currency) %}
+                        </td>
+                        <td class="text-right">
+                            {%= format_currency(row.paid, row.currency) %}
+                        </td>
+                        <td class="text-right">
+                            {%= format_currency(row.debit_note, row.currency) %}
+                        </td>
+                        <td class="text-right">
+                            {%= format_currency(row.outstanding, row.currency) %}
+                        </td>
+                    </tr>
+                {% } %}
+            </tbody>
+        </table>
+    </div>
+
+    <p class="text-right">
+        {%= __("Printed on {0}", [
+            frappe.datetime.str_to_user(frappe.datetime.get_datetime_as_string())
+        ]) %}
+    </p>
+
+</div>

erpnext/accounts/report/accounts_receivable/accounts_receivable.html

@@ -1,291 +1,225 @@
-<style>
-	.print-format {
-		padding: 4mm;
-		font-size: 8.0pt !important;
-	}
-	.print-format td {
-		vertical-align:middle !important;
-	}
-	</style>
+<style type="text/css">
+    body, html {
+        margin-top: 10px;
+        padding: 0;
+        width: 100%;
+        height: auto;
+        font-family: Inter, sans-serif;
+        font-size: 14px;
+        line-height: 21px;
+        color: #171717;
+    }
 
-	<h2 class="text-center" style="margin-top:0">{%= __(report.report_name) %}</h2>
-	<h4 class="text-center">
-		{% if (filters.party) { %}
-			{%= __(filters.party) %}
-		{% } %}
-	</h4>
-	<h6 class="text-center">
-			{% if (filters.tax_id) { %}
-			{%= __("Tax Id: ")%}	{%= filters.tax_id %}
-			{% } %}
-	</h6>
-	<h5 class="text-center">
-		{%= __(filters.ageing_based_on) %}
-		{%= __("Until") %}
-		{%= frappe.datetime.str_to_user(filters.report_date) %}
-	</h5>
+    .title-letter-spacing {
+        font-size: 15px;
+        font-weight: 600;
+        color: #171717;
+    }
 
-	<div class="clearfix">
-		<div class="pull-left">
-		{% if(filters.payment_terms) { %}
-			<strong>{%= __("Payment Terms") %}:</strong> {%= filters.payment_terms %}
-		{% } %}
-		</div>
-		<div class="pull-right">
-		{% if(filters.credit_limit) { %}
-			<strong>{%= __("Credit Limit") %}:</strong> {%= format_currency(filters.credit_limit) %}
-		{% } %}
-		</div>
-	</div>
+    .report-table table {
+        width: 100%;
+        table-layout: fixed;
+        border-collapse: collapse;
+    }
 
-	{% if(filters.show_future_payments) { %}
-		{% var balance_row = data.slice(-1).pop();
-			var start = report.columns.findIndex((elem) => (elem.fieldname == 'age'));
-			var range1 = report.columns[start].label;
-			var range2 = report.columns[start+1].label;
-			var range3 = report.columns[start+2].label;
-			var range4 = report.columns[start+3].label;
-			var range5 = report.columns[start+4].label;
-			var range6 = report.columns[start+5].label;
-		%}
-		{% if(balance_row) { %}
-		<table class="table table-bordered table-condensed">
-			<caption class="text-right">(Amount in {%= data[0]["currency"] || "" %})</caption>
-				<colgroup>
-					<col style="width: 30mm;">
-					<col style="width: 18mm;">
-					<col style="width: 18mm;">
-					<col style="width: 18mm;">
-					<col style="width: 18mm;">
-					<col style="width: 18mm;">
-					<col style="width: 18mm;">
-					<col style="width: 18mm;">
-				</colgroup>
+    .report-table thead th {
+        background: #f8f8f8;
+        text-align: center;
+        font-size: 14px;
+        font-weight: 500;
+        color: #7c7c7c;
+        border-top: 1px solid #ededed;
+        border-bottom: 1px solid #ededed;
+        padding: 6px 8px;
+    }
 
+    .report-table tbody td {
+        padding: 6px 8px;
+        border-top: 1px solid #ededed;
+        border-bottom: 1px solid #ededed;
+        vertical-align: top;
+        word-wrap: break-word;
+        font-size: 14px;
+    }
+
+	.report-table thead th:first-child {
+        border-left: 1px solid #ededed;
+    }
+
+    .report-table thead th:last-child {
+        border-right: 1px solid #ededed;
+    }
+
+    .report-table tbody tr:last-child td {
+        border-bottom: none;
+    }
+
+    .text-center { text-align: center; }
+    .text-right { text-align: right; font-variant-numeric: tabular-nums; }
+    .text-left { text-align: left; }
+
+	.text-bold { font-weight: 700;}
+
+    .report-meta {
+        margin: 10px 0 14px;
+        padding: 8px 10px;
+        font-size: 14px;
+        display: flex;
+        justify-content: space-between;
+    }
+
+    .report-meta .left,
+    .report-meta .right {
+        display: flex;
+        flex-direction: column;
+    }
+
+    .report-meta strong {
+        color: #7c7c7c;
+        font-weight: 500;
+    }
+
+    .report-subtitle {
+        margin: 10px 0 14px;
+    }
+
+    @media print {
+        @page {
+            size: A4;
+            margin-top: 10mm;
+        }
+        thead { display: table-header-group; }
+        tr { page-break-inside: avoid; }
+    }
+</style>
+
+<br>
+
+<div>
+
+    <div class="text-center" style="margin-bottom: 12px;">
+        <div class="title-letter-spacing">
+            {%= __(report.report_name) %}
+        </div>
+    </div>
+
+    {% if (subtitle && subtitle.trim()) { %}
+        <div class="report-subtitle">
+            {{ subtitle }}
+        </div>
+    {% } else { %}
+        <div class="report-meta">
+            <div class="left">
+                <div>
+                    <strong>{%= __("Customer") %}:</strong>
+                    {%= (filters.party.length && filters.party.join(", ")) || __("All Parties") %}
+                </div>
+            </div>
+
+            <div class="right text-right">
+                <div>
+                    <strong>{%= __("Report Date") %}:</strong>
+                    {%= frappe.datetime.str_to_user(filters.report_date) %}
+                </div>
+            </div>
+        </div>
+    {% } %}
+
+    <div class="report-table">
+		<table>
 			<thead>
 				<tr>
-					<th>{%= __(" ") %}</th>
-					<th>{%= __(range1) %}</th>
-					<th>{%= __(range2) %}</th>
-					<th>{%= __(range3) %}</th>
-					<th>{%= __(range4) %}</th>
-					<th>{%= __(range5) %}</th>
-					<th>{%= __(range6) %}</th>
-					<th>{%= __("Total") %}</th>
+					<th style="width: 8em; text-align: left;">{%= __("Date") %}</th>
+					<th style="text-align: left;">{%= __("Reference") %}</th>
+
+					{% if(filters.show_remarks) { %}
+						<th style="text-align: left;">{%= __("Remarks") %}</th>
+					{% } %}
+
+					<th style="width: 10em; text-align: right;">{%= __("Age (Days)") %}</th>
+					<th style="width: 10em; text-align: right;">{%= __("Invoiced Amount") %}</th>
+					<th style="width: 11em; text-align: right;">{%= __("Outstanding Amount") %}</th>
 				</tr>
 			</thead>
-			<tbody>
-				<tr>
-					<td>{%= __("Total Outstanding") %}</td>
-					<td class="text-right">
-						{%= format_number(balance_row["age"], null, 2) %}
-					</td>
-					<td class="text-right">
-						{%= format_currency(balance_row["range1"], data[data.length-1]["currency"]) %}
-					</td>
-					<td class="text-right">
-						{%= format_currency(balance_row["range2"], data[data.length-1]["currency"]) %}
-					</td>
-					<td class="text-right">
-						{%= format_currency(balance_row["range3"], data[data.length-1]["currency"]) %}
-					</td>
-					<td class="text-right">
-						{%= format_currency(balance_row["range4"], data[data.length-1]["currency"]) %}
-					</td>
-					<td class="text-right">
-						{%= format_currency(balance_row["range5"], data[data.length-1]["currency"]) %}
-					</td>
-					<td class="text-right">
-						{%= format_currency(flt(balance_row["outstanding"]), data[data.length-1]["currency"]) %}
-					</td>
-				</tr>
-					<td>{%= __("Future Payments") %}</td>
-					<td></td>
-					<td></td>
-					<td></td>
-					<td></td>
-					<td></td>
-					<td></td>
-					<td class="text-right">
-						{%= format_currency(flt(balance_row[("future_amount")]), data[data.length-1]["currency"]) %}
-					</td>
-				<tr class="cvs-footer">
-					<th class="text-left">{%= __("Cheques Required") %}</th>
-					<th></th>
-					<th></th>
-					<th></th>
-					<th></th>
-					<th></th>
-					<th></th>
-					<th class="text-right">
-						{%= format_currency(flt(balance_row["outstanding"] - balance_row[("future_amount")]), data[data.length-1]["currency"]) %}</th>
-				</tr>
-			</tbody>
 
+			<tbody>
+				{% for(var i=0, l=data.length; i<l; i++) { %}
+					<tr>
+						<td class="text-left">{%= frappe.datetime.str_to_user(data[i]["posting_date"]) %}</td>
+						<td class="{% if(i == data.length - 1) { %}text-left text-bold{% } %}">
+							{% if(i == data.length - 1) { %}
+								{%= __("Total") %}
+							{% } else { %}
+								{%= data[i]["voucher_no"] %}
+							{% } %}
+						</td>
+						{% if(filters.show_remarks) { %}
+							<td class="text-left">
+								{% if(data[i]["remarks"] && data[i]["remarks"] != "No Remarks") { %}
+									{%= data[i]["remarks"] %}
+								{% } %}
+							</td>
+						{% } %}
+						<td class="text-right">{%= data[i]["age"] %}</td>
+						<td class="text-right">{%= format_currency(data[i]["invoiced"], data[i]["currency"]) %}</td>
+						<td class="text-right">{%= format_currency(data[i]["outstanding"], data[i]["currency"]) %}</td>
+					</tr>
+				{% } %}
+			</tbody>
 		</table>
+	</div>
+
+	&nbsp;
+
+	{% if(filters.show_future_payments) { %}
+		{%
+			var balance_row = data.slice(-1).pop();
+			var start = report.columns.findIndex(e => e.fieldname == 'age');
+			var currency = data[data.length - 1]["currency"];
+
+			var ranges = [
+				report.columns[start].label,
+				report.columns[start+1].label,
+				report.columns[start+2].label,
+				report.columns[start+3].label,
+				report.columns[start+4].label,
+				report.columns[start+5].label
+			];
+		%}
+
+		{% if(balance_row) { %}
+		<div class="report-table">
+			<table>
+				<thead>
+					<tr>
+						<th style="text-align: right;"></th>
+						{% for(var i = 0; i < ranges.length; i++) { %}
+							<th style="text-align: right;">{%= __(ranges[i]) %}</th>
+						{% } %}
+						<th style="text-align: right;">{%= __("Total") %}</th>
+					</tr>
+				</thead>
+				<tbody>
+					<tr>
+						<td>{%= __("Total Outstanding") %}</td>
+						<td class="text-right">{%= format_number(balance_row["age"], null, 2) %}</td>
+						<td class="text-right">{%= format_currency(balance_row["range1"], currency) %}</td>
+						<td class="text-right">{%= format_currency(balance_row["range2"], currency) %}</td>
+						<td class="text-right">{%= format_currency(balance_row["range3"], currency) %}</td>
+						<td class="text-right">{%= format_currency(balance_row["range4"], currency) %}</td>
+						<td class="text-right">{%= format_currency(balance_row["range5"], currency) %}</td>
+						<td class="text-right">{%= format_currency(flt(balance_row["outstanding"]), currency) %}</td>
+					</tr>
+				</tbody>
+			</table>
+		</div>
 		{% } %}
 	{% } %}
-	<table class="table table-bordered">
-		<thead>
-			<tr>
-				{% if(report.report_name === "Accounts Receivable" || report.report_name === "Accounts Payable") { %}
-					<th style="width: 10%">{%= __("Date") %}</th>
-					<th style="width: 4%">{%= __("Age (Days)") %}</th>
 
-					{% if(report.report_name === "Accounts Receivable" && filters.show_sales_person) { %}
-						<th style="width: 14%">{%= __("Reference") %}</th>
-						<th style="width: 10%">{%= __("Sales Person") %}</th>
-					{% } else { %}
-						<th style="width: 24%">{%= __("Reference") %}</th>
-					{% } %}
-					{% if(!filters.show_future_payments) { %}
-						<th style="width: 20%">{%= (filters.party) ? __("Remarks"): __("Party") %}</th>
-					{% } %}
-					<th style="width: 10%; text-align: right">{%= __("Invoiced Amount") %}</th>
-					{% if(!filters.show_future_payments) { %}
-						<th style="width: 10%; text-align: right">{%= __("Paid Amount") %}</th>
-						<th style="width: 10%; text-align: right">{%= report.report_name === "Accounts Receivable" ? __('Credit Note') : __('Debit Note') %}</th>
-					{% } %}
-					<th style="width: 10%; text-align: right">{%= __("Outstanding Amount") %}</th>
-					{% if(filters.show_future_payments) { %}
-						{% if(report.report_name === "Accounts Receivable") { %}
-							<th style="width: 12%">{%= __("Customer LPO No.") %}</th>
-						{% } %}
-						<th style="width: 10%">{%= __("Future Payment Ref") %}</th>
-						<th style="width: 10%">{%= __("Future Payment Amount") %}</th>
-						<th style="width: 10%">{%= __("Remaining Balance") %}</th>
-					{% } %}
-				{% } else { %}
-					<th style="width: 40%">{%= (filters.party) ? __("Remarks"): __("Party") %}</th>
-					<th style="width: 15%">{%= __("Total Invoiced Amount") %}</th>
-					<th style="width: 15%">{%= __("Total Paid Amount") %}</th>
-					<th style="width: 15%">{%= report.report_name === "Accounts Receivable Summary" ? __('Credit Note Amount') : __('Debit Note Amount') %}</th>
-					<th style="width: 15%">{%= __("Total Outstanding Amount") %}</th>
-				{% } %}
-			</tr>
-		</thead>
-		<div class="show-filters">
-			{% if subtitle %}
-				{{ subtitle }}
-				<hr>
-			{% endif %}
-		</div>
-		<tbody>
-			{% for(var i=0, l=data.length; i<l; i++) { %}
-				<tr>
-				{% if(report.report_name === "Accounts Receivable" || report.report_name === "Accounts Payable") { %}
-					{% if(data[i]["party"]) { %}
-						<td>{%= frappe.datetime.str_to_user(data[i]["posting_date"]) %}</td>
-						<td style="text-align: right">{%= data[i]["age"] %}</td>
-						<td>
-							{% if(!filters.show_future_payments) { %}
-								{%= data[i]["voucher_type"] %}
-								<br>
-							{% } %}
-							{%= data[i]["voucher_no"] %}
-						</td>
+    <p class="text-right">
+        {%= __("Printed on {0}", [
+            frappe.datetime.str_to_user(frappe.datetime.get_datetime_as_string())
+        ]) %}
+    </p>
 
-						{% if(report.report_name === "Accounts Receivable" && filters.show_sales_person) { %}
-						<td>{%= data[i]["sales_person"] %}</td>
-						{% } %}
-
-						{% if(!filters.show_future_payments) { %}
-						<td>
-							{% if(!filters.party?.length) { %}
-								{%= data[i]["party"] %}
-								{% if(data[i]["customer_name"] && data[i]["customer_name"] != data[i]["party"]) { %}
-									<br> {%= data[i]["customer_name"] %}
-								{% } else if(data[i]["supplier_name"] != data[i]["party"]) { %}
-									<br> {%= data[i]["supplier_name"] %}
-								{% } %}
-							{% } %}
-							<div>
-							{% if data[i]["remarks"] %}
-								{%= __("Remarks") %}:
-								{%= data[i]["remarks"] %}
-							{% } %}
-							</div>
-						</td>
-						{% } %}
-
-						<td style="text-align: right">
-							{%= format_currency(data[i]["invoiced"], data[i]["currency"]) %}</td>
-
-						{% if(!filters.show_future_payments) { %}
-							<td style="text-align: right">
-								{%= format_currency(data[i]["paid"], data[i]["currency"]) %}</td>
-							<td style="text-align: right">
-								{%= format_currency(data[i]["credit_note"], data[i]["currency"]) %}</td>
-						{% } %}
-						<td style="text-align: right">
-							{%= format_currency(data[i]["outstanding"], data[i]["currency"]) %}</td>
-
-						{% if(filters.show_future_payments) { %}
-							{% if(report.report_name === "Accounts Receivable") { %}
-								<td style="text-align: right">
-									{%= data[i]["po_no"] %}</td>
-							{% } %}
-							<td style="text-align: right">{%= data[i]["future_ref"] %}</td>
-							<td style="text-align: right">{%= format_currency(data[i]["future_amount"], data[i]["currency"]) %}</td>
-							<td style="text-align: right">{%= format_currency(data[i]["remaining_balance"], data[i]["currency"]) %}</td>
-						{% } %}
-					{% } else { %}
-						<td></td>
-						{% if(!filters.show_future_payments) { %}
-						<td></td>
-						{% } %}
-						{% if(report.report_name === "Accounts Receivable" && filters.show_sales_person) { %}
-						<td></td>
-						{% } %}
-						<td></td>
-						<td style="text-align: right"><b>{%= __("Total") %}</b></td>
-						<td style="text-align: right">
-							{%= format_currency(data[i]["invoiced"], data[i]["currency"] ) %}</td>
-
-						{% if(!filters.show_future_payments) { %}
-							<td style="text-align: right">
-								{%= format_currency(data[i]["paid"], data[i]["currency"]) %}</td>
-							<td style="text-align: right">{%= format_currency(data[i]["credit_note"], data[i]["currency"]) %} </td>
-						{% } %}
-						<td style="text-align: right">
-							{%= format_currency(data[i]["outstanding"], data[i]["currency"]) %}</td>
-
-						{% if(filters.show_future_payments) { %}
-							{% if(report.report_name === "Accounts Receivable") { %}
-								<td style="text-align: right">
-									{%= data[i]["po_no"] %}</td>
-							{% } %}
-							<td style="text-align: right">{%= data[i]["future_ref"] %}</td>
-							<td style="text-align: right">{%= format_currency(data[i]["future_amount"], data[i]["currency"]) %}</td>
-							<td style="text-align: right">{%= format_currency(data[i]["remaining_balance"], data[i]["currency"]) %}</td>
-						{% } %}
-					{% } %}
-				{% } else { %}
-					{% if(data[i]["party"]|| "&nbsp;") { %}
-						{% if(!data[i]["is_total_row"]) { %}
-							<td>
-								{% if(!filters.party?.length) { %}
-									{%= data[i]["party"] %}
-									{% if(data[i]["customer_name"] && data[i]["customer_name"] != data[i]["party"]) { %}
-										<br> {%= data[i]["customer_name"] %}
-									{% } else if(data[i]["supplier_name"] != data[i]["party"]) { %}
-										<br> {%= data[i]["supplier_name"] %}
-									{% } %}
-								{% } %}
-								<br>{%= __("Remarks") %}:
-								{%= data[i]["remarks"] %}
-							</td>
-						{% } else { %}
-							<td><b>{%= __("Total") %}</b></td>
-						{% } %}
-						<td style="text-align: right">{%= format_currency(data[i]["invoiced"], data[i]["currency"]) %}</td>
-						<td style="text-align: right">{%= format_currency(data[i]["paid"], data[i]["currency"]) %}</td>
-						<td style="text-align: right">{%= format_currency(data[i]["credit_note"], data[i]["currency"]) %}</td>
-						<td style="text-align: right">{%= format_currency(data[i]["outstanding"], data[i]["currency"]) %}</td>
-					{% } %}
-				{% } %}
-				</tr>
-			{% } %}
-		</tbody>
-	</table>
-	<p class="text-right text-muted">{%= __("Printed on {0}", [frappe.datetime.str_to_user(frappe.datetime.get_datetime_as_string())]) %}</p>
+</div>

erpnext/accounts/report/accounts_receivable/accounts_receivable.py

@@ -131,8 +131,6 @@ class ReceivablePayableReport:
 			self.fetch_ple_in_buffered_cursor()
 		elif self.ple_fetch_method == "UnBuffered Cursor":
 			self.fetch_ple_in_unbuffered_cursor()
-		elif self.ple_fetch_method == "Raw SQL":
-			self.fetch_ple_in_sql_procedures()
 
 		# Build delivery note map against all sales invoices
 		self.build_delivery_note_map()
@@ -323,81 +321,6 @@ class ReceivablePayableReport:
 				row.paid -= amount
 				row.paid_in_account_currency -= amount_in_account_currency
 
-	def fetch_ple_in_sql_procedures(self):
-		self.proc = InitSQLProceduresForAR()
-
-		build_balance = f"""
-		begin not atomic
-		declare done boolean default false;
-		declare rec1 row type of `{self.proc._row_def_table_name}`;
-		declare ple cursor for {self.ple_query.get_sql()};
-		declare continue handler for not found set done = true;
-
-		open ple;
-		fetch ple into rec1;
-		while not done do
-			call {self.proc.init_procedure_name}(rec1);
-			fetch ple into rec1;
-		end while;
-		close ple;
-
-		set done = false;
-		open ple;
-		fetch ple into rec1;
-		while not done do
-			call {self.proc.allocate_procedure_name}(rec1);
-			fetch ple into rec1;
-		end while;
-		close ple;
-		end;
-		"""
-		frappe.db.sql(build_balance)
-
-		balances = frappe.db.sql(
-			f"""select
-			name,
-			voucher_type,
-			voucher_no,
-			party,
-			party_account `account`,
-			posting_date,
-			account_currency,
-			cost_center,
-			project,
-			sum(invoiced) `invoiced`,
-			sum(paid) `paid`,
-			sum(credit_note) `credit_note`,
-			sum(invoiced) - sum(paid) - sum(credit_note) `outstanding`,
-			sum(invoiced_in_account_currency) `invoiced_in_account_currency`,
-			sum(paid_in_account_currency) `paid_in_account_currency`,
-			sum(credit_note_in_account_currency) `credit_note_in_account_currency`,
-			sum(invoiced_in_account_currency) - sum(paid_in_account_currency) - sum(credit_note_in_account_currency) `outstanding_in_account_currency`
-			from `{self.proc._voucher_balance_name}` group by name order by posting_date;""",
-			as_dict=True,
-		)
-		for x in balances:
-			if self.filters.get("ignore_accounts"):
-				key = (x.voucher_type, x.voucher_no, x.party)
-			else:
-				key = (x.account, x.voucher_type, x.voucher_no, x.party)
-
-			_d = self.build_voucher_dict(x)
-			for field in [
-				"invoiced",
-				"paid",
-				"credit_note",
-				"outstanding",
-				"invoiced_in_account_currency",
-				"paid_in_account_currency",
-				"credit_note_in_account_currency",
-				"outstanding_in_account_currency",
-				"cost_center",
-				"project",
-			]:
-				_d[field] = x.get(field)
-
-			self.voucher_balance[key] = _d
-
 	def update_sub_total_row(self, row, party):
 		total_row = self.total_row_map.get(party)
 
@@ -1400,120 +1323,3 @@ def get_party_group_with_children(party, party_groups):
 			frappe.throw(_("{0}: {1} does not exist").format(group_dtype, d))
 
 	return list(set(all_party_groups))
-
-
-class InitSQLProceduresForAR:
-	"""
-	Initialize SQL Procedures, Functions and Temporary tables to build Receivable / Payable report
-	"""
-
-	_varchar_type = get_definition("Data")
-	_currency_type = get_definition("Currency")
-	# Temporary Tables
-	_voucher_balance_name = "_ar_voucher_balance"
-	_voucher_balance_definition = f"""
-		create temporary table `{_voucher_balance_name}`(
-		name {_varchar_type},
-		voucher_type {_varchar_type},
-		voucher_no {_varchar_type},
-		party {_varchar_type},
-		party_account {_varchar_type},
-		posting_date date,
-		account_currency {_varchar_type},
-		cost_center {_varchar_type},
-		project {_varchar_type},
-		invoiced {_currency_type},
-		paid {_currency_type},
-		credit_note {_currency_type},
-		invoiced_in_account_currency {_currency_type},
-		paid_in_account_currency {_currency_type},
-		credit_note_in_account_currency {_currency_type}) engine=memory;
-	"""
-
-	_row_def_table_name = "_ar_ple_row"
-	_row_def_table_definition = f"""
-		create temporary table `{_row_def_table_name}`(
-		name {_varchar_type},
-		account {_varchar_type},
-		voucher_type {_varchar_type},
-		voucher_no {_varchar_type},
-		against_voucher_type {_varchar_type},
-		against_voucher_no {_varchar_type},
-		party_type {_varchar_type},
-		cost_center {_varchar_type},
-		project {_varchar_type},
-		party {_varchar_type},
-		posting_date date,
-		due_date date,
-		account_currency {_varchar_type},
-		amount {_currency_type},
-		amount_in_account_currency {_currency_type}) engine=memory;
-	"""
-
-	# Procedures
-	init_procedure_name = "ar_init_tmp_table"
-	init_procedure_sql = f"""
-	create procedure ar_init_tmp_table(in ple row type of `{_row_def_table_name}`)
-	begin
-		if not exists (select name from `{_voucher_balance_name}` where name = sha1(concat_ws(',', ple.account, ple.against_voucher_type, ple.against_voucher_no, ple.party)))
-		then
-			insert into `{_voucher_balance_name}` values (sha1(concat_ws(',', ple.account, ple.against_voucher_type, ple.against_voucher_no, ple.party)), ple.voucher_type, ple.voucher_no, ple.party, ple.account, ple.posting_date, ple.account_currency, ple.cost_center, ple.project, 0, 0, 0, 0, 0, 0);
-		end if;
-	end;
-	"""
-
-	allocate_procedure_name = "ar_allocate_to_tmp_table"
-	allocate_procedure_sql = f"""
-	create procedure ar_allocate_to_tmp_table(in ple row type of `{_row_def_table_name}`)
-	begin
-		declare invoiced {_currency_type} default 0;
-		declare invoiced_in_account_currency {_currency_type} default 0;
-		declare paid {_currency_type} default 0;
-		declare paid_in_account_currency {_currency_type} default 0;
-		declare credit_note {_currency_type} default 0;
-		declare credit_note_in_account_currency {_currency_type} default 0;
-
-
-		if ple.amount > 0 then
-			if (ple.voucher_type in ("Journal Entry", "Payment Entry") and (ple.voucher_no != ple.against_voucher_no)) then
-				set paid = -1 * ple.amount;
-				set paid_in_account_currency = -1 * ple.amount_in_account_currency;
-			else
-				set invoiced = ple.amount;
-				set invoiced_in_account_currency = ple.amount_in_account_currency;
-			end if;
-		else
-
-		if ple.voucher_type in ("Sales Invoice", "Purchase Invoice") then
-			if (ple.voucher_no = ple.against_voucher_no) then
-				set paid = -1 * ple.amount;
-				set paid_in_account_currency = -1 * ple.amount_in_account_currency;
-			else
-				set credit_note = -1 * ple.amount;
-				set credit_note_in_account_currency = -1 * ple.amount_in_account_currency;
-		end if;
-		else
-			set paid = -1 * ple.amount;
-			set paid_in_account_currency = -1 * ple.amount_in_account_currency;
-		end if;
-
-		end if;
-
-		insert into `{_voucher_balance_name}` values (sha1(concat_ws(',', ple.account, ple.voucher_type, ple.voucher_no, ple.party)), ple.against_voucher_type, ple.against_voucher_no, ple.party, ple.account, ple.posting_date, ple.account_currency,'', '', invoiced, paid, 0, invoiced_in_account_currency, paid_in_account_currency, 0);
-	end;
-	"""
-
-	def __init__(self):
-		existing_procedures = frappe.db.get_routines()
-
-		if self.init_procedure_name not in existing_procedures:
-			frappe.db.sql(self.init_procedure_sql)
-
-		if self.allocate_procedure_name not in existing_procedures:
-			frappe.db.sql(self.allocate_procedure_sql)
-
-		frappe.db.sql(f"drop table if exists `{self._voucher_balance_name}`")
-		frappe.db.sql(self._voucher_balance_definition)
-
-		frappe.db.sql(f"drop table if exists `{self._row_def_table_name}`")
-		frappe.db.sql(self._row_def_table_definition)

erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.html

@@ -1 +1,180 @@
-{% include "accounts/report/accounts_receivable/accounts_receivable.html" %}
+<style type="text/css">
+    body, html {
+        margin-top: 10px;
+        padding: 0;
+        width: 100%;
+        height: auto;
+        font-family: Inter, sans-serif;
+        font-size: 14px;
+        line-height: 21px;
+        color: #171717;
+    }
+
+    .title-letter-spacing {
+        font-size: 15px;
+        font-weight: 600;
+        color: #171717;
+    }
+
+    .report-table table {
+        width: 100%;
+        table-layout: fixed;
+        border-collapse: collapse;
+    }
+
+    .report-table thead th {
+        background: #f8f8f8;
+        font-size: 14px;
+        font-weight: 500;
+        color: #7c7c7c;
+        border-top: 1px solid #ededed;
+        border-bottom: 1px solid #ededed;
+        padding: 6px 8px;
+    }
+
+    .report-table tbody td {
+        padding: 6px 8px;
+        border-top: 1px solid #ededed;
+        border-bottom: 1px solid #ededed;
+        vertical-align: top;
+        word-wrap: break-word;
+        font-size: 14px;
+    }
+
+    .report-table thead th:first-child {
+        border-left: 1px solid #ededed;
+    }
+
+    .report-table thead th:last-child {
+        border-right: 1px solid #ededed;
+    }
+
+    .report-table tbody tr:last-child td {
+        border-bottom: none;
+    }
+
+    .report-meta {
+        margin: 10px 0 14px;
+        padding: 8px 10px;
+        font-size: 14px;
+        display: flex;
+        justify-content: space-between;
+    }
+
+    .report-meta .left,
+    .report-meta .right {
+        display: flex;
+        flex-direction: column;
+    }
+
+    .report-meta strong {
+        color: #7c7c7c;
+        font-weight: 500;
+    }
+
+    .report-subtitle {
+        margin: 10px 0 14px;
+    }
+
+    .text-center { text-align: center; }
+    .text-right { text-align: right; font-variant-numeric: tabular-nums; }
+    .text-left { text-align: left; }
+    .text-bold { font-weight: 700; }
+
+    @media print {
+        @page {
+            size: A4;
+            margin-top: 10mm;
+        }
+        thead { display: table-header-group; }
+        tr { page-break-inside: avoid; }
+    }
+</style>
+
+<br>
+
+<div>
+
+    <div class="text-center" style="margin-bottom: 12px;">
+        <div class="title-letter-spacing">
+            {%= __(report.report_name) %}
+        </div>
+    </div>
+
+    {% if (subtitle && subtitle.trim()) { %}
+        <div class="report-subtitle">
+            {{ subtitle }}
+        </div>
+    {% } else { %}
+    <div class="report-meta">
+            <div class="left">
+                <div>
+                    <strong>{%= __("Customer") %}:</strong>
+                    {%= (filters.party && filters.party.length && filters.party.join(", ")) || __("All Parties") %}
+                </div>
+            </div>
+
+            <div class="right text-right">
+                <div>
+                    <strong>{%= __("Ageing Based On") %}:</strong>
+                    {%= __(filters.ageing_based_on) %}
+                </div>
+                <div>
+                    <strong>{%= __("As on Date") %}:</strong>
+                    {%= frappe.datetime.str_to_user(filters.report_date) %}
+                </div>
+            </div>
+        </div>
+    {% } %}
+
+    <div class="report-table">
+        <table>
+            <thead>
+                <tr>
+                    <th class="text-left">{%= __("Customer") %}</th>
+                    <th class="text-right">{%= __("Total Invoiced Amount") %}</th>
+                    <th class="text-right">{%= __("Total Paid Amount") %}</th>
+                    <th class="text-right">{%= __("Credit Note Amount") %}</th>
+                    <th class="text-right">{%= __("Total Outstanding Amount") %}</th>
+                </tr>
+                </thead>
+
+                <tbody>
+                {% for (var i = 0, l = data.length; i < l; i++) {
+                    var row = data[i];
+                    if (!(row.party || row.is_total_row)) continue;
+                %}
+                    <tr>
+                        <td class="{% if (row.is_total_row) { %}text-bold{% } %}">
+                            {% if (row.is_total_row) { %}
+                                {%= __("Total") %}
+                            {% } else { %}
+                                {%= row.party %}
+                            {% } %}
+                        </td>
+
+                        <td class="text-right">
+                            {%= format_currency(row.invoiced, row.currency) %}
+                        </td>
+                        <td class="text-right">
+                            {%= format_currency(row.paid, row.currency) %}
+                        </td>
+                        <td class="text-right">
+                            {%= format_currency(row.credit_note, row.currency) %}
+                        </td>
+                        <td class="text-right">
+                            {%= format_currency(row.outstanding, row.currency) %}
+                        </td>
+                    </tr>
+                {% } %}
+                </tbody>
+        </table>
+    </div>
+
+    <p class="text-right">
+        {%= __("Printed on {0}", [
+            frappe.datetime.str_to_user(frappe.datetime.get_datetime_as_string())
+        ]) %}
+    </p>
+
+</div>

erpnext/accounts/report/balance_sheet/balance_sheet.html

@@ -1 +1,224 @@
-{% include "accounts/report/financial_statements.html" %}
+{%
+	const report_columns = report
+		.get_columns_for_print()
+		.filter(col => !col.hidden);
+
+	if (report_columns.length > 8) {
+		frappe.throw(
+			__("Too many columns. Export the report and print it using a spreadsheet application.")
+		);
+	}
+%}
+
+<style>
+	body, html {
+		margin-top: 10px;
+		padding: 0;
+		width: 100%;
+		height: auto;
+		font-family: Inter, sans-serif;
+		font-size: 14px;
+		line-height: 21px;
+		color: #171717;
+	}
+
+	.title-letter-spacing {
+		font-size: 15px;
+		font-weight: 600;
+		color: #171717;
+	}
+
+	.financial-statements-important td { font-weight: bold; }
+	.financial-statements-blank-row td { height: 20px; }
+
+	.report-meta {
+		margin: 10px 0 14px;
+		padding: 8px 10px;
+		display: flex;
+		justify-content: space-between;
+		font-size: 14px;
+	}
+
+	.report-meta .left,
+	.report-meta .right {
+		display: flex;
+		flex-direction: column;
+	}
+
+	.report-meta strong {
+		color: #7c7c7c;
+		font-weight: 500;
+	}
+
+    .report-subtitle {
+        margin: 10px 0 14px;
+    }
+
+	.text-center { text-align: center; }
+	.text-right {
+		text-align: right;
+		font-variant-numeric: tabular-nums;
+	}
+	.text-left { text-align: left; }
+	.text-bold { font-weight: 700; }
+
+	.report-table table {
+		width: 100%;
+		table-layout: fixed;
+		border-collapse: collapse;
+	}
+
+	.report-table th,
+	.report-table td {
+		padding: 6px 8px;
+		font-size: 14px;
+		border-top: 1px solid #ededed;
+		border-bottom: 1px solid #ededed;
+	}
+
+	.report-table thead th {
+		background: #f8f8f8;
+		font-weight: 500;
+		color: #7c7c7c;
+	}
+
+	.report-table tbody td {
+		vertical-align: top;
+		word-wrap: break-word;
+	}
+
+	.report-table thead th:first-child {
+		border-left: 1px solid #ededed;
+	}
+
+	.report-table thead th:last-child {
+		border-right: 1px solid #ededed;
+	}
+
+	.report-table tbody tr:last-child td {
+		border-bottom: none;
+	}
+
+	@media print {
+		@page {
+			size: A4;
+			margin-top: 10mm;
+		}
+		thead { display: table-header-group; }
+		tr { page-break-inside: avoid; }
+	}
+</style>
+
+<div>
+
+	<div class="text-center" style="margin-bottom: 12px;">
+		<div class="title-letter-spacing">
+			{%= __(report.report_name) %}
+		</div>
+	</div>
+
+    {% if (subtitle && subtitle.trim()) { %}
+        <div class="report-subtitle">
+            {{ subtitle }}
+        </div>
+    {% } else { %}
+        <div class="report-meta">
+            <div class="left">
+                <div>
+                    <strong>{%= __("Company") %}:</strong> {%= filters.company %}
+                </div>
+                <div>
+                    <strong>{%= __("Currency") %}:</strong>
+                    {%= filters.presentation_currency || erpnext.get_currency(filters.company) %}
+                </div>
+            </div>
+
+            <div class="right text-right">
+                <div>
+                    <strong>{%= __("Period Based On") %}:</strong>
+                    {%= filters.filter_based_on %}
+                </div>
+
+                {% if (filters.filter_based_on === "Fiscal Year") { %}
+                    <div>
+                        <strong>{%= __("Start Year") %}:</strong> {%= filters.from_fiscal_year %}
+                    </div>
+                    <div>
+                        <strong>{%= __("End Year") %}:</strong> {%= filters.to_fiscal_year %}
+                    </div>
+
+                {% } else if (filters.filter_based_on === "Date Range") { %}
+                    <div>
+                        <strong>{%= __("Start Date") %}:</strong>
+                        {%= frappe.datetime.str_to_user(filters.period_start_date) %}
+                    </div>
+                    <div>
+                        <strong>{%= __("End Date") %}:</strong>
+                        {%= frappe.datetime.str_to_user(filters.period_end_date) %}
+                    </div>
+                {% } %}
+            </div>
+        </div>
+    {% } %}
+
+	<div class="report-table">
+    	<table>
+    		<thead>
+    			<tr>
+    				{% for (let i = 0, l = report_columns.length; i < l; i++) { %}
+    					{%
+    						const col = report_columns[i];
+    						const align = i === 0 ? "text-left" : "text-right";
+    					%}
+    					<th class="{%= align %}">
+    						{%= col.label %}
+    					</th>
+    				{% } %}
+    			</tr>
+    		</thead>
+
+    		<tbody>
+    			{% for (let j = 0, k = data.length; j < k; j++) { %}
+    				{%
+    					const row = data[j];
+
+    					let row_class = "";
+    					if (!(row.parent_account || row.parent_section)) {
+    						row_class = "financial-statements-important";
+    					}
+    					if (!(row.account_name || row.section)) {
+    						row_class += " financial-statements-blank-row";
+    					}
+    				%}
+
+    				<tr class="{%= row_class %}">
+    					{% for (let i = 0, l = report_columns.length; i < l; i++) { %}
+    						{%
+    							const col = report_columns[i];
+    							const value = row[col.fieldname];
+    							const align = i === 0 ? "text-left" : "text-right";
+    						%}
+
+    						<td class="{%= align %}">
+    							{% if (i === 0) { %}
+    								<span style="padding-left: {%= cint(row.indent) * 2 %}em">
+	                                   {%= String(row.account_name || row.section || "").replace(/^['"]|['"]$/g, "") %}
+    								</span>
+    							{% } else if (!is_null(value)) { %}
+    								{%= frappe.format(value, col, {}, row) %}
+    							{% } %}
+    						</td>
+    					{% } %}
+    				</tr>
+    			{% } %}
+    		</tbody>
+    	</table>
+    </div>
+
+	<p class="text-right text-muted">
+		{%= __("Printed on {0}", [
+			frappe.datetime.str_to_user(frappe.datetime.get_datetime_as_string())
+		]) %}
+	</p>
+
+</div>

erpnext/accounts/report/balance_sheet/balance_sheet.py

@@ -8,6 +8,7 @@ from frappe.utils import cint, flt
 
 from erpnext.accounts.doctype.financial_report_template.financial_report_engine import (
 	FinancialReportEngine,
+	get_xlsx_styles,  #! DO NOT REMOVE - hook for styling
 )
 from erpnext.accounts.report.financial_statements import (
 	compute_growth_view_data,

erpnext/accounts/report/balance_sheet/test_balance_sheet.py

@@ -13,9 +13,6 @@ COMPANY_SHORT_NAME = "_TC6"
 
 class TestBalanceSheet(ERPNextTestSuite):
 	def test_balance_sheet(self):
-		frappe.db.sql(f"delete from `tabJournal Entry` where company='{COMPANY}'")
-		frappe.db.sql(f"delete from `tabGL Entry` where company='{COMPANY}'")
-
 		create_account("VAT Liabilities", f"Duties and Taxes - {COMPANY_SHORT_NAME}", COMPANY)
 		create_account("Advance VAT Paid", f"Duties and Taxes - {COMPANY_SHORT_NAME}", COMPANY)
 		create_account("My Bank", f"Bank Accounts - {COMPANY_SHORT_NAME}", COMPANY)

erpnext/accounts/report/cash_flow/cash_flow.html

@@ -1 +1,224 @@
-{% include "accounts/report/financial_statements.html" %}
+{%
+	const report_columns = report
+		.get_columns_for_print()
+		.filter(col => !col.hidden);
+
+	if (report_columns.length > 8) {
+		frappe.throw(
+			__("Too many columns. Export the report and print it using a spreadsheet application.")
+		);
+	}
+%}
+
+<style>
+	body, html {
+		margin-top: 10px;
+		padding: 0;
+		width: 100%;
+		height: auto;
+		font-family: Inter, sans-serif;
+		font-size: 14px;
+		line-height: 21px;
+		color: #171717;
+	}
+
+	.title-letter-spacing {
+		font-size: 15px;
+		font-weight: 600;
+		color: #171717;
+	}
+
+	.financial-statements-important td { font-weight: bold; }
+	.financial-statements-blank-row td { height: 20px; }
+
+	.report-meta {
+		margin: 10px 0 14px;
+		padding: 8px 10px;
+		display: flex;
+		justify-content: space-between;
+		font-size: 14px;
+	}
+
+	.report-meta .left,
+	.report-meta .right {
+		display: flex;
+		flex-direction: column;
+	}
+
+	.report-meta strong {
+		color: #7c7c7c;
+		font-weight: 500;
+	}
+
+    .report-subtitle {
+        margin: 10px 0 14px;
+    }
+
+	.text-center { text-align: center; }
+	.text-right {
+		text-align: right;
+		font-variant-numeric: tabular-nums;
+	}
+	.text-left { text-align: left; }
+	.text-bold { font-weight: 700; }
+
+	.report-table table {
+		width: 100%;
+		table-layout: fixed;
+		border-collapse: collapse;
+	}
+
+	.report-table th,
+	.report-table td {
+		padding: 6px 8px;
+		font-size: 14px;
+		border-top: 1px solid #ededed;
+		border-bottom: 1px solid #ededed;
+	}
+
+	.report-table thead th {
+		background: #f8f8f8;
+		font-weight: 500;
+		color: #7c7c7c;
+	}
+
+	.report-table tbody td {
+		vertical-align: top;
+		word-wrap: break-word;
+	}
+
+	.report-table thead th:first-child {
+		border-left: 1px solid #ededed;
+	}
+
+	.report-table thead th:last-child {
+		border-right: 1px solid #ededed;
+	}
+
+	.report-table tbody tr:last-child td {
+		border-bottom: none;
+	}
+
+	@media print {
+		@page {
+			size: A4;
+			margin-top: 10mm;
+		}
+		thead { display: table-header-group; }
+		tr { page-break-inside: avoid; }
+	}
+</style>
+
+<div>
+
+	<div class="text-center" style="margin-bottom: 12px;">
+		<div class="title-letter-spacing">
+			{%= __(report.report_name) %}
+		</div>
+	</div>
+
+    {% if (subtitle && subtitle.trim()) { %}
+        <div class="report-subtitle">
+            {{ subtitle }}
+        </div>
+    {% } else { %}
+        <div class="report-meta">
+            <div class="left">
+                <div>
+                    <strong>{%= __("Company") %}:</strong> {%= filters.company %}
+                </div>
+                <div>
+                    <strong>{%= __("Currency") %}:</strong>
+                    {%= filters.presentation_currency || erpnext.get_currency(filters.company) %}
+                </div>
+            </div>
+
+            <div class="right text-right">
+                <div>
+                    <strong>{%= __("Period Based On") %}:</strong>
+                    {%= filters.filter_based_on %}
+                </div>
+
+                {% if (filters.filter_based_on === "Fiscal Year") { %}
+                    <div>
+                        <strong>{%= __("Start Year") %}:</strong> {%= filters.from_fiscal_year %}
+                    </div>
+                    <div>
+                        <strong>{%= __("End Year") %}:</strong> {%= filters.to_fiscal_year %}
+                    </div>
+
+                {% } else if (filters.filter_based_on === "Date Range") { %}
+                    <div>
+                        <strong>{%= __("Start Date") %}:</strong>
+                        {%= frappe.datetime.str_to_user(filters.period_start_date) %}
+                    </div>
+                    <div>
+                        <strong>{%= __("End Date") %}:</strong>
+                        {%= frappe.datetime.str_to_user(filters.period_end_date) %}
+                    </div>
+                {% } %}
+            </div>
+        </div>
+    {% } %}
+
+	<div class="report-table">
+    	<table>
+    		<thead>
+    			<tr>
+    				{% for (let i = 0, l = report_columns.length; i < l; i++) { %}
+    					{%
+    						const col = report_columns[i];
+    						const align = i === 0 ? "text-left" : "text-right";
+    					%}
+    					<th class="{%= align %}">
+    						{%= col.label %}
+    					</th>
+    				{% } %}
+    			</tr>
+    		</thead>
+
+    		<tbody>
+    			{% for (let j = 0, k = data.length; j < k; j++) { %}
+    				{%
+    					const row = data[j];
+
+    					let row_class = "";
+    					if (!(row.parent_account || row.parent_section)) {
+    						row_class = "financial-statements-important";
+    					}
+    					if (!(row.account_name || row.section)) {
+    						row_class += " financial-statements-blank-row";
+    					}
+    				%}
+
+    				<tr class="{%= row_class %}">
+    					{% for (let i = 0, l = report_columns.length; i < l; i++) { %}
+    						{%
+    							const col = report_columns[i];
+    							const value = row[col.fieldname];
+    							const align = i === 0 ? "text-left" : "text-right";
+    						%}
+
+    						<td class="{%= align %}">
+    							{% if (i === 0) { %}
+    								<span style="padding-left: {%= cint(row.indent) * 2 %}em">
+    									{%= String(row.account_name || row.section || "").replace(/^['"]|['"]$/g, "") %}
+    								</span>
+    							{% } else if (!is_null(value)) { %}
+    								{%= frappe.format(value, col, {}, row) %}
+    							{% } %}
+    						</td>
+    					{% } %}
+    				</tr>
+    			{% } %}
+    		</tbody>
+    	</table>
+    </div>
+
+	<p class="text-right text-muted">
+		{%= __("Printed on {0}", [
+			frappe.datetime.str_to_user(frappe.datetime.get_datetime_as_string())
+		]) %}
+	</p>
+
+</div>

erpnext/accounts/report/cash_flow/cash_flow.py

@@ -12,6 +12,7 @@ from pypika import Order
 
 from erpnext.accounts.doctype.financial_report_template.financial_report_engine import (
 	FinancialReportEngine,
+	get_xlsx_styles,  #! DO NOT REMOVE - hook for styling
 )
 from erpnext.accounts.report.financial_statements import (
 	get_columns,

erpnext/accounts/report/custom_financial_statement/custom_financial_statement.py

@@ -3,6 +3,7 @@
 
 from erpnext.accounts.doctype.financial_report_template.financial_report_engine import (
 	FinancialReportEngine,
+	get_xlsx_styles,  #! DO NOT REMOVE - hook for styling
 )
 
 

erpnext/accounts/report/general_ledger/general_ledger.html

@@ -1,51 +1,114 @@
-<!-- Modified on 25-11-2024
--->
-
 <style type="text/css">
-    /* General styles for both screen display and print */
     body, html {
-        margin-top: 10;
+        margin-top: 10px;
         padding: 0;
         width: 100%;
-        height: auto; /* Allow content to expand */
-        font-family: Arial, sans-serif; /* Example font */
+        height: auto;
+        font-family: Inter, sans-serif;
+        font-size: 14px;
+        line-height: 21px;
+        color: #171717;
     }
 
-    /* Ensure consistent letter spacing across all media */
     .title-letter-spacing {
-        letter-spacing: .2rem;
+		font-size: 15px;
+		font-weight: 600;
+		color: #171717;
+    }
+
+    .report-table table {
+        width: 100%;
+        table-layout: fixed;
+        border-collapse: collapse;
+    }
+
+    .report-table thead th {
+        background: #f8f8f8;
+        text-align: center;
+		font-size: 14px;
+        font-weight: 500;
+        color: #7c7c7c;
+        border-top: 1px solid #ededed;
+        border-bottom: 1px solid #ededed;
+        padding: 6px 8px;
+    }
+
+    .report-table tbody td {
+        padding: 6px 8px;
+        border-top: 1px solid #ededed;
+        border-bottom: 1px solid #ededed;
+        vertical-align: top;
+        word-wrap: break-word;
+        font-size: 14px;
+    }
+
+    .report-table thead th:first-child {
+        border-left: 1px solid #ededed;
+    }
+
+    .report-table thead th:last-child {
+        border-right: 1px solid #ededed;
+    }
+
+    .report-table tbody tr:last-child td {
+        border-bottom: none;
+    }
+
+    .date-col {
+        white-space: nowrap;
+    }
+
+    .text-center { text-align: center; }
+    .text-left { text-align: left; }
+    .text-right { text-align: right; font-variant-numeric: tabular-nums; }
+
+    .text-bold { font-weight: 700; }
+
+    .report-meta {
+        margin: 10px 0 14px;
+        padding: 8px 10px;
+        color: #171717;
+		font-size: 14px;
+        display: flex;
+        justify-content: space-between;
+        align-items: flex-start;
+        gap: 12px;
+    }
+
+    .report-meta .left,
+    .report-meta .right {
+        display: flex;
+        flex-direction: column;
+    }
+
+    .report-meta .filter-row {
+        margin-bottom: 4px;
+        line-height: 1.5;
+    }
+
+    .report-meta strong {
+        color: #7c7c7c;
+        font-weight: 500;
+    }
+
+    .report-subtitle {
+        margin: 10px 0 14px;
     }
 
-    /* Styles specific to printing and PDF generation */
     @media print {
-        /* Set page size and margins for printing */
         @page {
-            size: A4; /* Use fixed A4 page size */
+            size: A4;
             margin-top: 10mm;
         }
-
-        /* Force a page break before elements with the class "page-break" */
-        .page-break {
-            page-break-before: always;
-            margin-top: 10mm; /* Add some space after the break */
-        }
-
-        /* Ensure table headers repeat on each printed page */
         thead {
             display: table-header-group;
         }
-
-        /* Ensure table footers repeat on each printed page */
         tfoot {
             display: table-footer-group;
         }
-
-        th, td {
-            padding: 1px;
-            border: 1px solid black; /* Example border for clarity */
+        tr {
+            page-break-inside: avoid;
         }
-
-        /* Hide elements that should not appear in print (optional) */
         .no-print {
             display: none !important;
         }
@@ -53,129 +116,154 @@
 </style>
 
 <br>
-<div style="font-family:Arial">
-	<div>
-		<div class="title-letter-spacing" style="text-align:center; font-size:15px; text-decoration:underline;">
-			<b>
-				{%= __("STATEMENT OF ACCOUNTS") %}<br>
-				{% if (filters.party_name) { %}
-					<br>{%= filters.party_name %}
-				{% } else if (filters.party && filters.party.length) { %}
-					<br>{%= filters.party %}
-				{% } else if (filters.account) { %}
-					<br>{%= filters.account %}
-				{% } else { %}
-					<br>{%= __("All Parties ") %}
-				{% } %}
-			</b>
+
+<div>
+
+    <div class="text-center" style="margin-bottom: 12px;">
+        <div class="title-letter-spacing">
+            {%= __("Statement Of Accounts") %}
+        </div>
+    </div>
+
+    {% if (subtitle && subtitle.trim()) { %}
+        <div class="report-subtitle">
+            {{ subtitle }}
+        </div>
+    {% } else { %}
+       <div class="report-meta">
+			<div class="left">
+				<div class="filter-row">
+					<strong>{%= __("Customer") %}:</strong>
+					{%=
+						(filters.party.length && filters.party.join(", ")) || filters.party_name || "All Parties"
+					%}
+				</div>
+			</div>
+
+			<div class="right text-right">
+				<div class="filter-row">
+					<strong>{%= __("Statement Period") %}:</strong>
+					{%= __("{0} to {1}", [
+						frappe.datetime.str_to_user(filters.from_date),
+						frappe.datetime.str_to_user(filters.to_date)
+					]) %}
+				</div>
+			</div>
 		</div>
-		<div style="text-align:center; font-size:13px;">
-			<b>
-				{%= __("{0} to {1}", [frappe.datetime.str_to_user(filters.from_date), frappe.datetime.str_to_user(filters.to_date)]) %}<br><br>
-			</b>
-		</div>
-	</div>
-	<div class="show-filters">
-			{% if subtitle %}
-				{{ subtitle }}
-				<hr>
-			{% endif %}
-	</div>
-	<table style="width:100%; font-size: 11px">
-		<thead>
-			<tr class="title-letter-spacing" style="text-align: center; font-weight:bold">
-				<td style="border: 1.5px solid black; width: 7em">{%= __("Date").toLocaleUpperCase() %}</td>
-				<td style="border: 1.5px solid black">{%= __("Particulars").toLocaleUpperCase() %}</td>
-				{% if(filters.show_remarks) { %}
-						<td style="border: 1.5px solid black">{%= __("Remarks").toLocaleUpperCase() %}</td>
-				{% } %}
-				<td style="border: 1.5px solid black; width: 9em">{%= __("Debit").toLocaleUpperCase() %}</td>
-				<td style="border: 1.5px solid black; width: 9em">{%= __("Credit").toLocaleUpperCase() %}</td>
-				<td style="border: 1.5px solid black; width: 10.2em">{%= __("Balance").toLocaleUpperCase() %}</td>
-			</tr>
-		</thead>
-		<tbody>
-			{% for(var i=0, l=data.length; i<l; i++) { %}
-				<tr style="border-bottom: 1px solid black">
-					{% if(data[i].posting_date) { %}
-						<td style="text-align: center; border: 1px dotted black">
-							{%= frappe.datetime.str_to_user(data[i].posting_date) %}
-						</td>
-						<td style="border-right: 1px dotted black">
-							{%= data[i].voucher_type %} {%= data[i].voucher_no %}
-							{% if(!(filters.party || filters.account)) { %}
-								{%= data[i].party || data[i].account %}
-							{% } %}<br>
-							{% if(data[i].bill_no) { %}
-								{%= __("Supplier Invoice No") %}: {%= data[i].bill_no %}
-							{% } %}
-						</td>
-						{% if(filters.show_remarks) { %}
-						<td style="border-right: 1px dotted black; font-size: 10px">
-								{% if(data[i].remarks != "No Remarks" && data[i].remarks != "") { %}
-									{%= __("Remarks") %}: {%= data[i].remarks %}<br>
-								{% } %}
-						</td>
-						{% } %}
-						<td style="text-align: right; border-right: 1px dotted black">
-							{% if data[i].debit != 0 %}
-								{%= format_currency(data[i].debit, filters.presentation_currency) %}
-							{% } %}
-						</td>
-						<td style="text-align: right; border-right: 1px dotted black">
-							{% if data[i].credit != 0 %}
-								{%= format_currency(data[i].credit, filters.presentation_currency) %}
-							{% } %}
-						</td>
-					{% } else { %}
-						<td style="text-align: center; border: 1px dotted black">
-							{% if(i == 0) { %}
+    {% } %}
+
+    <div class="report-table">
+        <table>
+            <thead>
+                <tr>
+                    <th style="width: 8em; text-align: left;">{%= __("Date") %}</th>
+                    <th style="text-align: left;">{%= __("Voucher Details") %}</th>
+
+                    {% if(filters.show_remarks) { %}
+                        <th style="text-align: left;">{%= __("Remarks") %}</th>
+                    {% } %}
+
+                    <th style="width: 10em; text-align: right;">{%= __("Debit") %}</th>
+                    <th style="width: 10em; text-align: right;">{%= __("Credit") %}</th>
+                    <th style="width: 10em; text-align: right;">{%= __("Balance") %}</th>
+                </tr>
+            </thead>
+
+            <tbody>
+				{% for(var i=0, l=data.length; i<l; i++) { %}
+					{% var row = data[i]; %}
+					{% var is_entry = row.posting_date; %}
+					{% var is_last = i == l-1; %}
+					{% var is_second_last = i == l-2; %}
+
+					<tr>
+
+						<td class="text-left date-col">
+							{% if(is_entry) { %}
+								{%= frappe.datetime.str_to_user(row.posting_date) %}
+							{% } else if(i == 0) { %}
 								{%= frappe.datetime.str_to_user(filters.from_date) %}
 							{% } %}
 						</td>
-						<td style="text-align: left; border-right: 1px dotted black"><b>
-							{% if(i == l-2) { %}
-								{%= __("Total") %}
+
+						<td class="{% if(!is_entry) { %}text-left text-bold{% } %}">
+							{% if(is_entry) { %}
+
+								{%= row.voucher_type %} {%= row.voucher_no %}
+
+								{% if(!(filters.party || filters.account)) { %}
+									<div style="margin-top: 2px;">
+										{%= row.party || row.account %}
+									</div>
+								{% } %}
+
+								{% if(row.bill_no) { %}
+									<div style="margin-top: 2px;">
+										{%= __("Supplier Invoice No") %}: {%= row.bill_no %}
+									</div>
+								{% } %}
+
 							{% } else { %}
-								{% if(i == l-1) { %}
+
+								{% if(is_second_last) { %}
+									{%= __("Total") %}
+								{% } else if(is_last) { %}
 									{%= __("Closing [Opening + Total] ") %}
 								{% } else { %}
-									{%= frappe.format(data[i].account, {fieldtype: "Link"}) || "&nbsp;" %}
-								{% } %}
-							{% } %}</b>
-						</td>
-						{% if(filters.show_remarks) { %} <td style="text-align: left; border-right: 1px dotted black"></td>{% } %}
-						<td style="text-align: right; border-right: 1px dotted black">
-							{% if(i != 0){ %}
-								{% if(i != l-1){ %}
-									{%= data[i].account && format_currency(data[i].debit, filters.presentation_currency) %}
+									{%= frappe.format(row.account, {fieldtype: "Link"}) || "&nbsp;" %}
 								{% } %}
+
 							{% } %}
 						</td>
-						<td style="text-align: right; border-right: 1px dotted black">
-							{% if(i != 0){ %}
-								{% if(i != l-1){ %}
-									{%= data[i].account && format_currency(data[i].credit, filters.presentation_currency) %}
-								{% } %}
+
+						{% if(filters.show_remarks) { %}
+						<td class="text-left">
+							{% if(is_entry && row.remarks && row.remarks != "No Remarks") { %}
+								{%= row.remarks %}
 							{% } %}
 						</td>
-					{% } %}
-						{% if(i == l-1) { %}
-							<td style="text-align: right; font-weight:bold; border-right: 1px dotted black">
-								{%= format_currency(data[i].balance, filters.presentation_currency) %}
-								{% if(data[i].balance < 0){ %}Cr{% } %}
-								{% if(data[i].balance > 0){ %}Dr{% } %}
-							</td>
-						{% } else { %}
-							<td style="text-align: right; border-right: 1px dotted black">
-								{% if(i != l-2) { %}
-									{%= format_currency(data[i].balance, filters.presentation_currency) %}
-								{% } %}
-							</td>
 						{% } %}
-				</tr>
-			{% endfor%}
-		</tbody>
-	</table>
-	<p class="text-right text-muted">{%= __("Printed on {0}", [frappe.datetime.str_to_user(frappe.datetime.get_datetime_as_string())]) %}</p>
-</div>
+
+						<td class="text-right">
+							{% if(is_entry) { %}
+								{% if(row.debit != 0) { %}
+									{%= format_currency(row.debit, filters.presentation_currency) %}
+								{% } %}
+							{% } else if(i != 0 && !is_last) { %}
+								{%= row.account && format_currency(row.debit, filters.presentation_currency) %}
+							{% } %}
+						</td>
+
+						<td class="text-right">
+							{% if(is_entry) { %}
+								{% if(row.credit != 0) { %}
+									{%= format_currency(row.credit, filters.presentation_currency) %}
+								{% } %}
+							{% } else if(i != 0 && !is_last) { %}
+								{%= row.account && format_currency(row.credit, filters.presentation_currency) %}
+							{% } %}
+						</td>
+
+						<td class="text-right {% if(is_last) { %}text-bold{% } %}">
+							{% if(is_last) { %}
+								{%= format_currency(row.balance, filters.presentation_currency) %}
+								{% if(row.balance < 0) { %} Cr{% } %}
+								{% if(row.balance > 0) { %} Dr{% } %}
+							{% } else { %}
+								{%= format_currency(row.balance, filters.presentation_currency) %}
+							{% } %}
+						</td>
+
+					</tr>
+				{% } %}
+			</tbody>
+        </table>
+    </div>
+
+    <p class="text-right">
+        {%= __("Printed on {0}", [
+            frappe.datetime.str_to_user(frappe.datetime.get_datetime_as_string())
+        ]) %}
+    </p>
+
+</div>

erpnext/accounts/report/general_ledger/general_ledger.js

@@ -177,10 +177,16 @@ frappe.query_reports["General Ledger"] = {
 			fieldtype: "Check",
 			default: 1,
 		},
+		{
+			fieldname: "disable_opening_balance_calculation",
+			label: __("Disable Opening Balance Calculation"),
+			fieldtype: "Check",
+		},
 		{
 			fieldname: "show_opening_entries",
 			label: __("Show Opening Entries"),
 			fieldtype: "Check",
+			depends_on: "eval: !doc.disable_opening_balance_calculation",
 		},
 		{
 			fieldname: "include_default_book_entries",

erpnext/accounts/report/general_ledger/general_ledger.py

@@ -283,7 +283,15 @@ def get_conditions(filters):
 	if filters.get("party"):
 		conditions.append("party in %(party)s")
 
-	if not (
+	if filters.get("disable_opening_balance_calculation"):
+		if not ignore_is_opening:
+			conditions.append("(posting_date >=%(from_date)s or is_opening = 'Yes')")
+		else:
+			conditions.append("posting_date >=%(from_date)s")
+
+	# opening balance calculation is done only if filtered on account/party
+	# so from_date filter is not applied
+	elif not (
 		filters.get("account")
 		or filters.get("party")
 		or filters.get("categorize_by") in ["Categorize by Account", "Categorize by Party"]
@@ -417,7 +425,13 @@ def get_data_with_opening_closing(filters, account_details, accounting_dimension
 	# Opening for filtered account
 	add_total_to_data(totals, "opening")
 
-	if filters.get("categorize_by") != "Categorize by Voucher (Consolidated)":
+	if not filters.get("categorize_by"):
+		all_entries = []
+		for acc_dict in gle_map.values():
+			all_entries.extend(acc_dict.entries)
+		data += all_entries
+
+	elif filters.get("categorize_by") != "Categorize by Voucher (Consolidated)":
 		set_opening_closing = (not filters.get("categorize_by") and not filters.get("voucher_no")) or (
 			filters.get("categorize_by") and filters.get("categorize_by") != "Categorize by Voucher"
 		)
@@ -483,7 +497,6 @@ def initialize_gle_map(gl_entries, filters):
 				totals=get_totals_dict(),
 				entries=[],
 			)
-
 	return gle_map
 
 
@@ -548,7 +561,11 @@ def get_accountwise_gle(filters, accounting_dimensions, gl_entries, gle_map):
 		gle.remarks = _(gle.remarks)
 		gle.party_type = _(gle.party_type)
 
-		if gle.posting_date < from_date or (cstr(gle.is_opening) == "Yes" and not show_opening_entries):
+		if gle.posting_date < from_date or (
+			cstr(gle.is_opening) == "Yes"
+			and not show_opening_entries
+			and not filters.disable_opening_balance_calculation
+		):
 			if not group_by_voucher_consolidated:
 				update_value_in_dict(gle_map[group_by_value].totals, "opening", gle, True)
 				update_value_in_dict(gle_map[group_by_value].totals, "closing", gle, True)

erpnext/accounts/report/gross_profit/gross_profit.py

@@ -812,19 +812,11 @@ class GrossProfitGenerator:
 				return self.calculate_buying_amount_from_sle(
 					row, my_sle, parenttype, parent, row.item_row, item_code
 				)
-			elif self.delivery_notes.get((row.parent, row.item_code), None):
-				#  check if Invoice has delivery notes
-				dn = self.delivery_notes.get((row.parent, row.item_code))
-				parenttype, parent, item_row, dn_warehouse = (
-					"Delivery Note",
-					dn["delivery_note"],
-					dn["item_row"],
-					dn["warehouse"],
-				)
-				my_sle = self.get_stock_ledger_entries(item_code, dn_warehouse)
-				return self.calculate_buying_amount_from_sle(
-					row, my_sle, parenttype, parent, item_row, item_code
-				)
+			elif row.item_row and self.delivery_notes.get(row.item_row):
+				dn = self.delivery_notes[row.item_row]
+				if flt(dn.total_qty):
+					return flt(row.qty) * flt(dn.total_incoming_value) / flt(dn.total_qty)
+				return flt(row.qty) * self.get_average_buying_rate(row, item_code)
 			elif row.sales_order and row.so_detail:
 				incoming_amount = self.get_buying_amount_from_so_dn(row.sales_order, row.so_detail, item_code)
 				if incoming_amount:
@@ -1076,25 +1068,29 @@ class GrossProfitGenerator:
 	def get_delivery_notes(self):
 		self.delivery_notes = frappe._dict({})
 		if self.si_list:
+			from frappe.query_builder.functions import Sum
+
 			invoices = [x.parent for x in self.si_list]
 			dni = qb.DocType("Delivery Note Item")
 			delivery_notes = (
 				qb.from_(dni)
 				.select(
-					dni.against_sales_invoice.as_("sales_invoice"),
-					dni.item_code,
-					dni.warehouse,
-					dni.parent.as_("delivery_note"),
-					dni.name.as_("item_row"),
+					dni.si_detail,
+					Sum(dni.stock_qty * dni.incoming_rate).as_("total_incoming_value"),
+					Sum(dni.stock_qty).as_("total_qty"),
 				)
-				.where((dni.docstatus == 1) & (dni.against_sales_invoice.isin(invoices)))
-				.groupby(dni.against_sales_invoice, dni.item_code)
-				.orderby(dni.creation, order=Order.desc)
+				.where(
+					(dni.docstatus == 1)
+					& (dni.against_sales_invoice.isin(invoices))
+					& (dni.si_detail.isnotnull())
+					& (dni.si_detail != "")
+				)
+				.groupby(dni.si_detail)
 				.run(as_dict=True)
 			)
 
 			for entry in delivery_notes:
-				self.delivery_notes[(entry.sales_invoice, entry.item_code)] = entry
+				self.delivery_notes[entry.si_detail] = entry
 
 	def group_items_by_invoice(self):
 		"""

erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.html

@@ -1 +1,224 @@
-{% include "accounts/report/financial_statements.html" %}
+{%
+	const report_columns = report
+		.get_columns_for_print()
+		.filter(col => !col.hidden);
+
+	if (report_columns.length > 8) {
+		frappe.throw(
+			__("Too many columns. Export the report and print it using a spreadsheet application.")
+		);
+	}
+%}
+
+<style>
+	body, html {
+		margin-top: 10px;
+		padding: 0;
+		width: 100%;
+		height: auto;
+		font-family: Inter, sans-serif;
+		font-size: 14px;
+		line-height: 21px;
+		color: #171717;
+	}
+
+	.title-letter-spacing {
+		font-size: 15px;
+		font-weight: 600;
+		color: #171717;
+	}
+
+	.financial-statements-important td { font-weight: bold; }
+	.financial-statements-blank-row td { height: 20px; }
+
+	.report-meta {
+		margin: 10px 0 14px;
+		padding: 8px 10px;
+		display: flex;
+		justify-content: space-between;
+		font-size: 14px;
+	}
+
+	.report-meta .left,
+	.report-meta .right {
+		display: flex;
+		flex-direction: column;
+	}
+
+	.report-meta strong {
+		color: #7c7c7c;
+		font-weight: 500;
+	}
+
+    .report-subtitle {
+        margin: 10px 0 14px;
+    }
+
+	.text-center { text-align: center; }
+	.text-right {
+		text-align: right;
+		font-variant-numeric: tabular-nums;
+	}
+	.text-left { text-align: left; }
+	.text-bold { font-weight: 700; }
+
+	.report-table table {
+		width: 100%;
+		table-layout: fixed;
+		border-collapse: collapse;
+	}
+
+	.report-table th,
+	.report-table td {
+		padding: 6px 8px;
+		font-size: 14px;
+		border-top: 1px solid #ededed;
+		border-bottom: 1px solid #ededed;
+	}
+
+	.report-table thead th {
+		background: #f8f8f8;
+		font-weight: 500;
+		color: #7c7c7c;
+	}
+
+	.report-table tbody td {
+		vertical-align: top;
+		word-wrap: break-word;
+	}
+
+	.report-table thead th:first-child {
+		border-left: 1px solid #ededed;
+	}
+
+	.report-table thead th:last-child {
+		border-right: 1px solid #ededed;
+	}
+
+	.report-table tbody tr:last-child td {
+		border-bottom: none;
+	}
+
+	@media print {
+		@page {
+			size: A4;
+			margin-top: 10mm;
+		}
+		thead { display: table-header-group; }
+		tr { page-break-inside: avoid; }
+	}
+</style>
+
+<div>
+
+	<div class="text-center" style="margin-bottom: 12px;">
+		<div class="title-letter-spacing">
+			{%= __(report.report_name) %}
+		</div>
+	</div>
+
+    {% if (subtitle && subtitle.trim()) { %}
+        <div class="report-subtitle">
+            {{ subtitle }}
+        </div>
+    {% } else { %}
+        <div class="report-meta">
+            <div class="left">
+                <div>
+                    <strong>{%= __("Company") %}:</strong> {%= filters.company %}
+                </div>
+                <div>
+                    <strong>{%= __("Currency") %}:</strong>
+                    {%= filters.presentation_currency || erpnext.get_currency(filters.company) %}
+                </div>
+            </div>
+
+            <div class="right text-right">
+                <div>
+                    <strong>{%= __("Period Based On") %}:</strong>
+                    {%= filters.filter_based_on %}
+                </div>
+
+                {% if (filters.filter_based_on === "Fiscal Year") { %}
+                    <div>
+                        <strong>{%= __("Start Year") %}:</strong> {%= filters.from_fiscal_year %}
+                    </div>
+                    <div>
+                        <strong>{%= __("End Year") %}:</strong> {%= filters.to_fiscal_year %}
+                    </div>
+
+                {% } else if (filters.filter_based_on === "Date Range") { %}
+                    <div>
+                        <strong>{%= __("Start Date") %}:</strong>
+                        {%= frappe.datetime.str_to_user(filters.period_start_date) %}
+                    </div>
+                    <div>
+                        <strong>{%= __("End Date") %}:</strong>
+                        {%= frappe.datetime.str_to_user(filters.period_end_date) %}
+                    </div>
+                {% } %}
+            </div>
+        </div>
+    {% } %}
+
+	<div class="report-table">
+    	<table>
+    		<thead>
+    			<tr>
+    				{% for (let i = 0, l = report_columns.length; i < l; i++) { %}
+    					{%
+    						const col = report_columns[i];
+    						const align = i === 0 ? "text-left" : "text-right";
+    					%}
+    					<th class="{%= align %}">
+    						{%= col.label %}
+    					</th>
+    				{% } %}
+    			</tr>
+    		</thead>
+
+    		<tbody>
+    			{% for (let j = 0, k = data.length; j < k; j++) { %}
+    				{%
+    					const row = data[j];
+
+    					let row_class = "";
+    					if (!(row.parent_account || row.parent_section)) {
+    						row_class = "financial-statements-important";
+    					}
+    					if (!(row.account_name || row.section)) {
+    						row_class += " financial-statements-blank-row";
+    					}
+    				%}
+
+    				<tr class="{%= row_class %}">
+    					{% for (let i = 0, l = report_columns.length; i < l; i++) { %}
+    						{%
+    							const col = report_columns[i];
+    							const value = row[col.fieldname];
+    							const align = i === 0 ? "text-left" : "text-right";
+    						%}
+
+    						<td class="{%= align %}">
+    							{% if (i === 0) { %}
+    								<span style="padding-left: {%= cint(row.indent) * 2 %}em">
+    									{%= String(row.account_name || row.section || "").replace(/^['"]|['"]$/g, "") %}
+    								</span>
+    							{% } else if (!is_null(value)) { %}
+    								{%= frappe.format(value, col, {}, row) %}
+    							{% } %}
+    						</td>
+    					{% } %}
+    				</tr>
+    			{% } %}
+    		</tbody>
+    	</table>
+    </div>
+
+	<p class="text-right text-muted">
+		{%= __("Printed on {0}", [
+			frappe.datetime.str_to_user(frappe.datetime.get_datetime_as_string())
+		]) %}
+	</p>
+
+</div>

erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py

@@ -8,6 +8,7 @@ from frappe.utils import flt
 
 from erpnext.accounts.doctype.financial_report_template.financial_report_engine import (
 	FinancialReportEngine,
+	get_xlsx_styles,  #! DO NOT REMOVE - hook for styling
 )
 from erpnext.accounts.report.financial_statements import (
 	compute_growth_view_data,

erpnext/accounts/report/purchase_register/test_purchase_register.py

@@ -11,9 +11,6 @@ from erpnext.tests.utils import ERPNextTestSuite
 
 class TestPurchaseRegister(ERPNextTestSuite):
 	def test_purchase_register(self):
-		frappe.db.sql("delete from `tabPurchase Invoice` where company='_Test Company 6'")
-		frappe.db.sql("delete from `tabGL Entry` where company='_Test Company 6'")
-
 		filters = frappe._dict(company="_Test Company 6", from_date=add_months(today(), -1), to_date=today())
 
 		pi = make_purchase_invoice()
@@ -28,9 +25,6 @@ class TestPurchaseRegister(ERPNextTestSuite):
 		self.assertEqual(first_row.grand_total, 1100)
 
 	def test_purchase_register_ignores_tax_rows_from_other_doctype(self):
-		frappe.db.sql("delete from `tabPurchase Invoice` where company='_Test Company 6'")
-		frappe.db.sql("delete from `tabGL Entry` where company='_Test Company 6'")
-
 		filters = frappe._dict(company="_Test Company 6", from_date=add_months(today(), -1), to_date=today())
 
 		pi = make_purchase_invoice()
@@ -74,9 +68,6 @@ class TestPurchaseRegister(ERPNextTestSuite):
 		self.assertEqual(first_row.grand_total, 1100)
 
 	def test_purchase_register_ledger_view(self):
-		frappe.db.sql("delete from `tabPurchase Invoice` where company='_Test Company 6'")
-		frappe.db.sql("delete from `tabGL Entry` where company='_Test Company 6'")
-
 		filters = frappe._dict(
 			company="_Test Company 6",
 			from_date=add_months(today(), -1),

erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py

@@ -6,301 +6,282 @@ from frappe import _
 from frappe.query_builder.functions import IfNull
 
 
-def execute(filters=None):
-	"""Generate Tax Withholding Details report"""
-	validate_filters(filters)
+class TaxWithholdingDetailsReport:
+	party_types = ("Customer", "Supplier")
+	document_types = ("Purchase Invoice", "Sales Invoice", "Payment Entry", "Journal Entry")
 
-	# Process and format data
-	data = get_tax_withholding_data(filters)
-	columns = get_columns(filters)
+	def __init__(self, filters=None):
+		self.filters = frappe._dict(filters or {})
+		self.entries = []
+		self.doc_info = {}
+		self.party_details = {}
 
-	return columns, data
+	@classmethod
+	def execute(cls, filters=None):
+		return cls(filters).run()
 
+	def run(self):
+		self.validate_filters()
+		return self.get_columns(), self.get_data()
 
-def validate_filters(filters):
-	"""Validate report filters"""
-	filters = frappe._dict(filters or {})
+	def validate_filters(self):
+		if not self.filters.from_date or not self.filters.to_date:
+			frappe.throw(_("From Date and To Date are required"))
 
-	if not filters.from_date or not filters.to_date:
-		frappe.throw(_("From Date and To Date are required"))
+		if self.filters.from_date > self.filters.to_date:
+			frappe.throw(_("From Date must be before To Date"))
 
-	if filters.from_date > filters.to_date:
-		frappe.throw(_("From Date must be before To Date"))
+	def get_data(self):
+		self.entries = self.get_entries_query().run(as_dict=True)
+		if not self.entries:
+			return []
 
+		self.doc_info = self.fetch_additional_doc_info()
+		self.party_details = self.fetch_party_details()
+		return self.build_rows()
 
-def get_tax_withholding_data(filters):
-	"""Process entries into final report format"""
-	data = []
-	entries = get_tax_withholding_entries(filters)
-	if not entries:
-		return data
+	def build_rows(self):
+		rows = []
+		for entry in self.entries:
+			doc_details = (
+				self.doc_info.get((entry.transaction_type, entry.ref_no), {}) if entry.ref_no else {}
+			)
+			party_info = self.party_details.get((entry.party_type, entry.party), {})
+			rows.append({**entry, **doc_details, **party_info})
 
-	doc_info = get_additional_doc_info(entries)
-	party_details = get_party_details(entries)
+		rows.sort(
+			key=lambda x: (
+				x["tax_withholding_category"] or "",
+				x["transaction_date"] or "",
+				x["withholding_name"] or "",
+			)
+		)
+		return rows
 
-	for entry in entries:
-		doc_details = frappe._dict()
-		if entry.taxable_name:
-			doc_details = doc_info.get((entry.taxable_doctype, entry.taxable_name), {})
+	def get_entries_query(self):
+		twe = frappe.qb.DocType("Tax Withholding Entry")
+		query = (
+			frappe.qb.from_(twe)
+			.select(
+				twe.party_type,
+				twe.party,
+				IfNull(twe.tax_id, "").as_("tax_id"),
+				twe.tax_withholding_category,
+				twe.taxable_amount.as_("total_amount"),
+				twe.tax_rate.as_("rate"),
+				twe.withholding_amount.as_("tax_amount"),
+				IfNull(twe.taxable_doctype, "").as_("transaction_type"),
+				IfNull(twe.taxable_name, "").as_("ref_no"),
+				twe.taxable_date,
+				IfNull(twe.withholding_doctype, "").as_("withholding_doctype"),
+				IfNull(twe.withholding_name, "").as_("withholding_name"),
+				twe.withholding_date.as_("transaction_date"),
+			)
+			.where(twe.docstatus == 1)
+			.where(twe.withholding_date >= self.filters.from_date)
+			.where(twe.withholding_date <= self.filters.to_date)
+			.where(IfNull(twe.withholding_name, "") != "")
+			.where(twe.status != "Duplicate")
+		)
 
-		party_info = party_details.get((entry.party_type, entry.party), {})
+		if self.filters.company:
+			query = query.where(twe.company == self.filters.company)
+		if self.filters.party_type:
+			query = query.where(twe.party_type == self.filters.party_type)
+		if self.filters.party:
+			query = query.where(twe.party == self.filters.party)
 
-		row = {
-			"section_code": entry.tax_withholding_category,
-			"entity_type": party_info.get("entity_type"),
-			"rate": entry.tax_rate,
-			"total_amount": entry.taxable_amount,
-			"grand_total": doc_details.get("grand_total", 0),
-			"base_total": doc_details.get("base_total", 0),
-			"tax_amount": entry.withholding_amount,
-			"transaction_date": entry.withholding_date,
-			"transaction_type": entry.taxable_doctype,
-			"ref_no": entry.taxable_name,
-			"taxable_date": entry.taxable_date,
-			"supplier_invoice_no": doc_details.get("bill_no"),
-			"supplier_invoice_date": doc_details.get("bill_date"),
-			"withholding_doctype": entry.withholding_doctype,
-			"withholding_name": entry.withholding_name,
-			"party_name": party_info.get("party_name"),
-			"tax_id": entry.tax_id,
-			"party": entry.party,
-			"party_type": entry.party_type,
-		}
-		data.append(row)
+		return query
 
-	# Sort by section code, transaction date, then withholding_name for deterministic ordering
-	data.sort(
-		key=lambda x: (x["section_code"] or "", x["transaction_date"] or "", x["withholding_name"] or "")
-	)
-	return data
+	def fetch_party_details(self):
+		parties_by_type = {pt: set() for pt in self.party_types}
+		for entry in self.entries:
+			if entry.party_type in parties_by_type and entry.party:
+				parties_by_type[entry.party_type].add(entry.party)
 
+		party_map = {}
+		for party_type, party_set in parties_by_type.items():
+			if not party_set:
+				continue
 
-def get_party_details(entries):
-	"""Fetch party details in batch for all entries"""
-	party_map = frappe._dict()
-	parties_by_type = {"Customer": set(), "Supplier": set()}
+			query = self.get_party_query(party_type, party_set)
+			if query is None:
+				continue
 
-	# Group parties by type
-	for entry in entries:
-		if entry.party_type in parties_by_type and entry.party:
-			parties_by_type[entry.party_type].add(entry.party)
+			for row in query.run(as_dict=True):
+				party_map[(party_type, row.pop("name"))] = row
 
-	# Batch fetch for each party type
-	for party_type, party_set in parties_by_type.items():
-		if not party_type or not party_set:
-			continue
+		return party_map
 
+	def get_party_query(self, party_type, party_set):
 		doctype = frappe.qb.DocType(party_type)
 		fields = [doctype.name]
 
 		if party_type == "Supplier":
-			fields.extend([doctype.supplier_type.as_("entity_type"), doctype.supplier_name.as_("party_name")])
+			fields.extend(
+				[
+					doctype.supplier_type.as_("party_entity_type"),
+					doctype.supplier_name.as_("party_name"),
+				]
+			)
 		elif party_type == "Customer":
-			fields.extend([doctype.customer_type.as_("entity_type"), doctype.customer_name.as_("party_name")])
+			fields.extend(
+				[
+					doctype.customer_type.as_("party_entity_type"),
+					doctype.customer_name.as_("party_name"),
+				]
+			)
+		else:
+			return None
 
-		query = frappe.qb.from_(doctype).select(*fields).where(doctype.name.isin(party_set))
-		party_details = query.run(as_dict=True)
+		return frappe.qb.from_(doctype).select(*fields).where(doctype.name.isin(party_set))
 
-		for party in party_details:
-			party_map[(party_type, party.name)] = party
+	def fetch_additional_doc_info(self):
+		docs_by_type = {dt: set() for dt in self.document_types}
+		for entry in self.entries:
+			if entry.ref_no and entry.transaction_type in docs_by_type:
+				docs_by_type[entry.transaction_type].add(entry.ref_no)
 
-	return party_map
+		doc_info = {}
+		for doctype_name, voucher_set in docs_by_type.items():
+			if not voucher_set:
+				continue
+
+			query = self.get_doc_info_query(doctype_name, voucher_set)
+			if query is None:
+				continue
+
+			for row in query.run(as_dict=True):
+				doc_info[(doctype_name, row.pop("name"))] = row
+
+		return doc_info
+
+	def get_doc_info_query(self, doctype_name, voucher_set):
+		if doctype_name == "Purchase Invoice":
+			get_doc_fields = self.get_purchase_invoice_fields
+		elif doctype_name == "Sales Invoice":
+			get_doc_fields = self.get_sales_invoice_fields
+		elif doctype_name == "Payment Entry":
+			get_doc_fields = self.get_payment_entry_fields
+		elif doctype_name == "Journal Entry":
+			get_doc_fields = self.get_journal_entry_fields
+		else:
+			return None
+
+		doctype = frappe.qb.DocType(doctype_name)
+		fields = [doctype.name, *get_doc_fields(doctype)]
+		return frappe.qb.from_(doctype).select(*fields).where(doctype.name.isin(voucher_set))
+
+	def get_purchase_invoice_fields(self, doctype):
+		return [
+			doctype.grand_total,
+			doctype.base_total,
+			doctype.bill_no.as_("supplier_invoice_no"),
+			doctype.bill_date.as_("supplier_invoice_date"),
+		]
+
+	def get_sales_invoice_fields(self, doctype):
+		return [doctype.grand_total, doctype.base_total]
+
+	def get_payment_entry_fields(self, doctype):
+		return [
+			doctype.paid_amount_after_tax.as_("grand_total"),
+			doctype.base_paid_amount.as_("base_total"),
+		]
+
+	def get_journal_entry_fields(self, doctype):
+		return [doctype.total_debit.as_("grand_total"), doctype.total_debit.as_("base_total")]
+
+	def get_columns(self):
+		party_type = self.filters.get("party_type", "Party")
+		return [
+			{
+				"label": _("Tax Withholding Category"),
+				"options": "Tax Withholding Category",
+				"fieldname": "tax_withholding_category",
+				"fieldtype": "Link",
+				"width": 90,
+			},
+			{"label": _("Tax Id"), "fieldname": "tax_id", "fieldtype": "Data", "width": 60},
+			{
+				"label": _(f"{party_type} Name"),
+				"fieldname": "party_name",
+				"fieldtype": "Data",
+				"width": 180,
+			},
+			{
+				"label": _(party_type),
+				"fieldname": "party",
+				"fieldtype": "Dynamic Link",
+				"options": "party_type",
+				"width": 180,
+			},
+			{
+				"label": _(f"{party_type} Type"),
+				"fieldname": "party_entity_type",
+				"fieldtype": "Data",
+				"width": 100,
+			},
+			{
+				"label": _("Supplier Invoice No"),
+				"fieldname": "supplier_invoice_no",
+				"fieldtype": "Data",
+				"width": 120,
+			},
+			{
+				"label": _("Supplier Invoice Date"),
+				"fieldname": "supplier_invoice_date",
+				"fieldtype": "Date",
+				"width": 120,
+			},
+			{"label": _("Tax Rate %"), "fieldname": "rate", "fieldtype": "Percent", "width": 60},
+			{
+				"label": _("Taxable Amount"),
+				"fieldname": "total_amount",
+				"fieldtype": "Currency",
+				"width": 120,
+			},
+			{"label": _("Tax Amount"), "fieldname": "tax_amount", "fieldtype": "Currency", "width": 120},
+			{
+				"label": _("Grand Total (Company Currency)"),
+				"fieldname": "base_total",
+				"fieldtype": "Currency",
+				"width": 150,
+			},
+			{
+				"label": _("Grand Total (Transaction Currency)"),
+				"fieldname": "grand_total",
+				"fieldtype": "Currency",
+				"width": 170,
+			},
+			{"label": _("Reference Date"), "fieldname": "taxable_date", "fieldtype": "Date", "width": 100},
+			{
+				"label": _("Transaction Type"),
+				"fieldname": "transaction_type",
+				"fieldtype": "Data",
+				"width": 130,
+			},
+			{
+				"label": _("Reference No."),
+				"fieldname": "ref_no",
+				"fieldtype": "Dynamic Link",
+				"options": "transaction_type",
+				"width": 180,
+			},
+			{
+				"label": _("Date of Transaction"),
+				"fieldname": "transaction_date",
+				"fieldtype": "Date",
+				"width": 100,
+			},
+			{
+				"label": _("Withholding Document"),
+				"fieldname": "withholding_name",
+				"fieldtype": "Dynamic Link",
+				"options": "withholding_doctype",
+				"width": 150,
+			},
+		]
 
 
-def get_columns(filters):
-	"""Generate report columns based on filters"""
-	columns = [
-		{
-			"label": _("Section Code"),
-			"options": "Tax Withholding Category",
-			"fieldname": "section_code",
-			"fieldtype": "Link",
-			"width": 90,
-		},
-		{"label": _("Tax Id"), "fieldname": "tax_id", "fieldtype": "Data", "width": 60},
-		{
-			"label": _(f"{filters.get('party_type', 'Party')} Name"),
-			"fieldname": "party_name",
-			"fieldtype": "Data",
-			"width": 180,
-		},
-		{
-			"label": _(filters.get("party_type", "Party")),
-			"fieldname": "party",
-			"fieldtype": "Dynamic Link",
-			"options": "party_type",
-			"width": 180,
-		},
-		{
-			"label": _("Entity Type"),
-			"fieldname": "entity_type",
-			"fieldtype": "Data",
-			"width": 100,
-		},
-		{
-			"label": _("Supplier Invoice No"),
-			"fieldname": "supplier_invoice_no",
-			"fieldtype": "Data",
-			"width": 120,
-		},
-		{
-			"label": _("Supplier Invoice Date"),
-			"fieldname": "supplier_invoice_date",
-			"fieldtype": "Date",
-			"width": 120,
-		},
-		{
-			"label": _("Tax Rate %"),
-			"fieldname": "rate",
-			"fieldtype": "Percent",
-			"width": 60,
-		},
-		{
-			"label": _("Taxable Amount"),
-			"fieldname": "total_amount",
-			"fieldtype": "Currency",
-			"width": 120,
-		},
-		{
-			"label": _("Tax Amount"),
-			"fieldname": "tax_amount",
-			"fieldtype": "Currency",
-			"width": 120,
-		},
-		{
-			"label": _("Grand Total (Company Currency)"),
-			"fieldname": "base_total",
-			"fieldtype": "Currency",
-			"width": 150,
-		},
-		{
-			"label": _("Grand Total (Transaction Currency)"),
-			"fieldname": "grand_total",
-			"fieldtype": "Currency",
-			"width": 170,
-		},
-		{
-			"label": _("Reference Date"),
-			"fieldname": "taxable_date",
-			"fieldtype": "Date",
-			"width": 100,
-		},
-		{
-			"label": _("Transaction Type"),
-			"fieldname": "transaction_type",
-			"fieldtype": "Data",
-			"width": 130,
-		},
-		{
-			"label": _("Reference No."),
-			"fieldname": "ref_no",
-			"fieldtype": "Dynamic Link",
-			"options": "transaction_type",
-			"width": 180,
-		},
-		{
-			"label": _("Date of Transaction"),
-			"fieldname": "transaction_date",
-			"fieldtype": "Date",
-			"width": 100,
-		},
-		{
-			"label": _("Withholding Document"),
-			"fieldname": "withholding_name",
-			"fieldtype": "Dynamic Link",
-			"options": "withholding_doctype",
-			"width": 150,
-		},
-	]
-
-	return columns
-
-
-def get_tax_withholding_entries(filters):
-	twe = frappe.qb.DocType("Tax Withholding Entry")
-	query = (
-		frappe.qb.from_(twe)
-		.select(
-			twe.company,
-			twe.party_type,
-			twe.party,
-			IfNull(twe.tax_id, "").as_("tax_id"),
-			twe.tax_withholding_category,
-			IfNull(twe.tax_withholding_group, "").as_("tax_withholding_group"),
-			twe.taxable_amount,
-			twe.tax_rate,
-			twe.withholding_amount,
-			IfNull(twe.taxable_doctype, "").as_("taxable_doctype"),
-			IfNull(twe.taxable_name, "").as_("taxable_name"),
-			twe.taxable_date,
-			IfNull(twe.under_withheld_reason, "").as_("under_withheld_reason"),
-			IfNull(twe.lower_deduction_certificate, "").as_("lower_deduction_certificate"),
-			IfNull(twe.withholding_doctype, "").as_("withholding_doctype"),
-			IfNull(twe.withholding_name, "").as_("withholding_name"),
-			twe.withholding_date,
-			twe.status,
-		)
-		.where(twe.docstatus == 1)
-		.where(twe.withholding_date >= filters.from_date)
-		.where(twe.withholding_date <= filters.to_date)
-		.where(IfNull(twe.withholding_name, "") != "")
-		.where(twe.status != "Duplicate")
-	)
-
-	if filters.get("company"):
-		query = query.where(twe.company == filters.get("company"))
-
-	if filters.get("party_type"):
-		query = query.where(twe.party_type == filters.get("party_type"))
-
-	if filters.get("party"):
-		query = query.where(twe.party == filters.get("party"))
-
-	return query.run(as_dict=True)
-
-
-def get_additional_doc_info(entries):
-	"""Fetch additional document information in batch"""
-	doc_info = {}
-	docs_by_type = {
-		"Purchase Invoice": set(),
-		"Sales Invoice": set(),
-		"Payment Entry": set(),
-		"Journal Entry": set(),
-	}
-
-	# Group documents by type
-	for entry in entries:
-		if entry.taxable_name and entry.taxable_doctype in docs_by_type:
-			docs_by_type[entry.taxable_doctype].add(entry.taxable_name)
-
-	for doctype_name, voucher_set in docs_by_type.items():
-		if voucher_set:
-			_fetch_doc_info(doctype_name, voucher_set, doc_info)
-
-	return doc_info
-
-
-def _fetch_doc_info(doctype_name, voucher_set, doc_info):
-	doctype = frappe.qb.DocType(doctype_name)
-	fields = [doctype.name]
-
-	# Add doctype-specific fields
-	if doctype_name == "Purchase Invoice":
-		fields.extend([doctype.grand_total, doctype.base_total, doctype.bill_no, doctype.bill_date])
-	elif doctype_name == "Sales Invoice":
-		fields.extend([doctype.grand_total, doctype.base_total])
-	elif doctype_name == "Payment Entry":
-		fields.extend(
-			[doctype.paid_amount_after_tax.as_("grand_total"), doctype.base_paid_amount.as_("base_total")]
-		)
-	elif doctype_name == "Journal Entry":
-		fields.extend([doctype.total_debit.as_("grand_total"), doctype.total_debit.as_("base_total")])
-	else:
-		return
-
-	query = frappe.qb.from_(doctype).select(*fields).where(doctype.name.isin(voucher_set))
-	entries = query.run(as_dict=True)
-
-	for entry in entries:
-		doc_info[(doctype_name, entry.name)] = entry
+execute = TaxWithholdingDetailsReport.execute

erpnext/accounts/report/tax_withholding_details/test_tax_withholding_details.py

@@ -40,7 +40,7 @@ class TestTaxWithholdingDetails(ERPNextTestSuite, AccountsTestMixin):
 
 		expected_values = [
 			[jv.name, "TCS", 0.075, 1000.75, 0.75, 1000.75],
-			["", "TCS", 0.075, 0, 0.75, 0],
+			["", "TCS", 0.075, None, 0.75, None],
 			[si.name, "TCS", 0.075, 1000.0, 0.75, 1000.75],
 		]
 		self.check_expected_values(result, expected_values)
@@ -124,7 +124,7 @@ class TestTaxWithholdingDetails(ERPNextTestSuite, AccountsTestMixin):
 			voucher_expected_values = expected_values[i]
 			voucher_actual_values = (
 				voucher.ref_no,
-				voucher.section_code,
+				voucher.tax_withholding_category,
 				voucher.rate,
 				voucher.base_total,
 				voucher.tax_amount,

erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py

@@ -2,121 +2,94 @@ import frappe
 from frappe import _
 
 from erpnext.accounts.report.tax_withholding_details.tax_withholding_details import (
-	get_tax_withholding_data,
+	TaxWithholdingDetailsReport,
 )
 from erpnext.accounts.utils import get_fiscal_year
 
 
-def execute(filters=None):
-	validate_filters(filters)
+class TDSComputationSummaryReport(TaxWithholdingDetailsReport):
+	GROUP_BY_FIELDS = ("party_type", "party", "tax_withholding_category")
+	CARRY_OVER_FIELDS = (
+		"tax_id",
+		"party",
+		"party_type",
+		"party_name",
+		"tax_withholding_category",
+		"party_entity_type",
+		"rate",
+	)
+	AGGREGATE_FIELDS = ("total_amount", "tax_amount")
 
-	data = get_tax_withholding_data(filters)
-	columns = get_columns(filters)
+	def validate_filters(self):
+		if self.filters.from_date > self.filters.to_date:
+			frappe.throw(_("From Date must be before To Date"))
 
-	final_result = group_by_party_and_category(data, filters)
+		from_year = get_fiscal_year(self.filters.from_date)[0]
+		to_year = get_fiscal_year(self.filters.to_date)[0]
+		if from_year != to_year:
+			frappe.throw(_("From Date and To Date lie in different Fiscal Year"))
 
-	return columns, final_result
+		self.filters.fiscal_year = from_year
 
+	def get_data(self):
+		return self.group_rows(super().get_data())
 
-def validate_filters(filters):
-	"""Validate if dates are properly set and lie in the same fiscal year"""
-	if filters.from_date > filters.to_date:
-		frappe.throw(_("From Date must be before To Date"))
+	def group_rows(self, data):
+		grouped = {}
+		for row in data:
+			key = tuple(row.get(f) for f in self.GROUP_BY_FIELDS)
+			bucket = grouped.setdefault(
+				key,
+				{
+					**{f: row.get(f) for f in self.CARRY_OVER_FIELDS},
+					**{f: 0.0 for f in self.AGGREGATE_FIELDS},
+				},
+			)
 
-	from_year = get_fiscal_year(filters.from_date)[0]
-	to_year = get_fiscal_year(filters.to_date)[0]
-	if from_year != to_year:
-		frappe.throw(_("From Date and To Date lie in different Fiscal Year"))
+			for f in self.AGGREGATE_FIELDS:
+				bucket[f] += row.get(f) or 0.0
 
-	filters["fiscal_year"] = from_year
+		return list(grouped.values())
 
-
-def group_by_party_and_category(data, filters):
-	party_category_wise_map = {}
-
-	for row in data:
-		party_category_wise_map.setdefault(
-			(row.get("party"), row.get("section_code")),
+	def get_columns(self):
+		party_type = self.filters.get("party_type", "Party")
+		return [
+			{"label": _("Tax Id"), "fieldname": "tax_id", "fieldtype": "Data", "width": 90},
 			{
-				"tax_id": row.get("tax_id"),
-				"party": row.get("party"),
-				"party_name": row.get("party_name"),
-				"section_code": row.get("section_code"),
-				"entity_type": row.get("entity_type"),
-				"rate": row.get("rate"),
-				"total_amount": 0.0,
-				"tax_amount": 0.0,
+				"label": _(party_type),
+				"fieldname": "party",
+				"fieldtype": "Dynamic Link",
+				"options": "party_type",
+				"width": 180,
 			},
-		)
-
-		party_category_wise_map.get((row.get("party"), row.get("section_code")))["total_amount"] += row.get(
-			"total_amount", 0.0
-		)
-
-		party_category_wise_map.get((row.get("party"), row.get("section_code")))["tax_amount"] += row.get(
-			"tax_amount", 0.0
-		)
-
-	final_result = get_final_result(party_category_wise_map)
-
-	return final_result
+			{
+				"label": _(f"{party_type} Name"),
+				"fieldname": "party_name",
+				"fieldtype": "Data",
+				"width": 180,
+			},
+			{
+				"label": _("Tax Withholding Category"),
+				"options": "Tax Withholding Category",
+				"fieldname": "tax_withholding_category",
+				"fieldtype": "Link",
+				"width": 180,
+			},
+			{
+				"label": _(f"{party_type} Type"),
+				"fieldname": "party_entity_type",
+				"fieldtype": "Data",
+				"width": 180,
+			},
+			{"label": _("Tax Rate %"), "fieldname": "rate", "fieldtype": "Percent", "width": 120},
+			{
+				"label": _("Total Taxable Amount"),
+				"fieldname": "total_amount",
+				"fieldtype": "Float",
+				"width": 120,
+			},
+			{"label": _("Tax Amount"), "fieldname": "tax_amount", "fieldtype": "Float", "width": 120},
+		]
 
 
-def get_final_result(party_category_wise_map):
-	out = []
-	for _key, value in party_category_wise_map.items():
-		out.append(value)
-
-	return out
-
-
-def get_columns(filters):
-	columns = [
-		{"label": _("Tax Id"), "fieldname": "tax_id", "fieldtype": "Data", "width": 90},
-		{
-			"label": _(filters.get("party_type")),
-			"fieldname": "party",
-			"fieldtype": "Dynamic Link",
-			"options": "party_type",
-			"width": 180,
-		},
-		{
-			"label": _(f"{filters.get('party_type', 'Party')} Name"),
-			"fieldname": "party_name",
-			"fieldtype": "Data",
-			"width": 180,
-		},
-		{
-			"label": _("Section Code"),
-			"options": "Tax Withholding Category",
-			"fieldname": "section_code",
-			"fieldtype": "Link",
-			"width": 180,
-		},
-		{
-			"label": _("Entity Type"),
-			"fieldname": "entity_type",
-			"fieldtype": "Data",
-			"width": 180,
-		},
-		{
-			"label": _("Tax Rate %"),
-			"fieldname": "rate",
-			"fieldtype": "Percent",
-			"width": 120,
-		},
-		{
-			"label": _("Total Taxable Amount"),
-			"fieldname": "total_amount",
-			"fieldtype": "Float",
-			"width": 120,
-		},
-		{
-			"label": _("Tax Amount"),
-			"fieldname": "tax_amount",
-			"fieldtype": "Float",
-			"width": 120,
-		},
-	]
-
-	return columns
+execute = TDSComputationSummaryReport.execute

erpnext/accounts/report/trial_balance/test_trial_balance.py

@@ -42,9 +42,6 @@ class TestTrialBalance(ERPNextTestSuite):
 		"""
 		from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
 
-		frappe.db.sql("delete from `tabSales Invoice` where company='Trial Balance Company'")
-		frappe.db.sql("delete from `tabGL Entry` where company='Trial Balance Company'")
-
 		branch1 = frappe.new_doc("Branch")
 		branch1.branch = "Location 1"
 		branch1.insert(ignore_if_duplicate=True)

erpnext/accounts/report/trial_balance/trial_balance.html

@@ -1 +1,215 @@
-{% include "accounts/report/financial_statements.html" %}
+{%
+	const report_columns = report
+		.get_columns_for_print()
+		.filter(col => !col.hidden);
+
+	if (report_columns.length > 8) {
+		frappe.throw(
+			__("Too many columns. Export the report and print it using a spreadsheet application.")
+		);
+	}
+%}
+
+<style>
+	body, html {
+		margin-top: 10px;
+		padding: 0;
+		width: 100%;
+		height: auto;
+		font-family: Inter, sans-serif;
+		font-size: 14px;
+		line-height: 21px;
+		color: #171717;
+	}
+
+	.title-letter-spacing {
+		font-size: 15px;
+		font-weight: 600;
+		color: #171717;
+	}
+
+	.financial-statements-important td { font-weight: bold; }
+	.financial-statements-blank-row td { height: 20px; }
+
+	.report-meta {
+		margin: 10px 0 14px;
+		padding: 8px 10px;
+		display: flex;
+		justify-content: space-between;
+		font-size: 14px;
+	}
+
+	.report-meta .left,
+	.report-meta .right {
+		display: flex;
+		flex-direction: column;
+	}
+
+	.report-meta strong {
+		color: #7c7c7c;
+		font-weight: 500;
+	}
+
+	.report-subtitle {
+		margin: 10px 0 14px;
+	}
+
+	.text-center { text-align: center; }
+
+	.text-right {
+		text-align: right;
+		font-variant-numeric: tabular-nums;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	.text-left { text-align: left; }
+	.text-bold { font-weight: 700; }
+
+	.report-table table {
+		width: 100%;
+		table-layout: fixed;
+		border-collapse: collapse;
+	}
+
+	.report-table th,
+	.report-table td {
+		padding: 6px 8px;
+		font-size: 14px;
+		border-top: 1px solid #ededed;
+		border-bottom: 1px solid #ededed;
+	}
+
+	.report-table thead th {
+		background: #f8f8f8;
+		font-weight: 500;
+		color: #7c7c7c;
+	}
+
+	.report-table tbody td.text-left {
+		vertical-align: top;
+		word-wrap: break-word;
+	}
+
+	.report-table thead th:first-child {
+		border-left: 1px solid #ededed;
+	}
+
+	.report-table thead th:last-child {
+		border-right: 1px solid #ededed;
+	}
+
+	.report-table tbody tr:last-child td {
+		border-bottom: none;
+	}
+
+	@media print {
+		@page {
+			size: A4;
+			margin-top: 10mm;
+		}
+		thead { display: table-header-group; }
+		tr { page-break-inside: avoid; }
+	}
+</style>
+
+<div>
+
+	<div class="text-center" style="margin-bottom: 12px;">
+		<div class="title-letter-spacing">
+			{%= __(report.report_name) %}
+		</div>
+	</div>
+
+    {% if (subtitle && subtitle.trim()) { %}
+        <div class="report-subtitle">
+            {{ subtitle }}
+        </div>
+    {% } else { %}
+        <div class="report-meta">
+            <div class="left">
+                <div>
+                    <strong>{%= __("Company") %}:</strong> {%= filters.company %}
+                </div>
+                <div>
+                    <strong>{%= __("Currency") %}:</strong>
+                    {%= filters.presentation_currency || erpnext.get_currency(filters.company) %}
+                </div>
+            </div>
+
+            <div class="right text-right">
+                <div>
+                    <strong>{%= __("From Date") %}:</strong>
+                    {%= frappe.datetime.str_to_user(filters.from_date) %}
+                </div>
+                <div>
+                    <strong>{%= __("To Date") %}:</strong>
+                    {%= frappe.datetime.str_to_user(filters.to_date) %}
+                </div>
+            </div>
+        </div>
+    {% } %}
+
+	<div class="report-table">
+    	<table>
+    		<thead>
+    			<tr>
+    				{% for (let i = 0, l = report_columns.length; i < l; i++) { %}
+    					{%
+    						const col = report_columns[i];
+    						const align = i === 0 ? "text-left" : "text-right";
+    						const styling = i === 0 ? "" : "width: 9em";
+    					%}
+    					<th class="{%= align %}" style= "{%= styling%}">
+    						{%= col.label %}
+    					</th>
+    				{% } %}
+    			</tr>
+    		</thead>
+
+    		<tbody>
+    			{% for (let j = 0, k = data.length; j < k; j++) { %}
+    				{%
+    					const row = data[j];
+
+    					let row_class = "";
+    					if (!(row.parent_account || row.parent_section)) {
+    						row_class = "financial-statements-important";
+    					}
+    					if (!(row.account_name || row.section)) {
+    						row_class += " financial-statements-blank-row";
+    					}
+    				%}
+
+    				<tr class="{%= row_class %}">
+    					{% for (let i = 0, l = report_columns.length; i < l; i++) { %}
+    						{%
+    							const col = report_columns[i];
+    							const value = row[col.fieldname];
+    							const align = i === 0 ? "text-left" : "text-right";
+    						%}
+
+    						<td class="{%= align %}">
+    							{% if (i === 0) { %}
+    								<span style="padding-left: {%= cint(row.indent) * 2 %}em">
+    									{%= String(row.account_name || row.section || "").replace(/^['"]|['"]$/g, "") %}
+    								</span>
+    							{% } else if (!is_null(value)) { %}
+    								{%= frappe.format(value, col, {}, row) %}
+    							{% } %}
+    						</td>
+    					{% } %}
+    				</tr>
+    			{% } %}
+    		</tbody>
+    	</table>
+    </div>
+
+	<p class="text-right text-muted">
+		{%= __("Printed on {0}", [
+			frappe.datetime.str_to_user(frappe.datetime.get_datetime_as_string())
+		]) %}
+	</p>
+
+</div>

erpnext/accounts/utils.py

@@ -40,7 +40,7 @@ import erpnext
 from erpnext.accounts.doctype.account.account import get_account_currency
 from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import get_dimensions
 from erpnext.stock import get_warehouse_account_map
-from erpnext.stock.utils import get_stock_value_on
+from erpnext.stock.utils import get_combine_datetime, get_stock_value_on
 
 if TYPE_CHECKING:
 	from erpnext.stock.doctype.repost_item_valuation.repost_item_valuation import RepostItemValuation
@@ -546,7 +546,7 @@ def reconcile_against_document(
 					skip_ref_details_update_for_pe=skip_ref_details_update_for_pe,
 					dimensions_dict=dimensions_dict,
 				)
-				if referenced_row.get("outstanding_amount"):
+				if referenced_row.get("outstanding_amount") and entry.get("outstanding_amount") is None:
 					referenced_row.outstanding_amount -= flt(entry.allocated_amount)
 
 				reposting_rows.append(referenced_row)
@@ -1752,31 +1752,31 @@ def sort_stock_vouchers_by_posting_date(
 
 
 def get_future_stock_vouchers(posting_date, posting_time, for_warehouses=None, for_items=None, company=None):
-	values = []
-	condition = ""
+	posting_datetime = get_combine_datetime(posting_date, posting_time)
+
+	SLE = DocType("Stock Ledger Entry")
+
+	query = (
+		frappe.qb.from_(SLE)
+		.select(SLE.voucher_type, SLE.voucher_no)
+		.distinct()
+		.where(SLE.posting_datetime >= posting_datetime)
+		.where(SLE.is_cancelled == 0)
+		.orderby(SLE.posting_datetime)
+		.orderby(SLE.creation)
+		.for_update()
+	)
+
 	if for_items:
-		condition += " and item_code in ({})".format(", ".join(["%s"] * len(for_items)))
-		values += for_items
+		query = query.where(SLE.item_code.isin(for_items))
 
 	if for_warehouses:
-		condition += " and warehouse in ({})".format(", ".join(["%s"] * len(for_warehouses)))
-		values += for_warehouses
+		query = query.where(SLE.warehouse.isin(for_warehouses))
 
 	if company:
-		condition += " and company = %s"
-		values.append(company)
+		query = query.where(SLE.company == company)
 
-	future_stock_vouchers = frappe.db.sql(
-		f"""select distinct sle.voucher_type, sle.voucher_no
-		from `tabStock Ledger Entry` sle
-		where
-			timestamp(sle.posting_date, sle.posting_time) >= timestamp(%s, %s)
-			and is_cancelled = 0
-			{condition}
-		order by timestamp(sle.posting_date, sle.posting_time) asc, creation asc for update""",
-		tuple([posting_date, posting_time, *values]),
-		as_dict=True,
-	)
+	future_stock_vouchers = query.run(as_dict=True)
 
 	return [(d.voucher_type, d.voucher_no) for d in future_stock_vouchers]
 
@@ -2130,8 +2130,9 @@ def create_payment_ledger_entry(
 			ple = frappe.get_doc(entry)
 
 			if cancel:
-				delink_original_entry(ple, partial_cancel=partial_cancel)
-				if is_immutable_ledger_enabled():
+				if not is_immutable_ledger_enabled():
+					delink_original_entry(ple, partial_cancel=partial_cancel)
+				else:
 					ple.delinked = 0
 					ple.posting_date = frappe.form_dict.get("posting_date") or getdate()
 
@@ -2220,6 +2221,7 @@ def delink_original_entry(pl_entry, partial_cancel=False):
 			qb.update(ple)
 			.set(ple.modified, now())
 			.set(ple.modified_by, frappe.session.user)
+			.set(ple.delinked, True)
 			.where(
 				(ple.company == pl_entry.company)
 				& (ple.account_type == pl_entry.account_type)
@@ -2236,9 +2238,6 @@ def delink_original_entry(pl_entry, partial_cancel=False):
 		if partial_cancel:
 			query = query.where(ple.voucher_detail_no == pl_entry.voucher_detail_no)
 
-		if not is_immutable_ledger_enabled():
-			query = query.set(ple.delinked, True)
-
 		query.run()
 
 

erpnext/accounts/workspace/financial_reports/financial_reports.json

@@ -14,7 +14,7 @@
  "for_user": "",
  "hide_custom": 0,
  "icon": "table",
- "idx": 0,
+ "idx": 1,
  "indicator_color": "",
  "is_hidden": 0,
  "label": "Financial Reports",
@@ -266,13 +266,13 @@
    "type": "Link"
   }
  ],
- "modified": "2025-12-24 12:49:25.266357",
+ "modified": "2026-05-18 09:49:45.138296",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Financial Reports",
  "number_cards": [],
  "owner": "Administrator",
- "parent_page": "Accounting",
+ "parent_page": "",
  "public": 1,
  "quick_lists": [],
  "restrict_to_domain": "",

erpnext/assets/doctype/asset/asset.js

@@ -551,7 +551,9 @@ frappe.ui.form.on("Asset", {
 	asset_type: function (frm) {
 		if (frm.doc.docstatus == 0) {
 			if (frm.doc.asset_type == "Composite Asset") {
-				frm.set_value("net_purchase_amount", 0);
+				if (!frm.doc.net_purchase_amount) {
+					frm.set_value("net_purchase_amount", 0);
+				}
 			} else {
 				frm.set_df_property("net_purchase_amount", "read_only", 0);
 			}

erpnext/assets/doctype/asset/test_asset.py

@@ -1977,7 +1977,7 @@ def create_asset_category(enable_cwip=1):
 	asset_category.insert()
 
 
-def create_fixed_asset_item(item_code=None, auto_create_assets=1, is_grouped_asset=0):
+def create_fixed_asset_item(item_code=None, auto_create_assets=1, is_grouped_asset=0, asset_category=None):
 	meta = frappe.get_meta("Asset")
 	naming_series = meta.get_field("naming_series").options.splitlines()[0] or "ACC-ASS-.YYYY.-"
 	try:
@@ -1987,7 +1987,7 @@ def create_fixed_asset_item(item_code=None, auto_create_assets=1, is_grouped_ass
 				"item_code": item_code or "Macbook Pro",
 				"item_name": "Macbook Pro",
 				"description": "Macbook Pro Retina Display",
-				"asset_category": "Computers",
+				"asset_category": asset_category or "Computers",
 				"item_group": "All Item Groups",
 				"stock_uom": "Nos",
 				"is_stock_item": 0,

erpnext/assets/doctype/asset_capitalization/test_asset_capitalization.py

@@ -26,7 +26,6 @@ class TestAssetCapitalization(ERPNextTestSuite):
 	def setUp(self):
 		set_depreciation_settings_in_company()
 		create_asset_capitalization_data()
-		frappe.db.sql("delete from `tabTax Rule`")
 
 	def test_capitalization_with_perpetual_inventory(self):
 		company = "_Test Company with perpetual inventory"

erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py

@@ -195,6 +195,9 @@ def reschedule_depreciation(asset_doc, notes, disposal_date=None):
 	for row in asset_doc.get("finance_books"):
 		current_schedule = get_asset_depr_schedule_doc(asset_doc.name, None, row.finance_book)
 
+		if disposal_date and flt(row.value_after_depreciation) <= flt(row.expected_value_after_useful_life):
+			continue
+
 		if current_schedule:
 			if current_schedule.docstatus == 1:
 				new_schedule = frappe.copy_doc(current_schedule)