chore(release): Bumped to Version 16.16.0

# [16.16.0](https://github.com/frappe/erpnext/compare/v16.15.1...v16.16.0) (2026-04-28)

### Bug Fixes

* **`get_stock_balance`:** validate inventory dimension fieldnames (backport [#54587](https://github.com/frappe/erpnext/issues/54587)) ([#54589](https://github.com/frappe/erpnext/issues/54589)) ([9f04fcc](9f04fcc190))
* add filter labels and required filters for financial report validation ([e6f0bb6](e6f0bb66e2))
* add party type for dynamic link support ([c6d4802](c6d4802857))
* always exclude pcv entries except for closing account head ([446c111](446c111653))
* avoid double reduction of pe reference outstanding (backport [#54193](https://github.com/frappe/erpnext/issues/54193)) ([#54613](https://github.com/frappe/erpnext/issues/54613)) ([5de4b01](5de4b013ea))
* correct display depends on condition ([#54556](https://github.com/frappe/erpnext/issues/54556)) ([0df38a8](0df38a841e))
* debit credit not equal in purchase transactions for multi currency (backport [#54456](https://github.com/frappe/erpnext/issues/54456)) ([#54564](https://github.com/frappe/erpnext/issues/54564)) ([d9a9a5b](d9a9a5bcde))
* delivery schedule in the sales order ([386f499](386f49978e))
* duplicate entries being shown in batch exists in future transact… (backport [#54604](https://github.com/frappe/erpnext/issues/54604)) ([#54606](https://github.com/frappe/erpnext/issues/54606)) ([1111771](11117710d3))
* **edi:** restrict Code List imports to files and trusted backend URLs (backport [#54137](https://github.com/frappe/erpnext/issues/54137)) ([#54266](https://github.com/frappe/erpnext/issues/54266)) ([2a244d1](2a244d162b)), closes [#54488](https://github.com/frappe/erpnext/issues/54488)
* ensure fiscal year is checked before validating date filters in financial statements ([fba7871](fba78711cc))
* ensure tax withholding entries respect date range of category ([719d982](719d982a07))
* filter opening entries in first year in custom financial statement ([6bd6e62](6bd6e62c8c))
* filter overdue purchase order items by company (backport [#54099](https://github.com/frappe/erpnext/issues/54099)) ([#54611](https://github.com/frappe/erpnext/issues/54611)) ([8f8bf13](8f8bf13b41))
* hide feature flag controlled fields on install ([45dc2c4](45dc2c40fd))
* make inv dimen reqd only in delivery note (backport [#54546](https://github.com/frappe/erpnext/issues/54546)) ([#54552](https://github.com/frappe/erpnext/issues/54552)) ([d56df96](d56df96f73))
* **manufacturing:** remove conversion factor for stock qty (backport [#54525](https://github.com/frappe/erpnext/issues/54525)) ([#54573](https://github.com/frappe/erpnext/issues/54573)) ([f14751d](f14751d538))
* negative quantity check in validate_item_qty (backport [#54559](https://github.com/frappe/erpnext/issues/54559)) ([#54572](https://github.com/frappe/erpnext/issues/54572)) ([f7fa394](f7fa394aea))
* **payment_entry:** escape arguments on invoice and order fetching sql queries (backport [#54582](https://github.com/frappe/erpnext/issues/54582)) ([#54586](https://github.com/frappe/erpnext/issues/54586)) ([5289aa0](5289aa0ab3))
* **PCV:** set correct filters of `from_date` and `to_date` on General Ledger Report on clicking `Ledger` button (backport [#54522](https://github.com/frappe/erpnext/issues/54522)) ([#54524](https://github.com/frappe/erpnext/issues/54524)) ([f3996fb](f3996fb971))
* preserve inventory dimensions when raw materials are reset (backport [#54440](https://github.com/frappe/erpnext/issues/54440)) ([#54493](https://github.com/frappe/erpnext/issues/54493)) ([456e99b](456e99b352))
* py error on stock ageing report (backport [#54467](https://github.com/frappe/erpnext/issues/54467)) ([#54469](https://github.com/frappe/erpnext/issues/54469)) ([090aab3](090aab33fb))
* skip BudgetValidation when cancelling GL entries ([1b14673](1b146738c4))
* **stock:** add stock entry in batch master connection ([62bbe28](62bbe28a72))
* **stock:** remove validation for transfer_qty field (backport [#54542](https://github.com/frappe/erpnext/issues/54542)) ([#54545](https://github.com/frappe/erpnext/issues/54545)) ([cc85370](cc85370d54))
* **stock:** set incoming rate as zero for outward sle (backport [#54514](https://github.com/frappe/erpnext/issues/54514)) ([#54533](https://github.com/frappe/erpnext/issues/54533)) ([cabea2f](cabea2f288))
* **stock:** show available qty in warehouse link field (backport [#54474](https://github.com/frappe/erpnext/issues/54474)) ([#54484](https://github.com/frappe/erpnext/issues/54484)) ([f7b87ed](f7b87ed0e3))
* **stock:** show item code in serial and batch selector dialog ([85d1eb8](85d1eb8379))
* summing of values could be zero even if values exist ([d51ce66](d51ce66cb2))
* update account identification to avoid using name_field in financial statements ([7b60ec8](7b60ec8457))
* update fiscal year filter to use mandatory_depends_on instead of reqd ([6570796](6570796fba))
* update status of quotation in patch (backport [#54577](https://github.com/frappe/erpnext/issues/54577)) ([#54580](https://github.com/frappe/erpnext/issues/54580)) ([134e4b7](134e4b7446))

### Features

* add setting to hide Subscription references across doctypes ([#54576](https://github.com/frappe/erpnext/issues/54576)) ([15b6633](15b6633fc3))
* Add XLSX styling support to custom financial report templates ([#52612](https://github.com/frappe/erpnext/issues/52612)) ([055ff56](055ff56ce4))
* Add XLSX styling support to custom financial report templates (backport [#52612](https://github.com/frappe/erpnext/issues/52612)) ([#54485](https://github.com/frappe/erpnext/issues/54485)) ([df3fbed](df3fbeded2))
* danish_bosnian_address_template (backport [#54093](https://github.com/frappe/erpnext/issues/54093)) ([#54516](https://github.com/frappe/erpnext/issues/54516)) ([5c0d2cb](5c0d2cb474))
* enhance account category with root type ([#53190](https://github.com/frappe/erpnext/issues/53190)) ([96bab08](96bab08ae0))

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -60,7 +60,7 @@ body:
       description: Share exact version number of Frappe and ERPNext you are using.
       placeholder: |
         Frappe version -
-        ERPNext Verion -
+        ERPNext version -
     validations:
       required: true
 

.github/workflows/initiate_release.yml

@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: ["14", "15"]
+        version: ["14", "15", "16"]
 
     steps:
       - uses: octokit/request-action@v2.x

.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/patch.yml

@@ -113,8 +113,8 @@ jobs:
           jq 'del(.install_apps)' ~/frappe-bench/sites/test_site/site_config.json > tmp.json
           mv tmp.json ~/frappe-bench/sites/test_site/site_config.json
 
-          wget https://erpnext.com/files/v13-erpnext.sql.gz
-          bench --site test_site --force restore ~/frappe-bench/v13-erpnext.sql.gz
+          wget https://frappe.io/files/erpnext-v14.sql.gz
+          bench --site test_site --force restore ~/frappe-bench/erpnext-v14.sql.gz
 
           git -C "apps/frappe" remote set-url upstream https://github.com/frappe/frappe.git
           git -C "apps/erpnext" remote set-url upstream https://github.com/frappe/erpnext.git
@@ -142,7 +142,6 @@ jobs:
             bench --site test_site migrate
           }
 
-          update_to_version 14 3.11
           update_to_version 15 3.13
 
           echo "Updating to latest version"

.github/workflows/release.yml

@@ -2,7 +2,7 @@ name: Generate Semantic Release
 on:
   push:
     branches:
-      - version-13
+      - version-16
 
 permissions:
   contents: read

.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-faux.yml

@@ -7,6 +7,7 @@ on:
     paths:
       - "**.js"
       - "**.css"
+      - "**.svg"
       - "**.md"
       - "**.html"
       - 'crowdin.yml'

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

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

.releaserc

@@ -1,5 +1,5 @@
 {
-	"branches": ["version-13"],
+	"branches": ["version-16"],
 	"plugins": [
 		"@semantic-release/commit-analyzer", {
 			"preset": "angular",
@@ -21,4 +21,4 @@
 		],
 		"@semantic-release/github"
 	]
-}
+}

README.md

@@ -1,3 +1,4 @@
+
 <div align="center">
     <a href="https://frappe.io/erpnext">
 	<img src="./erpnext/public/images/v16/erpnext.svg" alt="ERPNext Logo" height="80px" width="80xp"/>

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

erpnext/accounts/accounts_dashboard/payments/payments.json

@@ -0,0 +1,50 @@
+{
+ "cards": [
+  {
+   "card": "Total Outgoing Bills"
+  },
+  {
+   "card": "Total Incoming Bills"
+  },
+  {
+   "card": "Total Incoming Payment"
+  },
+  {
+   "card": "Total Outgoing Payment"
+  }
+ ],
+ "charts": [
+  {
+   "chart": "Incoming Bills (Purchase Invoice)",
+   "width": "Half"
+  },
+  {
+   "chart": "Outgoing Bills (Sales Invoice)",
+   "width": "Half"
+  },
+  {
+   "chart": "Accounts Receivable Ageing",
+   "width": "Half"
+  },
+  {
+   "chart": "Accounts Payable Ageing",
+   "width": "Half"
+  },
+  {
+   "chart": "Bank Balance",
+   "width": "Full"
+  }
+ ],
+ "creation": "2026-01-26 21:25:12.793893",
+ "dashboard_name": "Payments",
+ "docstatus": 0,
+ "doctype": "Dashboard",
+ "idx": 0,
+ "is_default": 0,
+ "is_standard": 1,
+ "modified": "2026-01-26 21:25:12.793893",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Payments",
+ "owner": "Administrator"
+}

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.js

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

erpnext/accounts/doctype/account/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/id_chart_of_accounts.json

@@ -33,6 +33,17 @@
                         }, 
                         "account_number": "1151.000"
                     }, 
+                    "Pajak Dibayar di Muka": {
+                        "PPN Masukan": {
+                            "account_number": "1152.001",
+                            "account_type": "Tax"
+                        },
+                        "PPh 23 Dibayar di Muka": {
+                            "account_number": "1152.002",
+                            "account_type": "Tax"
+                        },
+                        "account_number": "1152.000"
+                    },
                     "account_number": "1150.000"
                 }, 
                 "Kas": {
@@ -97,17 +108,6 @@
                     }, 
                     "account_number": "1130.000"
                 },
-                "Pajak Dibayar di Muka": {
-                    "PPN Masukan": {
-                        "account_number": "1151.001", 
-                        "account_type": "Tax"
-                    },
-                    "PPh 23 Dibayar di Muka": {
-                        "account_number": "1152.001", 
-                        "account_type": "Tax"
-                    }, 
-                    "account_number": "1150.000"
-                },
                 "account_number": "1100.000"
                 
             }, 

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

@@ -7,6 +7,8 @@
  "engine": "InnoDB",
  "field_order": [
   "account_category_name",
+  "root_type",
+  "column_break_qluu",
   "description"
  ],
  "fields": [
@@ -14,6 +16,7 @@
    "fieldname": "account_category_name",
    "fieldtype": "Data",
    "in_list_view": 1,
+   "in_standard_filter": 1,
    "label": "Account Category Name",
    "reqd": 1,
    "unique": 1
@@ -22,12 +25,29 @@
    "fieldname": "description",
    "fieldtype": "Small Text",
    "label": "Description"
+  },
+  {
+   "fieldname": "column_break_qluu",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "root_type",
+   "fieldtype": "Select",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Root Type",
+   "options": "\nAsset\nLiability\nIncome\nExpense\nEquity"
   }
  ],
  "grid_page_length": 50,
  "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-03-05 06:49:34.430723",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Account Category",
@@ -64,7 +84,7 @@
   }
  ],
  "row_format": "Dynamic",
- "search_fields": "account_category_name, description",
+ "search_fields": "account_category_name, root_type",
  "sort_field": "creation",
  "sort_order": "DESC",
  "states": []

erpnext/accounts/doctype/account_category/account_category.py

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

erpnext/accounts/doctype/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

@@ -16,10 +16,15 @@
   "invoicing_features_section",
   "check_supplier_invoice_uniqueness",
   "automatically_fetch_payment_terms",
+  "enable_subscription",
   "column_break_17",
   "enable_common_party_accounting",
   "allow_multi_currency_invoices_against_single_party_account",
   "confirm_before_resetting_posting_date",
+  "analytics_section",
+  "enable_accounting_dimensions",
+  "column_break_vtnr",
+  "enable_discounts_and_margin",
   "journals_section",
   "merge_similar_account_heads",
   "deferred_accounting_settings_section",
@@ -51,12 +56,19 @@
   "allow_pegged_currencies_exchange_rates",
   "column_break_yuug",
   "stale_days",
+  "payments_tab",
   "section_break_jpd0",
   "auto_reconcile_payments",
   "auto_reconciliation_job_trigger",
   "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",
@@ -197,7 +209,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 ",
@@ -281,7 +293,7 @@
   },
   {
    "default": "0",
-   "description": "Learn about <a href=\"https://docs.erpnext.com/docs/v13/user/manual/en/accounts/articles/common_party_accounting#:~:text=Common%20Party%20Accounting%20in%20ERPNext,Invoice%20against%20a%20primary%20Supplier.\">Common Party</a>",
+   "description": "Learn about <a href=\"https://docs.frappe.io/erpnext/user/manual/en/common_party_accounting\" rel=\"noopener noreferrer\">Common Party</a>",
    "fieldname": "enable_common_party_accounting",
    "fieldtype": "Check",
    "label": "Enable Common Party Accounting"
@@ -637,16 +649,83 @@
    "fieldname": "budget_section",
    "fieldtype": "Section Break",
    "label": "Budget"
+  },
+  {
+   "fieldname": "analytics_section",
+   "fieldtype": "Section Break",
+   "label": "Analytical Accounting"
+  },
+  {
+   "fieldname": "column_break_vtnr",
+   "fieldtype": "Column Break"
+  },
+  {
+   "default": "0",
+   "description": "Apply discounts and margins on products",
+   "fieldname": "enable_discounts_and_margin",
+   "fieldtype": "Check",
+   "label": "Enable Discounts and Margin"
+  },
+  {
+   "fieldname": "payments_tab",
+   "fieldtype": "Tab Break",
+   "label": "Payments"
+  },
+  {
+   "fieldname": "payment_options_section",
+   "fieldtype": "Section Break",
+   "label": "Payment Options"
+  },
+  {
+   "default": "0",
+   "fieldname": "enable_loyalty_point_program",
+   "fieldtype": "Check",
+   "label": "Enable Loyalty Point Program"
+  },
+  {
+   "fieldname": "column_break_ctam",
+   "fieldtype": "Column Break"
+  },
+  {
+   "default": "0",
+   "description": "Enable cost center, projects and other custom accounting dimensions",
+   "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,
- "hide_toolbar": 1,
+ "hide_toolbar": 0,
  "icon": "icon-cog",
  "idx": 1,
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2026-01-11 18:30:45.968531",
+ "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,8 +10,33 @@ 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 = [
+	"Sales Invoice",
+	"Sales Order",
+	"Delivery Note",
+	"Quotation",
+	"Sales Invoice Item",
+	"Sales Order Item",
+	"Delivery Note Item",
+	"Quotation Item",
+	"POS Invoice",
+	"POS Invoice Item",
+]
+
+BUYING_DOCTYPES = [
+	"Purchase Invoice",
+	"Purchase Order",
+	"Purchase Receipt",
+	"Purchase Invoice Item",
+	"Purchase Order Item",
+	"Purchase Receipt Item",
+]
+
 
 class AccountsSettings(Document):
 	# begin: auto-generated types
@@ -22,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
@@ -43,11 +70,16 @@ class AccountsSettings(Document):
 		default_ageing_range: DF.Data | None
 		delete_linked_ledger_entries: DF.Check
 		determine_address_tax_category_from: DF.Literal["Billing Address", "Shipping Address"]
+		enable_accounting_dimensions: DF.Check
 		enable_common_party_accounting: DF.Check
+		enable_discounts_and_margin: DF.Check
 		enable_fuzzy_matching: DF.Check
 		enable_immutable_ledger: DF.Check
+		enable_loyalty_point_program: DF.Check
 		enable_party_matching: DF.Check
+		enable_subscription: DF.Check
 		exchange_gain_loss_posting_date: DF.Literal["Invoice", "Payment", "Reconciliation Date"]
+		fetch_payment_schedule_in_payment_request: DF.Check
 		fetch_valuation_rate_for_internal_transaction: DF.Check
 		general_ledger_remarks_length: DF.Int
 		ignore_account_closing_balance: DF.Check
@@ -60,6 +92,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
@@ -98,10 +131,27 @@ class AccountsSettings(Document):
 		if old_doc.show_payment_schedule_in_print != self.show_payment_schedule_in_print:
 			self.enable_payment_schedule_in_print()
 
+		if old_doc.enable_accounting_dimensions != self.enable_accounting_dimensions:
+			toggle_accounting_dimension_sections(not self.enable_accounting_dimensions)
+			clear_cache = True
+
+		if old_doc.enable_discounts_and_margin != self.enable_discounts_and_margin:
+			toggle_sales_discount_section(not self.enable_discounts_and_margin)
+			clear_cache = True
+
+		if old_doc.enable_loyalty_point_program != self.enable_loyalty_point_program:
+			toggle_loyalty_point_program_section(not self.enable_loyalty_point_program)
+			clear_cache = True
+
+		if old_doc.enable_subscription != self.enable_subscription:
+			toggle_subscription_sections(not self.enable_subscription)
+			clear_cache = True
+
 		if clear_cache:
 			frappe.clear_cache()
 
 		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:
@@ -148,9 +198,68 @@ 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
 
 		frappe.db.sql(f"drop procedure if exists {InitSQLProceduresForAR.init_procedure_name}")
 		frappe.db.sql(f"drop procedure if exists {InitSQLProceduresForAR.allocate_procedure_name}")
+
+
+def toggle_accounting_dimension_sections(hide):
+	accounting_dimension_doctypes = frappe.get_hooks("accounting_dimension_doctypes")
+	for doctype in accounting_dimension_doctypes:
+		create_property_setter_for_hiding_field(doctype, "accounting_dimensions_section", hide)
+
+
+def toggle_sales_discount_section(hide):
+	for doctype in SELLING_DOCTYPES + BUYING_DOCTYPES:
+		meta = frappe.get_meta(doctype)
+		if meta.has_field("additional_discount_section"):
+			create_property_setter_for_hiding_field(doctype, "additional_discount_section", hide)
+		if meta.has_field("discount_and_margin"):
+			create_property_setter_for_hiding_field(doctype, "discount_and_margin", hide)
+
+
+def toggle_loyalty_point_program_section(hide):
+	for doctype in SELLING_DOCTYPES:
+		meta = frappe.get_meta(doctype)
+		if meta.has_field("loyalty_points_redemption"):
+			create_property_setter_for_hiding_field(doctype, "loyalty_points_redemption", hide)
+
+
+def toggle_subscription_sections(hide):
+	subscription_doctypes = frappe.get_hooks("subscription_doctypes")
+	for doctype in subscription_doctypes:
+		create_property_setter_for_hiding_field(doctype, "subscription_section", hide)
+
+
+def create_property_setter_for_hiding_field(doctype, field_name, hide):
+	make_property_setter(
+		doctype,
+		field_name,
+		"hidden",
+		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/advance_payment_ledger_entry.json

@@ -50,6 +50,7 @@
    "fieldname": "amount",
    "fieldtype": "Currency",
    "label": "Amount",
+   "options": "currency",
    "read_only": 1
   },
   {

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/bank.js

@@ -3,9 +3,6 @@
 frappe.provide("erpnext.integrations");
 
 frappe.ui.form.on("Bank", {
-	onload: function (frm) {
-		add_fields_to_mapping_table(frm);
-	},
 	refresh: function (frm) {
 		add_fields_to_mapping_table(frm);
 		frm.toggle_display(["address_html", "contact_html"], !frm.doc.__islocal);
@@ -37,11 +34,11 @@ let add_fields_to_mapping_table = function (frm) {
 		});
 	});
 
-	frm.fields_dict.bank_transaction_mapping.grid.update_docfield_property(
-		"bank_transaction_field",
-		"options",
-		options
-	);
+	const grid = frm.fields_dict.bank_transaction_mapping?.grid;
+
+	if (grid) {
+		grid.update_docfield_property("bank_transaction_field", "options", options);
+	}
 };
 
 erpnext.integrations.refreshPlaidLink = class refreshPlaidLink {
@@ -116,7 +113,7 @@ erpnext.integrations.refreshPlaidLink = class refreshPlaidLink {
 				"There was an issue connecting to Plaid's authentication server. Check browser console for more information"
 			)
 		);
-		console.log(error);
+		console.error(error);
 	}
 
 	plaid_success(token, response) {

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.js

@@ -42,8 +42,4 @@ frappe.ui.form.on("Bank Account", {
 			});
 		}
 	},
-
-	is_company_account: function (frm) {
-		frm.set_df_property("account", "reqd", frm.doc.is_company_account);
-	},
 });

erpnext/accounts/doctype/bank_account/bank_account.json

@@ -52,6 +52,7 @@
    "fieldtype": "Link",
    "in_list_view": 1,
    "label": "Company Account",
+   "mandatory_depends_on": "is_company_account",
    "options": "Account"
   },
   {
@@ -98,6 +99,7 @@
    "in_list_view": 1,
    "in_standard_filter": 1,
    "label": "Company",
+   "mandatory_depends_on": "is_company_account",
    "options": "Company"
   },
   {
@@ -252,7 +254,7 @@
    "link_fieldname": "default_bank_account"
   }
  ],
- "modified": "2025-08-29 12:32:01.081687",
+ "modified": "2026-01-20 00:46:16.633364",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Bank Account",

erpnext/accounts/doctype/bank_account/bank_account.py

@@ -51,25 +51,29 @@ class BankAccount(Document):
 		delete_contact_and_address("Bank Account", self.name)
 
 	def validate(self):
-		self.validate_company()
-		self.validate_account()
+		self.validate_is_company_account()
 		self.update_default_bank_account()
 
-	def validate_account(self):
-		if self.account:
-			if accounts := frappe.db.get_all(
-				"Bank Account", filters={"account": self.account, "name": ["!=", self.name]}, as_list=1
-			):
-				frappe.throw(
-					_("'{0}' account is already used by {1}. Use another account.").format(
-						frappe.bold(self.account),
-						frappe.bold(comma_and([get_link_to_form(self.doctype, x[0]) for x in accounts])),
-					)
-				)
+	def validate_is_company_account(self):
+		if self.is_company_account:
+			if not self.company:
+				frappe.throw(_("Company is mandatory for company account"))
 
-	def validate_company(self):
-		if self.is_company_account and not self.company:
-			frappe.throw(_("Company is mandatory for company account"))
+			if not self.account:
+				frappe.throw(_("Company Account is mandatory"))
+
+			self.validate_account()
+
+	def validate_account(self):
+		if accounts := frappe.db.get_all(
+			"Bank Account", filters={"account": self.account, "name": ["!=", self.name]}, as_list=1
+		):
+			frappe.throw(
+				_("'{0}' account is already used by {1}. Use another account.").format(
+					frappe.bold(self.account),
+					frappe.bold(comma_and([get_link_to_form(self.doctype, x[0]) for x in accounts])),
+				)
+			)
 
 	def update_default_bank_account(self):
 		if self.is_default and not self.disabled:
@@ -112,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/bank_transaction.py

@@ -139,6 +139,8 @@ class BankTransaction(Document):
 		self.set_status()
 
 	def on_cancel(self):
+		self.ignore_linked_doctypes = ["GL Entry"]
+
 		for payment_entry in self.payment_entries:
 			self.delink_payment_entry(payment_entry)
 
@@ -373,11 +375,12 @@ def get_clearance_details(transaction, payment_entry, bt_allocations, gl_entries
 			("unallocated_amount", "bank_account"),
 			as_dict=True,
 		)
+		bt_bank_account = frappe.db.get_value("Bank Account", bt.bank_account, "account")
 
-		if bt.bank_account != gl_bank_account:
+		if bt_bank_account != gl_bank_account:
 			frappe.throw(
 				_("Bank Account {} in Bank Transaction {} is not matching with Bank Account {}").format(
-					bt.bank_account, payment_entry.payment_entry, gl_bank_account
+					bt_bank_account, payment_entry.payment_entry, gl_bank_account
 				)
 			)
 

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_engine.py

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

erpnext/accounts/doctype/financial_report_template/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

@@ -10,19 +10,15 @@ from erpnext.accounts.doctype.financial_report_template.financial_report_engine
 	DependencyResolver,
 	FilterExpressionParser,
 	FinancialQueryBuilder,
+	FinancialReportEngine,
 	FormulaCalculator,
 	PeriodValue,
 )
 from erpnext.accounts.doctype.financial_report_template.test_financial_report_template import (
 	FinancialReportTemplateTestCase,
 )
-from erpnext.accounts.utils import get_currency_precision
-
-# 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.accounts.doctype.journal_entry.test_journal_entry import make_journal_entry
+from erpnext.accounts.utils import get_currency_precision, get_fiscal_year
 
 
 class TestDependencyResolver(FinancialReportTemplateTestCase):
@@ -1300,6 +1296,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)
 
@@ -1672,3 +1669,720 @@ class TestFilterExpressionParser(FinancialReportTemplateTestCase):
 		mock_row_invalid = self._create_mock_report_row(invalid_formula)
 		condition = parser.build_condition(mock_row_invalid, account_table)
 		self.assertIsNone(condition)
+
+
+class TestFinancialQueryBuilder(FinancialReportTemplateTestCase):
+	def test_fetch_balances_with_journal_entries(self):
+		company = "_Test Company"
+		cash_account = "_Test Cash - _TC"
+		bank_account = "_Test Bank - _TC"
+
+		# Create journal entries in different periods
+		# October: Transfer 1000 from Bank to Cash
+		jv_oct = make_journal_entry(
+			account1=cash_account,
+			account2=bank_account,
+			amount=1000,
+			posting_date="2024-10-15",
+			company=company,
+			submit=True,
+		)
+
+		# November: Transfer 500 from Bank to Cash
+		jv_nov = make_journal_entry(
+			account1=cash_account,
+			account2=bank_account,
+			amount=500,
+			posting_date="2024-11-20",
+			company=company,
+			submit=True,
+		)
+
+		# December: No transactions (test zero movement period)
+
+		try:
+			# Set up filters and periods for Q4 2024
+			filters = {
+				"company": company,
+				"from_fiscal_year": "2024",
+				"to_fiscal_year": "2024",
+				"period_start_date": "2024-10-01",
+				"period_end_date": "2024-12-31",
+				"filter_based_on": "Date Range",
+				"periodicity": "Monthly",
+			}
+
+			periods = [
+				{"key": "2024_oct", "from_date": "2024-10-01", "to_date": "2024-10-31"},
+				{"key": "2024_nov", "from_date": "2024-11-01", "to_date": "2024-11-30"},
+				{"key": "2024_dec", "from_date": "2024-12-01", "to_date": "2024-12-31"},
+			]
+
+			query_builder = FinancialQueryBuilder(filters, periods)
+
+			# Create account objects as expected by fetch_account_balances
+			accounts = [
+				frappe._dict({"name": cash_account, "account_name": "Cash", "account_number": "1001"}),
+				frappe._dict({"name": bank_account, "account_name": "Bank", "account_number": "1002"}),
+			]
+
+			# Fetch balances using the full workflow
+			balances_data = query_builder.fetch_account_balances(accounts)
+
+			# Verify Cash account balances
+			cash_data = balances_data.get(cash_account)
+			self.assertIsNotNone(cash_data, "Cash account should exist in results")
+
+			# October: movement = +1000 (debit)
+			oct_cash = cash_data.get_period("2024_oct")
+			self.assertIsNotNone(oct_cash, "October period should exist for cash")
+			self.assertEqual(oct_cash.movement, 1000.0, "October cash movement should be 1000")
+
+			# November: movement = +500
+			nov_cash = cash_data.get_period("2024_nov")
+			self.assertIsNotNone(nov_cash, "November period should exist for cash")
+			self.assertEqual(nov_cash.movement, 500.0, "November cash movement should be 500")
+			self.assertEqual(
+				nov_cash.opening, oct_cash.closing, "November opening should equal October closing"
+			)
+
+			# December: movement = 0 (no transactions)
+			dec_cash = cash_data.get_period("2024_dec")
+			self.assertIsNotNone(dec_cash, "December period should exist for cash")
+			self.assertEqual(dec_cash.movement, 0.0, "December cash movement should be 0")
+			self.assertEqual(
+				dec_cash.closing,
+				nov_cash.closing,
+				"December closing should equal November closing when no movement",
+			)
+
+			# Verify Bank account balances (opposite direction)
+			bank_data = balances_data.get(bank_account)
+			self.assertIsNotNone(bank_data, "Bank account should exist in results")
+
+			oct_bank = bank_data.get_period("2024_oct")
+			self.assertEqual(oct_bank.movement, -1000.0, "October bank movement should be -1000")
+
+			nov_bank = bank_data.get_period("2024_nov")
+			self.assertEqual(nov_bank.movement, -500.0, "November bank movement should be -500")
+
+		finally:
+			# Clean up: cancel journal entries
+			jv_nov.cancel()
+			jv_oct.cancel()
+
+	def test_opening_balance_from_previous_period_closing(self):
+		company = "_Test Company"
+		cash_account = "_Test Cash - _TC"
+		sales_account = "Sales - _TC"
+		posting_date_2023 = "2023-06-15"
+
+		# Create journal entry in prior period (2023)
+		# Cash Dr 5000, Sales Cr 5000
+		jv_2023 = make_journal_entry(
+			account1=cash_account,
+			account2=sales_account,
+			amount=5000,
+			posting_date=posting_date_2023,
+			company=company,
+			submit=True,
+		)
+
+		pcv = None
+		jv_2024 = None
+		original_pcv_setting = frappe.db.get_single_value(
+			"Accounts Settings", "use_legacy_controller_for_pcv"
+		)
+
+		try:
+			# Create Period Closing Voucher for 2023
+			# This will create Account Closing Balance entries
+			closing_account = frappe.db.get_value(
+				"Account",
+				{
+					"company": company,
+					"root_type": "Liability",
+					"is_group": 0,
+					"account_type": ["not in", ["Payable", "Receivable"]],
+				},
+				"name",
+			)
+
+			fy_2023 = get_fiscal_year(posting_date_2023, company=company)
+
+			frappe.db.set_single_value("Accounts Settings", "use_legacy_controller_for_pcv", 1)
+
+			pcv = frappe.get_doc(
+				{
+					"doctype": "Period Closing Voucher",
+					"transaction_date": "2023-12-31",
+					"period_start_date": fy_2023[1],
+					"period_end_date": fy_2023[2],
+					"company": company,
+					"fiscal_year": fy_2023[0],
+					"cost_center": "_Test Cost Center - _TC",
+					"closing_account_head": closing_account,
+					"remarks": "Test Period Closing",
+				}
+			)
+			pcv.insert()
+			pcv.submit()
+			pcv.reload()
+
+			# Now create a small transaction in 2024 to ensure the account appears
+			jv_2024 = make_journal_entry(
+				account1=cash_account,
+				account2=sales_account,
+				amount=100,
+				posting_date="2024-01-15",
+				company=company,
+				submit=True,
+			)
+
+			# Set up filters for Q1 2024 (after the period closing)
+			filters = {
+				"company": company,
+				"from_fiscal_year": "2024",
+				"to_fiscal_year": "2024",
+				"period_start_date": "2024-01-01",
+				"period_end_date": "2024-03-31",
+				"filter_based_on": "Date Range",
+				"periodicity": "Monthly",
+				"ignore_closing_entries": True,  # Don't include PCV entries in movements
+			}
+
+			periods = [
+				{"key": "2024_jan", "from_date": "2024-01-01", "to_date": "2024-01-31"},
+				{"key": "2024_feb", "from_date": "2024-02-01", "to_date": "2024-02-29"},
+				{"key": "2024_mar", "from_date": "2024-03-01", "to_date": "2024-03-31"},
+			]
+
+			query_builder = FinancialQueryBuilder(filters, periods)
+
+			accounts = [
+				frappe._dict({"name": cash_account, "account_name": "Cash", "account_number": "1001"}),
+			]
+
+			balances_data = query_builder.fetch_account_balances(accounts)
+
+			# Verify Cash account has opening balance from 2023 transactions
+			cash_data = balances_data.get(cash_account)
+			self.assertIsNotNone(cash_data, "Cash account should exist in results")
+
+			jan_cash = cash_data.get_period("2024_jan")
+			self.assertIsNotNone(jan_cash, "January period should exist")
+
+			# Opening balance should be from prior period
+			# Cash had 5000 debit in 2023, so opening in 2024 should be >= 5000
+			# (may be higher if there were other test transactions)
+			self.assertEqual(
+				jan_cash.opening,
+				5000.0,
+				"January opening should equal to balance from 2023 (5000)",
+			)
+
+			# Verify running balance logic
+			# Movement in January is 100 (from jv_2024)
+			self.assertEqual(jan_cash.movement, 100.0, "January movement should be 100")
+			self.assertEqual(
+				jan_cash.closing, jan_cash.opening + jan_cash.movement, "Closing = Opening + Movement"
+			)
+
+			# February and March should have no movement but carry the balance
+			feb_cash = cash_data.get_period("2024_feb")
+			self.assertEqual(feb_cash.opening, jan_cash.closing, "Feb opening = Jan closing")
+			self.assertEqual(feb_cash.movement, 0.0, "February should have no movement")
+			self.assertEqual(feb_cash.closing, feb_cash.opening, "Feb closing = opening when no movement")
+
+			mar_cash = cash_data.get_period("2024_mar")
+			self.assertEqual(mar_cash.opening, feb_cash.closing, "Mar opening = Feb closing")
+			self.assertEqual(mar_cash.movement, 0.0, "March should have no movement")
+			self.assertEqual(mar_cash.closing, mar_cash.opening, "Mar closing = opening when no movement")
+
+			# Set up filters for Q2 2024
+			filters_q2 = {
+				"company": company,
+				"from_fiscal_year": "2024",
+				"to_fiscal_year": "2024",
+				"period_start_date": "2024-04-01",
+				"period_end_date": "2024-06-30",
+				"filter_based_on": "Date Range",
+				"periodicity": "Monthly",
+				"ignore_closing_entries": True,
+			}
+
+			periods_q2 = [
+				{"key": "2024_apr", "from_date": "2024-04-01", "to_date": "2024-04-30"},
+				{"key": "2024_may", "from_date": "2024-05-01", "to_date": "2024-05-31"},
+				{"key": "2024_jun", "from_date": "2024-06-01", "to_date": "2024-06-30"},
+			]
+
+			query_builder_q2 = FinancialQueryBuilder(filters_q2, periods_q2)
+
+			balances_data_q2 = query_builder_q2.fetch_account_balances(accounts)
+
+			# Verify Cash account in Q2
+			cash_data_q2 = balances_data_q2.get(cash_account)
+			self.assertIsNotNone(cash_data_q2, "Cash account should exist in Q2 results")
+
+			apr_cash = cash_data_q2.get_period("2024_apr")
+			self.assertIsNotNone(apr_cash, "April period should exist")
+
+			# Opening balance in April should equal closing in March
+			self.assertEqual(
+				apr_cash.opening,
+				mar_cash.closing,
+				"April opening should equal March closing balance",
+			)
+
+			self.assertEqual(apr_cash.closing, apr_cash.opening, "April closing = opening when no movement")
+
+		finally:
+			# Clean up
+			frappe.db.set_single_value(
+				"Accounts Settings", "use_legacy_controller_for_pcv", original_pcv_setting or 0
+			)
+
+			if jv_2024:
+				jv_2024.cancel()
+
+			if pcv:
+				pcv.reload()
+				if pcv.docstatus == 1:
+					pcv.cancel()
+
+			jv_2023.cancel()
+
+	def test_opening_entries_roll_into_opening_after_period_closing(self):
+		"""
+		Sequence:
+		    1. is_opening JV of 3000 in current year (FY 2024)
+		    2. is_opening JV of 5000 in next year (FY 2025)
+		    3. Period Closing Voucher for previous year (FY 2023)
+
+		Expected (BS report for FY 2024):
+		    opening of FY 2024 = 3000 + 5000 = 8000
+		    (all is_opening entries roll into opening irrespective of fiscal year,
+		    on top of the PCV carry-forward — here PCV closing for cash is 0).
+		"""
+		company = "_Test Company"
+		cash_account = "_Test Cash - _TC"
+		# Opening JVs cannot post against P&L accounts; use a Balance Sheet offset.
+		opening_offset_account = "Temporary Opening - _TC"
+
+		pcv = None
+		jv_current_year = None
+		jv_next_year = None
+		original_pcv_setting = frappe.db.get_single_value(
+			"Accounts Settings", "use_legacy_controller_for_pcv"
+		)
+
+		try:
+			# Step 1: opening JV in current year (FY 2024) — must be posted before PCV
+			# exists, else `validate_against_pcv` rejects it.
+			jv_current_year = make_journal_entry(
+				account1=cash_account,
+				account2=opening_offset_account,
+				amount=3000,
+				posting_date="2024-06-15",
+				company=company,
+				save=False,
+			)
+			jv_current_year.is_opening = "Yes"
+			jv_current_year.insert()
+			jv_current_year.submit()
+
+			# Step 2: opening JV in next year (FY 2025)
+			jv_next_year = make_journal_entry(
+				account1=cash_account,
+				account2=opening_offset_account,
+				amount=5000,
+				posting_date="2025-06-15",
+				company=company,
+				save=False,
+			)
+			jv_next_year.is_opening = "Yes"
+			jv_next_year.insert()
+			jv_next_year.submit()
+
+			# Step 3: book Period Closing Voucher for previous year (FY 2023)
+			closing_account = frappe.db.get_value(
+				"Account",
+				{
+					"company": company,
+					"root_type": "Liability",
+					"is_group": 0,
+					"account_type": ["not in", ["Payable", "Receivable"]],
+				},
+				"name",
+			)
+			fy_2023 = get_fiscal_year("2023-06-15", company=company)
+
+			frappe.db.set_single_value("Accounts Settings", "use_legacy_controller_for_pcv", 1)
+
+			pcv = frappe.get_doc(
+				{
+					"doctype": "Period Closing Voucher",
+					"transaction_date": "2023-12-31",
+					"period_start_date": fy_2023[1],
+					"period_end_date": fy_2023[2],
+					"company": company,
+					"fiscal_year": fy_2023[0],
+					"cost_center": "_Test Cost Center - _TC",
+					"closing_account_head": closing_account,
+					"remarks": "Test Period Closing",
+				}
+			)
+			pcv.insert()
+			pcv.submit()
+			pcv.reload()
+
+			# Run BS report for FY 2024
+			filters = {
+				"company": company,
+				"from_fiscal_year": "2024",
+				"to_fiscal_year": "2024",
+				"period_start_date": "2024-01-01",
+				"period_end_date": "2024-12-31",
+				"filter_based_on": "Date Range",
+				"periodicity": "Yearly",
+				"ignore_closing_entries": True,
+			}
+
+			periods = [{"key": "2024", "from_date": "2024-01-01", "to_date": "2024-12-31"}]
+
+			query_builder = FinancialQueryBuilder(filters, periods)
+			accounts = [
+				frappe._dict({"name": cash_account, "account_name": "Cash", "account_number": "1001"}),
+				frappe._dict(
+					{
+						"name": opening_offset_account,
+						"account_name": "Temporary Opening",
+						"account_number": "1900",
+					}
+				),
+			]
+
+			balances_data = query_builder.fetch_account_balances(accounts)
+			cash_data = balances_data.get(cash_account)
+			offset_data = balances_data.get(opening_offset_account)
+			self.assertIsNotNone(cash_data, "Cash account should exist in results")
+			self.assertIsNotNone(offset_data, "Offset account should exist in results")
+
+			year_2024_cash = cash_data.get_period("2024")
+			year_2024_offset = offset_data.get_period("2024")
+			self.assertIsNotNone(year_2024_cash, "FY 2024 period should exist for cash")
+			self.assertIsNotNone(year_2024_offset, "FY 2024 period should exist for offset")
+
+			# All is_opening JVs (current + next year) roll into FY 2024 opening
+			self.assertEqual(
+				year_2024_cash.opening,
+				8000.0,
+				"FY 2024 cash opening must combine is_opening JVs from current and next year",
+			)
+			self.assertEqual(
+				year_2024_offset.opening,
+				-8000.0,
+				"FY 2024 offset opening must combine is_opening JVs from current and next year",
+			)
+			self.assertEqual(
+				year_2024_cash.movement, 0.0, "Opening JVs must not be counted as period movement"
+			)
+			self.assertEqual(year_2024_cash.closing, 8000.0, "Closing = opening when no non-opening movement")
+
+		finally:
+			frappe.db.set_single_value(
+				"Accounts Settings", "use_legacy_controller_for_pcv", original_pcv_setting or 0
+			)
+
+			if pcv:
+				pcv.reload()
+				if pcv.docstatus == 1:
+					pcv.cancel()
+
+			if jv_next_year and jv_next_year.docstatus == 1:
+				jv_next_year.cancel()
+
+			if jv_current_year and jv_current_year.docstatus == 1:
+				jv_current_year.cancel()
+
+	def test_account_with_gl_entries_but_no_prior_closing_balance(self):
+		company = "_Test Company"
+		cash_account = "_Test Cash - _TC"
+		bank_account = "_Test Bank - _TC"
+
+		# Create journal entries WITHOUT any prior Period Closing Voucher
+		# This ensures the account exists in gl_dict but NOT in balances_data
+		jv = make_journal_entry(
+			account1=cash_account,
+			account2=bank_account,
+			amount=2500,
+			posting_date="2024-07-15",
+			company=company,
+			submit=True,
+		)
+
+		try:
+			# Set up filters - use a period with no prior PCV
+			filters = {
+				"company": company,
+				"from_fiscal_year": "2024",
+				"to_fiscal_year": "2024",
+				"period_start_date": "2024-07-01",
+				"period_end_date": "2024-09-30",
+				"filter_based_on": "Date Range",
+				"periodicity": "Monthly",
+			}
+
+			periods = [
+				{"key": "2024_jul", "from_date": "2024-07-01", "to_date": "2024-07-31"},
+				{"key": "2024_aug", "from_date": "2024-08-01", "to_date": "2024-08-31"},
+				{"key": "2024_sep", "from_date": "2024-09-01", "to_date": "2024-09-30"},
+			]
+
+			query_builder = FinancialQueryBuilder(filters, periods)
+
+			# Use accounts that have GL entries but may not have Account Closing Balance
+			accounts = [
+				frappe._dict({"name": cash_account, "account_name": "Cash", "account_number": "1001"}),
+				frappe._dict({"name": bank_account, "account_name": "Bank", "account_number": "1002"}),
+			]
+
+			balances_data = query_builder.fetch_account_balances(accounts)
+
+			# Verify accounts are present in results even without prior closing balance
+			cash_data = balances_data.get(cash_account)
+			self.assertIsNotNone(cash_data, "Cash account should exist in results")
+
+			bank_data = balances_data.get(bank_account)
+			self.assertIsNotNone(bank_data, "Bank account should exist in results")
+
+			# Verify July has the movement from journal entry
+			jul_cash = cash_data.get_period("2024_jul")
+			self.assertIsNotNone(jul_cash, "July period should exist for cash")
+			self.assertEqual(jul_cash.movement, 2500.0, "July cash movement should be 2500")
+
+			jul_bank = bank_data.get_period("2024_jul")
+			self.assertIsNotNone(jul_bank, "July period should exist for bank")
+			self.assertEqual(jul_bank.movement, -2500.0, "July bank movement should be -2500")
+
+			# Verify subsequent periods exist with zero movement
+			aug_cash = cash_data.get_period("2024_aug")
+			self.assertIsNotNone(aug_cash, "August period should exist for cash")
+			self.assertEqual(aug_cash.movement, 0.0, "August cash movement should be 0")
+			self.assertEqual(aug_cash.opening, jul_cash.closing, "August opening = July closing")
+
+			sep_cash = cash_data.get_period("2024_sep")
+			self.assertIsNotNone(sep_cash, "September period should exist for cash")
+			self.assertEqual(sep_cash.movement, 0.0, "September cash movement should be 0")
+			self.assertEqual(sep_cash.opening, aug_cash.closing, "September opening = August closing")
+
+		finally:
+			jv.cancel()
+
+	def test_pl_pcv_exclusion_and_growth_view_year_over_year(self):
+		"""
+		Sequence:
+		    1. Expense JV 2000 in FY 2024, PCV for FY 2024
+		       → assert FY 2024 movement = 2000 via FinancialQueryBuilder
+		    2. Expense JV 3000 in FY 2025, PCV for FY 2025
+		    3. Run FinancialReportEngine with selected_view="Growth"
+		       → assert col_2024 = 2000 (raw), col_2025 = 50.0 (% growth)
+		"""
+		company = "_Test Company"
+		expense_account = "Administrative Expenses - _TC"
+		bank_account = "_Test Bank - _TC"
+
+		template = None
+		pcv_2024 = None
+		pcv_2025 = None
+		jv_2024 = None
+		jv_2025 = None
+		original_pcv_setting = frappe.db.get_single_value(
+			"Accounts Settings", "use_legacy_controller_for_pcv"
+		)
+
+		try:
+			closing_account = frappe.db.get_value(
+				"Account",
+				{
+					"company": company,
+					"root_type": "Liability",
+					"is_group": 0,
+					"account_type": ["not in", ["Payable", "Receivable"]],
+				},
+				"name",
+			)
+
+			frappe.db.set_single_value("Accounts Settings", "use_legacy_controller_for_pcv", 1)
+
+			accounts = [
+				frappe._dict(
+					{
+						"name": expense_account,
+						"account_name": "Administrative Expenses",
+						"account_number": "5001",
+					}
+				),
+			]
+
+			# --- Step 1: FY 2024 expense + PCV, assert PCV reversal excluded ---
+			jv_2024 = make_journal_entry(
+				account1=expense_account,
+				account2=bank_account,
+				amount=2000,
+				posting_date="2024-06-15",
+				company=company,
+				submit=True,
+			)
+			fy_2024 = get_fiscal_year("2024-06-15", company=company)
+			pcv_2024 = frappe.get_doc(
+				{
+					"doctype": "Period Closing Voucher",
+					"transaction_date": "2024-12-31",
+					"period_start_date": fy_2024[1],
+					"period_end_date": fy_2024[2],
+					"company": company,
+					"fiscal_year": fy_2024[0],
+					"cost_center": "_Test Cost Center - _TC",
+					"closing_account_head": closing_account,
+					"remarks": "Test PCV FY 2024",
+				}
+			)
+			pcv_2024.insert()
+			pcv_2024.submit()
+			pcv_2024.reload()
+
+			builder_2024 = FinancialQueryBuilder(
+				{
+					"company": company,
+					"from_fiscal_year": "2024",
+					"to_fiscal_year": "2024",
+					"period_start_date": "2024-01-01",
+					"period_end_date": "2024-12-31",
+					"filter_based_on": "Date Range",
+					"periodicity": "Yearly",
+				},
+				[{"key": "2024", "from_date": "2024-01-01", "to_date": "2024-12-31"}],
+			)
+			data_2024 = builder_2024.fetch_account_balances(accounts)
+			expense_2024 = data_2024.get(expense_account)
+			self.assertIsNotNone(expense_2024, "Expense account must appear in FY 2024 results")
+			year_2024 = expense_2024.get_period("2024")
+			self.assertEqual(
+				year_2024.movement,
+				2000.0,
+				"FY 2024 expense movement must equal real expense (PCV reversal excluded)",
+			)
+
+			# --- Step 2: FY 2025 expense + PCV ---
+			jv_2025 = make_journal_entry(
+				account1=expense_account,
+				account2=bank_account,
+				amount=3000,
+				posting_date="2025-06-15",
+				company=company,
+				submit=True,
+			)
+			fy_2025 = get_fiscal_year("2025-06-15", company=company)
+			pcv_2025 = frappe.get_doc(
+				{
+					"doctype": "Period Closing Voucher",
+					"transaction_date": "2025-12-31",
+					"period_start_date": fy_2025[1],
+					"period_end_date": fy_2025[2],
+					"company": company,
+					"fiscal_year": fy_2025[0],
+					"cost_center": "_Test Cost Center - _TC",
+					"closing_account_head": closing_account,
+					"remarks": "Test PCV FY 2025",
+				}
+			)
+			pcv_2025.insert()
+			pcv_2025.submit()
+			pcv_2025.reload()
+
+			# --- Step 3: full pipeline with Growth view across both years ---
+			template_name = f"Test Growth Template {frappe.generate_hash()[:8]}"
+			template = frappe.get_doc(
+				{
+					"doctype": "Financial Report Template",
+					"template_name": template_name,
+					"report_type": "Profit and Loss Statement",
+					"rows": [
+						{
+							"reference_code": "EXP_ADMIN",
+							"display_name": "Administrative Expenses",
+							"indentation_level": 0,
+							"data_source": "Account Data",
+							"balance_type": "Closing Balance",
+							"calculation_formula": f'["name", "=", "{expense_account}"]',
+						},
+					],
+				}
+			)
+			template.insert()
+
+			filters = frappe._dict(
+				{
+					"company": company,
+					"report_template": template_name,
+					"from_fiscal_year": fy_2024[0],
+					"to_fiscal_year": fy_2025[0],
+					"period_start_date": "2024-01-01",
+					"period_end_date": "2025-12-31",
+					"filter_based_on": "Date Range",
+					"periodicity": "Yearly",
+					"accumulated_values": 0,
+					"selected_view": "Growth",
+				}
+			)
+
+			_columns, formatted_data, _msg, _chart = FinancialReportEngine().execute(filters)
+
+			expense_row = next(
+				(row for row in formatted_data if row.get("account_name") == "Administrative Expenses"),
+				None,
+			)
+			self.assertIsNotNone(expense_row, "Administrative Expenses row must appear in growth view")
+
+			period_keys = expense_row.get("_segment_info", {}).get("period_keys", [])
+			self.assertEqual(len(period_keys), 2, "Yearly view must yield exactly two periods")
+			first_period_key, second_period_key = period_keys
+
+			# First column: raw absolute value (FY 2024 expense)
+			self.assertEqual(
+				flt(expense_row[first_period_key]),
+				2000.0,
+				"First column in growth view must keep raw FY 2024 expense value",
+			)
+			# Second column: ((3000 - 2000) / 2000) * 100 = 50.0
+			self.assertEqual(
+				flt(expense_row[second_period_key]),
+				50.0,
+				"Second column must be % growth FY 2024 → FY 2025",
+			)
+
+		finally:
+			frappe.db.set_single_value(
+				"Accounts Settings", "use_legacy_controller_for_pcv", original_pcv_setting or 0
+			)
+
+			if pcv_2025:
+				pcv_2025.reload()
+				if pcv_2025.docstatus == 1:
+					pcv_2025.cancel()
+
+			if jv_2025 and jv_2025.docstatus == 1:
+				jv_2025.cancel()
+
+			if pcv_2024:
+				pcv_2024.reload()
+				if pcv_2024.docstatus == 1:
+					pcv_2024.cancel()
+
+			if jv_2024 and jv_2024.docstatus == 1:
+				jv_2024.cancel()
+
+			if template and frappe.db.exists("Financial Report Template", template.name):
+				frappe.delete_doc("Financial Report Template", template.name, force=1)

erpnext/accounts/doctype/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/fiscal_year.py

@@ -4,7 +4,7 @@
 
 import frappe
 from dateutil.relativedelta import relativedelta
-from frappe import _
+from frappe import _, cint
 from frappe.model.document import Document
 from frappe.utils import add_days, add_years, cstr, getdate
 
@@ -33,23 +33,11 @@ class FiscalYear(Document):
 		self.validate_dates()
 		self.validate_overlap()
 
-		if not self.is_new():
-			year_start_end_dates = frappe.db.sql(
-				"""select year_start_date, year_end_date
-				from `tabFiscal Year` where name=%s""",
-				(self.name),
-			)
+	def on_update(self):
+		frappe.cache().delete_key("fiscal_years")
 
-			if year_start_end_dates:
-				if (
-					getdate(self.year_start_date) != year_start_end_dates[0][0]
-					or getdate(self.year_end_date) != year_start_end_dates[0][1]
-				):
-					frappe.throw(
-						_(
-							"Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved."
-						)
-					)
+	def on_trash(self):
+		frappe.cache().delete_key("fiscal_years")
 
 	def validate_dates(self):
 		self.validate_from_to_dates("year_start_date", "year_end_date")
@@ -66,28 +54,20 @@ class FiscalYear(Document):
 				frappe.exceptions.InvalidDates,
 			)
 
-	def on_update(self):
-		check_duplicate_fiscal_year(self)
-		frappe.cache().delete_value("fiscal_years")
-
-	def on_trash(self):
-		frappe.cache().delete_value("fiscal_years")
-
 	def validate_overlap(self):
-		existing_fiscal_years = frappe.db.sql(
-			"""select name from `tabFiscal Year`
-			where (
-				(%(year_start_date)s between year_start_date and year_end_date)
-				or (%(year_end_date)s between year_start_date and year_end_date)
-				or (year_start_date between %(year_start_date)s and %(year_end_date)s)
-				or (year_end_date between %(year_start_date)s and %(year_end_date)s)
-			) and name!=%(name)s""",
-			{
-				"year_start_date": self.year_start_date,
-				"year_end_date": self.year_end_date,
-				"name": self.name or "No Name",
-			},
-			as_dict=True,
+		fy = frappe.qb.DocType("Fiscal Year")
+
+		name = self.name or self.year
+
+		existing_fiscal_years = (
+			frappe.qb.from_(fy)
+			.select(fy.name)
+			.where(
+				(fy.year_start_date <= self.year_end_date)
+				& (fy.year_end_date >= self.year_start_date)
+				& (fy.name != name)
+			)
+			.run(as_dict=True)
 		)
 
 		if existing_fiscal_years:
@@ -110,37 +90,30 @@ class FiscalYear(Document):
 					frappe.throw(
 						_(
 							"Year start date or end date is overlapping with {0}. To avoid please set company"
-						).format(existing.name),
+						).format(frappe.get_desk_link("Fiscal Year", existing.name, open_in_new_tab=True)),
 						frappe.NameError,
 					)
 
 
-@frappe.whitelist()
-def check_duplicate_fiscal_year(doc):
-	year_start_end_dates = frappe.db.sql(
-		"""select name, year_start_date, year_end_date from `tabFiscal Year` where name!=%s""",
-		(doc.name),
-	)
-	for fiscal_year, ysd, yed in year_start_end_dates:
-		if (getdate(doc.year_start_date) == ysd and getdate(doc.year_end_date) == yed) and (
-			not frappe.in_test
-		):
-			frappe.throw(
-				_(
-					"Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0}"
-				).format(fiscal_year)
-			)
-
-
-@frappe.whitelist()
 def auto_create_fiscal_year():
-	for d in frappe.db.sql(
-		"""select name from `tabFiscal Year` where year_end_date = date_add(current_date, interval 3 day)"""
-	):
+	fy = frappe.qb.DocType("Fiscal Year")
+
+	# Skipped auto-creating Short Year, as it has very rare use case.
+	# Reference: https://www.irs.gov/businesses/small-businesses-self-employed/tax-years (US)
+	follow_up_date = add_days(getdate(), days=3)
+	fiscal_year = (
+		frappe.qb.from_(fy)
+		.select(fy.name)
+		.where((fy.year_end_date == follow_up_date) & (fy.is_short_year == 0))
+		.run()
+	)
+
+	for d in fiscal_year:
 		try:
 			current_fy = frappe.get_doc("Fiscal Year", d[0])
 
-			new_fy = frappe.copy_doc(current_fy, ignore_no_copy=False)
+			new_fy = frappe.new_doc("Fiscal Year")
+			new_fy.disabled = cint(current_fy.disabled)
 
 			new_fy.year_start_date = add_days(current_fy.year_end_date, 1)
 			new_fy.year_end_date = add_years(current_fy.year_end_date, 1)
@@ -148,6 +121,10 @@ def auto_create_fiscal_year():
 			start_year = cstr(new_fy.year_start_date.year)
 			end_year = cstr(new_fy.year_end_date.year)
 			new_fy.year = start_year if start_year == end_year else (start_year + "-" + end_year)
+
+			for row in current_fy.companies:
+				new_fy.append("companies", {"company": row.company})
+
 			new_fy.auto_created = 1
 
 			new_fy.insert(ignore_permissions=True)

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/fiscal_year_company/fiscal_year_company.json

@@ -15,20 +15,22 @@
    "ignore_user_permissions": 1,
    "in_list_view": 1,
    "label": "Company",
-   "options": "Company"
+   "options": "Company",
+   "reqd": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2024-03-27 13:09:44.659251",
+ "modified": "2026-02-20 23:02:26.193606",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Fiscal Year Company",
  "owner": "Administrator",
  "permissions": [],
+ "row_format": "Dynamic",
  "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
-}
+}

erpnext/accounts/doctype/fiscal_year_company/fiscal_year_company.py

@@ -14,7 +14,7 @@ class FiscalYearCompany(Document):
 	if TYPE_CHECKING:
 		from frappe.types import DF
 
-		company: DF.Link | None
+		company: DF.Link
 		parent: DF.Data
 		parentfield: DF.Data
 		parenttype: DF.Data

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

@@ -277,7 +277,21 @@ frappe.ui.form.on("Journal Entry", {
 var update_jv_details = function (doc, r) {
 	$.each(r, function (i, d) {
 		var row = frappe.model.add_child(doc, "Journal Entry Account", "accounts");
-		frappe.model.set_value(row.doctype, row.name, "account", d.account);
+		const {
+			idx,
+			name,
+			owner,
+			parent,
+			parenttype,
+			parentfield,
+			creation,
+			modified,
+			modified_by,
+			doctype,
+			docstatus,
+			...fields
+		} = d;
+		frappe.model.set_value(row.doctype, row.name, fields);
 	});
 	refresh_field("accounts");
 };
@@ -289,10 +303,6 @@ erpnext.accounts.JournalEntry = class JournalEntry extends frappe.ui.form.Contro
 		erpnext.accounts.dimensions.setup_dimension_filters(this.frm, this.frm.doctype);
 	}
 
-	onload_post_render() {
-		this.frm.get_field("accounts").grid.set_multiple_add("account");
-	}
-
 	load_defaults() {
 		//this.frm.show_print_first = true;
 		if (this.frm.doc.__islocal && this.frm.doc.company) {
@@ -638,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",
@@ -655,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

@@ -9,19 +9,16 @@
  "engine": "InnoDB",
  "field_order": [
   "entry_type_and_date",
-  "is_system_generated",
-  "title",
-  "voucher_type",
-  "naming_series",
-  "process_deferred_accounting",
-  "reversal_of",
-  "column_break1",
-  "from_template",
   "company",
+  "voucher_type",
+  "column_break1",
+  "naming_series",
   "posting_date",
-  "finance_book",
+  "multi_currency",
   "apply_tds",
   "tax_withholding_category",
+  "is_system_generated",
+  "amended_from",
   "section_break_tcvw",
   "for_all_stock_asset_accounts",
   "column_break_wpau",
@@ -30,52 +27,61 @@
   "get_balance_for_periodic_accounting",
   "2_add_edit_gl_entries",
   "accounts",
-  "section_break99",
-  "cheque_no",
-  "cheque_date",
-  "user_remark",
-  "column_break99",
+  "section_break_ouaq",
   "total_debit",
+  "column_break_cixu",
   "total_credit",
   "difference",
   "get_balance",
-  "multi_currency",
-  "total_amount_currency",
-  "total_amount",
-  "total_amount_in_words",
+  "section_break99",
+  "cheque_no",
+  "cheque_date",
+  "clearance_date",
+  "column_break_oizh",
+  "user_remark",
+  "auto_repeat_section",
+  "auto_repeat",
+  "tax_withholding_tab",
   "section_tax_withholding_entry",
   "tax_withholding_group",
   "ignore_tax_withholding_threshold",
   "override_tax_withholding_entries",
   "tax_withholding_entries",
+  "more_info_tab",
   "reference",
-  "clearance_date",
-  "remark",
-  "inter_company_journal_entry_reference",
   "column_break98",
   "bill_no",
   "bill_date",
   "due_date",
+  "column_break_isfa",
+  "inter_company_journal_entry_reference",
+  "process_deferred_accounting",
+  "reversal_of",
+  "payment_order",
+  "stock_entry",
+  "printing_settings",
+  "pay_to_recd_from",
+  "letter_head",
+  "select_print_heading",
+  "column_break_35",
+  "total_amount_currency",
+  "total_amount",
+  "total_amount_in_words",
   "write_off",
   "write_off_based_on",
   "get_outstanding_invoices",
   "column_break_30",
   "write_off_amount",
-  "printing_settings",
-  "pay_to_recd_from",
-  "column_break_35",
-  "letter_head",
-  "select_print_heading",
   "addtional_info",
-  "mode_of_payment",
-  "payment_order",
-  "party_not_required",
-  "column_break3",
   "is_opening",
-  "stock_entry",
-  "subscription_section",
-  "auto_repeat",
-  "amended_from"
+  "finance_book",
+  "from_template",
+  "title",
+  "column_break3",
+  "custom_remark",
+  "remark",
+  "mode_of_payment",
+  "party_not_required"
  ],
  "fields": [
   {
@@ -135,6 +141,7 @@
   {
    "fieldname": "company",
    "fieldtype": "Link",
+   "in_list_view": 1,
    "in_standard_filter": 1,
    "label": "Company",
    "oldfieldname": "company",
@@ -155,6 +162,7 @@
   {
    "fieldname": "2_add_edit_gl_entries",
    "fieldtype": "Section Break",
+   "hide_border": 1,
    "oldfieldtype": "Section Break",
    "options": "fa fa-table"
   },
@@ -175,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,
@@ -196,16 +203,13 @@
   {
    "fieldname": "user_remark",
    "fieldtype": "Small Text",
+   "hidden": 1,
    "label": "User Remark",
    "no_copy": 1,
    "oldfieldname": "user_remark",
    "oldfieldtype": "Small Text",
    "print_hide": 1
   },
-  {
-   "fieldname": "column_break99",
-   "fieldtype": "Column Break"
-  },
   {
    "fieldname": "total_debit",
    "fieldtype": "Currency",
@@ -313,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\"",
@@ -429,7 +433,7 @@
    "collapsible": 1,
    "fieldname": "addtional_info",
    "fieldtype": "Section Break",
-   "label": "More Information",
+   "label": "Additional Info",
    "oldfieldtype": "Section Break",
    "options": "fa fa-file-text"
   },
@@ -473,11 +477,6 @@
    "options": "Stock Entry",
    "read_only": 1
   },
-  {
-   "fieldname": "subscription_section",
-   "fieldtype": "Section Break",
-   "label": "Subscription Section"
-  },
   {
    "allow_on_submit": 1,
    "fieldname": "auto_repeat",
@@ -593,12 +592,10 @@
    "no_copy": 1
   },
   {
-   "collapsible": 1,
    "collapsible_depends_on": "eval: doc.apply_tds && doc.docstatus == 0",
    "depends_on": "eval: doc.apply_tds",
    "fieldname": "section_tax_withholding_entry",
-   "fieldtype": "Section Break",
-   "label": "Tax Withholding Entry"
+   "fieldtype": "Section Break"
   },
   {
    "fieldname": "tax_withholding_group",
@@ -624,6 +621,44 @@
    "label": "Tax Withholding Entries",
    "options": "Tax Withholding Entry",
    "read_only_depends_on": "eval: !doc.override_tax_withholding_entries"
+  },
+  {
+   "fieldname": "more_info_tab",
+   "fieldtype": "Tab Break",
+   "label": "More Info"
+  },
+  {
+   "fieldname": "section_break_ouaq",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "column_break_cixu",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "column_break_oizh",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "column_break_isfa",
+   "fieldtype": "Column Break"
+  },
+  {
+   "depends_on": "eval: doc.apply_tds",
+   "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",
@@ -638,7 +673,7 @@
    "table_fieldname": "payment_entries"
   }
  ],
- "modified": "2025-11-13 17:54:14.542903",
+ "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
@@ -74,8 +75,8 @@ class JournalEntry(AccountsController):
 		mode_of_payment: DF.Link | None
 		multi_currency: DF.Check
 		naming_series: DF.Literal["ACC-JV-.YYYY.-"]
-		party_not_required: DF.Check
 		override_tax_withholding_entries: DF.Check
+		party_not_required: DF.Check
 		pay_to_recd_from: DF.Data | None
 		payment_order: DF.Link | None
 		periodic_entry_difference_account: DF.Link | None
@@ -179,11 +180,14 @@ class JournalEntry(AccountsController):
 		validate_docs_for_deferred_accounting([self.name], [])
 
 	def submit(self):
-		if len(self.accounts) > 100:
+		if len(self.accounts) > 100 and not self.meta.queue_in_background:
 			queue_submission(self, "_submit")
 		else:
 			return self._submit()
 
+	def before_cancel(self):
+		self.has_asset_adjustment_entry()
+
 	def cancel(self):
 		if len(self.accounts) > 100:
 			queue_submission(self, "_cancel")
@@ -290,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",
@@ -303,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()
@@ -344,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)
@@ -554,12 +567,27 @@ class JournalEntry(AccountsController):
 			)
 			frappe.db.set_value("Journal Entry", self.name, "inter_company_journal_entry_reference", "")
 
-	def unlink_asset_adjustment_entry(self):
-		frappe.db.sql(
-			""" update `tabAsset Value Adjustment`
-			set journal_entry = null where journal_entry = %s""",
-			self.name,
+	def has_asset_adjustment_entry(self):
+		if self.flags.get("via_asset_value_adjustment"):
+			return
+
+		asset_value_adjustment = frappe.db.get_value(
+			"Asset Value Adjustment", {"docstatus": 1, "journal_entry": self.name}, "name"
 		)
+		if asset_value_adjustment:
+			frappe.throw(
+				_(
+					"Cannot cancel this document as it is linked with the submitted Asset Value Adjustment <b>{0}</b>. Please cancel the Asset Value Adjustment to continue."
+				).format(frappe.utils.get_link_to_form("Asset Value Adjustment", asset_value_adjustment))
+			)
+
+	def unlink_asset_adjustment_entry(self):
+		AssetValueAdjustment = frappe.qb.DocType("Asset Value Adjustment")
+		(
+			frappe.qb.update(AssetValueAdjustment)
+			.set(AssetValueAdjustment.journal_entry, None)
+			.where(AssetValueAdjustment.journal_entry == self.name)
+		).run()
 
 	def validate_party(self):
 		for d in self.get("accounts"):
@@ -999,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:
@@ -1514,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):
@@ -1673,6 +1701,10 @@ def get_exchange_rate(
 	credit=None,
 	exchange_rate=None,
 ):
+	# Ensure exchange_rate is always numeric to avoid calculation errors
+	if isinstance(exchange_rate, str):
+		exchange_rate = flt(exchange_rate) or 1
+
 	account_details = frappe.get_cached_value(
 		"Account", account, ["account_type", "root_type", "account_currency", "company"], as_dict=1
 	)

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_account/journal_entry_account.json

@@ -43,7 +43,7 @@
  "fields": [
   {
    "bold": 1,
-   "columns": 2,
+   "columns": 4,
    "fieldname": "account",
    "fieldtype": "Link",
    "in_global_search": 1,
@@ -185,20 +185,19 @@
    "fieldtype": "Select",
    "label": "Reference Type",
    "no_copy": 1,
-   "options": "\nSales Invoice\nPurchase Invoice\nJournal Entry\nSales Order\nPurchase Order\nExpense Claim\nAsset\nLoan\nPayroll Entry\nEmployee Advance\nExchange Rate Revaluation\nInvoice Discounting\nFees\nFull and Final Statement\nPayment Entry",
+   "options": "\nSales Invoice\nPurchase Invoice\nJournal Entry\nSales Order\nPurchase Order\nExpense Claim\nAsset\nLoan\nPayroll Entry\nEmployee Advance\nExchange Rate Revaluation\nInvoice Discounting\nFees\nFull and Final Statement\nPayment Entry\nBank Transaction",
    "search_index": 1
   },
   {
    "fieldname": "reference_name",
    "fieldtype": "Dynamic Link",
-   "in_list_view": 1,
    "label": "Reference Name",
    "no_copy": 1,
    "options": "reference_type",
    "search_index": 1
   },
   {
-   "depends_on": "eval:doc.reference_type&&!in_list(doc.reference_type, ['Expense Claim', 'Asset', 'Employee Loan', 'Employee Advance'])",
+   "depends_on": "eval:doc.reference_type&&!in_list(doc.reference_type, ['Expense Claim', 'Asset', 'Employee Loan', 'Employee Advance', 'Bank Transaction'])",
    "fieldname": "reference_due_date",
    "fieldtype": "Date",
    "label": "Reference Due Date",
@@ -294,7 +293,7 @@
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2025-11-27 12:23:33.157655",
+ "modified": "2026-02-16 16:04:16.022407",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Journal Entry Account",