chore(release): Bumped to Version 16.15.1

## [16.15.1](https://github.com/frappe/erpnext/compare/v16.15.0...v16.15.1) (2026-04-24)

### Bug Fixes

* preserve inventory dimensions when raw materials are reset (backport [#54440](https://github.com/frappe/erpnext/issues/54440)) (backport [#54493](https://github.com/frappe/erpnext/issues/54493)) ([#54513](https://github.com/frappe/erpnext/issues/54513)) ([610735d](610735d1c5))

.github/workflows/linters.yml

@@ -43,3 +43,6 @@ jobs:
 
       - name: Run Semgrep rules
         run: semgrep ci --config ./frappe-semgrep-rules/rules --config r/python.lang.correctness
+
+      - name: Semgrep for Test Correctness
+        run: semgrep ci --include=**/test_*.py --config ./semgrep/test-correctness.yml

.github/workflows/run-individual-tests.yml

@@ -4,8 +4,8 @@ on:
   workflow_dispatch:
 
 concurrency:
-  group: server-individual-tests-develop-${{ github.event_name }}-${{ github.event.number || github.event_name == 'workflow_dispatch' && github.run_id || '' }}
-  cancel-in-progress: false
+  group: server-individual-tests-lightmode-develop
+  cancel-in-progress: true
 
 permissions:
   contents: read
@@ -21,7 +21,7 @@ jobs:
     - id: set-matrix
       run: |
         # Use grep and find to get the list of test files
-        matrix=$(find . -path '*/doctype/*/test_*.py' | xargs grep -l 'def test_' | awk '{
+        matrix=$(find . -path '*/test_*.py' | xargs grep -l 'def test_' | sort | awk '{
             # Remove ./ prefix, file extension, and replace / with .
             gsub(/^\.\//, "", $0)
             gsub(/\.py$/, "", $0)
@@ -58,6 +58,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix: ${{fromJson(needs.discover.outputs.matrix)}}
+      max-parallel: 14
 
     name: Test
 
@@ -130,4 +131,13 @@ jobs:
           FRAPPE_BRANCH: ${{ github.event.inputs.branch }}
 
       - name: Run Tests
-        run: 'cd ~/frappe-bench/ && bench --site test_site run-tests --app erpnext --module ${{ matrix.test }}'
+        run: |
+          site_name=$(echo "${{matrix.test}}" | sed -e 's/.*\.\(test_.*$\)/\1/')
+          echo "$site_name"
+          mkdir ~/frappe-bench/sites/$site_name
+          cp -r "${GITHUB_WORKSPACE}/.github/helper/site_config_mariadb.json" ~/frappe-bench/sites/$site_name/site_config.json
+          cd ~/frappe-bench/
+          bench --site $site_name reinstall --yes
+          bench --site $site_name set-config allow_tests true
+          bench --site $site_name run-tests --module ${{ matrix.test }} --lightmode
+

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

@@ -129,7 +129,7 @@ jobs:
           FRAPPE_BRANCH: ${{ github.event.client_payload.sha || github.event.inputs.branch }}
 
       - name: Run Tests
-        run: 'cd ~/frappe-bench/ && bench --site test_site run-parallel-tests --app erpnext --total-builds ${{ strategy.job-total }} --build-number ${{ matrix.container }} --with-coverage'
+        run: 'cd ~/frappe-bench/ && bench --site test_site run-parallel-tests --lightmode --app erpnext --total-builds ${{ strategy.job-total }} --build-number ${{ matrix.container }} --with-coverage'
         env:
           TYPE: server
 

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.8.3"
+__version__ = "16.15.1"
 
 
 def get_default_company(user=None):

erpnext/accounts/deferred_revenue.py

@@ -524,7 +524,8 @@ def make_gl_entries(
 	if gl_entries:
 		try:
 			make_gl_entries(gl_entries, cancel=(doc.docstatus == 2), merge_entries=True)
-			frappe.db.commit()
+			if not frappe.in_test:
+				frappe.db.commit()
 		except Exception as e:
 			if frappe.in_test:
 				doc.log_error(f"Error while processing deferred accounting for Invoice {doc.name}")
@@ -606,7 +607,8 @@ def book_revenue_via_journal_entry(
 		if submit:
 			journal_entry.submit()
 
-		frappe.db.commit()
+		if not frappe.in_test:
+			frappe.db.commit()
 	except Exception:
 		frappe.db.rollback()
 		doc.log_error(f"Error while processing deferred accounting for Invoice {doc.name}")

erpnext/accounts/doctype/account/account.json

@@ -203,7 +203,7 @@
  "idx": 1,
  "is_tree": 1,
  "links": [],
- "modified": "2025-08-02 06:26:44.657146",
+ "modified": "2026-04-14 18:14:42.202065",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Account",
@@ -256,6 +256,14 @@
    "role": "Accounts Manager",
    "share": 1,
    "write": 1
+  },
+  {
+   "role": "HR User",
+   "select": 1
+  },
+  {
+   "role": "HR Manager",
+   "select": 1
   }
  ],
  "row_format": "Dynamic",

erpnext/accounts/doctype/account/account_tree.js

@@ -52,60 +52,55 @@ frappe.treeview_settings["Account"] = {
 	],
 	root_label: "Accounts",
 	get_tree_nodes: "erpnext.accounts.utils.get_children",
-	on_get_node: function (nodes, deep = false) {
-		if (frappe.boot.user.can_read.indexOf("GL Entry") == -1) return;
+	on_node_render: function (node, deep) {
+		const render_balances = () => {
+			for (let account of cur_tree.account_balance_data) {
+				const node = cur_tree.nodes && cur_tree.nodes[account.value];
+				if (!node || node.is_root) continue;
 
-		let accounts = [];
-		if (deep) {
-			// in case of `get_all_nodes`
-			accounts = nodes.reduce((acc, node) => [...acc, ...node.data], []);
-		} else {
-			accounts = nodes;
-		}
+				// show Dr if positive since balance is calculated as debit - credit else show Cr
+				const balance = account.balance_in_account_currency || account.balance;
+				const dr_or_cr = balance > 0 ? __("Dr") : __("Cr");
+				const format = (value, currency) => format_currency(Math.abs(value), currency);
 
-		frappe.db.get_single_value("Accounts Settings", "show_balance_in_coa").then((value) => {
-			if (value) {
-				const get_balances = frappe.call({
-					method: "erpnext.accounts.utils.get_account_balances",
-					args: {
-						accounts: accounts,
-						company: cur_tree.args.company,
-						include_default_fb_balances: true,
-					},
-				});
-
-				get_balances.then((r) => {
-					if (!r.message || r.message.length == 0) return;
-
-					for (let account of r.message) {
-						const node = cur_tree.nodes && cur_tree.nodes[account.value];
-						if (!node || node.is_root) continue;
-
-						// show Dr if positive since balance is calculated as debit - credit else show Cr
-						const balance = account.balance_in_account_currency || account.balance;
-						const dr_or_cr = balance > 0 ? __("Dr") : __("Cr");
-						const format = (value, currency) => format_currency(Math.abs(value), currency);
-
-						if (account.balance !== undefined) {
-							node.parent && node.parent.find(".balance-area").remove();
-							$(
-								'<span class="balance-area pull-right">' +
-									(account.balance_in_account_currency
-										? format(
-												account.balance_in_account_currency,
-												account.account_currency
-										  ) + " / "
-										: "") +
-									format(account.balance, account.company_currency) +
-									" " +
-									dr_or_cr +
-									"</span>"
-							).insertBefore(node.$ul);
-						}
-					}
-				});
+				if (account.balance !== undefined) {
+					node.parent && node.parent.find(".balance-area").remove();
+					$(
+						'<span class="balance-area pull-right">' +
+							(account.account_currency != account.company_currency
+								? format(account.balance_in_account_currency, account.account_currency) +
+								  " / "
+								: "") +
+							format(account.balance, account.company_currency) +
+							" " +
+							dr_or_cr +
+							"</span>"
+					).insertBefore(node.$ul);
+				}
 			}
-		});
+		};
+
+		if (frappe.boot.user.can_read.indexOf("GL Entry") == -1) return;
+		if (!cur_tree.account_balance_data) {
+			frappe.db.get_single_value("Accounts Settings", "show_balance_in_coa").then((value) => {
+				if (value) {
+					frappe.call({
+						method: "erpnext.accounts.utils.get_account_balances_coa",
+						args: {
+							company: cur_tree.args.company,
+							include_default_fb_balances: true,
+						},
+						callback: function (r) {
+							if (!r.message || r.message.length === 0) return;
+							cur_tree.account_balance_data = r.message || [];
+							render_balances();
+						},
+					});
+				}
+			});
+		} else {
+			render_balances();
+		}
 	},
 	add_tree_node: "erpnext.accounts.utils.add_ac",
 	menu_items: [

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

@@ -6,64 +6,83 @@
             "Current Assets": {
                 "Accounts Receivable": {
                     "Debtors": {
-                        "account_type": "Receivable"
+                        "account_type": "Receivable",
+                        "account_category": "Trade Receivables"
                     }
                 },
                 "Bank Accounts": {
                     "account_type": "Bank",
-                    "is_group": 1
+                    "is_group": 1,
+                    "account_category": "Cash and Cash Equivalents"
                 },
                 "Cash In Hand": {
                     "Cash": {
-                        "account_type": "Cash"
+                        "account_type": "Cash",
+                        "account_category": "Cash and Cash Equivalents"
                     },
-                    "account_type": "Cash"
+                    "account_type": "Cash",
+                    "account_category": "Cash and Cash Equivalents"
                 },
                 "Loans and Advances (Assets)": {
-                    "is_group": 1
+                    "is_group": 1,
+                    "account_category": "Other Receivables"
                 },
                 "Securities and Deposits": {
-                    "Earnest Money": {}
+                    "Earnest Money": {
+                        "account_category": "Other Current Assets"
+                    }
                 },
                 "Stock Assets": {
                     "Stock In Hand": {
-                        "account_type": "Stock"
+                        "account_type": "Stock",
+                        "account_category": "Stock Assets"
                     },
-                    "account_type": "Stock"
+                    "account_type": "Stock",
+                    "account_category": "Stock Assets"
                 },
                 "Tax Assets": {
-                    "is_group": 1
+                    "is_group": 1,
+                    "account_category": "Other Current Assets"
                 }
             },
             "Fixed Assets": {
                 "Capital Equipment": {
-                    "account_type": "Fixed Asset"
+                    "account_type": "Fixed Asset",
+                    "account_category": "Tangible Assets"
                 },
                 "Electronic Equipment": {
-                    "account_type": "Fixed Asset"
+                    "account_type": "Fixed Asset",
+                    "account_category": "Tangible Assets"
                 },
                 "Furniture and Fixtures": {
-                    "account_type": "Fixed Asset"
+                    "account_type": "Fixed Asset",
+                    "account_category": "Tangible Assets"
                 },
                 "Office Equipment": {
-                    "account_type": "Fixed Asset"
+                    "account_type": "Fixed Asset",
+                    "account_category": "Tangible Assets"
                 },
                 "Plants and Machineries": {
-                    "account_type": "Fixed Asset"
+                    "account_type": "Fixed Asset",
+                    "account_category": "Tangible Assets"
                 },
                 "Buildings": {
-                    "account_type": "Fixed Asset"
+                    "account_type": "Fixed Asset",
+                    "account_category": "Tangible Assets"
                 },
                 "Accumulated Depreciations": {
-                    "account_type": "Accumulated Depreciation"
+                    "account_type": "Accumulated Depreciation",
+                    "account_category": "Tangible Assets"
                 }
             },
             "Investments": {
-                "is_group": 1
+                "is_group": 1,
+                "account_category": "Long-term Investments"
             },
             "Temporary Accounts": {
                 "Temporary Opening": {
-                    "account_type": "Temporary"
+                    "account_type": "Temporary",
+                    "account_category": "Other Non-current Assets"
                 }
             },
             "root_type": "Asset"
@@ -72,55 +91,103 @@
             "Direct Expenses": {
                 "Stock Expenses": {
                     "Cost of Goods Sold": {
-                        "account_type": "Cost of Goods Sold"
+                        "account_type": "Cost of Goods Sold",
+                        "account_category": "Cost of Goods Sold"
                     },
                     "Expenses Included In Valuation": {
-                        "account_type": "Expenses Included In Valuation"
+                        "account_type": "Expenses Included In Valuation",
+                        "account_category": "Other Direct Costs"
                     },
                     "Stock Adjustment": {
-                        "account_type": "Stock Adjustment"
+                        "account_type": "Stock Adjustment",
+                        "account_category": "Other Direct Costs"
                     }
                 }
             },
             "Indirect Expenses": {
-                "Administrative Expenses": {},
-                "Commission on Sales": {},
+                "Administrative Expenses": {
+                    "account_category": "Operating Expenses"
+                },
+                "Commission on Sales": {
+                    "account_category": "Operating Expenses"
+                },
                 "Depreciation": {
-                    "account_type": "Depreciation"
+                    "account_type": "Depreciation",
+                    "account_category": "Operating Expenses"
+                },
+                "Entertainment Expenses": {
+                    "account_category": "Operating Expenses"
                 },
-                "Entertainment Expenses": {},
                 "Freight and Forwarding Charges": {
-                    "account_type": "Chargeable"
+                    "account_type": "Chargeable",
+                    "account_category": "Operating Expenses"
+                },
+                "Legal Expenses": {
+                    "account_category": "Operating Expenses"
+                },
+                "Marketing Expenses": {
+                    "account_type": "Chargeable",
+                    "account_category": "Operating Expenses"
+                },
+                "Miscellaneous Expenses": {
+                    "account_type": "Chargeable",
+                    "account_category": "Operating Expenses"
+                },
+                "Office Maintenance Expenses": {
+                    "account_category": "Operating Expenses"
+                },
+                "Office Rent": {
+                    "account_category": "Operating Expenses"
+                },
+                "Postal Expenses": {
+                    "account_category": "Operating Expenses"
+                },
+                "Print and Stationery": {
+                    "account_category": "Operating Expenses"
                 },
-                "Legal Expenses": {},
-                "Marketing Expenses": {},
-                "Miscellaneous Expenses": {},
-                "Office Maintenance Expenses": {},
-                "Office Rent": {},
-                "Postal Expenses": {},
-                "Print and Stationery": {},
                 "Rounded Off": {
-                    "account_type": "Round Off"
+                    "account_type": "Round Off",
+                    "account_category": "Operating Expenses"
                 },
-                "Salary": {},
-                "Sales Expenses": {},
-                "Telephone Expenses": {},
-                "Travel Expenses": {},
-                "Utility Expenses": {},
-                "Write Off": {},
-                "Exchange Gain/Loss": {},
-                "Gain/Loss on Asset Disposal": {},
-                "Impairment": {}
+                "Salary": {
+                    "account_category": "Operating Expenses"
+                },
+                "Sales Expenses": {
+                    "account_category": "Operating Expenses"
+                },
+                "Telephone Expenses": {
+                    "account_category": "Operating Expenses"
+                },
+                "Travel Expenses": {
+                    "account_category": "Operating Expenses"
+                },
+                "Utility Expenses": {
+                    "account_category": "Operating Expenses"
+                },
+                "Write Off": {
+                    "account_category": "Operating Expenses"
+                },
+                "Exchange Gain/Loss": {
+                    "account_category": "Operating Expenses"
+                },
+                "Gain/Loss on Asset Disposal": {
+                    "account_category": "Other Operating Income"
+                },
+                "Impairment": {
+                    "account_category": "Operating Expenses"
+                }
             },
             "root_type": "Expense"
         },
         "Income": {
             "Direct Income": {
                 "Sales": {
-                    "account_type": "Income Account"
+                    "account_type": "Income Account",
+                    "account_category": "Revenue from Operations"
                 },
                 "Service": {
-                    "account_type": "Income Account"
+                    "account_type": "Income Account",
+                    "account_category": "Revenue from Operations"
                 },
                 "account_type": "Income Account"
             },
@@ -132,31 +199,51 @@
         },
         "Source of Funds (Liabilities)": {
             "Capital Account": {
-                "Reserves and Surplus": {},
-                "Shareholders Funds": {},
-                "Revaluation Surplus": {}
+                "Reserves and Surplus": {
+                    "account_category": "Reserves and Surplus"
+                },
+                "Shareholders Funds": {
+                    "account_category": "Share Capital"
+                },
+                "Revaluation Surplus": {
+                    "account_category": "Reserves and Surplus"
+                }
             },
             "Current Liabilities": {
                 "Accounts Payable": {
                     "Creditors": {
-                        "account_type": "Payable"
+                        "account_type": "Payable",
+                        "account_category": "Trade Payables"
                     },
-                    "Payroll Payable": {}
+                    "Payroll Payable": {
+                        "account_category": "Other Payables"
+                    }
                 },
                 "Stock Liabilities": {
                     "Stock Received But Not Billed": {
-                        "account_type": "Stock Received But Not Billed"
+                        "account_type": "Stock Received But Not Billed",
+                        "account_category": "Trade Payables"
                     }
                 },
                 "Duties and Taxes": {
                     "TDS": {
-                        "account_type": "Tax"
-                    }
+                        "account_type": "Tax",
+                        "account_category": "Current Tax Liabilities"
+                    },
+                    "account_type": "Tax",
+                    "is_group": 1,
+                    "account_category": "Current Tax Liabilities"
                 },
                 "Loans (Liabilities)": {
-                    "Secured Loans": {},
-                    "Unsecured Loans": {},
-                    "Bank Overdraft Account": {}
+                    "Secured Loans": {
+                        "account_category": "Long-term Borrowings"
+                    },
+                    "Unsecured Loans": {
+                        "account_category": "Long-term Borrowings"
+                    },
+                    "Bank Overdraft Account": {
+                        "account_category": "Short-term Borrowings"
+                    }
                 }
             },
             "root_type": "Liability"

erpnext/accounts/doctype/account/test_account.py

@@ -3,7 +3,6 @@
 import unittest
 
 import frappe
-from frappe.tests import IntegrationTestCase
 from frappe.utils import nowdate
 
 from erpnext.accounts.doctype.account.account import (
@@ -12,11 +11,10 @@ from erpnext.accounts.doctype.account.account import (
 	update_account_number,
 )
 from erpnext.stock import get_company_default_inventory_account, get_warehouse_account
-
-EXTRA_TEST_RECORD_DEPENDENCIES = ["Company"]
+from erpnext.tests.utils import ERPNextTestSuite
 
 
-class TestAccount(IntegrationTestCase):
+class TestAccount(ERPNextTestSuite):
 	def test_rename_account(self):
 		if not frappe.db.exists("Account", "1210 - Debtors - _TC"):
 			acc = frappe.new_doc("Account")
@@ -323,72 +321,6 @@ class TestAccount(IntegrationTestCase):
 		self.assertEqual(balance, 0)
 
 
-def _make_test_records(verbose=None):
-	from frappe.tests.utils import make_test_objects
-
-	accounts = [
-		# [account_name, parent_account, is_group]
-		["_Test Bank", "Bank Accounts", 0, "Bank", None],
-		["_Test Bank USD", "Bank Accounts", 0, "Bank", "USD"],
-		["_Test Bank EUR", "Bank Accounts", 0, "Bank", "EUR"],
-		["_Test Cash", "Cash In Hand", 0, "Cash", None],
-		["_Test Account Stock Expenses", "Direct Expenses", 1, None, None],
-		["_Test Account Shipping Charges", "_Test Account Stock Expenses", 0, "Chargeable", None],
-		["_Test Account Customs Duty", "_Test Account Stock Expenses", 0, "Tax", None],
-		["_Test Account Insurance Charges", "_Test Account Stock Expenses", 0, "Chargeable", None],
-		["_Test Account Stock Adjustment", "_Test Account Stock Expenses", 0, "Stock Adjustment", None],
-		["_Test Employee Advance", "Current Liabilities", 0, None, None],
-		["_Test Account Tax Assets", "Current Assets", 1, None, None],
-		["_Test Account VAT", "_Test Account Tax Assets", 0, "Tax", None],
-		["_Test Account Service Tax", "_Test Account Tax Assets", 0, "Tax", None],
-		["_Test Account Reserves and Surplus", "Current Liabilities", 0, None, None],
-		["_Test Account Cost for Goods Sold", "Expenses", 0, None, None],
-		["_Test Account Excise Duty", "_Test Account Tax Assets", 0, "Tax", None],
-		["_Test Account Education Cess", "_Test Account Tax Assets", 0, "Tax", None],
-		["_Test Account S&H Education Cess", "_Test Account Tax Assets", 0, "Tax", None],
-		["_Test Account CST", "Direct Expenses", 0, "Tax", None],
-		["_Test Account Discount", "Direct Expenses", 0, None, None],
-		["_Test Write Off", "Indirect Expenses", 0, None, None],
-		["_Test Exchange Gain/Loss", "Indirect Expenses", 0, None, None],
-		["_Test Account Sales", "Direct Income", 0, None, None],
-		# related to Account Inventory Integration
-		["_Test Account Stock In Hand", "Current Assets", 0, None, None],
-		# fixed asset depreciation
-		["_Test Fixed Asset", "Current Assets", 0, "Fixed Asset", None],
-		["_Test Accumulated Depreciations", "Current Assets", 0, "Accumulated Depreciation", None],
-		["_Test Depreciations", "Expenses", 0, "Depreciation", None],
-		["_Test Gain/Loss on Asset Disposal", "Expenses", 0, None, None],
-		# Receivable / Payable Account
-		["_Test Receivable", "Current Assets", 0, "Receivable", None],
-		["_Test Payable", "Current Liabilities", 0, "Payable", None],
-		["_Test Receivable USD", "Current Assets", 0, "Receivable", "USD"],
-		["_Test Payable USD", "Current Liabilities", 0, "Payable", "USD"],
-	]
-
-	for company, abbr in [
-		["_Test Company", "_TC"],
-		["_Test Company 1", "_TC1"],
-		["_Test Company with perpetual inventory", "TCP1"],
-	]:
-		test_objects = make_test_objects(
-			"Account",
-			[
-				{
-					"doctype": "Account",
-					"account_name": account_name,
-					"parent_account": parent_account + " - " + abbr,
-					"company": company,
-					"is_group": is_group,
-					"account_type": account_type,
-					"account_currency": currency,
-				}
-				for account_name, parent_account, is_group, account_type, currency in accounts
-			],
-		)
-
-	return test_objects
-
-
 def get_inventory_account(company, warehouse=None):
 	account = None
 	if warehouse:

erpnext/accounts/doctype/account/test_records.json

@@ -1,6 +0,0 @@
-[
-	{
-		"doctype": "Account",
-		"name": "_Test Account 1"
-	}
-]

erpnext/accounts/doctype/account_category/account_category.json

@@ -26,8 +26,13 @@
  ],
  "grid_page_length": 50,
  "index_web_pages_for_search": 1,
- "links": [],
- "modified": "2025-10-15 03:19:47.171349",
+ "links": [
+  {
+   "link_doctype": "Account",
+   "link_fieldname": "account_category"
+  }
+ ],
+ "modified": "2026-02-23 01:19:49.589393",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Account Category",

erpnext/accounts/doctype/account_category/test_account_category.py

@@ -2,19 +2,3 @@
 # See license.txt
 
 # import frappe
-from frappe.tests import IntegrationTestCase
-
-# On IntegrationTestCase, the doctype test records and all
-# link-field test record dependencies are recursively loaded
-# Use these module variables to add/remove to/from that list
-EXTRA_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
-IGNORE_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
-
-
-class IntegrationTestAccountCategory(IntegrationTestCase):
-	"""
-	Integration tests for AccountCategory.
-	Use this class for testing interactions between multiple components.
-	"""
-
-	pass

erpnext/accounts/doctype/account_closing_balance/test_account_closing_balance.py

@@ -2,8 +2,9 @@
 # See license.txt
 
 # import frappe
-from frappe.tests import IntegrationTestCase
+
+from erpnext.tests.utils import ERPNextTestSuite
 
 
-class TestAccountClosingBalance(IntegrationTestCase):
+class TestAccountClosingBalance(ERPNextTestSuite):
 	pass

erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py

@@ -82,7 +82,7 @@ class AccountingDimension(Document):
 			else:
 				frappe.throw(_("Company {0} is added more than once").format(frappe.bold(default.company)))
 
-	def after_insert(self):
+	def on_update(self):
 		if frappe.in_test:
 			make_dimension_in_accounting_doctypes(doc=self)
 		else:
@@ -103,10 +103,6 @@ class AccountingDimension(Document):
 		if not self.fieldname:
 			self.fieldname = scrub(self.label)
 
-	def on_update(self):
-		frappe.flags.accounting_dimensions = None
-		frappe.flags.accounting_dimensions_details = None
-
 
 def make_dimension_in_accounting_doctypes(doc, doclist=None):
 	if not doclist:
@@ -241,34 +237,26 @@ def get_doctypes_with_dimensions():
 	return frappe.get_hooks("accounting_dimension_doctypes")
 
 
-def get_accounting_dimensions(as_list=True, filters=None):
-	if not filters:
-		filters = {"disabled": 0}
-
-	if frappe.flags.accounting_dimensions is None:
-		frappe.flags.accounting_dimensions = frappe.get_all(
-			"Accounting Dimension",
-			fields=["label", "fieldname", "disabled", "document_type"],
-			filters=filters,
-		)
+def get_accounting_dimensions(as_list=True):
+	accounting_dimensions = frappe.get_all(
+		"Accounting Dimension",
+		fields=["label", "fieldname", "disabled", "document_type"],
+		filters={"disabled": 0},
+	)
 
 	if as_list:
-		return [d.fieldname for d in frappe.flags.accounting_dimensions]
+		return [d.fieldname for d in accounting_dimensions]
 	else:
-		return frappe.flags.accounting_dimensions
+		return accounting_dimensions
 
 
 def get_checks_for_pl_and_bs_accounts():
-	if frappe.flags.accounting_dimensions_details is None:
-		# nosemgrep
-		frappe.flags.accounting_dimensions_details = frappe.db.sql(
-			"""SELECT p.label, p.disabled, p.fieldname, c.default_dimension, c.company, c.mandatory_for_pl, c.mandatory_for_bs
+	return frappe.db.sql(
+		"""SELECT p.label, p.disabled, p.fieldname, c.default_dimension, c.company, c.mandatory_for_pl, c.mandatory_for_bs
 			FROM `tabAccounting Dimension`p ,`tabAccounting Dimension Detail` c
 			WHERE p.name = c.parent AND p.disabled = 0""",
-			as_dict=1,
-		)
-
-	return frappe.flags.accounting_dimensions_details
+		as_dict=1,
+	)
 
 
 def get_dimension_with_children(doctype, dimensions):

erpnext/accounts/doctype/accounting_dimension/test_accounting_dimension.py

@@ -3,18 +3,13 @@
 import unittest
 
 import frappe
-from frappe.tests import IntegrationTestCase
 
 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
-
-EXTRA_TEST_RECORD_DEPENDENCIES = ["Cost Center", "Location", "Warehouse", "Department"]
+from erpnext.tests.utils import ERPNextTestSuite
 
 
-class TestAccountingDimension(IntegrationTestCase):
-	def setUp(self):
-		create_dimension()
-
+class TestAccountingDimension(ERPNextTestSuite):
 	def test_dimension_against_sales_invoice(self):
 		si = create_sales_invoice(do_not_save=1)
 
@@ -79,68 +74,3 @@ class TestAccountingDimension(IntegrationTestCase):
 
 		si.save()
 		self.assertRaises(frappe.ValidationError, si.submit)
-
-	def tearDown(self):
-		disable_dimension()
-		frappe.flags.accounting_dimensions_details = None
-		frappe.flags.dimension_filter_map = None
-
-
-def create_dimension():
-	frappe.set_user("Administrator")
-
-	if not frappe.db.exists("Accounting Dimension", {"document_type": "Department"}):
-		dimension = frappe.get_doc(
-			{
-				"doctype": "Accounting Dimension",
-				"document_type": "Department",
-			}
-		)
-		dimension.append(
-			"dimension_defaults",
-			{
-				"company": "_Test Company",
-				"reference_document": "Department",
-				"default_dimension": "_Test Department - _TC",
-			},
-		)
-		dimension.insert()
-		dimension.save()
-	else:
-		dimension = frappe.get_doc("Accounting Dimension", "Department")
-		dimension.disabled = 0
-		dimension.save()
-
-	if not frappe.db.exists("Accounting Dimension", {"document_type": "Location"}):
-		dimension1 = frappe.get_doc(
-			{
-				"doctype": "Accounting Dimension",
-				"document_type": "Location",
-			}
-		)
-
-		dimension1.append(
-			"dimension_defaults",
-			{
-				"company": "_Test Company",
-				"reference_document": "Location",
-				"default_dimension": "Block 1",
-			},
-		)
-
-		dimension1.insert()
-		dimension1.save()
-	else:
-		dimension1 = frappe.get_doc("Accounting Dimension", "Location")
-		dimension1.disabled = 0
-		dimension1.save()
-
-
-def disable_dimension():
-	dimension1 = frappe.get_doc("Accounting Dimension", "Department")
-	dimension1.disabled = 1
-	dimension1.save()
-
-	dimension2 = frappe.get_doc("Accounting Dimension", "Location")
-	dimension2.disabled = 1
-	dimension2.save()

erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.py

@@ -69,37 +69,34 @@ class AccountingDimensionFilter(Document):
 
 
 def get_dimension_filter_map():
-	if not frappe.flags.get("dimension_filter_map"):
-		filters = frappe.db.sql(
-			"""
-			SELECT
-				a.applicable_on_account, d.dimension_value, p.accounting_dimension,
-				p.allow_or_restrict, p.fieldname, a.is_mandatory
-			FROM
-				`tabApplicable On Account` a,
-				`tabAccounting Dimension Filter` p
-			LEFT JOIN `tabAllowed Dimension` d ON d.parent = p.name
-			WHERE
-				p.name = a.parent
-				AND p.disabled = 0
-		""",
-			as_dict=1,
+	filters = frappe.db.sql(
+		"""
+		SELECT
+			a.applicable_on_account, d.dimension_value, p.accounting_dimension,
+			p.allow_or_restrict, p.fieldname, a.is_mandatory
+		FROM
+			`tabApplicable On Account` a,
+			`tabAccounting Dimension Filter` p
+		LEFT JOIN `tabAllowed Dimension` d ON d.parent = p.name
+		WHERE
+			p.name = a.parent
+			AND p.disabled = 0
+	""",
+		as_dict=1,
+	)
+
+	dimension_filter_map = {}
+
+	for f in filters:
+		build_map(
+			dimension_filter_map,
+			f.fieldname,
+			f.applicable_on_account,
+			f.dimension_value,
+			f.allow_or_restrict,
+			f.is_mandatory,
 		)
-
-		dimension_filter_map = {}
-
-		for f in filters:
-			build_map(
-				dimension_filter_map,
-				f.fieldname,
-				f.applicable_on_account,
-				f.dimension_value,
-				f.allow_or_restrict,
-				f.is_mandatory,
-			)
-		frappe.flags.dimension_filter_map = dimension_filter_map
-
-	return frappe.flags.dimension_filter_map
+	return dimension_filter_map
 
 
 def build_map(map_object, dimension, account, filter_value, allow_or_restrict, is_mandatory):

erpnext/accounts/doctype/accounting_dimension_filter/test_accounting_dimension_filter.py

@@ -5,19 +5,13 @@ import unittest
 
 import frappe
 
-from erpnext.accounts.doctype.accounting_dimension.test_accounting_dimension import (
-	create_dimension,
-	disable_dimension,
-)
 from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
 from erpnext.exceptions import InvalidAccountDimensionError, MandatoryAccountDimensionError
-
-EXTRA_TEST_RECORD_DEPENDENCIES = ["Location", "Cost Center", "Department"]
+from erpnext.tests.utils import ERPNextTestSuite
 
 
-class TestAccountingDimensionFilter(unittest.TestCase):
+class TestAccountingDimensionFilter(ERPNextTestSuite):
 	def setUp(self):
-		create_dimension()
 		create_accounting_dimension_filter()
 		self.invoice_list = []
 
@@ -44,17 +38,6 @@ class TestAccountingDimensionFilter(unittest.TestCase):
 		self.assertRaises(MandatoryAccountDimensionError, si.submit)
 		self.invoice_list.append(si)
 
-	def tearDown(self):
-		disable_dimension_filter()
-		disable_dimension()
-		frappe.flags.accounting_dimensions_details = None
-		frappe.flags.dimension_filter_map = None
-
-		for si in self.invoice_list:
-			si.load_from_db()
-			if si.docstatus == 1:
-				si.cancel()
-
 
 def create_accounting_dimension_filter():
 	if not frappe.db.get_value("Accounting Dimension Filter", {"accounting_dimension": "Cost Center"}):

erpnext/accounts/doctype/accounting_period/accounting_period.json

@@ -20,7 +20,6 @@
   {
    "fieldname": "period_name",
    "fieldtype": "Data",
-   "in_list_view": 1,
    "label": "Period Name",
    "reqd": 1,
    "unique": 1
@@ -79,7 +78,7 @@
   }
  ],
  "links": [],
- "modified": "2025-12-01 16:53:44.631299",
+ "modified": "2026-03-09 17:15:33.577217",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Accounting Period",

erpnext/accounts/doctype/accounting_period/accounting_period.py

@@ -97,7 +97,7 @@ def validate_accounting_period_on_doc_save(doc, method=None):
 	if doc.doctype == "Bank Clearance":
 		return
 	elif doc.doctype == "Asset":
-		if doc.is_existing_asset:
+		if doc.asset_type == "Existing Asset":
 			return
 		else:
 			date = doc.available_for_use_date

erpnext/accounts/doctype/accounting_period/test_accounting_period.py

@@ -3,7 +3,6 @@
 import unittest
 
 import frappe
-from frappe.tests import IntegrationTestCase
 from frappe.utils import add_months, nowdate
 
 from erpnext.accounts.doctype.accounting_period.accounting_period import (
@@ -11,11 +10,10 @@ from erpnext.accounts.doctype.accounting_period.accounting_period import (
 	OverlapError,
 )
 from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
-
-EXTRA_TEST_RECORD_DEPENDENCIES = ["Item"]
+from erpnext.tests.utils import ERPNextTestSuite
 
 
-class TestAccountingPeriod(IntegrationTestCase):
+class TestAccountingPeriod(ERPNextTestSuite):
 	def test_overlap(self):
 		ap1 = create_accounting_period(
 			start_date="2018-04-01", end_date="2018-06-30", company="Wind Power LLC"
@@ -90,10 +88,6 @@ class TestAccountingPeriod(IntegrationTestCase):
 		doc.submit()  # Should not raise
 		self.assertEqual(doc.docstatus, 1)
 
-	def tearDown(self):
-		for d in frappe.get_all("Accounting Period"):
-			frappe.delete_doc("Accounting Period", d.name)
-
 
 def create_accounting_period(**args):
 	args = frappe._dict(args)

erpnext/accounts/doctype/accounts_settings/accounts_settings.js

@@ -2,7 +2,15 @@
 // For license information, please see license.txt
 
 frappe.ui.form.on("Accounts Settings", {
-	refresh: function (frm) {},
+	refresh: function (frm) {
+		frm.set_query("document_type", "repost_allowed_types", function (doc, cdt, cdn) {
+			return {
+				filters: {
+					name: ["in", frappe.boot.sysdefaults.repost_allowed_doctypes],
+				},
+			};
+		});
+	},
 	enable_immutable_ledger: function (frm) {
 		if (!frm.doc.enable_immutable_ledger) {
 			return;

erpnext/accounts/doctype/accounts_settings/accounts_settings.json

@@ -62,9 +62,12 @@
   "reconciliation_queue_size",
   "column_break_resa",
   "exchange_gain_loss_posting_date",
+  "repost_section",
+  "repost_allowed_types",
   "payment_options_section",
   "enable_loyalty_point_program",
   "column_break_ctam",
+  "fetch_payment_schedule_in_payment_request",
   "invoicing_settings_tab",
   "accounts_transactions_settings_section",
   "over_billing_allowance",
@@ -205,7 +208,7 @@
    "description": "Payment Terms from orders will be fetched into the invoices as is",
    "fieldname": "automatically_fetch_payment_terms",
    "fieldtype": "Check",
-   "label": "Automatically Fetch Payment Terms from Order"
+   "label": "Automatically Fetch Payment Terms from Order/Quotation"
   },
   {
    "description": "The percentage you are allowed to bill more against the amount ordered. For example, if the order value is $100 for an item and tolerance is set as 10%, then you are allowed to bill up to $110 ",
@@ -688,6 +691,30 @@
    "fieldname": "enable_accounting_dimensions",
    "fieldtype": "Check",
    "label": "Enable Accounting Dimensions"
+  },
+  {
+   "default": "1",
+   "description": "Enable Subscription tracking in invoice",
+   "fieldname": "enable_subscription",
+   "fieldtype": "Check",
+   "label": "Enable Subscription"
+  },
+  {
+   "default": "1",
+   "fieldname": "fetch_payment_schedule_in_payment_request",
+   "fieldtype": "Check",
+   "label": "Fetch Payment Schedule In Payment Request"
+  },
+  {
+   "fieldname": "repost_section",
+   "fieldtype": "Section Break",
+   "label": "Repost"
+  },
+  {
+   "fieldname": "repost_allowed_types",
+   "fieldtype": "Table",
+   "label": "Allowed Doctypes",
+   "options": "Repost Allowed Types"
   }
  ],
  "grid_page_length": 50,
@@ -697,7 +724,7 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2026-02-04 17:15:38.609327",
+ "modified": "2026-04-13 15:30:28.729627",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Accounts Settings",

erpnext/accounts/doctype/accounts_settings/accounts_settings.py

@@ -10,6 +10,9 @@ from frappe.custom.doctype.property_setter.property_setter import make_property_
 from frappe.model.document import Document
 from frappe.utils import cint
 
+from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import (
+	get_accounting_dimensions,
+)
 from erpnext.accounts.utils import sync_auto_reconcile_config
 
 SELLING_DOCTYPES = [
@@ -44,6 +47,8 @@ class AccountsSettings(Document):
 	if TYPE_CHECKING:
 		from frappe.types import DF
 
+		from erpnext.accounts.doctype.repost_allowed_types.repost_allowed_types import RepostAllowedTypes
+
 		add_taxes_from_item_tax_template: DF.Check
 		add_taxes_from_taxes_and_charges_template: DF.Check
 		allow_multi_currency_invoices_against_single_party_account: DF.Check
@@ -73,6 +78,7 @@ class AccountsSettings(Document):
 		enable_loyalty_point_program: DF.Check
 		enable_party_matching: 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
 		general_ledger_remarks_length: DF.Int
 		ignore_account_closing_balance: DF.Check
@@ -85,6 +91,7 @@ class AccountsSettings(Document):
 		receivable_payable_fetch_method: DF.Literal["Buffered Cursor", "UnBuffered Cursor", "Raw SQL"]
 		receivable_payable_remarks_length: DF.Int
 		reconciliation_queue_size: DF.Int
+		repost_allowed_types: DF.Table[RepostAllowedTypes]
 		role_allowed_to_over_bill: DF.Link | None
 		role_to_notify_on_depreciation_failure: DF.Link | None
 		role_to_override_stop_action: DF.Link | None
@@ -139,6 +146,7 @@ class AccountsSettings(Document):
 			frappe.clear_cache()
 
 		self.validate_and_sync_auto_reconcile_config()
+		self.update_property_for_accounting_dimension()
 
 	def validate_stale_days(self):
 		if not self.allow_stale and cint(self.stale_days) <= 0:
@@ -185,6 +193,17 @@ class AccountsSettings(Document):
 				title=_("Auto Tax Settings Error"),
 			)
 
+	def update_property_for_accounting_dimension(self):
+		doctypes = [entry.document_type for entry in self.repost_allowed_types]
+		if not doctypes:
+			return
+
+		from erpnext.accounts.doctype.repost_accounting_ledger.repost_accounting_ledger import get_child_docs
+
+		doctypes += get_child_docs(doctypes)
+
+		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
@@ -224,3 +243,12 @@ def create_property_setter_for_hiding_field(doctype, field_name, hide):
 		"Check",
 		validate_fields_for_doctype=False,
 	)
+
+
+def set_allow_on_submit_for_dimension_fields(doctypes):
+	for dt in doctypes:
+		meta = frappe.get_meta(dt)
+		for dimension in get_accounting_dimensions():
+			df = meta.get_field(dimension)
+			if df and not df.allow_on_submit:
+				frappe.db.set_value("Custom Field", dt + "-" + dimension, "allow_on_submit", 1)

erpnext/accounts/doctype/accounts_settings/test_accounts_settings.py

@@ -1,17 +1,11 @@
 import unittest
 
 import frappe
-from frappe.tests import IntegrationTestCase
+
+from erpnext.tests.utils import ERPNextTestSuite
 
 
-class TestAccountsSettings(IntegrationTestCase):
-	def tearDown(self):
-		# Just in case `save` method succeeds, we need to take things back to default so that other tests
-		# don't break
-		cur_settings = frappe.get_doc("Accounts Settings", "Accounts Settings")
-		cur_settings.allow_stale = 1
-		cur_settings.save()
-
+class TestAccountsSettings(ERPNextTestSuite):
 	def test_stale_days(self):
 		cur_settings = frappe.get_doc("Accounts Settings", "Accounts Settings")
 		cur_settings.allow_stale = 0

erpnext/accounts/doctype/advance_payment_ledger_entry/test_advance_payment_ledger_entry.py

@@ -2,7 +2,6 @@
 # See license.txt
 
 import frappe
-from frappe.tests import IntegrationTestCase
 from frappe.utils import nowdate, today
 
 from erpnext.accounts.doctype.payment_entry.test_payment_entry import get_payment_entry
@@ -10,14 +9,13 @@ from erpnext.accounts.test.accounts_mixin import AccountsTestMixin
 from erpnext.buying.doctype.purchase_order.test_purchase_order import create_purchase_order
 from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
 
-# On IntegrationTestCase, the doctype test records and all
+# On ERPNextTestSuite, the doctype test records and all
 # link-field test record depdendencies are recursively loaded
 # Use these module variables to add/remove to/from that list
-EXTRA_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
-IGNORE_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
+from erpnext.tests.utils import ERPNextTestSuite
 
 
-class TestAdvancePaymentLedgerEntry(AccountsTestMixin, IntegrationTestCase):
+class TestAdvancePaymentLedgerEntry(ERPNextTestSuite, AccountsTestMixin):
 	"""
 	Integration tests for AdvancePaymentLedgerEntry.
 	Use this class for testing interactions between multiple components.
@@ -30,9 +28,6 @@ class TestAdvancePaymentLedgerEntry(AccountsTestMixin, IntegrationTestCase):
 		self.create_item()
 		self.clear_old_entries()
 
-	def tearDown(self):
-		frappe.db.rollback()
-
 	def create_sales_order(self, qty=1, rate=100, currency="INR", do_not_submit=False):
 		"""
 		Helper method

erpnext/accounts/doctype/bank/test_bank.py

@@ -2,8 +2,8 @@
 # See license.txt
 import unittest
 
-from frappe.tests import IntegrationTestCase
+from erpnext.tests.utils import ERPNextTestSuite
 
 
-class TestBank(IntegrationTestCase):
+class TestBank(ERPNextTestSuite):
 	pass

erpnext/accounts/doctype/bank_account/bank_account.py

@@ -116,6 +116,7 @@ def get_default_company_bank_account(company, party_type, party):
 
 @frappe.whitelist()
 def get_bank_account_details(bank_account):
+	frappe.has_permission("Bank Account", doc=bank_account, ptype="read", throw=True)
 	return frappe.get_cached_value(
 		"Bank Account", bank_account, ["account", "bank", "bank_account_no"], as_dict=1
 	)

erpnext/accounts/doctype/bank_account/test_bank_account.py

@@ -2,10 +2,8 @@
 # See license.txt
 import unittest
 
-import frappe
-from frappe import ValidationError
-from frappe.tests import IntegrationTestCase
+from erpnext.tests.utils import ERPNextTestSuite
 
 
-class TestBankAccount(IntegrationTestCase):
+class TestBankAccount(ERPNextTestSuite):
 	pass

erpnext/accounts/doctype/bank_account_subtype/test_bank_account_subtype.py

@@ -2,8 +2,8 @@
 # See license.txt
 import unittest
 
-from frappe.tests import IntegrationTestCase
+from erpnext.tests.utils import ERPNextTestSuite
 
 
-class TestBankAccountSubtype(IntegrationTestCase):
+class TestBankAccountSubtype(ERPNextTestSuite):
 	pass

erpnext/accounts/doctype/bank_account_type/test_bank_account_type.py

@@ -3,8 +3,8 @@
 # import frappe
 import unittest
 
-from frappe.tests import IntegrationTestCase
+from erpnext.tests.utils import ERPNextTestSuite
 
 
-class TestBankAccountType(IntegrationTestCase):
+class TestBankAccountType(ERPNextTestSuite):
 	pass

erpnext/accounts/doctype/bank_clearance/bank_clearance.py

@@ -5,8 +5,10 @@
 import frappe
 from frappe import _, msgprint
 from frappe.model.document import Document
+from frappe.query_builder import Case
 from frappe.query_builder.custom import ConstantColumn
-from frappe.utils import cint, flt, fmt_money, get_link_to_form, getdate
+from frappe.query_builder.functions import Coalesce, Sum
+from frappe.utils import cint, flt, fmt_money, getdate
 from pypika import Order
 
 import erpnext
@@ -182,65 +184,162 @@ def get_payment_entries_for_bank_clearance(
 ):
 	entries = []
 
-	condition = ""
-	pe_condition = ""
+	journal_entry = frappe.qb.DocType("Journal Entry")
+	journal_entry_account = frappe.qb.DocType("Journal Entry Account")
+
+	journal_entry_query = (
+		frappe.qb.from_(journal_entry_account)
+		.inner_join(journal_entry)
+		.on(journal_entry_account.parent == journal_entry.name)
+		.select(
+			ConstantColumn("Journal Entry").as_("payment_document"),
+			journal_entry.name.as_("payment_entry"),
+			journal_entry.cheque_no.as_("cheque_number"),
+			journal_entry.cheque_date,
+			Sum(journal_entry_account.debit_in_account_currency).as_("debit"),
+			Sum(journal_entry_account.credit_in_account_currency).as_("credit"),
+			journal_entry.posting_date,
+			journal_entry_account.against_account,
+			journal_entry.clearance_date,
+			journal_entry_account.account_currency,
+		)
+		.where(
+			(journal_entry_account.account == account)
+			& (journal_entry.docstatus == 1)
+			& (journal_entry.posting_date >= from_date)
+			& (journal_entry.posting_date <= to_date)
+			& (journal_entry.is_opening == "No")
+		)
+	)
+
 	if not include_reconciled_entries:
-		condition = "and (clearance_date IS NULL or clearance_date='0000-00-00')"
-		pe_condition = "and (pe.clearance_date IS NULL or pe.clearance_date='0000-00-00')"
+		journal_entry_query = journal_entry_query.where(
+			(journal_entry.clearance_date.isnull()) | (journal_entry.clearance_date == "0000-00-00")
+		)
 
-	journal_entries = frappe.db.sql(
-		f"""
-			select
-				"Journal Entry" as payment_document, t1.name as payment_entry,
-				t1.cheque_no as cheque_number, t1.cheque_date,
-				sum(t2.debit_in_account_currency) as debit, sum(t2.credit_in_account_currency) as credit,
-				t1.posting_date, t2.against_account, t1.clearance_date, t2.account_currency
-			from
-				`tabJournal Entry` t1, `tabJournal Entry Account` t2
-			where
-				t2.parent = t1.name and t2.account = %(account)s and t1.docstatus=1
-				and t1.posting_date >= %(from)s and t1.posting_date <= %(to)s
-				and ifnull(t1.is_opening, 'No') = 'No' {condition}
-			group by t2.account, t1.name
-			order by t1.posting_date ASC, t1.name DESC
-		""",
-		{"account": account, "from": from_date, "to": to_date},
-		as_dict=1,
+	journal_entries = (
+		journal_entry_query.groupby(journal_entry_account.account, journal_entry.name)
+		.orderby(journal_entry.posting_date)
+		.orderby(journal_entry.name, order=Order.desc)
+	).run(as_dict=True)
+
+	pe = frappe.qb.DocType("Payment Entry")
+	company = frappe.qb.DocType("Company")
+	payment_entry_query = (
+		frappe.qb.from_(pe)
+		.join(company)
+		.on(pe.company == company.name)
+		.select(
+			ConstantColumn("Payment Entry").as_("payment_document"),
+			pe.name.as_("payment_entry"),
+			pe.reference_no.as_("cheque_number"),
+			pe.reference_date.as_("cheque_date"),
+			(
+				Case()
+				.when(
+					pe.paid_from == account,
+					(
+						pe.paid_amount
+						+ (
+							Case()
+							.when(
+								(pe.payment_type == "Pay")
+								& (company.default_currency == pe.paid_from_account_currency),
+								pe.base_total_taxes_and_charges,
+							)
+							.else_(pe.total_taxes_and_charges)
+						)
+					),
+				)
+				.else_(0)
+			).as_("credit"),
+			(
+				Case()
+				.when(pe.paid_from == account, 0)
+				.else_(
+					pe.received_amount
+					+ (
+						Case()
+						.when(
+							company.default_currency == pe.paid_to_account_currency,
+							pe.base_total_taxes_and_charges,
+						)
+						.else_(pe.total_taxes_and_charges)
+					)
+				)
+			).as_("debit"),
+			pe.posting_date,
+			Coalesce(pe.party, Case().when(pe.paid_from == account, pe.paid_to).else_(pe.paid_from)).as_(
+				"against_account"
+			),
+			pe.clearance_date,
+			(
+				Case()
+				.when(pe.paid_to == account, pe.paid_to_account_currency)
+				.else_(pe.paid_from_account_currency)
+			).as_("account_currency"),
+		)
+		.where(
+			((pe.paid_from == account) | (pe.paid_to == account))
+			& (pe.docstatus == 1)
+			& (pe.posting_date >= from_date)
+			& (pe.posting_date <= to_date)
+		)
 	)
 
-	payment_entries = frappe.db.sql(
-		f"""
-			select
-				"Payment Entry" as payment_document, pe.name as payment_entry,
-				pe.reference_no as cheque_number, pe.reference_date as cheque_date,
-				if(pe.paid_from=%(account)s, pe.paid_amount + if(pe.payment_type = 'Pay' and c.default_currency = pe.paid_from_account_currency, pe.base_total_taxes_and_charges, pe.total_taxes_and_charges) , 0) as credit,
-				if(pe.paid_from=%(account)s, 0, pe.received_amount + pe.total_taxes_and_charges) as debit,
-				pe.posting_date, ifnull(pe.party,if(pe.paid_from=%(account)s,pe.paid_to,pe.paid_from)) as against_account, pe.clearance_date,
-				if(pe.paid_to=%(account)s, pe.paid_to_account_currency, pe.paid_from_account_currency) as account_currency
-			from `tabPayment Entry` as pe
-			join `tabCompany` c on c.name = pe.company
-			where
-				(pe.paid_from=%(account)s or pe.paid_to=%(account)s) and pe.docstatus=1
-				and pe.posting_date >= %(from)s and pe.posting_date <= %(to)s
-				{pe_condition}
-			order by
-				pe.posting_date ASC, pe.name DESC
-		""",
-		{
-			"account": account,
-			"from": from_date,
-			"to": to_date,
-		},
-		as_dict=1,
+	if not include_reconciled_entries:
+		payment_entry_query = payment_entry_query.where(
+			(pe.clearance_date.isnull()) | (pe.clearance_date == "0000-00-00")
+		)
+
+	payment_entries = (payment_entry_query.orderby(pe.posting_date).orderby(pe.name, order=Order.desc)).run(
+		as_dict=True
 	)
 
-	pos_sales_invoices, pos_purchase_invoices = [], []
+	acc = frappe.qb.DocType("Account")
+
+	pi = frappe.qb.DocType("Purchase Invoice")
+
+	paid_purchase_invoices_query = (
+		frappe.qb.from_(pi)
+		.inner_join(acc)
+		.on(pi.cash_bank_account == acc.name)
+		.select(
+			ConstantColumn("Purchase Invoice").as_("payment_document"),
+			pi.name.as_("payment_entry"),
+			pi.paid_amount.as_("credit"),
+			pi.posting_date,
+			pi.supplier.as_("against_account"),
+			pi.bill_no.as_("cheque_number"),
+			pi.clearance_date,
+			acc.account_currency,
+			ConstantColumn(0).as_("debit"),
+		)
+		.where(
+			(pi.docstatus == 1)
+			& (pi.is_paid == 1)
+			& (pi.cash_bank_account == account)
+			& (pi.posting_date >= from_date)
+			& (pi.posting_date <= to_date)
+		)
+	)
+
+	if not include_reconciled_entries:
+		paid_purchase_invoices_query = paid_purchase_invoices_query.where(
+			(pi.clearance_date.isnull()) | (pi.clearance_date == "0000-00-00")
+		)
+
+	paid_purchase_invoices = (
+		paid_purchase_invoices_query.orderby(pi.posting_date).orderby(pi.name, order=Order.desc)
+	).run(as_dict=True)
+
+	pos_sales_invoices = []
+
 	if include_pos_transactions:
 		si_payment = frappe.qb.DocType("Sales Invoice Payment")
 		si = frappe.qb.DocType("Sales Invoice")
-		acc = frappe.qb.DocType("Account")
 
-		pos_sales_invoices = (
+		pos_sales_invoices_query = (
 			frappe.qb.from_(si_payment)
 			.inner_join(si)
 			.on(si_payment.parent == si.name)
@@ -263,38 +362,22 @@ def get_payment_entries_for_bank_clearance(
 				& (si.posting_date >= from_date)
 				& (si.posting_date <= to_date)
 			)
-			.orderby(si.posting_date)
-			.orderby(si.name, order=Order.desc)
-		).run(as_dict=True)
+		)
 
-		pi = frappe.qb.DocType("Purchase Invoice")
+		if not include_reconciled_entries:
+			pos_sales_invoices_query = pos_sales_invoices_query.where(
+				(si_payment.clearance_date.isnull()) | (si_payment.clearance_date == "0000-00-00")
+			)
 
-		pos_purchase_invoices = (
-			frappe.qb.from_(pi)
-			.inner_join(acc)
-			.on(pi.cash_bank_account == acc.name)
-			.select(
-				ConstantColumn("Purchase Invoice").as_("payment_document"),
-				pi.name.as_("payment_entry"),
-				pi.paid_amount.as_("credit"),
-				pi.posting_date,
-				pi.supplier.as_("against_account"),
-				pi.clearance_date,
-				acc.account_currency,
-				ConstantColumn(0).as_("debit"),
-			)
-			.where(
-				(pi.docstatus == 1)
-				& (pi.cash_bank_account == account)
-				& (pi.posting_date >= from_date)
-				& (pi.posting_date <= to_date)
-			)
-			.orderby(pi.posting_date)
-			.orderby(pi.name, order=Order.desc)
+		pos_sales_invoices = (
+			pos_sales_invoices_query.orderby(si.posting_date).orderby(si.name, order=Order.desc)
 		).run(as_dict=True)
 
 	entries = (
-		list(payment_entries) + list(journal_entries) + list(pos_sales_invoices) + list(pos_purchase_invoices)
+		list(payment_entries)
+		+ list(journal_entries)
+		+ list(pos_sales_invoices)
+		+ list(paid_purchase_invoices)
 	)
 
 	return entries

erpnext/accounts/doctype/bank_clearance/test_bank_clearance.py

@@ -3,7 +3,6 @@
 import unittest
 
 import frappe
-from frappe.tests import IntegrationTestCase
 from frappe.utils import add_months, getdate
 
 from erpnext.accounts.doctype.cost_center.test_cost_center import create_cost_center
@@ -15,13 +14,12 @@ from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make
 from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
 from erpnext.stock.doctype.item.test_item import create_item
 from erpnext.stock.doctype.warehouse.test_warehouse import create_warehouse
-from erpnext.tests.utils import if_lending_app_installed, if_lending_app_not_installed
+from erpnext.tests.utils import ERPNextTestSuite, if_lending_app_installed, if_lending_app_not_installed
 
 
-class TestBankClearance(IntegrationTestCase):
-	@classmethod
-	def setUpClass(cls):
-		super().setUpClass()
+class TestBankClearance(ERPNextTestSuite):
+	def setUp(self):
+		frappe.clear_cache()
 		create_warehouse(
 			warehouse_name="_Test Warehouse",
 			properties={"parent_warehouse": "All Warehouses - _TC"},

erpnext/accounts/doctype/bank_guarantee/test_bank_guarantee.py

@@ -2,8 +2,8 @@
 # See license.txt
 import unittest
 
-from frappe.tests import IntegrationTestCase
+from erpnext.tests.utils import ERPNextTestSuite
 
 
-class TestBankGuarantee(IntegrationTestCase):
+class TestBankGuarantee(ERPNextTestSuite):
 	pass

erpnext/accounts/doctype/bank_reconciliation_tool/test_bank_reconciliation_tool.py

@@ -4,7 +4,6 @@
 
 import frappe
 from frappe import qb
-from frappe.tests import IntegrationTestCase
 from frappe.utils import add_days, today
 
 from erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool import (
@@ -13,9 +12,10 @@ from erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool
 )
 from erpnext.accounts.doctype.payment_entry.test_payment_entry import create_payment_entry
 from erpnext.accounts.test.accounts_mixin import AccountsTestMixin
+from erpnext.tests.utils import ERPNextTestSuite
 
 
-class TestBankReconciliationTool(AccountsTestMixin, IntegrationTestCase):
+class TestBankReconciliationTool(ERPNextTestSuite, AccountsTestMixin):
 	def setUp(self):
 		self.create_company()
 		self.create_customer()
@@ -24,9 +24,6 @@ class TestBankReconciliationTool(AccountsTestMixin, IntegrationTestCase):
 		qb.from_(bank_dt).delete().where(bank_dt.name == "HDFC").run()
 		self.create_bank_account()
 
-	def tearDown(self):
-		frappe.db.rollback()
-
 	def create_bank_account(self):
 		bank = frappe.get_doc(
 			{
@@ -43,6 +40,7 @@ class TestBankReconciliationTool(AccountsTestMixin, IntegrationTestCase):
 					"bank": bank.name,
 					"is_company_account": True,
 					"account": self.bank,  # account from Chart of Accounts
+					"company": self.company,
 				}
 			)
 			.insert()

erpnext/accounts/doctype/bank_statement_import/test_bank_statement_import.py

@@ -1,15 +1,14 @@
 # Copyright (c) 2020, Frappe Technologies and Contributors
 # See license.txt
 
-import unittest
-
 from erpnext.accounts.doctype.bank_statement_import.bank_statement_import import (
 	is_mt940_format,
 	preprocess_mt940_content,
 )
+from erpnext.tests.utils import ERPNextTestSuite
 
 
-class TestBankStatementImport(unittest.TestCase):
+class TestBankStatementImport(ERPNextTestSuite):
 	"""Unit tests for Bank Statement Import functions"""
 
 	def test_preprocess_mt940_content_with_long_statement_number(self):

erpnext/accounts/doctype/bank_transaction/test_auto_match_party.py

@@ -2,27 +2,20 @@
 # License: GNU General Public License v3. See license.txt
 
 import frappe
-from frappe.tests import IntegrationTestCase
 from frappe.utils import nowdate
 
 from erpnext.accounts.doctype.bank_transaction.test_bank_transaction import create_bank_account
+from erpnext.tests.utils import ERPNextTestSuite
 
 IBAN_1 = "DE02000000003716541159"
 IBAN_2 = "DE02500105170137075030"
 
 
-class TestAutoMatchParty(IntegrationTestCase):
-	@classmethod
-	def setUpClass(cls):
+class TestAutoMatchParty(ERPNextTestSuite):
+	def setUp(self):
 		create_bank_account()
 		frappe.db.set_single_value("Accounts Settings", "enable_party_matching", 1)
 		frappe.db.set_single_value("Accounts Settings", "enable_fuzzy_matching", 1)
-		return super().setUpClass()
-
-	@classmethod
-	def tearDownClass(cls):
-		frappe.db.set_single_value("Accounts Settings", "enable_party_matching", 0)
-		frappe.db.set_single_value("Accounts Settings", "enable_fuzzy_matching", 0)
 
 	def test_match_by_account_number(self):
 		create_supplier_for_match(account_no=IBAN_1[11:])

erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py

@@ -6,7 +6,6 @@ import json
 import frappe
 from frappe import utils
 from frappe.model.docstatus import DocStatus
-from frappe.tests import IntegrationTestCase
 
 from erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool import (
 	get_linked_payments,
@@ -19,12 +18,10 @@ from erpnext.accounts.doctype.payment_entry.test_payment_entry import get_paymen
 from erpnext.accounts.doctype.pos_profile.test_pos_profile import make_pos_profile
 from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make_purchase_invoice
 from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
-from erpnext.tests.utils import if_lending_app_installed
-
-EXTRA_TEST_RECORD_DEPENDENCIES = ["Item", "Cost Center"]
+from erpnext.tests.utils import ERPNextTestSuite, if_lending_app_installed
 
 
-class TestBankTransaction(IntegrationTestCase):
+class TestBankTransaction(ERPNextTestSuite):
 	def setUp(self):
 		make_pos_profile()
 
@@ -385,7 +382,7 @@ def add_vouchers(gl_account="_Test Bank - _TC"):
 		frappe.get_doc(
 			{
 				"doctype": "Customer",
-				"customer_group": "All Customer Groups",
+				"customer_group": "Individual",
 				"customer_type": "Company",
 				"customer_name": "Poore Simon's",
 			}
@@ -416,7 +413,7 @@ def add_vouchers(gl_account="_Test Bank - _TC"):
 		frappe.get_doc(
 			{
 				"doctype": "Customer",
-				"customer_group": "All Customer Groups",
+				"customer_group": "Individual",
 				"customer_type": "Company",
 				"customer_name": "Fayva",
 			}

erpnext/accounts/doctype/bank_transaction/test_bank_transaction_fees.py

@@ -2,10 +2,11 @@
 # See license.txt
 
 import frappe
-from frappe.tests import UnitTestCase
+
+from erpnext.tests.utils import ERPNextTestSuite
 
 
-class TestBankTransactionFees(UnitTestCase):
+class TestBankTransactionFees(ERPNextTestSuite):
 	def test_included_fee_throws(self):
 		"""A fee that's part of a withdrawal cannot be bigger than the
 		withdrawal itself."""

erpnext/accounts/doctype/bisect_accounting_statements/test_bisect_accounting_statements.py

@@ -2,8 +2,10 @@
 # See license.txt
 
 # import frappe
-from frappe.tests import IntegrationTestCase
 
 
-class TestBisectAccountingStatements(IntegrationTestCase):
+from erpnext.tests.utils import ERPNextTestSuite
+
+
+class TestBisectAccountingStatements(ERPNextTestSuite):
 	pass

erpnext/accounts/doctype/bisect_nodes/test_bisect_nodes.py

@@ -2,8 +2,10 @@
 # See license.txt
 
 # import frappe
-from frappe.tests import IntegrationTestCase
 
 
-class TestBisectNodes(IntegrationTestCase):
+from erpnext.tests.utils import ERPNextTestSuite
+
+
+class TestBisectNodes(ERPNextTestSuite):
 	pass

erpnext/accounts/doctype/budget/test_budget.py

@@ -19,12 +19,6 @@ from erpnext.tests.utils import ERPNextTestSuite
 
 
 class TestBudget(ERPNextTestSuite):
-	@classmethod
-	def setUpClass(cls):
-		super().setUpClass()
-		cls.make_monthly_distribution()
-		cls.make_projects()
-
 	def setUp(self):
 		frappe.db.set_single_value("Accounts Settings", "use_legacy_budget_controller", False)
 		self.company = "_Test Company"

erpnext/accounts/doctype/cashier_closing/test_cashier_closing.py

@@ -2,8 +2,8 @@
 # See license.txt
 import unittest
 
-from frappe.tests import IntegrationTestCase
+from erpnext.tests.utils import ERPNextTestSuite
 
 
-class TestCashierClosing(IntegrationTestCase):
+class TestCashierClosing(ERPNextTestSuite):
 	pass

erpnext/accounts/doctype/chart_of_accounts_importer/test_chart_of_accounts_importer.py

@@ -2,8 +2,8 @@
 # See license.txt
 import unittest
 
-from frappe.tests import IntegrationTestCase
+from erpnext.tests.utils import ERPNextTestSuite
 
 
-class TestChartofAccountsImporter(IntegrationTestCase):
+class TestChartofAccountsImporter(ERPNextTestSuite):
 	pass

erpnext/accounts/doctype/cheque_print_template/test_cheque_print_template.py

@@ -2,8 +2,8 @@
 # See license.txt
 import unittest
 
-from frappe.tests import IntegrationTestCase
+from erpnext.tests.utils import ERPNextTestSuite
 
 
-class TestChequePrintTemplate(IntegrationTestCase):
+class TestChequePrintTemplate(ERPNextTestSuite):
 	pass

erpnext/accounts/doctype/cost_center/cost_center.json

@@ -126,7 +126,7 @@
  "idx": 1,
  "is_tree": 1,
  "links": [],
- "modified": "2025-01-22 10:46:42.904001",
+ "modified": "2026-04-14 18:15:27.367298",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Cost Center",
@@ -173,11 +173,20 @@
    "role": "Employee",
    "select": 1,
    "share": 1
+  },
+  {
+   "role": "HR User",
+   "select": 1
+  },
+  {
+   "role": "HR Manager",
+   "select": 1
   }
  ],
+ "row_format": "Dynamic",
  "search_fields": "parent_cost_center, is_group",
  "show_name_in_global_search": 1,
  "sort_field": "creation",
  "sort_order": "ASC",
  "states": []
-}
+}

erpnext/accounts/doctype/cost_center/test_cost_center.py

@@ -3,10 +3,11 @@
 import unittest
 
 import frappe
-from frappe.tests import IntegrationTestCase
+
+from erpnext.tests.utils import ERPNextTestSuite
 
 
-class TestCostCenter(IntegrationTestCase):
+class TestCostCenter(ERPNextTestSuite):
 	def test_cost_center_creation_against_child_node(self):
 		cost_center = frappe.get_doc(
 			{

erpnext/accounts/doctype/cost_center/test_records.json

@@ -1,23 +0,0 @@
-[
- {
-  "company": "_Test Company",
-  "cost_center_name": "_Test Cost Center",
-  "doctype": "Cost Center",
-  "is_group": 0,
-  "parent_cost_center": "_Test Company - _TC"
- },
- {
-  "company": "_Test Company",
-  "cost_center_name": "_Test Cost Center 2",
-  "doctype": "Cost Center",
-  "is_group": 0,
-  "parent_cost_center": "_Test Company - _TC"
- },
- {
-  "company": "_Test Company",
-  "cost_center_name": "_Test Write Off Cost Center",
-  "doctype": "Cost Center",
-  "is_group": 0,
-  "parent_cost_center": "_Test Company - _TC"
- }
-]

erpnext/accounts/doctype/cost_center_allocation/test_cost_center_allocation.py

@@ -4,7 +4,6 @@ import unittest
 
 import frappe
 from frappe.query_builder.functions import Sum
-from frappe.tests import IntegrationTestCase
 from frappe.utils import add_days, today
 
 from erpnext.accounts.doctype.cost_center.test_cost_center import create_cost_center
@@ -16,9 +15,10 @@ from erpnext.accounts.doctype.cost_center_allocation.cost_center_allocation impo
 	WrongPercentageAllocation,
 )
 from erpnext.accounts.doctype.journal_entry.test_journal_entry import make_journal_entry
+from erpnext.tests.utils import ERPNextTestSuite
 
 
-class TestCostCenterAllocation(IntegrationTestCase):
+class TestCostCenterAllocation(ERPNextTestSuite):
 	def setUp(self):
 		cost_centers = [
 			"Main Cost Center 1",
@@ -191,7 +191,7 @@ class TestCostCenterAllocation(IntegrationTestCase):
 		coa2.cancel()
 		jv.cancel()
 
-	@IntegrationTestCase.change_settings("System Settings", {"rounding_method": "Commercial Rounding"})
+	@ERPNextTestSuite.change_settings("System Settings", {"rounding_method": "Commercial Rounding"})
 	def test_debit_credit_on_cost_center_allocation_for_commercial_rounding(self):
 		from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
 

erpnext/accounts/doctype/coupon_code/test_coupon_code.py

@@ -3,11 +3,9 @@
 import unittest
 
 import frappe
-from frappe.tests import IntegrationTestCase
 
 from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
-
-EXTRA_TEST_RECORD_DEPENDENCIES = ["Item"]
+from erpnext.tests.utils import ERPNextTestSuite
 
 
 def test_create_test_data():
@@ -88,6 +86,7 @@ def test_create_test_data():
 				"partner_name": "_Test Coupon Partner",
 				"commission_rate": 2,
 				"referral_code": "COPART",
+				"territory": "All Territories",
 			}
 		)
 		sales_partner.insert()
@@ -110,13 +109,10 @@ def test_create_test_data():
 		coupon_code.insert()
 
 
-class TestCouponCode(IntegrationTestCase):
+class TestCouponCode(ERPNextTestSuite):
 	def setUp(self):
 		test_create_test_data()
 
-	def tearDown(self):
-		frappe.set_user("Administrator")
-
 	def test_sales_order_with_coupon_code(self):
 		frappe.db.set_value("Coupon Code", "SAVE30", "used", 0)
 

erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.json

@@ -101,11 +101,11 @@
    "label": "Use HTTP Protocol"
   }
  ],
- "hide_toolbar": 1,
+ "hide_toolbar": 0,
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2026-01-02 18:19:02.873815",
+ "modified": "2026-03-16 13:28:21.075743",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Currency Exchange Settings",

erpnext/accounts/doctype/currency_exchange_settings/test_currency_exchange_settings.py

@@ -3,8 +3,8 @@
 # import frappe
 import unittest
 
-from frappe.tests import IntegrationTestCase
+from erpnext.tests.utils import ERPNextTestSuite
 
 
-class TestCurrencyExchangeSettings(IntegrationTestCase):
+class TestCurrencyExchangeSettings(ERPNextTestSuite):
 	pass

erpnext/accounts/doctype/dunning/test_dunning.py

@@ -4,37 +4,20 @@ import json
 
 import frappe
 from frappe.model import mapper
-from frappe.tests import IntegrationTestCase
 from frappe.utils import add_days, nowdate, today
 
 from erpnext import get_default_cost_center
 from erpnext.accounts.doctype.payment_entry.test_payment_entry import get_payment_entry
-from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import (
-	unlink_payment_on_cancel_of_invoice,
-)
 from erpnext.accounts.doctype.sales_invoice.sales_invoice import (
 	create_dunning as create_dunning_from_sales_invoice,
 )
 from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import (
 	create_sales_invoice_against_cost_center,
 )
-
-EXTRA_TEST_RECORD_DEPENDENCIES = ["Company", "Cost Center"]
+from erpnext.tests.utils import ERPNextTestSuite
 
 
-class TestDunning(IntegrationTestCase):
-	@classmethod
-	def setUpClass(cls):
-		super().setUpClass()
-		create_dunning_type("First Notice", fee=0.0, interest=0.0, is_default=1)
-		create_dunning_type("Second Notice", fee=10.0, interest=10.0, is_default=0)
-		unlink_payment_on_cancel_of_invoice()
-
-	@classmethod
-	def tearDownClass(cls):
-		unlink_payment_on_cancel_of_invoice(0)
-		super().tearDownClass()
-
+class TestDunning(ERPNextTestSuite):
 	def test_dunning_without_fees(self):
 		dunning = create_dunning(overdue_days=20)
 

erpnext/accounts/doctype/dunning_type/test_dunning_type.py

@@ -3,8 +3,8 @@
 # import frappe
 import unittest
 
-from frappe.tests import IntegrationTestCase
+from erpnext.tests.utils import ERPNextTestSuite
 
 
-class TestDunningType(IntegrationTestCase):
+class TestDunningType(ERPNextTestSuite):
 	pass

erpnext/accounts/doctype/dunning_type/test_records.json

@@ -1,36 +0,0 @@
-[
-    {
-        "doctype": "Dunning Type",
-        "dunning_type": "_Test First Notice",
-        "company": "_Test Company",
-        "is_default": 1,
-        "dunning_fee": 0.0,
-        "rate_of_interest": 0.0,
-        "dunning_letter_text": [
-            {
-                "language": "en",
-                "body_text": "We have still not received payment for our invoice",
-                "closing_text": "We kindly request that you pay the outstanding amount immediately, including interest and late fees."
-            }
-        ],
-        "income_account": "Sales - _TC",
-        "cost_center": "_Test Cost Center - _TC"
-    },
-    {
-        "doctype": "Dunning Type",
-        "dunning_type": "_Test Second Notice",
-        "company": "_Test Company",
-        "is_default": 0,
-        "dunning_fee": 10.0,
-        "rate_of_interest": 10.0,
-        "dunning_letter_text": [
-            {
-                "language": "en",
-                "body_text": "We have still not received payment for our invoice",
-                "closing_text": "We kindly request that you pay the outstanding amount immediately, including interest and late fees."
-            }
-        ],
-        "income_account": "Sales - _TC",
-        "cost_center": "_Test Cost Center - _TC"
-    }
-]

erpnext/accounts/doctype/exchange_rate_revaluation/test_exchange_rate_revaluation.py

@@ -5,15 +5,15 @@
 import frappe
 from frappe.query_builder import functions
 from frappe.query_builder.utils import DocType
-from frappe.tests import IntegrationTestCase
 from frappe.utils import add_days, flt, today
 
 from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry
 from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
 from erpnext.accounts.test.accounts_mixin import AccountsTestMixin
+from erpnext.tests.utils import ERPNextTestSuite
 
 
-class TestExchangeRateRevaluation(AccountsTestMixin, IntegrationTestCase):
+class TestExchangeRateRevaluation(ERPNextTestSuite, AccountsTestMixin):
 	def setUp(self):
 		self.create_company()
 		self.create_usd_receivable_account()
@@ -22,14 +22,13 @@ class TestExchangeRateRevaluation(AccountsTestMixin, IntegrationTestCase):
 		self.clear_old_entries()
 		self.set_system_and_company_settings()
 
-	def tearDown(self):
-		frappe.db.rollback()
-
 	def set_system_and_company_settings(self):
 		# set number and currency precision
 		system_settings = frappe.get_doc("System Settings")
 		system_settings.float_precision = 2
 		system_settings.currency_precision = 2
+		system_settings.language = "en"
+		system_settings.time_zone = "Asia/Kolkata"
 		system_settings.save()
 
 		# Using Exchange Gain/Loss account for unrealized as well.
@@ -37,7 +36,7 @@ class TestExchangeRateRevaluation(AccountsTestMixin, IntegrationTestCase):
 		company_doc.unrealized_exchange_gain_loss_account = company_doc.exchange_gain_loss_account
 		company_doc.save()
 
-	@IntegrationTestCase.change_settings(
+	@ERPNextTestSuite.change_settings(
 		"Accounts Settings",
 		{"allow_multi_currency_invoices_against_single_party_account": 1, "allow_stale": 0},
 	)
@@ -91,7 +90,7 @@ class TestExchangeRateRevaluation(AccountsTestMixin, IntegrationTestCase):
 		)[0]
 		self.assertEqual(acc_balance.balance, 8500.0)
 
-	@IntegrationTestCase.change_settings(
+	@ERPNextTestSuite.change_settings(
 		"Accounts Settings",
 		{"allow_multi_currency_invoices_against_single_party_account": 1, "allow_stale": 0},
 	)
@@ -164,7 +163,7 @@ class TestExchangeRateRevaluation(AccountsTestMixin, IntegrationTestCase):
 		self.assertEqual(acc_balance.balance, 0.0)
 		self.assertEqual(acc_balance.balance_in_account_currency, 0.0)
 
-	@IntegrationTestCase.change_settings(
+	@ERPNextTestSuite.change_settings(
 		"Accounts Settings",
 		{"allow_multi_currency_invoices_against_single_party_account": 1, "allow_stale": 0},
 	)
@@ -259,7 +258,7 @@ class TestExchangeRateRevaluation(AccountsTestMixin, IntegrationTestCase):
 		self.assertEqual(flt(acc_balance.balance, precision), 0.0)
 		self.assertEqual(flt(acc_balance.balance_in_account_currency, precision), 0.0)
 
-	@IntegrationTestCase.change_settings(
+	@ERPNextTestSuite.change_settings(
 		"Accounts Settings",
 		{"allow_multi_currency_invoices_against_single_party_account": 1, "allow_stale": 0},
 	)

erpnext/accounts/doctype/finance_book/test_finance_book.py

@@ -3,12 +3,12 @@
 import unittest
 
 import frappe
-from frappe.tests import IntegrationTestCase
 
 from erpnext.accounts.doctype.journal_entry.test_journal_entry import make_journal_entry
+from erpnext.tests.utils import ERPNextTestSuite
 
 
-class TestFinanceBook(IntegrationTestCase):
+class TestFinanceBook(ERPNextTestSuite):
 	def test_finance_book(self):
 		finance_book = create_finance_book()
 

erpnext/accounts/doctype/financial_report_template/financial_report_template.js

@@ -3,6 +3,8 @@
 
 frappe.ui.form.on("Financial Report Template", {
 	refresh(frm) {
+		if (frm.is_new() || frm.doc.rows.length === 0) return;
+
 		// add custom button to view missed accounts
 		frm.add_custom_button(__("View Account Coverage"), function () {
 			let selected_rows = frm.get_field("rows").grid.get_selected_children();
@@ -20,7 +22,7 @@ frappe.ui.form.on("Financial Report Template", {
 		});
 	},
 
-	validate(frm) {
+	after_save(frm) {
 		if (!frm.doc.rows || frm.doc.rows.length === 0) {
 			frappe.msgprint(__("At least one row is required for a financial report template"));
 		}
@@ -34,14 +36,6 @@ frappe.ui.form.on("Financial Report Row", {
 		update_formula_label(frm, row.data_source);
 		update_formula_description(frm, row.data_source);
 
-		if (row.data_source !== "Account Data") {
-			frappe.model.set_value(cdt, cdn, "balance_type", "");
-		}
-
-		if (["Blank Line", "Column Break", "Section Break"].includes(row.data_source)) {
-			frappe.model.set_value(cdt, cdn, "calculation_formula", "");
-		}
-
 		set_up_filters_editor(frm, cdt, cdn);
 	},
 
@@ -322,6 +316,8 @@ function update_formula_description(frm, data_source) {
 	const list_style = `style="margin-bottom: var(--margin-sm); color: var(--text-muted); font-size: 0.9em;"`;
 	const note_style = `style="margin-bottom: 0; color: var(--text-muted); font-size: 0.9em;"`;
 	const tip_style = `style="margin-bottom: 0; color: var(--text-color); font-size: 0.85em;"`;
+	const code_style = `style="background: var(--bg-light-gray); padding: var(--padding-xs); border-radius: var(--border-radius); font-size: 0.85em; width: max-content; margin-bottom: var(--margin-sm);"`;
+	const pre_style = `style="margin: 0; border-radius: var(--border-radius)"`;
 
 	let description_html = "";
 
@@ -382,8 +378,13 @@ function update_formula_description(frm, data_source) {
 					<li><code>my_app.financial_reports.get_kpi_data</code></li>
 				</ul>
 
+				<h6 ${subtitle_style}>Method Signature:</h6>
+				<div ${code_style}>
+					<pre ${pre_style}>def get_custom_data(filters, periods, row): <br>&nbsp; # filters: dict — report filters (company, period, etc.) <br>&nbsp; # periods: list[dict] — period definitions <br>&nbsp; # row: dict — the current report row <br><br>&nbsp; return [1000.0, 1200.0, 1150.0]  # one value per period</pre>
+				</div>
+
 				<h6 ${subtitle_style}>Return Format:</h6>
-				<p ${text_style}>Numbers for each period: <code>[1000.0, 1200.0, 1150.0]</code></p>
+				<p ${text_style}>A list of numbers, one for each period: <code>[1000.0, 1200.0, 1150.0]</code></p>
 			</div>`;
 	} else if (data_source === "Blank Line") {
 		description_html = `

erpnext/accounts/doctype/financial_report_template/financial_report_template.json

@@ -1,6 +1,5 @@
 {
  "actions": [],
- "allow_rename": 1,
  "autoname": "field:template_name",
  "creation": "2025-08-02 04:44:15.184541",
  "doctype": "DocType",
@@ -31,7 +30,8 @@
    "in_list_view": 1,
    "in_standard_filter": 1,
    "label": "Report Type",
-   "options": "\nProfit and Loss Statement\nBalance Sheet\nCash Flow\nCustom Financial Statement"
+   "options": "\nProfit and Loss Statement\nBalance Sheet\nCash Flow\nCustom Financial Statement",
+   "reqd": 1
   },
   {
    "depends_on": "eval:frappe.boot.developer_mode",
@@ -66,7 +66,7 @@
  "grid_page_length": 50,
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2025-11-14 00:11:03.508139",
+ "modified": "2026-02-23 01:04:05.797161",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Financial Report Template",

erpnext/accounts/doctype/financial_report_template/financial_report_template.py

@@ -32,6 +32,19 @@ class FinancialReportTemplate(Document):
 		template_name: DF.Data
 	# end: auto-generated types
 
+	def before_validate(self):
+		self.clear_hidden_fields()
+
+	def clear_hidden_fields(self):
+		style_data_sources = {"Blank Line", "Column Break", "Section Break"}
+
+		for row in self.rows:
+			if row.data_source != "Account Data":
+				row.balance_type = None
+
+			if row.data_source in style_data_sources:
+				row.calculation_formula = None
+
 	def validate(self):
 		validator = TemplateValidator(self)
 		result = validator.validate()

erpnext/accounts/doctype/financial_report_template/financial_report_validation.py

@@ -70,8 +70,8 @@ class ValidationResult:
 		self.warnings.append(issue)
 
 	def notify_user(self) -> None:
-		warnings = "<br><br>".join(str(w) for w in self.warnings)
-		errors = "<br><br>".join(str(e) for e in self.issues)
+		warnings = "<br><br>".join(str(w) for w in self.warnings if w)
+		errors = "<br><br>".join(str(e) for e in self.issues if e)
 
 		if warnings:
 			frappe.msgprint(warnings, title=_("Warnings"), indicator="orange")
@@ -99,9 +99,8 @@ class TemplateValidator:
 			result.merge(validator.validate(self.template))
 
 		# Run row-level validations
-		account_fields = {field.fieldname for field in frappe.get_meta("Account").fields}
 		for row in self.template.rows:
-			result.merge(self.formula_validator.validate(row, account_fields))
+			result.merge(self.formula_validator.validate(row))
 
 		return result
 
@@ -383,7 +382,8 @@ class AccountFilterValidator(Validator):
 	"""Validates account filter expressions used in Account Data rows"""
 
 	def __init__(self, account_fields: set | None = None):
-		self.account_fields = account_fields or set(frappe.get_meta("Account")._valid_columns)
+		self.account_meta = frappe.get_meta("Account")
+		self.account_fields = account_fields or set(self.account_meta._valid_columns)
 
 	def validate(self, row) -> ValidationResult:
 		result = ValidationResult()
@@ -403,7 +403,11 @@ class AccountFilterValidator(Validator):
 
 		try:
 			filter_config = json.loads(row.calculation_formula)
-			error = self._validate_filter_structure(filter_config, self.account_fields)
+			error = self._validate_filter_structure(
+				filter_config,
+				self.account_fields,
+				row.advanced_filtering,
+			)
 
 			if error:
 				result.add_error(
@@ -425,7 +429,12 @@ class AccountFilterValidator(Validator):
 
 		return result
 
-	def _validate_filter_structure(self, filter_config, account_fields: set) -> str | None:
+	def _validate_filter_structure(
+		self,
+		filter_config,
+		account_fields: set,
+		advanced_filtering: bool = False,
+	) -> str | None:
 		# simple condition: [field, operator, value]
 		if isinstance(filter_config, list):
 			if len(filter_config) != 3:
@@ -436,8 +445,10 @@ class AccountFilterValidator(Validator):
 			if not isinstance(field, str) or not isinstance(operator, str):
 				return "Field and operator must be strings"
 
+			display = (field if advanced_filtering else self.account_meta.get_label(field)) or field
+
 			if field not in account_fields:
-				return f"Field '{field}' is not a valid account field"
+				return f"Field '{display}' is not a valid Account field"
 
 			if operator.casefold() not in OPERATOR_MAP:
 				return f"Invalid operator '{operator}'"
@@ -460,7 +471,7 @@ class AccountFilterValidator(Validator):
 
 			# recursive
 			for condition in conditions:
-				error = self._validate_filter_structure(condition, account_fields)
+				error = self._validate_filter_structure(condition, account_fields, advanced_filtering)
 				if error:
 					return error
 		else:
@@ -476,7 +487,7 @@ class FormulaValidator(Validator):
 		self.calculation_validator = CalculationFormulaValidator(reference_codes)
 		self.account_filter_validator = AccountFilterValidator()
 
-	def validate(self, row, account_fields: set) -> ValidationResult:
+	def validate(self, row) -> ValidationResult:
 		result = ValidationResult()
 
 		if not row.calculation_formula:
@@ -486,9 +497,6 @@ class FormulaValidator(Validator):
 			return self.calculation_validator.validate(row)
 
 		elif row.data_source == "Account Data":
-			# Update account fields if provided
-			if account_fields:
-				self.account_filter_validator.account_fields = account_fields
 			return self.account_filter_validator.validate(row)
 
 		elif row.data_source == "Custom API":

erpnext/accounts/doctype/financial_report_template/test_financial_report_engine.py

@@ -19,12 +19,6 @@ from erpnext.accounts.doctype.financial_report_template.test_financial_report_te
 from erpnext.accounts.doctype.journal_entry.test_journal_entry import make_journal_entry
 from erpnext.accounts.utils import get_currency_precision, get_fiscal_year
 
-# On IntegrationTestCase, the doctype test records and all
-# link-field test record dependencies are recursively loaded
-# Use these module variables to add/remove to/from that list
-EXTRA_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
-IGNORE_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
-
 
 class TestDependencyResolver(FinancialReportTemplateTestCase):
 	"""Test cases for DependencyResolver class"""
@@ -1301,6 +1295,7 @@ class TestFilterExpressionParser(FinancialReportTemplateTestCase):
 				self.data_source = "Account Data"
 				self.idx = 1
 				self.reverse_sign = 0
+				self.advanced_filtering = True
 
 		return MockReportRow(formula, reference_code)
 

erpnext/accounts/doctype/financial_report_template/test_financial_report_template.py

@@ -2,29 +2,16 @@
 # For license information, please see license.txt
 
 import frappe
-from frappe.tests import IntegrationTestCase
-from frappe.tests.utils import make_test_records
 
-# On IntegrationTestCase, the doctype test records and all
-# link-field test record dependencies are recursively loaded
-# Use these module variables to add/remove to/from that list
-EXTRA_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
-IGNORE_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
+from erpnext.tests.utils import ERPNextTestSuite
 
 
-class TestFinancialReportTemplate(IntegrationTestCase):
-	pass
-
-
-class FinancialReportTemplateTestCase(IntegrationTestCase):
+class FinancialReportTemplateTestCase(ERPNextTestSuite):
 	"""Utility class with common setup and helper methods for all test classes"""
 
-	@classmethod
-	def setUpClass(cls):
+	def setUp(self):
 		"""Set up test data"""
-		make_test_records("Company")
-		make_test_records("Fiscal Year")
-		cls.create_test_template()
+		self.create_test_template()
 
 	@classmethod
 	def create_test_template(cls):

erpnext/accounts/doctype/fiscal_year/test_fiscal_year.py

@@ -3,13 +3,12 @@
 import unittest
 
 import frappe
-from frappe.tests import IntegrationTestCase
 from frappe.utils import now_datetime
 
-IGNORE_TEST_RECORD_DEPENDENCIES = ["Company"]
+from erpnext.tests.utils import ERPNextTestSuite
 
 
-class TestFiscalYear(IntegrationTestCase):
+class TestFiscalYear(ERPNextTestSuite):
 	def test_extra_year(self):
 		if frappe.db.exists("Fiscal Year", "_Test Fiscal Year 2000"):
 			frappe.delete_doc("Fiscal Year", "_Test Fiscal Year 2000")

erpnext/accounts/doctype/gl_entry/gl_entry.py

@@ -489,4 +489,5 @@ def rename_temporarily_named_docs(doctype):
 				for hook in frappe.get_hooks(hook_type):
 					frappe.call(hook, newname=newname, oldname=oldname)
 
-		frappe.db.commit()
+		if not frappe.in_test:
+			frappe.db.commit()

erpnext/accounts/doctype/gl_entry/test_gl_entry.py

@@ -4,13 +4,13 @@ import unittest
 
 import frappe
 from frappe.model.naming import parse_naming_series
-from frappe.tests import IntegrationTestCase
 
 from erpnext.accounts.doctype.gl_entry.gl_entry import rename_gle_sle_docs
 from erpnext.accounts.doctype.journal_entry.test_journal_entry import make_journal_entry
+from erpnext.tests.utils import ERPNextTestSuite
 
 
-class TestGLEntry(IntegrationTestCase):
+class TestGLEntry(ERPNextTestSuite):
 	def test_round_off_entry(self):
 		frappe.db.set_value("Company", "_Test Company", "round_off_account", "_Test Write Off - _TC")
 		frappe.db.set_value("Company", "_Test Company", "round_off_cost_center", "_Test Cost Center - _TC")

erpnext/accounts/doctype/invoice_discounting/test_invoice_discounting.py

@@ -3,16 +3,16 @@
 import unittest
 
 import frappe
-from frappe.tests import IntegrationTestCase
 from frappe.utils import add_days, flt, nowdate
 
 from erpnext.accounts.doctype.account.test_account import create_account
 from erpnext.accounts.doctype.journal_entry.journal_entry import get_payment_entry_against_invoice
 from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
 from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import get_gl_entries
+from erpnext.tests.utils import ERPNextTestSuite
 
 
-class TestInvoiceDiscounting(IntegrationTestCase):
+class TestInvoiceDiscounting(ERPNextTestSuite):
 	def setUp(self):
 		self.ar_credit = create_account(
 			account_name="_Test Accounts Receivable Credit",

erpnext/accounts/doctype/item_tax_template/item_tax_template.js

@@ -47,3 +47,12 @@ frappe.ui.form.on("Item Tax Template", {
 		});
 	},
 });
+
+frappe.ui.form.on("Item Tax Template Detail", {
+	not_applicable: function (frm, cdt, cdn) {
+		let row = locals[cdt][cdn];
+		if (row.not_applicable) {
+			frappe.model.set_value(cdt, cdn, "tax_rate", 0);
+		}
+	},
+});

erpnext/accounts/doctype/item_tax_template/item_tax_template.py

@@ -27,8 +27,15 @@ class ItemTaxTemplate(Document):
 	# end: auto-generated types
 
 	def validate(self):
+		self.set_zero_rate_for_not_applicable_tax()
 		self.validate_tax_accounts()
 
+	def set_zero_rate_for_not_applicable_tax(self):
+		"""Ensure tax_rate is 0 for any row marked as not applicable."""
+		for row in self.get("taxes"):
+			if row.not_applicable:
+				row.tax_rate = 0
+
 	def autoname(self):
 		if self.company and self.title:
 			abbr = frappe.get_cached_value("Company", self.company, "abbr")

erpnext/accounts/doctype/item_tax_template/test_item_tax_template.py

@@ -2,8 +2,8 @@
 # See license.txt
 import unittest
 
-from frappe.tests import IntegrationTestCase
+from erpnext.tests.utils import ERPNextTestSuite
 
 
-class TestItemTaxTemplate(IntegrationTestCase):
+class TestItemTaxTemplate(ERPNextTestSuite):
 	pass

erpnext/accounts/doctype/item_tax_template/test_records.json

@@ -1,79 +0,0 @@
-[
- {
-  "doctype": "Item Tax Template",
-  "title": "_Test Account Excise Duty @ 10",
-  "company": "_Test Company",
-  "taxes": [
-   {
-    "doctype": "Item Tax Template Detail",
-    "parentfield": "taxes",
-    "tax_rate": 10,
-    "tax_type": "_Test Account Excise Duty - _TC"
-   }
-  ]
- },
- {
-  "doctype": "Item Tax Template",
-  "title": "_Test Account Excise Duty @ 12",
-  "company": "_Test Company",
-  "taxes": [
-   {
-    "doctype": "Item Tax Template Detail",
-    "parentfield": "taxes",
-    "tax_rate": 12,
-    "tax_type": "_Test Account Excise Duty - _TC"
-   }
-  ]
- },
- {
-  "doctype": "Item Tax Template",
-  "title": "_Test Account Excise Duty @ 15",
-  "company": "_Test Company",
-  "taxes": [
-   {
-    "doctype": "Item Tax Template Detail",
-    "parentfield": "taxes",
-    "tax_rate": 15,
-    "tax_type": "_Test Account Excise Duty - _TC"
-   }
-  ]
- },
- {
-  "doctype": "Item Tax Template",
-  "title": "_Test Account Excise Duty @ 20",
-  "company": "_Test Company",
-  "taxes": [
-   {
-    "doctype": "Item Tax Template Detail",
-    "parentfield": "taxes",
-    "tax_rate": 20,
-    "tax_type": "_Test Account Excise Duty - _TC"
-   }
-  ]
- },
- {
-  "doctype": "Item Tax Template",
-  "title": "_Test Item Tax Template 1",
-  "company": "_Test Company",
-  "taxes": [
-   {
-    "doctype": "Item Tax Template Detail",
-    "parentfield": "taxes",
-    "tax_rate": 5,
-    "tax_type": "_Test Account Excise Duty - _TC"
-   },
-   {
-    "doctype": "Item Tax Template Detail",
-    "parentfield": "taxes",
-    "tax_rate": 10,
-    "tax_type": "_Test Account Education Cess - _TC"
-   },
-   {
-    "doctype": "Item Tax Template Detail",
-    "parentfield": "taxes",
-    "tax_rate": 15,
-    "tax_type": "_Test Account S&H Education Cess - _TC"
-   }
-  ]
- }
-]

erpnext/accounts/doctype/item_tax_template_detail/item_tax_template_detail.json

@@ -6,7 +6,8 @@
  "engine": "InnoDB",
  "field_order": [
   "tax_type",
-  "tax_rate"
+  "tax_rate",
+  "not_applicable"
  ],
  "fields": [
   {
@@ -21,20 +22,30 @@
    "fieldname": "tax_rate",
    "fieldtype": "Float",
    "in_list_view": 1,
-   "label": "Tax Rate"
+   "label": "Tax Rate",
+   "read_only_depends_on": "eval:doc.not_applicable"
+  },
+  {
+   "default": "0",
+   "description": "Check if this tax is not applicable to items (distinct from 0% rate)",
+   "fieldname": "not_applicable",
+   "fieldtype": "Check",
+   "in_list_view": 1,
+   "label": "Not Applicable"
   }
  ],
  "istable": 1,
  "links": [],
- "modified": "2024-03-27 13:09:55.735360",
+ "modified": "2025-12-26 17:19:18.791891",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Item Tax Template Detail",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
+ "row_format": "Dynamic",
  "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
-}
+}

erpnext/accounts/doctype/item_tax_template_detail/item_tax_template_detail.py

@@ -14,6 +14,7 @@ class ItemTaxTemplateDetail(Document):
 	if TYPE_CHECKING:
 		from frappe.types import DF
 
+		not_applicable: DF.Check
 		parent: DF.Data
 		parentfield: DF.Data
 		parenttype: DF.Data

erpnext/accounts/doctype/journal_entry/journal_entry.js

@@ -648,7 +648,7 @@ $.extend(erpnext.journal_entry, {
 					reqd: 1,
 					default: frm.doc.posting_date,
 				},
-				{ fieldtype: "Small Text", fieldname: "user_remark", label: __("User Remark") },
+				{ fieldtype: "Small Text", fieldname: "remark", label: __("Remark") },
 				{
 					fieldtype: "Select",
 					fieldname: "naming_series",
@@ -665,8 +665,14 @@ $.extend(erpnext.journal_entry, {
 			var values = dialog.get_values();
 
 			frm.set_value("posting_date", values.posting_date);
-			frm.set_value("user_remark", values.user_remark);
 			frm.set_value("naming_series", values.naming_series);
+			if (values.remark) {
+				frm.set_value("custom_remark", 1);
+				frm.set_value("remark", values.remark);
+			} else {
+				frm.set_value("custom_remark", 0);
+				frm.set_value("remark", "");
+			}
 
 			// clear table is used because there might've been an error while adding child
 			// and cleanup didn't happen

erpnext/accounts/doctype/journal_entry/journal_entry.json

@@ -78,6 +78,7 @@
   "from_template",
   "title",
   "column_break3",
+  "custom_remark",
   "remark",
   "mode_of_payment",
   "party_not_required"
@@ -140,6 +141,7 @@
   {
    "fieldname": "company",
    "fieldtype": "Link",
+   "in_list_view": 1,
    "in_standard_filter": 1,
    "label": "Company",
    "oldfieldname": "company",
@@ -181,7 +183,6 @@
    "fieldname": "cheque_no",
    "fieldtype": "Data",
    "in_global_search": 1,
-   "in_list_view": 1,
    "label": "Reference Number",
    "mandatory_depends_on": "eval:doc.voucher_type == \"Bank Entry\"",
    "no_copy": 1,
@@ -202,6 +203,7 @@
   {
    "fieldname": "user_remark",
    "fieldtype": "Small Text",
+   "hidden": 1,
    "label": "User Remark",
    "no_copy": 1,
    "oldfieldname": "user_remark",
@@ -315,7 +317,7 @@
    "no_copy": 1,
    "oldfieldname": "remark",
    "oldfieldtype": "Small Text",
-   "read_only": 1
+   "read_only_depends_on": "eval: !doc.custom_remark"
   },
   {
    "depends_on": "eval:doc.voucher_type== \"Inter Company Journal Entry\"",
@@ -651,6 +653,17 @@
    "fieldname": "tax_withholding_tab",
    "fieldtype": "Tab Break",
    "label": "Tax Withholding"
+  },
+  {
+   "fieldname": "auto_repeat_section",
+   "fieldtype": "Section Break",
+   "label": "Auto Repeat"
+  },
+  {
+   "default": "0",
+   "fieldname": "custom_remark",
+   "fieldtype": "Check",
+   "label": "Custom Remark"
   }
  ],
  "icon": "fa fa-file-text",
@@ -665,7 +678,7 @@
    "table_fieldname": "payment_entries"
   }
  ],
- "modified": "2026-02-16 16:06:10.468482",
+ "modified": "2026-04-08 14:19:30.870894",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Journal Entry",

erpnext/accounts/doctype/journal_entry/journal_entry.py

@@ -61,6 +61,7 @@ class JournalEntry(AccountsController):
 		cheque_no: DF.Data | None
 		clearance_date: DF.Date | None
 		company: DF.Link
+		custom_remark: DF.Check
 		difference: DF.Currency
 		due_date: DF.Date | None
 		finance_book: DF.Link | None
@@ -293,6 +294,8 @@ class JournalEntry(AccountsController):
 
 		# References for this Journal are removed on the `on_cancel` event in accounts_controller
 		super().on_cancel()
+
+		from_doc_events = getattr(self, "ignore_linked_doctypes", ())
 		self.ignore_linked_doctypes = (
 			"GL Entry",
 			"Stock Ledger Entry",
@@ -306,6 +309,10 @@ class JournalEntry(AccountsController):
 			"Advance Payment Ledger Entry",
 			"Tax Withholding Entry",
 		)
+
+		if from_doc_events and from_doc_events != self.ignore_linked_doctypes:
+			self.ignore_linked_doctypes = self.ignore_linked_doctypes + from_doc_events
+
 		self.make_gl_entries(1)
 		JournalTaxWithholding(self).on_cancel()
 		self.unlink_advance_entry_reference()
@@ -347,8 +354,11 @@ class JournalEntry(AccountsController):
 					frappe.throw(_("Account {0} should be of type Expense").format(d.account))
 
 	def validate_stock_accounts(self):
-		if self.voucher_type == "Periodic Accounting Entry":
-			# Skip validation for periodic accounting entry
+		if (
+			not erpnext.is_perpetual_inventory_enabled(self.company)
+			or self.voucher_type == "Periodic Accounting Entry"
+		):
+			# Skip validation for periodic accounting entry and Perpetual Inventory Disabled Company.
 			return
 
 		stock_accounts = get_stock_accounts(self.company, accounts=self.accounts)
@@ -1017,8 +1027,8 @@ class JournalEntry(AccountsController):
 		if self.flags.skip_remarks_creation:
 			return
 
-		if self.user_remark:
-			r.append(_("Note: {0}").format(self.user_remark))
+		if self.get("custom_remark"):
+			return
 
 		if self.cheque_no:
 			if self.cheque_date:
@@ -1532,31 +1542,31 @@ def get_against_jv(doctype, txt, searchfield, start, page_len, filters):
 	if not frappe.db.has_column("Journal Entry", searchfield):
 		return []
 
-	return frappe.db.sql(
-		f"""
-		SELECT jv.name, jv.posting_date, jv.user_remark
-		FROM `tabJournal Entry` jv, `tabJournal Entry Account` jv_detail
-		WHERE jv_detail.parent = jv.name
-			AND jv_detail.account = %(account)s
-			AND IFNULL(jv_detail.party, '') = %(party)s
-			AND (
-				jv_detail.reference_type IS NULL
-				OR jv_detail.reference_type = ''
-			)
-			AND jv.docstatus = 1
-			AND jv.`{searchfield}` LIKE %(txt)s
-		ORDER BY jv.name DESC
-		LIMIT %(limit)s offset %(offset)s
-		""",
-		dict(
-			account=filters.get("account"),
-			party=cstr(filters.get("party")),
-			txt=f"%{txt}%",
-			offset=start,
-			limit=page_len,
-		),
+	JournalEntry = frappe.qb.DocType("Journal Entry")
+	JournalEntryAccount = frappe.qb.DocType("Journal Entry Account")
+
+	query = (
+		frappe.qb.from_(JournalEntry)
+		.join(JournalEntryAccount)
+		.on(JournalEntryAccount.parent == JournalEntry.name)
+		.select(JournalEntry.name, JournalEntry.posting_date, JournalEntry.remark)
+		.where(JournalEntryAccount.account == filters.get("account"))
+		.where(JournalEntryAccount.reference_type.isnull() | (JournalEntryAccount.reference_type == ""))
+		.where(JournalEntry.docstatus == 1)
+		.where(JournalEntry[searchfield].like(f"%{txt}%"))
+		.orderby(JournalEntry.name, order=frappe.qb.desc)
+		.limit(page_len)
+		.offset(start)
 	)
 
+	party = filters.get("party")
+	if party:
+		query = query.where(JournalEntryAccount.party == party)
+	else:
+		query = query.where(JournalEntryAccount.party.isnull() | (JournalEntryAccount.party == ""))
+
+	return query.run()
+
 
 @frappe.whitelist()
 def get_outstanding(args):

erpnext/accounts/doctype/journal_entry/journal_entry_list.js

@@ -1,5 +1,5 @@
 frappe.listview_settings["Journal Entry"] = {
-	add_fields: ["voucher_type", "posting_date", "total_debit", "company", "user_remark"],
+	add_fields: ["voucher_type", "posting_date", "total_debit", "company", "remark"],
 	get_indicator: function (doc) {
 		if (doc.docstatus === 1) {
 			return [__(doc.voucher_type), "blue", `voucher_type,=,${doc.voucher_type}`];

erpnext/accounts/doctype/journal_entry/test_journal_entry.py

@@ -2,19 +2,20 @@
 # License: GNU General Public License v3. See license.txt
 
 import frappe
-from frappe.tests import IntegrationTestCase
 from frappe.utils import flt, nowdate
 
 from erpnext.accounts.doctype.account.test_account import get_inventory_account
 from erpnext.accounts.doctype.journal_entry.journal_entry import StockAccountInvalidTransaction
 from erpnext.exceptions import InvalidAccountCurrency
 from erpnext.selling.doctype.customer.test_customer import make_customer, set_credit_limit
+from erpnext.tests.utils import ERPNextTestSuite
 
 
-class TestJournalEntry(IntegrationTestCase):
-	@IntegrationTestCase.change_settings(
-		"Accounts Settings", {"unlink_payment_on_cancellation_of_invoice": 1}
-	)
+class TestJournalEntry(ERPNextTestSuite):
+	def setUp(self):
+		self.load_test_records("Journal Entry")
+
+	@ERPNextTestSuite.change_settings("Accounts Settings", {"unlink_payment_on_cancellation_of_invoice": 1})
 	def test_journal_entry_with_against_jv(self):
 		jv_invoice = frappe.copy_doc(self.globalTestRecords["Journal Entry"][2])
 		base_jv = frappe.copy_doc(self.globalTestRecords["Journal Entry"][0])
@@ -149,7 +150,6 @@ class TestJournalEntry(IntegrationTestCase):
 
 		if account_bal == stock_bal:
 			self.assertRaises(StockAccountInvalidTransaction, jv.save)
-			frappe.db.rollback()
 		else:
 			jv.submit()
 			jv.cancel()
@@ -413,9 +413,9 @@ class TestJournalEntry(IntegrationTestCase):
 		from erpnext.accounts.doctype.cost_center.test_cost_center import create_cost_center
 
 		# Configure Repost Accounting Ledger for JVs
-		settings = frappe.get_doc("Repost Accounting Ledger Settings")
-		if not [x for x in settings.allowed_types if x.document_type == "Journal Entry"]:
-			settings.append("allowed_types", {"document_type": "Journal Entry", "allowed": True})
+		settings = frappe.get_doc("Accounts Settings")
+		if "Journal Entry" not in [x.document_type for x in settings.repost_allowed_types]:
+			settings.append("repost_allowed_types", {"document_type": "Journal Entry"})
 		settings.save()
 
 		# Create JV with defaut cost center - _Test Cost Center
@@ -523,7 +523,7 @@ class TestJournalEntry(IntegrationTestCase):
 		jv = frappe.new_doc("Journal Entry")
 		jv.posting_date = nowdate()
 		jv.company = "_Test Company"
-		jv.user_remark = "test"
+		jv.remark = "test"
 		jv.extend(
 			"accounts",
 			[
@@ -592,6 +592,14 @@ class TestJournalEntry(IntegrationTestCase):
 
 		self.assertEqual(jv.pay_to_recd_from, "_Test Receiver 2")
 
+	def test_custom_remark(self):
+		# When custom_remark is enabled, remark should not be auto-overwritten on save
+		jv = make_journal_entry("_Test Cash - _TC", "_Test Bank - _TC", 100, save=False)
+		jv.custom_remark = 1
+		jv.remark = "My custom remark text"
+		jv.insert()
+		self.assertEqual(jv.remark, "My custom remark text")
+
 	def test_credit_limit_for_customer(self):
 		customer = make_customer("_Test New Customer")
 		set_credit_limit("_Test New Customer", "_Test Company", 50)
@@ -620,7 +628,7 @@ def make_journal_entry(
 	jv = frappe.new_doc("Journal Entry")
 	jv.posting_date = posting_date or nowdate()
 	jv.company = company or "_Test Company"
-	jv.user_remark = "test"
+	jv.remark = "test"
 	jv.multi_currency = 1
 	jv.set(
 		"accounts",

erpnext/accounts/doctype/journal_entry_template/test_journal_entry_template.py

@@ -3,8 +3,8 @@
 # import frappe
 import unittest
 
-from frappe.tests import IntegrationTestCase
+from erpnext.tests.utils import ERPNextTestSuite
 
 
-class TestJournalEntryTemplate(IntegrationTestCase):
+class TestJournalEntryTemplate(ERPNextTestSuite):
 	pass

erpnext/accounts/doctype/ledger_health/test_ledger_health.py

@@ -3,23 +3,20 @@
 
 import frappe
 from frappe import qb
-from frappe.tests import IntegrationTestCase
 from frappe.utils import nowdate
 
 from erpnext.accounts.test.accounts_mixin import AccountsTestMixin
 from erpnext.accounts.utils import run_ledger_health_checks
+from erpnext.tests.utils import ERPNextTestSuite
 
 
-class TestLedgerHealth(AccountsTestMixin, IntegrationTestCase):
+class TestLedgerHealth(ERPNextTestSuite, AccountsTestMixin):
 	def setUp(self):
 		self.create_company()
 		self.create_customer()
 		self.configure_monitoring_tool()
 		self.clear_old_entries()
 
-	def tearDown(self):
-		frappe.db.rollback()
-
 	def configure_monitoring_tool(self):
 		monitor_settings = frappe.get_doc("Ledger Health Monitor")
 		monitor_settings.enable_health_monitor = True

erpnext/accounts/doctype/ledger_health_monitor/test_ledger_health_monitor.py

@@ -2,8 +2,10 @@
 # See license.txt
 
 # import frappe
-from frappe.tests import IntegrationTestCase
 
 
-class TestLedgerHealthMonitor(IntegrationTestCase):
+from erpnext.tests.utils import ERPNextTestSuite
+
+
+class TestLedgerHealthMonitor(ERPNextTestSuite):
 	pass

erpnext/accounts/doctype/ledger_merge/ledger_merge.py

@@ -71,14 +71,16 @@ def start_merge(docname):
 					ledger_merge.account,
 				)
 				row.db_set("merged", 1)
-				frappe.db.commit()
+				if not frappe.in_test:
+					frappe.db.commit()
 				successful_merges += 1
 				frappe.publish_realtime(
 					"ledger_merge_progress",
 					{"ledger_merge": ledger_merge.name, "current": successful_merges, "total": total},
 				)
 			except Exception:
-				frappe.db.rollback()
+				if not frappe.in_test:
+					frappe.db.rollback()
 				ledger_merge.log_error("Ledger merge failed")
 			finally:
 				if successful_merges == total:

erpnext/accounts/doctype/ledger_merge/test_ledger_merge.py

@@ -3,12 +3,12 @@
 import unittest
 
 import frappe
-from frappe.tests import IntegrationTestCase
 
 from erpnext.accounts.doctype.ledger_merge.ledger_merge import start_merge
+from erpnext.tests.utils import ERPNextTestSuite
 
 
-class TestLedgerMerge(IntegrationTestCase):
+class TestLedgerMerge(ERPNextTestSuite):
 	def test_merge_success(self):
 		if not frappe.db.exists("Account", "Indirect Expenses - _TC"):
 			acc = frappe.new_doc("Account")
@@ -101,16 +101,3 @@ class TestLedgerMerge(IntegrationTestCase):
 
 		self.assertFalse(frappe.db.exists("Account", "Indirect Test Income - _TC"))
 		self.assertTrue(frappe.db.exists("Account", "Administrative Test Income - _TC"))
-
-	def tearDown(self):
-		for entry in frappe.db.get_all("Ledger Merge"):
-			frappe.delete_doc("Ledger Merge", entry.name)
-
-		test_accounts = [
-			"Indirect Test Expenses - _TC",
-			"Administrative Test Expenses - _TC",
-			"Indirect Test Income - _TC",
-			"Administrative Test Income - _TC",
-		]
-		for account in test_accounts:
-			frappe.delete_doc_if_exists("Account", account)

erpnext/accounts/doctype/loyalty_point_entry/test_loyalty_point_entry.py

@@ -3,31 +3,20 @@
 import unittest
 
 import frappe
-from frappe.tests import IntegrationTestCase
 from frappe.utils import today
 
-from erpnext.accounts.doctype.loyalty_program.test_loyalty_program import create_records
 from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
+from erpnext.tests.utils import ERPNextTestSuite
 
 
-class TestLoyaltyPointEntry(IntegrationTestCase):
-	@classmethod
-	def setUpClass(cls):
-		super().setUpClass()
+class TestLoyaltyPointEntry(ERPNextTestSuite):
+	def setUp(self):
 		# Create test records
-		create_records()
-		cls.loyalty_program_name = "Test Single Loyalty"
-		cls.customer_name = "Test Loyalty Customer"
-		customer = frappe.get_doc("Customer", cls.customer_name)
-		customer.db_set("loyalty_program", cls.loyalty_program_name)
-
-	@classmethod
-	def tearDownClass(cls):
-		# Delete all Loyalty Point Entries
-		frappe.db.sql("DELETE FROM `tabLoyalty Point Entry` WHERE customer = %s", cls.customer_name)
-		frappe.db.sql("DELETE FROM `tabSales Invoice` WHERE customer = %s", cls.customer_name)
-		frappe.db.commit()
-		# cls.customer.delete()
+		self.loyalty_program_name = "Test Single Loyalty"
+		self.customer_name = "Test Loyalty Customer"
+		customer = frappe.get_doc("Customer", self.customer_name)
+		customer.loyalty_program = self.loyalty_program_name
+		customer.save()
 
 	def create_test_invoice(self, redeem=None):
 		if redeem:
@@ -69,9 +58,10 @@ class TestLoyaltyPointEntry(IntegrationTestCase):
 		self.assertEqual(entry.discretionary_reason, "Customer Appreciation")
 
 	def test_redeem_loyalty_points(self):
-		self.create_test_invoice(redeem=10)
+		self.create_test_invoice()
+		self.create_test_invoice(redeem=7)
 		doc = frappe.get_last_doc("Loyalty Point Entry")
-		self.assertEqual(doc.loyalty_points, -10)
+		self.assertEqual(doc.loyalty_points, -7)
 
 		# Check balance
 		balance = frappe.db.sql(
@@ -83,4 +73,4 @@ class TestLoyaltyPointEntry(IntegrationTestCase):
 			(self.customer_name,),
 		)[0][0]
 
-		self.assertEqual(balance, 75)  # 85 added, 10 redeemed
+		self.assertEqual(balance, 3)  # 10 added, 7 redeemed

erpnext/accounts/doctype/loyalty_program/test_loyalty_program.py

@@ -3,7 +3,6 @@
 import unittest
 
 import frappe
-from frappe.tests import IntegrationTestCase
 from frappe.utils import cint, flt, getdate, today
 
 from erpnext.accounts.doctype.loyalty_program.loyalty_program import (
@@ -11,15 +10,10 @@ from erpnext.accounts.doctype.loyalty_program.loyalty_program import (
 	get_loyalty_program_details_with_points,
 )
 from erpnext.accounts.party import get_dashboard_info
+from erpnext.tests.utils import ERPNextTestSuite
 
 
-class TestLoyaltyProgram(IntegrationTestCase):
-	@classmethod
-	def setUpClass(cls):
-		super().setUpClass()
-		# create relevant item, customer, loyalty program, etc
-		create_records()
-
+class TestLoyaltyProgram(ERPNextTestSuite):
 	def test_loyalty_points_earned_single_tier(self):
 		frappe.db.set_value("Customer", "Test Loyalty Customer", "loyalty_program", "Test Single Loyalty")
 		# create a new sales invoice
@@ -323,96 +317,3 @@ def create_sales_invoice_record(qty=1):
 			],
 		}
 	)
-
-
-def create_records():
-	# create a new loyalty Account
-	if not frappe.db.exists("Account", "Loyalty - _TC"):
-		frappe.get_doc(
-			{
-				"doctype": "Account",
-				"account_name": "Loyalty",
-				"parent_account": "Direct Expenses - _TC",
-				"company": "_Test Company",
-				"is_group": 0,
-				"account_type": "Expense Account",
-			}
-		).insert()
-
-	# create a new loyalty program Single tier
-	if not frappe.db.exists("Loyalty Program", "Test Single Loyalty"):
-		frappe.get_doc(
-			{
-				"doctype": "Loyalty Program",
-				"loyalty_program_name": "Test Single Loyalty",
-				"auto_opt_in": 1,
-				"from_date": today(),
-				"loyalty_program_type": "Single Tier Program",
-				"conversion_factor": 1,
-				"expiry_duration": 10,
-				"company": "_Test Company",
-				"cost_center": "Main - _TC",
-				"expense_account": "Loyalty - _TC",
-				"collection_rules": [{"tier_name": "Bronce", "collection_factor": 1000, "min_spent": 0}],
-			}
-		).insert()
-
-	# create a new customer
-	if not frappe.db.exists("Customer", "Test Loyalty Customer"):
-		frappe.get_doc(
-			{
-				"customer_group": "_Test Customer Group",
-				"customer_name": "Test Loyalty Customer",
-				"customer_type": "Individual",
-				"doctype": "Customer",
-				"territory": "_Test Territory",
-			}
-		).insert()
-
-	# create a new loyalty program Multiple tier
-	if not frappe.db.exists("Loyalty Program", "Test Multiple Loyalty"):
-		frappe.get_doc(
-			{
-				"doctype": "Loyalty Program",
-				"loyalty_program_name": "Test Multiple Loyalty",
-				"auto_opt_in": 1,
-				"from_date": today(),
-				"loyalty_program_type": "Multiple Tier Program",
-				"conversion_factor": 1,
-				"expiry_duration": 10,
-				"company": "_Test Company",
-				"cost_center": "Main - _TC",
-				"expense_account": "Loyalty - _TC",
-				"collection_rules": [
-					{"tier_name": "Bronze", "collection_factor": 1000, "min_spent": 0},
-					{"tier_name": "Silver", "collection_factor": 1000, "min_spent": 10000},
-					{"tier_name": "Gold", "collection_factor": 1000, "min_spent": 19000},
-				],
-			}
-		).insert()
-
-	# create an item
-	if not frappe.db.exists("Item", "Loyal Item"):
-		frappe.get_doc(
-			{
-				"doctype": "Item",
-				"item_code": "Loyal Item",
-				"item_name": "Loyal Item",
-				"item_group": "All Item Groups",
-				"company": "_Test Company",
-				"is_stock_item": 1,
-				"opening_stock": 100,
-				"valuation_rate": 10000,
-			}
-		).insert()
-
-	# create item price
-	if not frappe.db.exists("Item Price", {"price_list": "Standard Selling", "item_code": "Loyal Item"}):
-		frappe.get_doc(
-			{
-				"doctype": "Item Price",
-				"price_list": "Standard Selling",
-				"item_code": "Loyal Item",
-				"price_list_rate": 10000,
-			}
-		).insert()

erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json

@@ -48,7 +48,7 @@
  "idx": 1,
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-08-16 19:22:42.942264",
+ "modified": "2026-04-14 18:16:47.795986",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Mode of Payment",
@@ -68,12 +68,21 @@
    "read": 1,
    "report": 1,
    "role": "Accounts User"
+  },
+  {
+   "role": "HR User",
+   "select": 1
+  },
+  {
+   "role": "HR Manager",
+   "select": 1
   }
  ],
  "quick_entry": 1,
+ "row_format": "Dynamic",
  "show_name_in_global_search": 1,
  "sort_field": "creation",
  "sort_order": "ASC",
  "states": [],
  "translated_doctype": 1
-}
+}

erpnext/accounts/doctype/mode_of_payment/test_mode_of_payment.py

@@ -3,10 +3,11 @@
 import unittest
 
 import frappe
-from frappe.tests import IntegrationTestCase
+
+from erpnext.tests.utils import ERPNextTestSuite
 
 
-class TestModeofPayment(IntegrationTestCase):
+class TestModeofPayment(ERPNextTestSuite):
 	pass
 
 

erpnext/accounts/doctype/monthly_distribution/test_monthly_distribution.py

@@ -2,9 +2,8 @@
 # See license.txt
 import unittest
 
-import frappe
-from frappe.tests import IntegrationTestCase
+from erpnext.tests.utils import ERPNextTestSuite
 
 
-class TestMonthlyDistribution(IntegrationTestCase):
+class TestMonthlyDistribution(ERPNextTestSuite):
 	pass

erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js

@@ -50,6 +50,7 @@ frappe.ui.form.on("Opening Invoice Creation Tool", {
 
 	refresh: function (frm) {
 		frm.disable_save();
+		frm.trigger("create_missing_party");
 		!frm.doc.import_in_progress && frm.trigger("make_dashboard");
 		frm.page.set_primary_action(__("Create Invoices"), () => {
 			let btn_primary = frm.page.btn_primary.get(0);
@@ -69,9 +70,7 @@ frappe.ui.form.on("Opening Invoice Creation Tool", {
 			});
 		});
 
-		if (frm.doc.create_missing_party) {
-			frm.set_df_property("party", "fieldtype", "Data", frm.doc.name, "invoices");
-		}
+		frm.trigger("update_party_labels");
 	},
 
 	setup_company_filters: function (frm) {
@@ -123,9 +122,12 @@ frappe.ui.form.on("Opening Invoice Creation Tool", {
 	invoice_type: function (frm) {
 		$.each(frm.doc.invoices, (idx, row) => {
 			row.party_type = frm.doc.invoice_type == "Sales" ? "Customer" : "Supplier";
-			row.party = "";
+			frappe.model.set_value(row.doctype, row.name, "party", "");
+			frappe.model.set_value(row.doctype, row.name, "party_name", "");
 		});
+		frm.clear_table("invoices");
 		frm.refresh_fields();
+		frm.trigger("update_party_labels");
 	},
 
 	make_dashboard: function (frm) {
@@ -162,9 +164,61 @@ frappe.ui.form.on("Opening Invoice Creation Tool", {
 			row.party_type = frm.doc.invoice_type == "Sales" ? "Customer" : "Supplier";
 		});
 	},
+
+	create_missing_party: function (frm) {
+		if (frm.doc.create_missing_party) {
+			frm.fields_dict["invoices"].grid.update_docfield_property("party", "reqd", 0);
+			frm.fields_dict["invoices"].grid.update_docfield_property("party_name", "read_only", 0);
+		} else {
+			frm.fields_dict["invoices"].grid.update_docfield_property("party", "reqd", 1);
+			frm.fields_dict["invoices"].grid.update_docfield_property("party_name", "read_only", 1);
+		}
+		frm.refresh_field("invoices");
+	},
+
+	update_party_labels: function (frm) {
+		let is_sales = frm.doc.invoice_type == "Sales";
+
+		frm.fields_dict["invoices"].grid.update_docfield_property(
+			"party",
+			"label",
+			is_sales ? "Customer ID" : "Supplier ID"
+		);
+		frm.fields_dict["invoices"].grid.update_docfield_property(
+			"party_name",
+			"label",
+			is_sales ? "Customer Name" : "Supplier Name"
+		);
+
+		frm.set_df_property(
+			"create_missing_party",
+			"description",
+			is_sales
+				? __("If party does not exist, create it using the Customer Name field.")
+				: __("If party does not exist, create it using the Supplier Name field.")
+		);
+
+		frm.refresh_field("invoices");
+		frm.refresh_field("create_missing_party");
+	},
 });
 
 frappe.ui.form.on("Opening Invoice Creation Tool Item", {
+	party: function (frm, cdt, cdn) {
+		let row = locals[cdt][cdn];
+		if (!row.party) {
+			frappe.model.set_value(cdt, cdn, "party_name", "");
+			return;
+		}
+
+		let party_type = frm.doc.invoice_type == "Sales" ? "Customer" : "Supplier";
+		let name_field = party_type === "Customer" ? "customer_name" : "supplier_name";
+
+		frappe.db.get_value(party_type, row.party, name_field, (r) => {
+			frappe.model.set_value(cdt, cdn, "party_name", r?.[name_field] || "");
+		});
+	},
+
 	invoices_add: (frm) => {
 		frm.trigger("update_invoice_table");
 	},

erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json

@@ -7,6 +7,7 @@
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
+  "section_break_ynel",
   "company",
   "create_missing_party",
   "column_break_3",
@@ -25,11 +26,11 @@
    "in_list_view": 1,
    "label": "Company",
    "options": "Company",
+   "remember_last_selected_value": 1,
    "reqd": 1
   },
   {
    "default": "0",
-   "description": "Create missing customer or supplier.",
    "fieldname": "create_missing_party",
    "fieldtype": "Check",
    "label": "Create Missing Party"
@@ -65,10 +66,10 @@
    "options": "Cost Center"
   },
   {
-    "fieldname": "project",
-    "fieldtype": "Link",
-    "label": "Project",
-    "options": "Project"
+   "fieldname": "project",
+   "fieldtype": "Link",
+   "label": "Project",
+   "options": "Project"
   },
   {
    "collapsible": 1,
@@ -79,12 +80,17 @@
   {
    "fieldname": "dimension_col_break",
    "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "section_break_ynel",
+   "fieldtype": "Section Break",
+   "hide_border": 1
   }
  ],
  "hide_toolbar": 1,
  "issingle": 1,
  "links": [],
- "modified": "2024-03-27 13:10:06.564397",
+ "modified": "2026-03-31 01:47:20.360352",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Opening Invoice Creation Tool",
@@ -101,8 +107,9 @@
   }
  ],
  "quick_entry": 1,
+ "row_format": "Dynamic",
  "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
-}
+}

erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py

@@ -5,7 +5,7 @@
 import frappe
 from frappe import _, scrub
 from frappe.model.document import Document
-from frappe.utils import flt, nowdate
+from frappe.utils import escape_html, flt, nowdate
 from frappe.utils.background_jobs import enqueue, is_job_enqueued
 
 from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import (
@@ -32,6 +32,7 @@ class OpeningInvoiceCreationTool(Document):
 		create_missing_party: DF.Check
 		invoice_type: DF.Literal["Sales", "Purchase"]
 		invoices: DF.Table[OpeningInvoiceCreationToolItem]
+		project: DF.Link | None
 	# end: auto-generated types
 
 	def onload(self):
@@ -85,6 +86,11 @@ class OpeningInvoiceCreationTool(Document):
 			)
 			prepare_invoice_summary(doctype, invoices)
 
+		invoices_summary_companies = list(invoices_summary.keys())
+
+		for company in invoices_summary_companies:
+			invoices_summary[escape_html(company)] = invoices_summary.pop(company)
+
 		return invoices_summary, max_count
 
 	def validate_company(self):
@@ -102,10 +108,20 @@ class OpeningInvoiceCreationTool(Document):
 		row.due_date = row.due_date or nowdate()
 
 	def validate_mandatory_invoice_fields(self, row):
-		if not frappe.db.exists(row.party_type, row.party):
-			if self.create_missing_party:
-				self.add_party(row.party_type, row.party)
-			else:
+		if self.create_missing_party:
+			if not row.party and not row.party_name:
+				frappe.throw(_("Row #{}: Either Party ID or Party Name is required").format(row.idx))
+
+			if not row.party and row.party_name:
+				row.party = self.add_party(row.party_type, row.party_name)
+
+			if row.party and not frappe.db.exists(row.party_type, row.party):
+				row.party = self.add_party(row.party_type, row.party)
+
+		else:
+			if not row.party:
+				frappe.throw(_("Row #{}: Party ID is required").format(row.idx))
+			if not frappe.db.exists(row.party_type, row.party):
 				frappe.throw(
 					_("Row #{}: {} {} does not exist.").format(
 						row.idx, frappe.bold(row.party_type), frappe.bold(row.party)
@@ -113,7 +129,7 @@ class OpeningInvoiceCreationTool(Document):
 				)
 
 		mandatory_error_msg = _("Row #{0}: {1} is required to create the Opening {2} Invoices")
-		for d in ("Party", "Outstanding Amount", "Temporary Opening Account"):
+		for d in ("Outstanding Amount", "Temporary Opening Account"):
 			if not row.get(scrub(d)):
 				frappe.throw(mandatory_error_msg.format(row.idx, d, self.invoice_type))
 
@@ -159,6 +175,7 @@ class OpeningInvoiceCreationTool(Document):
 
 		party_doc.flags.ignore_mandatory = True
 		party_doc.save(ignore_permissions=True)
+		return party_doc.name
 
 	def get_invoice_dict(self, row=None):
 		def get_item_dict():
@@ -262,7 +279,8 @@ def start_import(invoices):
 			doc.flags.ignore_mandatory = True
 			doc.insert(set_name=invoice_number)
 			doc.submit()
-			frappe.db.commit()
+			if not frappe.in_test:
+				frappe.db.commit()
 			names.append(doc.name)
 		except Exception:
 			errors += 1

erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html

@@ -1,5 +1,5 @@
 {% $.each(data, (company, summary) => { %}
-<h6 style="margin: 15px 0px -10px 0px;"><a class="company-link"> {{ company }}</a></h6>
+<div style="margin: 15px 0px -10px 0px;"> {{ company }}</div>
 
 <table class="table table-bordered small">
 	<thead>
@@ -23,7 +23,7 @@
 			<td class="text-right">
 				{{ format_currency(summary[doctype].outstanding_amount, summary.currency, 2) }}
 			</td>
-		</div>
+		</tr>
 		{% endif %}
 		{% }); %}
 	</tbody>

erpnext/accounts/doctype/opening_invoice_creation_tool/test_opening_invoice_creation_tool.py

@@ -2,27 +2,14 @@
 # See license.txt
 
 import frappe
-from frappe.tests import IntegrationTestCase
 
-from erpnext.accounts.doctype.accounting_dimension.test_accounting_dimension import (
-	create_dimension,
-	disable_dimension,
-)
 from erpnext.accounts.doctype.opening_invoice_creation_tool.opening_invoice_creation_tool import (
 	get_temporary_opening_account,
 )
-
-EXTRA_TEST_RECORD_DEPENDENCIES = ["Customer", "Supplier", "Accounting Dimension"]
+from erpnext.tests.utils import ERPNextTestSuite
 
 
-class TestOpeningInvoiceCreationTool(IntegrationTestCase):
-	@classmethod
-	def setUpClass(cls):
-		if not frappe.db.exists("Company", "_Test Opening Invoice Company"):
-			make_company()
-		create_dimension()
-		return super().setUpClass()
-
+class TestOpeningInvoiceCreationTool(ERPNextTestSuite):
 	def make_invoices(
 		self,
 		invoice_type="Sales",
@@ -149,9 +136,6 @@ class TestOpeningInvoiceCreationTool(IntegrationTestCase):
 		}
 		self.check_expected_values(invoices, expected_value, invoice_type="Sales")
 
-	def tearDown(self):
-		disable_dimension()
-
 
 def get_opening_invoice_creation_dict(**args):
 	party = "Customer" if args.get("invoice_type", "Sales") == "Sales" else "Supplier"
@@ -190,26 +174,13 @@ def get_opening_invoice_creation_dict(**args):
 	return invoice_dict
 
 
-def make_company():
-	if frappe.db.exists("Company", "_Test Opening Invoice Company"):
-		return frappe.get_doc("Company", "_Test Opening Invoice Company")
-
-	company = frappe.new_doc("Company")
-	company.company_name = "_Test Opening Invoice Company"
-	company.abbr = "_TOIC"
-	company.default_currency = "INR"
-	company.country = "Pakistan"
-	company.insert()
-	return company
-
-
 def make_customer(customer=None):
 	customer_name = customer or "Opening Customer"
 	customer = frappe.get_doc(
 		{
 			"doctype": "Customer",
 			"customer_name": customer_name,
-			"customer_group": "All Customer Groups",
+			"customer_group": "Individual",
 			"customer_type": "Company",
 			"territory": "All Territories",
 		}

erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json

@@ -8,6 +8,7 @@
   "invoice_number",
   "party_type",
   "party",
+  "party_name",
   "temporary_opening_account",
   "column_break_3",
   "posting_date",
@@ -35,9 +36,9 @@
    "fieldname": "party",
    "fieldtype": "Dynamic Link",
    "in_list_view": 1,
-   "label": "Party",
-   "options": "party_type",
-   "reqd": 1
+   "label": "Party ID",
+   "mandatory_depends_on": "eval: !parent.create_missing_party",
+   "options": "party_type"
   },
   {
    "fieldname": "temporary_opening_account",
@@ -118,11 +119,17 @@
    "fieldname": "supplier_invoice_date",
    "fieldtype": "Date",
    "label": "Supplier Invoice Date"
+  },
+  {
+   "fieldname": "party_name",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Party Name"
   }
  ],
  "istable": 1,
  "links": [],
- "modified": "2025-12-01 16:18:07.997594",
+ "modified": "2026-03-20 02:11:42.023575",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Opening Invoice Creation Tool Item",

erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.py

@@ -22,7 +22,8 @@ class OpeningInvoiceCreationToolItem(Document):
 		parent: DF.Data
 		parentfield: DF.Data
 		parenttype: DF.Data
-		party: DF.DynamicLink
+		party: DF.DynamicLink | None
+		party_name: DF.Data | None
 		party_type: DF.Link | None
 		posting_date: DF.Date | None
 		qty: DF.Data | None

erpnext/accounts/doctype/party_link/test_party_link.py

@@ -3,8 +3,8 @@
 # import frappe
 import unittest
 
-from frappe.tests import IntegrationTestCase
+from erpnext.tests.utils import ERPNextTestSuite
 
 
-class TestPartyLink(IntegrationTestCase):
+class TestPartyLink(ERPNextTestSuite):
 	pass

erpnext/accounts/doctype/payment_entry/payment_entry.json

@@ -138,6 +138,7 @@
    "fieldname": "posting_date",
    "fieldtype": "Date",
    "in_list_view": 1,
+   "in_standard_filter": 1,
    "label": "Posting Date",
    "reqd": 1
   },
@@ -160,7 +161,6 @@
   {
    "fieldname": "mode_of_payment",
    "fieldtype": "Link",
-   "in_list_view": 1,
    "label": "Mode of Payment",
    "options": "Mode of Payment"
   },
@@ -228,6 +228,7 @@
    "fieldname": "paid_from",
    "fieldtype": "Link",
    "in_global_search": 1,
+   "in_list_view": 1,
    "label": "Account Paid From",
    "options": "Account",
    "print_hide": 1,
@@ -252,6 +253,7 @@
    "fieldname": "paid_to",
    "fieldtype": "Link",
    "in_global_search": 1,
+   "in_list_view": 1,
    "label": "Account Paid To",
    "options": "Account",
    "print_hide": 1,
@@ -414,6 +416,7 @@
    "depends_on": "eval:(doc.paid_from && doc.paid_to)",
    "fieldname": "reference_no",
    "fieldtype": "Data",
+   "in_standard_filter": 1,
    "label": "Cheque/Reference No",
    "mandatory_depends_on": "eval:(doc.paid_from_account_type == 'Bank' || doc.paid_to_account_type == 'Bank')"
   },
@@ -792,7 +795,7 @@
    "table_fieldname": "payment_entries"
   }
  ],
- "modified": "2026-02-03 16:08:49.800381",
+ "modified": "2026-03-09 17:15:30.453920",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Entry",

erpnext/accounts/doctype/payment_entry/payment_entry.py

@@ -2376,9 +2376,7 @@ def get_outstanding_reference_documents(args, validate=False):
 			vouchers=args.get("vouchers") or None,
 		)
 
-		outstanding_invoices = split_invoices_based_on_payment_terms(
-			outstanding_invoices, args.get("company")
-		)
+		outstanding_invoices = split_refdocs_based_on_payment_terms(outstanding_invoices, args.get("company"))
 
 		for d in outstanding_invoices:
 			d["exchange_rate"] = 1
@@ -2416,6 +2414,8 @@ def get_outstanding_reference_documents(args, validate=False):
 			filters=args,
 		)
 
+		orders_to_be_billed = split_refdocs_based_on_payment_terms(orders_to_be_billed, args.get("company"))
+
 	data = negative_outstanding_invoices + outstanding_invoices + orders_to_be_billed
 
 	if not data:
@@ -2438,13 +2438,13 @@ def get_outstanding_reference_documents(args, validate=False):
 	return data
 
 
-def split_invoices_based_on_payment_terms(outstanding_invoices, company) -> list:
+def split_refdocs_based_on_payment_terms(refdocs, company) -> list:
 	"""Split a list of invoices based on their payment terms."""
-	exc_rates = get_currency_data(outstanding_invoices, company)
+	exc_rates = get_currency_data(refdocs, company)
 
-	outstanding_invoices_after_split = []
-	for entry in outstanding_invoices:
-		if entry.voucher_type in ["Sales Invoice", "Purchase Invoice"]:
+	outstanding_refdoc_after_split = []
+	for entry in refdocs:
+		if entry.voucher_type in ["Sales Invoice", "Purchase Invoice", "Sales Order", "Purchase Order"]:
 			if payment_term_template := frappe.db.get_value(
 				entry.voucher_type, entry.voucher_no, "payment_terms_template"
 			):
@@ -2459,25 +2459,25 @@ def split_invoices_based_on_payment_terms(outstanding_invoices, company) -> list
 						),
 						alert=True,
 					)
-				outstanding_invoices_after_split += split_rows
+				outstanding_refdoc_after_split += split_rows
 				continue
 
 		# If not an invoice or no payment terms template, add as it is
-		outstanding_invoices_after_split.append(entry)
+		outstanding_refdoc_after_split.append(entry)
 
-	return outstanding_invoices_after_split
+	return outstanding_refdoc_after_split
 
 
-def get_currency_data(outstanding_invoices: list, company: str | None = None) -> dict:
+def get_currency_data(outstanding_refdocs: list, company: str | None = None) -> dict:
 	"""Get currency and conversion data for a list of invoices."""
 	exc_rates = frappe._dict()
 	company_currency = frappe.db.get_value("Company", company, "default_currency") if company else None
 
-	for doctype in ["Sales Invoice", "Purchase Invoice"]:
-		invoices = [x.voucher_no for x in outstanding_invoices if x.voucher_type == doctype]
+	for doctype in ["Sales Invoice", "Purchase Invoice", "Sales Order", "Purchase Order"]:
+		refdoc = [x.voucher_no for x in outstanding_refdocs if x.voucher_type == doctype]
 		for x in frappe.db.get_all(
 			doctype,
-			filters={"name": ["in", invoices]},
+			filters={"name": ["in", refdoc]},
 			fields=["name", "currency", "conversion_rate", "party_account_currency"],
 		):
 			exc_rates[x.name] = frappe._dict(
@@ -2556,14 +2556,9 @@ def get_orders_to_be_billed(
 	if not voucher_type:
 		return []
 
-	# Add cost center condition
-	doc = frappe.get_doc({"doctype": voucher_type})
-	condition = ""
-	if doc and hasattr(doc, "cost_center") and doc.cost_center:
-		condition = " and cost_center='%s'" % cost_center
-
 	# dynamic dimension filters
-	active_dimensions = get_dimensions()[0]
+	condition = ""
+	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)}'"

erpnext/accounts/doctype/payment_entry/test_payment_entry.py

@@ -4,7 +4,6 @@
 
 import frappe
 from frappe import qb
-from frappe.tests import IntegrationTestCase
 from frappe.utils import add_days, flt, nowdate
 
 from erpnext.accounts.doctype.account.test_account import create_account
@@ -24,14 +23,10 @@ from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import (
 )
 from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
 from erpnext.setup.doctype.employee.test_employee import make_employee
-
-EXTRA_TEST_RECORD_DEPENDENCIES = ["Item", "Currency Exchange"]
+from erpnext.tests.utils import ERPNextTestSuite
 
 
-class TestPaymentEntry(IntegrationTestCase):
-	def tearDown(self):
-		frappe.db.rollback()
-
+class TestPaymentEntry(ERPNextTestSuite):
 	def get_journals_for(self, voucher_type: str, voucher_no: str) -> list:
 		journals = []
 		if voucher_type and voucher_no:
@@ -427,7 +422,7 @@ class TestPaymentEntry(IntegrationTestCase):
 		self.assertEqual(si.payment_schedule[0].outstanding, 0)
 		self.assertEqual(si.payment_schedule[0].discounted_amount, 50)
 
-	@IntegrationTestCase.change_settings(
+	@ERPNextTestSuite.change_settings(
 		"Accounts Settings",
 		{
 			"allow_multi_currency_invoices_against_single_party_account": 1,
@@ -645,6 +640,7 @@ class TestPaymentEntry(IntegrationTestCase):
 	def test_payment_entry_retrieves_last_exchange_rate(self):
 		from erpnext.setup.doctype.currency_exchange.test_currency_exchange import save_new_records
 
+		self.load_test_records("Currency Exchange")
 		save_new_records(self.globalTestRecords["Currency Exchange"])
 
 		pe = frappe.new_doc("Payment Entry")
@@ -982,6 +978,7 @@ class TestPaymentEntry(IntegrationTestCase):
 	def test_gl_of_multi_currency_payment_transaction(self):
 		from erpnext.setup.doctype.currency_exchange.test_currency_exchange import save_new_records
 
+		self.load_test_records("Currency Exchange")
 		save_new_records(self.globalTestRecords["Currency Exchange"])
 		paid_from = create_account(
 			parent_account="Current Liabilities - _TC",
@@ -1158,7 +1155,7 @@ class TestPaymentEntry(IntegrationTestCase):
 		}
 		self.assertDictEqual(ref_details, expected_response)
 
-	@IntegrationTestCase.change_settings(
+	@ERPNextTestSuite.change_settings(
 		"Accounts Settings",
 		{
 			"unlink_payment_on_cancellation_of_invoice": 1,
@@ -1253,7 +1250,7 @@ class TestPaymentEntry(IntegrationTestCase):
 		si3.cancel()
 		si3.delete()
 
-	@IntegrationTestCase.change_settings(
+	@ERPNextTestSuite.change_settings(
 		"Accounts Settings",
 		{
 			"unlink_payment_on_cancellation_of_invoice": 1,
@@ -1949,7 +1946,7 @@ class TestPaymentEntry(IntegrationTestCase):
 		# 'Is Opening' should always be 'No' for normal advance payments
 		self.assertEqual(gl_with_opening_set, [])
 
-	@IntegrationTestCase.change_settings("Accounts Settings", {"delete_linked_ledger_entries": 1})
+	@ERPNextTestSuite.change_settings("Accounts Settings", {"delete_linked_ledger_entries": 1})
 	def test_delete_linked_exchange_gain_loss_journal(self):
 		from erpnext.accounts.doctype.account.test_account import create_account
 		from erpnext.accounts.doctype.opening_invoice_creation_tool.test_opening_invoice_creation_tool import (
@@ -2022,6 +2019,123 @@ class TestPaymentEntry(IntegrationTestCase):
 		self.assertRaises(frappe.DoesNotExistError, frappe.get_doc, pe.doctype, pe.name)
 		self.assertRaises(frappe.DoesNotExistError, frappe.get_doc, "Journal Entry", jv[0])
 
+	def test_outstanding_orders_split_by_payment_terms(self):
+		create_payment_terms_template()
+
+		so = make_sales_order(do_not_save=1, qty=1, rate=200)
+		so.payment_terms_template = "Test Receivable Template"
+		so.save().submit()
+
+		args = {
+			"posting_date": nowdate(),
+			"company": so.company,
+			"party_type": "Customer",
+			"payment_type": "Receive",
+			"party": so.customer,
+			"party_account": "Debtors - _TC",
+			"get_orders_to_be_billed": True,
+		}
+
+		references = get_outstanding_reference_documents(args)
+
+		self.assertEqual(len(references), 2)
+		self.assertEqual(references[0].voucher_no, so.name)
+		self.assertEqual(references[1].voucher_no, so.name)
+		self.assertEqual(references[0].payment_term, "Basic Amount Receivable")
+		self.assertEqual(references[1].payment_term, "Tax Receivable")
+
+	def test_outstanding_orders_no_split_when_allocate_disabled(self):
+		create_payment_terms_template()
+
+		template = frappe.get_doc("Payment Terms Template", "Test Receivable Template")
+		template.allocate_payment_based_on_payment_terms = 0
+		template.save()
+
+		so = make_sales_order(do_not_save=1, qty=1, rate=200)
+		so.payment_terms_template = "Test Receivable Template"
+		so.save().submit()
+
+		args = {
+			"posting_date": nowdate(),
+			"company": so.company,
+			"party_type": "Customer",
+			"payment_type": "Receive",
+			"party": so.customer,
+			"party_account": "Debtors - _TC",
+			"get_orders_to_be_billed": True,
+		}
+
+		references = get_outstanding_reference_documents(args)
+
+		self.assertEqual(len(references), 1)
+		self.assertIsNone(references[0].payment_term)
+
+		template.allocate_payment_based_on_payment_terms = 1
+		template.save()
+
+	def test_outstanding_multicurrency_sales_order_split(self):
+		create_payment_terms_template()
+
+		so = make_sales_order(
+			customer="_Test Customer USD",
+			currency="USD",
+			qty=1,
+			rate=100,
+			do_not_submit=True,
+		)
+		so.payment_terms_template = "Test Receivable Template"
+		so.conversion_rate = 50
+		so.save().submit()
+
+		args = {
+			"posting_date": nowdate(),
+			"company": so.company,
+			"party_type": "Customer",
+			"payment_type": "Receive",
+			"party": so.customer,
+			"party_account": "Debtors - _TC",
+			"get_orders_to_be_billed": True,
+		}
+
+		references = get_outstanding_reference_documents(args)
+
+		# Should split without throwing currency errors
+		self.assertEqual(len(references), 2)
+		for ref in references:
+			self.assertEqual(ref.voucher_no, so.name)
+			self.assertIsNotNone(ref.payment_term)
+
+	def test_project_name_in_exchange_gain_loss_entry(self):
+		si = create_sales_invoice(
+			customer="_Test Customer USD",
+			debit_to="_Test Receivable USD - _TC",
+			currency="USD",
+			conversion_rate=50,
+			do_not_submit=True,
+		)
+		from erpnext.projects.doctype.project.test_project import make_project
+
+		si.project = make_project({"project_name": "_Test Project for Exchange Gain Loss Entry"}).name
+
+		si.submit()
+
+		pe = get_payment_entry("Sales Invoice", si.name)
+
+		pe.source_exchange_rate = 100
+
+		pe.insert()
+		pe.submit()
+
+		rows = frappe.get_all(
+			"Journal Entry Account",
+			or_filters=[{"reference_name": pe.name}, {"reference_name": si.name}],
+			fields=["project"],
+		)
+		self.assertEqual(len(rows), 2)
+
+		self.assertEqual(rows[0].project, si.project)
+		self.assertEqual(rows[1].project, si.project)
+
 
 def create_payment_entry(**args):
 	payment_entry = frappe.new_doc("Payment Entry")

erpnext/accounts/doctype/payment_entry_deduction/payment_entry_deduction.json

@@ -22,6 +22,7 @@
    "reqd": 1
   },
   {
+   "allow_on_submit": 1,
    "fieldname": "cost_center",
    "fieldtype": "Link",
    "in_list_view": 1,
@@ -59,7 +60,7 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2025-08-13 06:52:46.130142",
+ "modified": "2026-03-11 14:26:11.312950",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Entry Deduction",

erpnext/accounts/doctype/payment_gateway_account/test_payment_gateway_account.py

@@ -2,10 +2,8 @@
 # See license.txt
 import unittest
 
-from frappe.tests import IntegrationTestCase
-
-IGNORE_TEST_RECORD_DEPENDENCIES = ["Payment Gateway"]
+from erpnext.tests.utils import ERPNextTestSuite
 
 
-class TestPaymentGatewayAccount(IntegrationTestCase):
+class TestPaymentGatewayAccount(ERPNextTestSuite):
 	pass