ci: preventing manual changes in erpnext/locale/*

.github/CONTRIBUTING.md

@@ -1,4 +1,4 @@
-### Introduction (for first timers)
+### Introduction (first timers)
 
 Thank you for your interest in raising an Issue with ERPNext. An Issue could mean a bug report or a request for a missing feature. By raising a bug report, you are contributing to the development of ERPNext and this is the first step of participating in the community. Bug reports are very helpful for developers as they quickly fix the issue before other users start facing it.
 
@@ -6,31 +6,31 @@ Feature requests are also a great way to take the product forward. New ideas can
 
 When you are raising an Issue, you should keep a few things in mind. Remember that the developer does not have access to your machine so you must give all the information you can while raising an Issue. If you are suggesting a feature, you should be very clear about what you want.
 
-The Issue list is not the right place to ask a question or start a general discussion. If you want to do that, then the right place is the forum [https://discuss.frappe.io](https://discuss.frappe.io/c/erpnext/6).
+The Issue list is not the right place to ask a question or start a general discussion. If you want to do that , then the right place is the forum [https://discuss.frappe.io](https://discuss.frappe.io/c/erpnext/6).
 
 ### Reply and Closing Policy
 
-If your issue is not clear or does not meet the guidelines, then it will be closed. If it is closed, please supply the requested information and re-open it.
+If your issue is not clear or does not meet the guidelines, then it will be closed. If it is closed, please supply the information asked and re-open it.
 
 ### General Issue Guidelines
 
-1. **Search existing Issues:** Before raising an Issue, search if it has been raised before. Maybe add a 👍 or give additional help by creating a mockup if it is not already created.
-2. **Report each issue separately:** Don't club multiple, unrelated issues in one note.
-3. **Brief:** Please don't include long explanations. Use screenshots and bullet points instead of descriptive paragraphs.
+1. **Search existing Issues:** Before raising a Issue, search if it has been raised before. Maybe add a 👍 or give additional help by creating a mockup if it is not already created.
+1. **Report each issue separately:** Don't club multiple, unreleated issues in one note.
+1. **Brief:** Please don't include long explanations. Use screenshots and bullet points instead of descriptive paragraphs.
 
 ### Bug Report Guidelines
 
 1. **Steps to Reproduce:** The bug report must have a list of steps needed to reproduce a bug. If we cannot reproduce it, then we cannot solve it.
-2. **Version Number:** Please add the version number in your report. Often a bug is fixed in the latest version.
-3. **Clear Title:** Add a clear subject to your bug report like "Unable to submit Purchase Order without Basic Rate" instead of just "Cannot Submit".
-4. **Screenshots:** Screenshots are a great way of communicating issues. Try adding annotations or using LICEcap to take a screencast in `.gif` format.
+1. **Version Number:** Please add the version number in your report. Often a bug is fixed in the latest version
+1. **Clear Title:** Add a clear subject to your bug report like "Unable to submit Purchase Order without Basic Rate" instead of just "Cannot Submit"
+1. **Screenshots:** Screenshots are a great way of communicating issues. Try adding annotations or using LiceCAP to take a screencast in `gif`.
 
 ### Feature Request Guidelines
 
-1. **Clarity:** Clearly specify how you want the feature to behave. Don't just say "I would like multiple PDF formats", instead say "Ability to add multiple print formats for customers with different languages".
-2. **Solution:** Try to identify what the feature should look like.
-3. **Mockups:** Mockups are a great way to explain your requirement.
+1. **Clarity:** Clearly specify how do you want the feature to behave. Don't just say "I would like multiple PDF formats", say that "Ability to add multiple print formats for customers with different languages".
+1. **Solution:** Try and identify how the feature should look like.
+1. **Mockups:** Mockups are a great way to explain your requirement.
 
-### What if my issue is closed
+### What if my Issue is closed
 
 Don't worry, take the feedback, supply the correct information and re-open it!

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,6 +1,6 @@
 ---
 name: Feature request
-about: Suggest an idea or enhancement for ERPNext
+about: Suggest an idea to improve ERPNext
 title: ''
 labels: feature-request
 assignees: ''
@@ -17,21 +17,17 @@ Welcome to ERPNext issue tracker! Before creating an issue, please heed the foll
 3. When making a feature request, make sure to be as verbose as possible. The better you convey your message, the greater the drive to make it happen.
 
 
-Please keep in mind that we get many requests and we can't possibly work on all of them, we prioritize development based on the goals of the product and organization. Feature requests are still welcome as it helps us in research when we do decide to work on the requested feature. 
+Please keep in mind that we get many many requests and we can't possibly work on all of them, we prioritize development based on the goals of the product and organization. Feature requests are still welcome as it helps us in research when we do decide to work on the requested feature. 
 
-If you're in urgent need of a feature, please try the following channels to get paid developments done quickly:
+If you're in urgent need to a feature, please try the following channels to get paid developments done quickly:
 1. Certified ERPNext partners: https://erpnext.com/partners 
 2. Developer community on ERPNext forums: https://discuss.frappe.io/c/framework/5  
 3. Telegram group for ERPNext/Frappe development work: https://t.me/erpnext_opps 
 
 -->
-## Before Submitting
-- [ ] I searched existing issues and confirmed this is not a duplicate
-- [ ] This is a feature request, not a bug or support question
-- [ ] For support: https://discuss.frappe.io/c/erpnext/6
 
 **Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. As a [role], I have to [painful task] because [missing feature].
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
 
 **Describe the solution you'd like**
 A clear and concise description of what you want to happen.
@@ -39,17 +35,5 @@ A clear and concise description of what you want to happen.
 **Describe alternatives you've considered**
 A clear and concise description of any alternative solutions or features you've considered.
 
-**Impact**
-<!-- Check one: -->
-- [ ] Blocks critical workflow — no viable workaround
-- [ ] Significant friction — workaround exists but is painful
-- [ ] Nice to have — minor improvement
-
 **Additional context**
 Add any other context or screenshots about the feature request here.
-
-**Environment**
-- ERPNext Version: <!-- Find this in Help > About, e.g. v15.12.0 -->
-- Frappe Version: <!-- Find this in Help > About, e.g. v15.10.0 -->
-- Deployment: <!-- Frappe Cloud / Self-hosted / ERPNext Cloud -->
-

.github/helper/locale_review.js

@@ -0,0 +1,39 @@
+module.exports = async ({ github, context, localeChanged }) => {
+  const pr = context.payload.pull_request.number
+  const { owner, repo } = context.repo
+  
+  const { data: me } = await github.rest.users.getAuthenticated()
+  const botUser = me.login
+
+  const reviews = await github.rest.pulls.listReviews({
+    owner,
+    repo,
+    pull_number: pr
+  })
+
+  const botReview = reviews.data
+    .reverse()
+    .find(r => r.user.login === botUser && r.state === "CHANGES_REQUESTED")
+
+  if (localeChanged) {
+    if (!botReview) {
+      await github.rest.pulls.createReview({
+        owner,
+        repo,
+        pull_number: pr,
+        event: "REQUEST_CHANGES",
+        body: "Translations are managed through [Crowdin](https://crowdin.com/project/frappe/). Consider contributing through Crowdin."
+      })
+    }
+  } else {
+    if (botReview) {
+      await github.rest.pulls.dismissReview({
+        owner,
+        repo,
+        pull_number: pr,
+        review_id: botReview.id,
+        message: ""
+      })
+    }
+  }
+}

.github/workflows/initiate_release.yml

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

.github/workflows/linters.yml

@@ -43,6 +43,3 @@ 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/prevent-locale-changes.yml

@@ -0,0 +1,44 @@
+name: Prevent Locale Changes
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  check-locale:
+    permissions:
+      contents: read
+    runs-on: ubuntu-latest
+
+    if: github.actor != 'frappe-pr-bot' 
+    # Exemption for the bot used for Crowdin Sync and POT File generation.
+
+    concurrency:
+      group: prevent-locale-changes-${{ github.event.pull_request.number }}
+      cancel-in-progress: true
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Detect locale changes
+        id: check
+        run: |
+          git fetch origin ${{ github.base_ref }}
+
+          if git diff --name-only origin/${{ github.base_ref }}...HEAD | grep -q '^erpnext/locale/'; then
+            echo "locale_changed=true" >> $GITHUB_OUTPUT
+          else
+            echo "locale_changed=false" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Manage locale review
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ secrets.RELEASE_TOKEN }}
+          script: |
+            const localeChanged = "${{ steps.check.outputs.locale_changed }}" === "true"
+            const handler = require('./.github/helper/locale_review.js')
+            await handler({ github, context, localeChanged })

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

@@ -4,8 +4,8 @@ on:
   workflow_dispatch:
 
 concurrency:
-  group: server-individual-tests-lightmode-develop
-  cancel-in-progress: true
+  group: server-individual-tests-develop-${{ github.event_name }}-${{ github.event.number || github.event_name == 'workflow_dispatch' && github.run_id || '' }}
+  cancel-in-progress: false
 
 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 '*/test_*.py' | xargs grep -l 'def test_' | sort | awk '{
+        matrix=$(find . -path '*/doctype/*/test_*.py' | xargs grep -l 'def test_' | awk '{
             # Remove ./ prefix, file extension, and replace / with .
             gsub(/^\.\//, "", $0)
             gsub(/\.py$/, "", $0)
@@ -58,7 +58,6 @@ jobs:
     strategy:
       fail-fast: false
       matrix: ${{fromJson(needs.discover.outputs.matrix)}}
-      max-parallel: 14
 
     name: Test
 
@@ -131,13 +130,4 @@ jobs:
           FRAPPE_BRANCH: ${{ github.event.inputs.branch }}
 
       - name: Run Tests
-        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
-
+        run: 'cd ~/frappe-bench/ && bench --site test_site run-tests --app erpnext --module ${{ matrix.test }}'

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

@@ -41,7 +41,6 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 60
     env:
-      TZ: 'Asia/Kolkata'
       NODE_ENV: "production"
       WITH_COVERAGE: ${{ github.event_name != 'pull_request' }}
 
@@ -57,7 +56,6 @@ jobs:
       mysql:
         image: mariadb:10.6
         env:
-          TZ: 'Asia/Kolkata'
           MARIADB_ROOT_PASSWORD: 'root'
         ports:
           - 3306:3306
@@ -131,7 +129,7 @@ jobs:
           FRAPPE_BRANCH: ${{ github.event.client_payload.sha || github.event.inputs.branch }}
 
       - name: Run Tests
-        run: 'cd ~/frappe-bench/ && bench --site test_site run-parallel-tests --lightmode --app erpnext --total-builds ${{ strategy.job-total }} --build-number ${{ matrix.container }} --with-coverage'
+        run: 'cd ~/frappe-bench/ && bench --site test_site run-parallel-tests --app erpnext --total-builds ${{ strategy.job-total }} --build-number ${{ matrix.container }} --with-coverage'
         env:
           TYPE: server
 

CODEOWNERS

@@ -7,17 +7,17 @@ erpnext/accounts/               @ruthra-kumar
 erpnext/assets/                 @khushi8112
 erpnext/regional                @ruthra-kumar
 erpnext/selling                 @ruthra-kumar
+erpnext/support/                @ruthra-kumar
 
 erpnext/buying/                 @rohitwaghchaure @mihir-kandoi
-erpnext/maintenance/            @rohitwaghchaure @mihir-kandoi
+erpnext/maintenance/            @rohitwaghchaure
 erpnext/manufacturing/          @rohitwaghchaure @mihir-kandoi
-erpnext/quality_management/     @rohitwaghchaure @mihir-kandoi
+erpnext/quality_management/     @rohitwaghchaure
 erpnext/stock/                  @rohitwaghchaure @mihir-kandoi
-erpnext/subcontracting/         @mihir-kandoi
-erpnext/projects/               @nishkagosalia
+erpnext/subcontracting          @mihir-kandoi
 
 erpnext/controllers/            @ruthra-kumar @rohitwaghchaure @mihir-kandoi
-erpnext/patches/                @ruthra-kumar @rohitwaghchaure @mihir-kandoi
+erpnext/patches/                @ruthra-kumar
 
-.github/                        @ruthra-kumar @mihir-kandoi
+.github/                        @ruthra-kumar
 pyproject.toml                  @ruthra-kumar

README.md

@@ -1,12 +1,12 @@
 
 <div align="center">
     <a href="https://frappe.io/erpnext">
-	<img src="./erpnext/public/images/v16/erpnext.svg" alt="ERPNext Logo" height="80px" width="80px"/>
+	<img src="./erpnext/public/images/v16/erpnext.svg" alt="ERPNext Logo" height="80px" width="80xp"/>
     </a>
     <h2>ERPNext</h2>
-    <div align="center">
+    <p align="center">
         <p>Powerful, Intuitive and Open-Source ERP</p>
-    </div>
+    </p>
 
 [![Learn on Frappe School](https://img.shields.io/badge/Frappe%20School-Learn%20ERPNext-blue?style=flat-square)](https://frappe.school)<br><br>
 [![CI](https://github.com/frappe/erpnext/actions/workflows/server-tests-mariadb.yml/badge.svg?event=schedule)](https://github.com/frappe/erpnext/actions/workflows/server-tests-mariadb.yml)
@@ -15,7 +15,7 @@
 </div>
 
 <div align="center">
-	<img src="./erpnext/public/images/v16/hero_image.png" alt="ERPNext Hero Image"/>
+	<img src="./erpnext/public/images/v16/hero_image.png"/>
 </div>
 
 <div align="center">
@@ -28,19 +28,19 @@
 
 ## ERPNext
 
-100% Open-Source ERP System to help you run your business.
+100% Open-Source ERP system to help you run your business.
 
 ### Motivation
 
-Running a business is a complex task - handling invoices, tracking stock, managing personnel, and other daily operations. In a market where software is sold separately to manage each of these tasks, ERPNext does all of the above and more, for free.
+Running a business is a complex task - handling invoices, tracking stock, managing personnel and even more ad-hoc activities. In a market where software is sold separately to manage each of these tasks, ERPNext does all of the above and more, for free.
 
 ### Key Features
 
 - **Accounting**: All the tools you need to manage cash flow in one place, right from recording transactions to summarizing and analyzing financial reports.
 - **Order Management**: Track inventory levels, replenish stock, and manage sales orders, customers, suppliers, shipments, deliverables, and order fulfillment.
 - **Manufacturing**: Simplifies the production cycle, helps track material consumption, exhibits capacity planning, handles subcontracting, and more!
-- **Asset Management**: From purchase to disposal, IT infrastructure to equipment. Covers every branch of your organization, all in one centralized system.
-- **Projects**: Deliver both internal and external projects on time, budget and profitability. Track tasks, timesheets, and issues by project.
+- **Asset Management**: From purchase to perishment, IT infrastructure to equipment. Cover every branch of your organization, all in one centralized system.
+- **Projects**: Delivery both internal and external Projects on time, budget and Profitability. Track tasks, timesheets, and issues by project.
 
 <details open>
 
@@ -53,7 +53,7 @@ Running a business is a complex task - handling invoices, tracking stock, managi
 
 ### Under the Hood
 
-- [**Frappe Framework**](https://github.com/frappe/frappe): A full-stack web application framework written in Python and JavaScript. The framework provides a robust foundation for building web applications, including a database abstraction layer, user authentication, and a REST API.
+- [**Frappe Framework**](https://github.com/frappe/frappe): A full-stack web application framework written in Python and Javascript. The framework provides a robust foundation for building web applications, including a database abstraction layer, user authentication, and a REST API.
 
 - [**Frappe UI**](https://github.com/frappe/frappe-ui): A Vue-based UI library, to provide a modern user interface. The Frappe UI library provides a variety of components that can be used to build single-page applications on top of the Frappe Framework.
 
@@ -61,12 +61,12 @@ Running a business is a complex task - handling invoices, tracking stock, managi
 
 ### Managed Hosting
 
-You can try [Frappe Cloud](https://frappecloud.com), a simple, user-friendly, and sophisticated [open-source](https://github.com/frappe/press) platform to host Frappe applications reliably and securely.
+You can try [Frappe Cloud](https://frappecloud.com), a simple, user-friendly and sophisticated [open-source](https://github.com/frappe/press) platform to host Frappe applications with peace of mind.
 
-It handles installation, setup, upgrades, monitoring, maintenance, and support of your Frappe deployments. It is a fully featured developer platform with an ability to manage and control multiple Frappe deployments.
+It takes care of installation, setup, upgrades, monitoring, maintenance and support of your Frappe deployments. It is a fully featured developer platform with an ability to manage and control multiple Frappe deployments.
 
 <div>
-	<a href="https://erpnext-demo.frappe.cloud/app/home" target="_blank" rel="noopener noreferrer">
+	<a href="https://erpnext-demo.frappe.cloud/app/home" target="_blank">
 		<picture>
 			<source media="(prefers-color-scheme: dark)" srcset="https://frappe.io/files/try-on-fc-white.png">
 			<img src="https://frappe.io/files/try-on-fc-black.png" alt="Try on Frappe Cloud" height="28" />
@@ -75,48 +75,25 @@ It handles installation, setup, upgrades, monitoring, maintenance, and support o
 </div>
 
 
+
 ### Self-Hosted
 #### Docker
 
-See [Frappe Docker Documentation](https://github.com/frappe/frappe_docker) for full documentation & FAQ on Docker setup
+Prerequisites: docker, docker-compose, git. Refer [Docker Documentation](https://docs.docker.com) for more details on Docker setup.
 
-#### Prerequisites
+Run following commands:
 
-- [Docker](https://docs.docker.com/get-docker/)
-- [Docker Compose v2](https://docs.docker.com/compose/)
-- [git](https://docs.github.com/en/get-started/getting-started-with-git/set-up-git)
-
-> For Docker basics and best practices refer to Docker's [documentation](https://docs.docker.com)
-
-#### Demo setup
-
-The fastest way to try ERPNext is to play in a pre-configured sandbox, in your browser, click the button below:
-
-<a href="https://labs.play-with-docker.com/?stack=https://raw.githubusercontent.com/frappe/frappe_docker/main/pwd.yml">
-  <img src="https://raw.githubusercontent.com/play-with-docker/stacks/master/assets/images/button.png" alt="Try in PWD"/>
-</a>
-
-### Try on your environment
-
-> **⚠️ Disposable demo only**
->
-> **This setup is intended for quick evaluation. Expect to throw the environment away.** You will not be able to install custom apps to this setup. For production deployments, custom configurations, and detailed explanations, see the full documentation.
-
-First clone the repo:
-
-```sh
+```
 git clone https://github.com/frappe/frappe_docker
 cd frappe_docker
-```
-
-Then run:
-
-```sh
 docker compose -f pwd.yml up -d
 ```
-Wait for a couple of minutes for ERPNext site to be created or check the `create-site` container logs before opening browser on port `8080`. (username: `Administrator`, password: `admin`)
 
-See [Frappe Docker](https://github.com/frappe/frappe_docker/blob/main/docs/01-getting-started/03-arm64.md) for ARM based docker setup
+After a couple of minutes, site should be accessible on your localhost port: 8080. Use below default login credentials to access the site.
+- Username: Administrator
+- Password: admin
+
+See [Frappe Docker](https://github.com/frappe/frappe_docker?tab=readme-ov-file#to-run-on-arm64-architecture-follow-this-instructions) for ARM based docker setup.
 
 
 ## Development Setup
@@ -124,7 +101,7 @@ See [Frappe Docker](https://github.com/frappe/frappe_docker/blob/main/docs/01-ge
 
 The Easy Way: our install script for bench will install all dependencies (e.g. MariaDB). See https://github.com/frappe/bench for more details.
 
-New passwords will be created for the ERPNext "Administrator" user, the MariaDB root user, and the Frappe user (the script displays the passwords and saves them to ~/frappe_passwords.txt).
+New passwords will be created for the ERPNext "Administrator" user, the MariaDB root user, and the frappe user (the script displays the passwords and saves them to ~/frappe_passwords.txt).
 
 
 ### Local
@@ -153,20 +130,20 @@ To setup the repository locally follow the steps mentioned below:
 
 4. Open the URL `http://erpnext.localhost:8000/app` in your browser, you should see the app running
 
-## Learning and Community
+## Learning and community
 
 1. [Frappe School](https://school.frappe.io) - Learn Frappe Framework and ERPNext from the various courses by the maintainers or from the community.
 2. [Official documentation](https://docs.erpnext.com/) - Extensive documentation for ERPNext.
-3. [Discussion Forum](https://discuss.frappe.io/c/erpnext/6) - Engage with the community of ERPNext users and service providers.
+3. [Discussion Forum](https://discuss.frappe.io/c/erpnext/6) - Engage with community of ERPNext users and service providers.
 4. [Telegram Group](https://erpnext_public.t.me) - Get instant help from huge community of users.
 
 
 ## Contributing
 
 1. [Issue Guidelines](https://github.com/frappe/erpnext/wiki/Issue-Guidelines)
-2. [Report Security Vulnerabilities](https://erpnext.com/security)
-3. [Pull Request Requirements](https://github.com/frappe/erpnext/wiki/Contribution-Guidelines)
-4. [Translations](https://crowdin.com/project/frappe)
+1. [Report Security Vulnerabilities](https://erpnext.com/security)
+1. [Pull Request Requirements](https://github.com/frappe/erpnext/wiki/Contribution-Guidelines)
+2. [Translations](https://crowdin.com/project/frappe)
 
 
 ## Logo and Trademark Policy

TRADEMARK_POLICY.md

@@ -18,9 +18,8 @@ We will grant permission to use the ERPNext name and logo for projects that meet
 
 - The primary purpose of your project is to promote the spread and improvement of the ERPNext software.
 - Your project is non-commercial in nature (it can make money to cover its costs or contribute to non-profit entities, but it cannot be run as a for-profit project or business).
-- Your project neither promotes nor is associated with entities that currently fail to comply with the GPL license under which ERPNext is distributed.
-
-If your project meets these criteria, you will be permitted to use the ERPNext name and logo to promote your project in any way you see fit with one exception: Please do not use ERPNext as part of a domain name.
+Your project neither promotes nor is associated with entities that currently fail to comply with the GPL license under which ERPNext is distributed.
+- If your project meets these criteria, you will be permitted to use the ERPNext name and logo to promote your project in any way you see fit with one exception: Please do not use ERPNext as part of a domain name.
 
 Use of the ERPNext name and logo is additionally allowed in the following situations:
 

erpnext/accounts/dashboard_chart_source/account_balance_timeline/account_balance_timeline.js

@@ -17,15 +17,6 @@ frappe.dashboards.chart_sources["Account Balance Timeline"] = {
 			fieldtype: "Link",
 			options: "Account",
 			reqd: 1,
-			default: locals[":Company"][frappe.defaults.get_user_default("Company")]["default_bank_account"],
-			get_query: () => {
-				return {
-					filters: {
-						account_type: "Bank",
-						is_group: 0,
-					},
-				};
-			},
 		},
 	],
 };

erpnext/accounts/dashboard_chart_source/account_balance_timeline/account_balance_timeline.py

@@ -4,7 +4,7 @@
 
 import frappe
 from frappe import _
-from frappe.utils import add_to_date, formatdate, getdate, nowdate
+from frappe.utils import add_to_date, formatdate, get_link_to_form, getdate, nowdate
 from frappe.utils.dashboard import cache_source
 from frappe.utils.dateutils import get_from_date_from_timespan, get_period_ending
 from frappe.utils.nestedset import get_descendants_of
@@ -37,14 +37,21 @@ def get(
 	filters = frappe.parse_json(filters) or frappe.parse_json(chart.filters_json)
 
 	account = filters.get("account")
-	company = filters.get("company")
+	filters.get("company")
 
-	if not company and not account:
-		frappe.throw(_("Company and account filters not set!"))
-	if not company:
-		frappe.throw(_("Company filter not set!"))
-	if not account:
-		frappe.throw(_("Account filter not set!"))
+	if not account and chart_name:
+		frappe.throw(
+			_("Account is not set for the dashboard chart {0}").format(
+				get_link_to_form("Dashboard Chart", chart_name)
+			)
+		)
+
+	if not frappe.db.exists("Account", account) and chart_name:
+		frappe.throw(
+			_("Account {0} does not exists in the dashboard chart {1}").format(
+				account, get_link_to_form("Dashboard Chart", chart_name)
+			)
+		)
 
 	if not to_date:
 		to_date = nowdate()

erpnext/accounts/deferred_revenue.py

@@ -523,8 +523,7 @@ def make_gl_entries(
 	if gl_entries:
 		try:
 			make_gl_entries(gl_entries, cancel=(doc.docstatus == 2), merge_entries=True)
-			if not frappe.in_test:
-				frappe.db.commit()
+			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,8 +605,7 @@ def book_revenue_via_journal_entry(
 		if submit:
 			journal_entry.submit()
 
-		if not frappe.in_test:
-			frappe.db.commit()
+		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,7 +5,8 @@ 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: {
@@ -14,18 +15,7 @@ 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());
 
@@ -68,20 +58,12 @@ 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": "2026-04-14 18:14:42.202065",
+ "modified": "2025-08-02 06:26:44.657146",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Account",
@@ -256,14 +256,6 @@
    "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,55 +52,60 @@ frappe.treeview_settings["Account"] = {
 	],
 	root_label: "Accounts",
 	get_tree_nodes: "erpnext.accounts.utils.get_children",
-	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;
-
-				// 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.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);
-				}
-			}
-		};
-
+	on_get_node: function (nodes, deep = false) {
 		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();
-						},
-					});
-				}
-			});
+
+		let accounts = [];
+		if (deep) {
+			// in case of `get_all_nodes`
+			accounts = nodes.reduce((acc, node) => [...acc, ...node.data], []);
 		} else {
-			render_balances();
+			accounts = nodes;
 		}
+
+		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);
+						}
+					}
+				});
+			}
+		});
 	},
 	add_tree_node: "erpnext.accounts.utils.add_ac",
 	menu_items: [

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

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

erpnext/accounts/doctype/account/test_account.py

@@ -2,6 +2,7 @@
 # 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.account.account import (
@@ -10,10 +11,11 @@ from erpnext.accounts.doctype.account.account import (
 	update_account_number,
 )
 from erpnext.stock import get_company_default_inventory_account, get_warehouse_account
-from erpnext.tests.utils import ERPNextTestSuite
+
+EXTRA_TEST_RECORD_DEPENDENCIES = ["Company"]
 
 
-class TestAccount(ERPNextTestSuite):
+class TestAccount(IntegrationTestCase):
 	def test_rename_account(self):
 		if not frappe.db.exists("Account", "1210 - Debtors - _TC"):
 			acc = frappe.new_doc("Account")
@@ -320,6 +322,72 @@ class TestAccount(ERPNextTestSuite):
 		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

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

erpnext/accounts/doctype/account_category/account_category.json

@@ -7,8 +7,6 @@
  "engine": "InnoDB",
  "field_order": [
   "account_category_name",
-  "root_type",
-  "column_break_qluu",
   "description"
  ],
  "fields": [
@@ -16,7 +14,6 @@
    "fieldname": "account_category_name",
    "fieldtype": "Data",
    "in_list_view": 1,
-   "in_standard_filter": 1,
    "label": "Account Category Name",
    "reqd": 1,
    "unique": 1
@@ -25,29 +22,12 @@
    "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": [
-  {
-   "link_doctype": "Account",
-   "link_fieldname": "account_category"
-  }
- ],
- "modified": "2026-03-05 06:49:34.430723",
+ "links": [],
+ "modified": "2025-10-15 03:19:47.171349",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Account Category",
@@ -84,7 +64,7 @@
   }
  ],
  "row_format": "Dynamic",
- "search_fields": "account_category_name, root_type",
+ "search_fields": "account_category_name, description",
  "sort_field": "creation",
  "sort_order": "DESC",
  "states": []

erpnext/accounts/doctype/account_category/account_category.py

@@ -21,7 +21,6 @@ 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,3 +2,19 @@
 # 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/account_closing_balance.js

@@ -1,8 +1,8 @@
 // Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on("Account Closing Balance", {
-	refresh(frm) {
-		frm.page.btn_secondary.hide();
-	},
-});
+// frappe.ui.form.on("Account Closing Balance", {
+// 	refresh(frm) {
+
+// 	},
+// });

erpnext/accounts/doctype/account_closing_balance/account_closing_balance.json

@@ -5,7 +5,6 @@
  "doctype": "DocType",
  "document_type": "Document",
  "engine": "InnoDB",
- "is_submittable": 1,
  "field_order": [
   "closing_date",
   "account",

erpnext/accounts/doctype/account_closing_balance/test_account_closing_balance.py

@@ -2,9 +2,8 @@
 # See license.txt
 
 # import frappe
-
-from erpnext.tests.utils import ERPNextTestSuite
+from frappe.tests import IntegrationTestCase
 
 
-class TestAccountClosingBalance(ERPNextTestSuite):
+class TestAccountClosingBalance(IntegrationTestCase):
 	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 on_update(self):
+	def after_insert(self):
 		if frappe.in_test:
 			make_dimension_in_accounting_doctypes(doc=self)
 		else:

erpnext/accounts/doctype/accounting_dimension/test_accounting_dimension.py

@@ -2,13 +2,18 @@
 # See license.txt
 
 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
-from erpnext.tests.utils import ERPNextTestSuite
+
+EXTRA_TEST_RECORD_DEPENDENCIES = ["Cost Center", "Location", "Warehouse", "Department"]
 
 
-class TestAccountingDimension(ERPNextTestSuite):
+class TestAccountingDimension(IntegrationTestCase):
+	def setUp(self):
+		create_dimension()
+
 	def test_dimension_against_sales_invoice(self):
 		si = create_sales_invoice(do_not_save=1)
 
@@ -73,3 +78,68 @@ class TestAccountingDimension(ERPNextTestSuite):
 
 		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/test_accounting_dimension_filter.py

@@ -1,15 +1,23 @@
 # Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
 
+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
-from erpnext.tests.utils import ERPNextTestSuite
+
+EXTRA_TEST_RECORD_DEPENDENCIES = ["Location", "Cost Center", "Department"]
 
 
-class TestAccountingDimensionFilter(ERPNextTestSuite):
+class TestAccountingDimensionFilter(unittest.TestCase):
 	def setUp(self):
+		create_dimension()
 		create_accounting_dimension_filter()
 		self.invoice_list = []
 
@@ -36,6 +44,17 @@ class TestAccountingDimensionFilter(ERPNextTestSuite):
 		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,6 +20,7 @@
   {
    "fieldname": "period_name",
    "fieldtype": "Data",
+   "in_list_view": 1,
    "label": "Period Name",
    "reqd": 1,
    "unique": 1
@@ -78,7 +79,7 @@
   }
  ],
  "links": [],
- "modified": "2026-03-09 17:15:33.577217",
+ "modified": "2025-12-01 16:53:44.631299",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Accounting Period",

erpnext/accounts/doctype/accounting_period/test_accounting_period.py

@@ -2,6 +2,7 @@
 # See license.txt
 
 import frappe
+from frappe.tests import IntegrationTestCase
 from frappe.utils import add_months, nowdate
 
 from erpnext.accounts.doctype.accounting_period.accounting_period import (
@@ -9,10 +10,11 @@ from erpnext.accounts.doctype.accounting_period.accounting_period import (
 	OverlapError,
 )
 from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
-from erpnext.tests.utils import ERPNextTestSuite
+
+EXTRA_TEST_RECORD_DEPENDENCIES = ["Item"]
 
 
-class TestAccountingPeriod(ERPNextTestSuite):
+class TestAccountingPeriod(IntegrationTestCase):
 	def test_overlap(self):
 		ap1 = create_accounting_period(
 			start_date="2018-04-01", end_date="2018-06-30", company="Wind Power LLC"
@@ -87,6 +89,10 @@ class TestAccountingPeriod(ERPNextTestSuite):
 		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,15 +2,7 @@
 // For license information, please see license.txt
 
 frappe.ui.form.on("Accounts Settings", {
-	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],
-				},
-			};
-		});
-	},
+	refresh: function (frm) {},
 	enable_immutable_ledger: function (frm) {
 		if (!frm.doc.enable_immutable_ledger) {
 			return;

erpnext/accounts/doctype/accounts_settings/accounts_settings.json

@@ -16,7 +16,6 @@
   "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",
@@ -63,12 +62,9 @@
   "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",
@@ -692,39 +688,16 @@
    "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": 0,
  "icon": "icon-cog",
  "idx": 1,
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2026-04-13 15:30:28.729627",
+ "modified": "2026-02-27 01:04:09.415288",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Accounts Settings",

erpnext/accounts/doctype/accounts_settings/accounts_settings.py

@@ -10,9 +10,6 @@ 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 = [
@@ -47,8 +44,6 @@ 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
@@ -77,9 +72,7 @@ class AccountsSettings(Document):
 		enable_immutable_ledger: DF.Check
 		enable_loyalty_point_program: DF.Check
 		enable_party_matching: DF.Check
-		enable_subscription: DF.Check
 		exchange_gain_loss_posting_date: DF.Literal["Invoice", "Payment", "Reconciliation Date"]
-		fetch_payment_schedule_in_payment_request: DF.Check
 		fetch_valuation_rate_for_internal_transaction: DF.Check
 		general_ledger_remarks_length: DF.Int
 		ignore_account_closing_balance: DF.Check
@@ -92,7 +85,6 @@ 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
@@ -143,15 +135,10 @@ class AccountsSettings(Document):
 			toggle_loyalty_point_program_section(not self.enable_loyalty_point_program)
 			clear_cache = True
 
-		if old_doc.enable_subscription != self.enable_subscription:
-			toggle_subscription_sections(not self.enable_subscription)
-			clear_cache = True
-
 		if clear_cache:
 			frappe.clear_cache()
 
 		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:
@@ -198,17 +185,6 @@ 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
@@ -239,12 +215,6 @@ def toggle_loyalty_point_program_section(hide):
 			create_property_setter_for_hiding_field(doctype, "loyalty_points_redemption", hide)
 
 
-def toggle_subscription_sections(hide):
-	subscription_doctypes = frappe.get_hooks("subscription_doctypes")
-	for doctype in subscription_doctypes:
-		create_property_setter_for_hiding_field(doctype, "subscription_section", hide)
-
-
 def create_property_setter_for_hiding_field(doctype, field_name, hide):
 	make_property_setter(
 		doctype,
@@ -254,12 +224,3 @@ def create_property_setter_for_hiding_field(doctype, field_name, hide):
 		"Check",
 		validate_fields_for_doctype=False,
 	)
-
-
-def set_allow_on_submit_for_dimension_fields(doctypes):
-	for dt in doctypes:
-		meta = frappe.get_meta(dt)
-		for dimension in get_accounting_dimensions():
-			df = meta.get_field(dimension)
-			if df and not df.allow_on_submit:
-				frappe.db.set_value("Custom Field", dt + "-" + dimension, "allow_on_submit", 1)

erpnext/accounts/doctype/accounts_settings/test_accounts_settings.py

@@ -1,9 +1,15 @@
 import frappe
-
-from erpnext.tests.utils import ERPNextTestSuite
+from frappe.tests import IntegrationTestCase
 
 
-class TestAccountsSettings(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()
+
 	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.js

@@ -3,7 +3,6 @@
 
 frappe.ui.form.on("Advance Payment Ledger Entry", {
 	refresh(frm) {
-		frm.page.btn_secondary.hide();
 		frm.set_currency_labels(["amount"], frm.doc.currency);
 		frm.set_currency_labels(["base_amount"], erpnext.get_currency(frm.doc.company));
 	},

erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json

@@ -4,7 +4,6 @@
  "creation": "2024-10-16 16:57:12.085072",
  "doctype": "DocType",
  "engine": "InnoDB",
- "is_submittable": 1,
  "field_order": [
   "company",
   "voucher_type",

erpnext/accounts/doctype/advance_payment_ledger_entry/test_advance_payment_ledger_entry.py

@@ -2,6 +2,7 @@
 # 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
@@ -9,13 +10,14 @@ 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 ERPNextTestSuite, the doctype test records and all
+# On IntegrationTestCase, 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
-from erpnext.tests.utils import ERPNextTestSuite
+EXTRA_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
+IGNORE_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
 
 
-class TestAdvancePaymentLedgerEntry(ERPNextTestSuite, AccountsTestMixin):
+class TestAdvancePaymentLedgerEntry(AccountsTestMixin, IntegrationTestCase):
 	"""
 	Integration tests for AdvancePaymentLedgerEntry.
 	Use this class for testing interactions between multiple components.
@@ -28,6 +30,9 @@ class TestAdvancePaymentLedgerEntry(ERPNextTestSuite, AccountsTestMixin):
 		self.create_item()
 		self.clear_old_entries()
 
+	def tearDown(self):
+		frappe.db.rollback()
+
 	def create_sales_order(self, qty=1, rate=100, currency="INR", do_not_submit=False):
 		"""
 		Helper method

erpnext/accounts/doctype/bank/test_bank.py

@@ -1,8 +1,8 @@
 # Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
 
-from erpnext.tests.utils import ERPNextTestSuite
+from frappe.tests import IntegrationTestCase
 
 
-class TestBank(ERPNextTestSuite):
+class TestBank(IntegrationTestCase):
 	pass

erpnext/accounts/doctype/bank_account/bank_account.py

@@ -116,7 +116,6 @@ def get_default_company_bank_account(company, party_type, party):
 
 @frappe.whitelist()
 def get_bank_account_details(bank_account: str):
-	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

@@ -1,8 +1,8 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
 
-from erpnext.tests.utils import ERPNextTestSuite
+from frappe.tests import IntegrationTestCase
 
 
-class TestBankAccount(ERPNextTestSuite):
+class TestBankAccount(IntegrationTestCase):
 	pass

erpnext/accounts/doctype/bank_account_subtype/test_bank_account_subtype.py

@@ -1,8 +1,8 @@
 # Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
 
-from erpnext.tests.utils import ERPNextTestSuite
+from frappe.tests import IntegrationTestCase
 
 
-class TestBankAccountSubtype(ERPNextTestSuite):
+class TestBankAccountSubtype(IntegrationTestCase):
 	pass

erpnext/accounts/doctype/bank_account_type/test_bank_account_type.py

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

erpnext/accounts/doctype/bank_clearance/bank_clearance.py

@@ -5,9 +5,7 @@
 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.query_builder.functions import Coalesce, Sum
 from frappe.utils import cint, flt, fmt_money, getdate
 from pypika import Order
 
@@ -184,162 +182,65 @@ def get_payment_entries_for_bank_clearance(
 ):
 	entries = []
 
-	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")
-		)
-	)
-
+	condition = ""
+	pe_condition = ""
 	if not include_reconciled_entries:
-		journal_entry_query = journal_entry_query.where(
-			(journal_entry.clearance_date.isnull()) | (journal_entry.clearance_date == "0000-00-00")
-		)
+		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_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)
-		)
+	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,
 	)
 
-	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
+	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,
 	)
 
-	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 = []
-
+	pos_sales_invoices, pos_purchase_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_query = (
+		pos_sales_invoices = (
 			frappe.qb.from_(si_payment)
 			.inner_join(si)
 			.on(si_payment.parent == si.name)
@@ -362,22 +263,38 @@ 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)
 
-		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")
+		pi = frappe.qb.DocType("Purchase Invoice")
+
+		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"),
 			)
-
-		pos_sales_invoices = (
-			pos_sales_invoices_query.orderby(si.posting_date).orderby(si.name, order=Order.desc)
+			.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)
 		).run(as_dict=True)
 
 	entries = (
-		list(payment_entries)
-		+ list(journal_entries)
-		+ list(pos_sales_invoices)
-		+ list(paid_purchase_invoices)
+		list(payment_entries) + list(journal_entries) + list(pos_sales_invoices) + list(pos_purchase_invoices)
 	)
 
 	return entries

erpnext/accounts/doctype/bank_clearance/test_bank_clearance.py

@@ -2,6 +2,7 @@
 # See license.txt
 
 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
@@ -13,12 +14,13 @@ 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 ERPNextTestSuite, if_lending_app_installed, if_lending_app_not_installed
+from erpnext.tests.utils import if_lending_app_installed, if_lending_app_not_installed
 
 
-class TestBankClearance(ERPNextTestSuite):
-	def setUp(self):
-		frappe.clear_cache()
+class TestBankClearance(IntegrationTestCase):
+	@classmethod
+	def setUpClass(cls):
+		super().setUpClass()
 		create_warehouse(
 			warehouse_name="_Test Warehouse",
 			properties={"parent_warehouse": "All Warehouses - _TC"},

erpnext/accounts/doctype/bank_guarantee/test_bank_guarantee.py

@@ -1,8 +1,8 @@
 # Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
 
-from erpnext.tests.utils import ERPNextTestSuite
+from frappe.tests import IntegrationTestCase
 
 
-class TestBankGuarantee(ERPNextTestSuite):
+class TestBankGuarantee(IntegrationTestCase):
 	pass

erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py

@@ -59,7 +59,7 @@ def get_bank_transactions(
 		filters.append(["date", "<=", to_date])
 	if from_date:
 		filters.append(["date", ">=", from_date])
-	transactions = frappe.get_list(
+	transactions = frappe.get_all(
 		"Bank Transaction",
 		fields=[
 			"date",
@@ -84,7 +84,6 @@ def get_bank_transactions(
 @frappe.whitelist()
 def get_account_balance(bank_account: str, till_date: str | date, company: str):
 	# returns account balance till the specified date
-	frappe.has_permission("Bank Account", "read", bank_account, throw=True)
 	account = frappe.db.get_value("Bank Account", bank_account, "account")
 	filters = frappe._dict(
 		{

erpnext/accounts/doctype/bank_reconciliation_tool/test_bank_reconciliation_tool.py

@@ -4,6 +4,7 @@
 
 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 (
@@ -12,10 +13,9 @@ 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(ERPNextTestSuite, AccountsTestMixin):
+class TestBankReconciliationTool(AccountsTestMixin, IntegrationTestCase):
 	def setUp(self):
 		self.create_company()
 		self.create_customer()
@@ -24,6 +24,9 @@ class TestBankReconciliationTool(ERPNextTestSuite, AccountsTestMixin):
 		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(
 			{
@@ -40,7 +43,6 @@ class TestBankReconciliationTool(ERPNextTestSuite, AccountsTestMixin):
 					"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,14 +1,15 @@
 # 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(ERPNextTestSuite):
+class TestBankStatementImport(unittest.TestCase):
 	"""Unit tests for Bank Statement Import functions"""
 
 	def test_preprocess_mt940_content_with_long_statement_number(self):

erpnext/accounts/doctype/bank_transaction/test_auto_match_party.py

@@ -2,20 +2,27 @@
 # 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(ERPNextTestSuite):
-	def setUp(self):
+class TestAutoMatchParty(IntegrationTestCase):
+	@classmethod
+	def setUpClass(cls):
 		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,6 +6,7 @@ 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,
@@ -18,10 +19,12 @@ 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 ERPNextTestSuite, if_lending_app_installed
+from erpnext.tests.utils import if_lending_app_installed
+
+EXTRA_TEST_RECORD_DEPENDENCIES = ["Item", "Cost Center"]
 
 
-class TestBankTransaction(ERPNextTestSuite):
+class TestBankTransaction(IntegrationTestCase):
 	def setUp(self):
 		make_pos_profile()
 
@@ -382,7 +385,7 @@ def add_vouchers(gl_account="_Test Bank - _TC"):
 		frappe.get_doc(
 			{
 				"doctype": "Customer",
-				"customer_group": "Individual",
+				"customer_group": "All Customer Groups",
 				"customer_type": "Company",
 				"customer_name": "Poore Simon's",
 			}
@@ -413,7 +416,7 @@ def add_vouchers(gl_account="_Test Bank - _TC"):
 		frappe.get_doc(
 			{
 				"doctype": "Customer",
-				"customer_group": "Individual",
+				"customer_group": "All Customer Groups",
 				"customer_type": "Company",
 				"customer_name": "Fayva",
 			}

erpnext/accounts/doctype/bank_transaction/test_bank_transaction_fees.py

@@ -2,11 +2,10 @@
 # See license.txt
 
 import frappe
-
-from erpnext.tests.utils import ERPNextTestSuite
+from frappe.tests import UnitTestCase
 
 
-class TestBankTransactionFees(ERPNextTestSuite):
+class TestBankTransactionFees(UnitTestCase):
 	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,10 +2,8 @@
 # See license.txt
 
 # import frappe
+from frappe.tests import IntegrationTestCase
 
 
-from erpnext.tests.utils import ERPNextTestSuite
-
-
-class TestBisectAccountingStatements(ERPNextTestSuite):
+class TestBisectAccountingStatements(IntegrationTestCase):
 	pass

erpnext/accounts/doctype/bisect_nodes/test_bisect_nodes.py

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

erpnext/accounts/doctype/budget/test_budget.py

@@ -17,6 +17,12 @@ 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

@@ -1,8 +1,8 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
 
-from erpnext.tests.utils import ERPNextTestSuite
+from frappe.tests import IntegrationTestCase
 
 
-class TestCashierClosing(ERPNextTestSuite):
+class TestCashierClosing(IntegrationTestCase):
 	pass

erpnext/accounts/doctype/chart_of_accounts_importer/test_chart_of_accounts_importer.py

@@ -1,8 +1,8 @@
 # Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
 
-from erpnext.tests.utils import ERPNextTestSuite
+from frappe.tests import IntegrationTestCase
 
 
-class TestChartofAccountsImporter(ERPNextTestSuite):
+class TestChartofAccountsImporter(IntegrationTestCase):
 	pass

erpnext/accounts/doctype/cheque_print_template/test_cheque_print_template.py

@@ -1,8 +1,8 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
 
-from erpnext.tests.utils import ERPNextTestSuite
+from frappe.tests import IntegrationTestCase
 
 
-class TestChequePrintTemplate(ERPNextTestSuite):
+class TestChequePrintTemplate(IntegrationTestCase):
 	pass

erpnext/accounts/doctype/cost_center/cost_center.json

@@ -126,7 +126,7 @@
  "idx": 1,
  "is_tree": 1,
  "links": [],
- "modified": "2026-04-14 18:15:27.367298",
+ "modified": "2025-01-22 10:46:42.904001",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Cost Center",
@@ -173,20 +173,11 @@
    "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

@@ -2,11 +2,10 @@
 # License: GNU General Public License v3. See license.txt
 
 import frappe
-
-from erpnext.tests.utils import ERPNextTestSuite
+from frappe.tests import IntegrationTestCase
 
 
-class TestCostCenter(ERPNextTestSuite):
+class TestCostCenter(IntegrationTestCase):
 	def test_cost_center_creation_against_child_node(self):
 		cost_center = frappe.get_doc(
 			{

erpnext/accounts/doctype/cost_center/test_records.json

@@ -0,0 +1,23 @@
+[
+ {
+  "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

@@ -3,6 +3,7 @@
 
 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
@@ -14,10 +15,9 @@ 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(ERPNextTestSuite):
+class TestCostCenterAllocation(IntegrationTestCase):
 	def setUp(self):
 		cost_centers = [
 			"Main Cost Center 1",
@@ -190,7 +190,7 @@ class TestCostCenterAllocation(ERPNextTestSuite):
 		coa2.cancel()
 		jv.cancel()
 
-	@ERPNextTestSuite.change_settings("System Settings", {"rounding_method": "Commercial Rounding"})
+	@IntegrationTestCase.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

@@ -2,9 +2,11 @@
 # See license.txt
 
 import frappe
+from frappe.tests import IntegrationTestCase
 
 from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
-from erpnext.tests.utils import ERPNextTestSuite
+
+EXTRA_TEST_RECORD_DEPENDENCIES = ["Item"]
 
 
 def test_create_test_data():
@@ -85,7 +87,6 @@ def test_create_test_data():
 				"partner_name": "_Test Coupon Partner",
 				"commission_rate": 2,
 				"referral_code": "COPART",
-				"territory": "All Territories",
 			}
 		)
 		sales_partner.insert()
@@ -108,10 +109,13 @@ def test_create_test_data():
 		coupon_code.insert()
 
 
-class TestCouponCode(ERPNextTestSuite):
+class TestCouponCode(IntegrationTestCase):
 	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": 0,
+ "hide_toolbar": 1,
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2026-03-16 13:28:21.075743",
+ "modified": "2026-01-02 18:19:02.873815",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Currency Exchange Settings",

erpnext/accounts/doctype/currency_exchange_settings/test_currency_exchange_settings.py

@@ -2,8 +2,8 @@
 # For license information, please see license.txt
 # import frappe
 
-from erpnext.tests.utils import ERPNextTestSuite
+from frappe.tests import IntegrationTestCase
 
 
-class TestCurrencyExchangeSettings(ERPNextTestSuite):
+class TestCurrencyExchangeSettings(IntegrationTestCase):
 	pass

erpnext/accounts/doctype/dunning/test_dunning.py

@@ -4,20 +4,37 @@ 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,
 )
-from erpnext.tests.utils import ERPNextTestSuite
+
+EXTRA_TEST_RECORD_DEPENDENCIES = ["Company", "Cost Center"]
 
 
-class TestDunning(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()
+
 	def test_dunning_without_fees(self):
 		dunning = create_dunning(overdue_days=20)
 

erpnext/accounts/doctype/dunning_type/test_dunning_type.py

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

erpnext/accounts/doctype/dunning_type/test_records.json

@@ -0,0 +1,36 @@
+[
+    {
+        "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(ERPNextTestSuite, AccountsTestMixin):
+class TestExchangeRateRevaluation(AccountsTestMixin, IntegrationTestCase):
 	def setUp(self):
 		self.create_company()
 		self.create_usd_receivable_account()
@@ -22,13 +22,14 @@ class TestExchangeRateRevaluation(ERPNextTestSuite, AccountsTestMixin):
 		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.
@@ -36,7 +37,7 @@ class TestExchangeRateRevaluation(ERPNextTestSuite, AccountsTestMixin):
 		company_doc.unrealized_exchange_gain_loss_account = company_doc.exchange_gain_loss_account
 		company_doc.save()
 
-	@ERPNextTestSuite.change_settings(
+	@IntegrationTestCase.change_settings(
 		"Accounts Settings",
 		{"allow_multi_currency_invoices_against_single_party_account": 1, "allow_stale": 0},
 	)
@@ -90,7 +91,7 @@ class TestExchangeRateRevaluation(ERPNextTestSuite, AccountsTestMixin):
 		)[0]
 		self.assertEqual(acc_balance.balance, 8500.0)
 
-	@ERPNextTestSuite.change_settings(
+	@IntegrationTestCase.change_settings(
 		"Accounts Settings",
 		{"allow_multi_currency_invoices_against_single_party_account": 1, "allow_stale": 0},
 	)
@@ -163,7 +164,7 @@ class TestExchangeRateRevaluation(ERPNextTestSuite, AccountsTestMixin):
 		self.assertEqual(acc_balance.balance, 0.0)
 		self.assertEqual(acc_balance.balance_in_account_currency, 0.0)
 
-	@ERPNextTestSuite.change_settings(
+	@IntegrationTestCase.change_settings(
 		"Accounts Settings",
 		{"allow_multi_currency_invoices_against_single_party_account": 1, "allow_stale": 0},
 	)
@@ -258,7 +259,7 @@ class TestExchangeRateRevaluation(ERPNextTestSuite, AccountsTestMixin):
 		self.assertEqual(flt(acc_balance.balance, precision), 0.0)
 		self.assertEqual(flt(acc_balance.balance_in_account_currency, precision), 0.0)
 
-	@ERPNextTestSuite.change_settings(
+	@IntegrationTestCase.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

@@ -2,12 +2,12 @@
 # See license.txt
 
 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(ERPNextTestSuite):
+class TestFinanceBook(IntegrationTestCase):
 	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 cache, reduce
+from functools import reduce
 from typing import Any, Union
 
 import frappe
@@ -15,7 +15,6 @@ from frappe.database.operator_map import OPERATOR_MAP
 from frappe.query_builder import Case
 from frappe.query_builder.functions import Sum
 from frappe.utils import cstr, date_diff, flt, getdate
-from frappe.utils.xlsxutils import XLSXMetadata, XLSXStyleBuilder
 from pypika.terms import Bracket, LiteralValue
 
 from erpnext import get_company_currency
@@ -39,9 +38,6 @@ 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
 # ============================================================================
@@ -145,7 +141,7 @@ class SegmentData:
 
 	@property
 	def id(self) -> str:
-		return f"{SEGMENT_PREFIX}{self.index}"
+		return f"seg_{self.index}"
 
 
 @dataclass
@@ -226,38 +222,14 @@ class FinancialReportEngine:
 		return context.get_result()
 
 	def _validate_filters(self, filters: dict[str, Any]) -> None:
-		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"), ()))
+		required_filters = ["report_template", "period_start_date", "period_end_date"]
 
 		for filter_key in required_filters:
 			if not filters.get(filter_key):
-				frappe.throw(
-					title=_("Missing Required Filter"),
-					msg=_("Missing required filter: {0}").format(
-						frappe.bold(filter_labels.get(filter_key, filter_key))
-					),
-				)
+				frappe.throw(_("Missing required filter: {0}").format(filter_key))
 
 		if filters.get("presentation_currency"):
-			frappe.msgprint(
-				title=_("Unsupported Feature"),
-				msg=_("Currency filters are currently unsupported in Custom Financial Report."),
-				indicator="orange",
-			)
+			frappe.msgprint(_("Currency filters are currently unsupported in Custom Financial Report."))
 
 		# 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.
@@ -492,7 +464,6 @@ 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]:
 		"""
@@ -530,8 +501,6 @@ 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)
 
@@ -551,9 +520,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
 
-			return self._rebase_closing_balances(closing_data, closing_voucher.period_end_date)
+			if sum(closing_data.values()) != 0.0:
+				return self._rebase_closing_balances(closing_data, closing_voucher.period_end_date)
 
 		return self._get_opening_balances_from_gl(accounts)
 
@@ -647,12 +616,7 @@ class FinancialQueryBuilder:
 			.groupby(gl_table.account)
 		)
 
-		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
+		if not frappe.get_single_value("Accounts Settings", "ignore_is_opening_check_for_reporting"):
 			query = query.where(gl_table.is_opening == "No")
 
 		# Add period-specific columns
@@ -716,18 +680,11 @@ class FinancialQueryBuilder:
 				account_data.unaccumulate_values()
 
 	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("ignore_closing_entries"):
+			if doctype == "GL Entry":
+				query = query.where(table.voucher_type != "Period Closing Voucher")
+			else:
+				query = query.where(table.is_period_closing_voucher_entry == 0)
 
 		if self.filters.get("project"):
 			projects = self.filters.get("project")
@@ -1435,8 +1392,7 @@ 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": DEFAULT_BULLET_PREFIX},
+				condition=lambda rd: rd.is_detail_row, format_properties={"is_detail": True, "prefix": "• "}
 			),
 			FormattingRule(
 				condition=lambda rd: getattr(rd.row, "warn_if_negative", False),
@@ -1882,124 +1838,3 @@ 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,8 +3,6 @@
 
 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();
@@ -22,7 +20,7 @@ frappe.ui.form.on("Financial Report Template", {
 		});
 	},
 
-	after_save(frm) {
+	validate(frm) {
 		if (!frm.doc.rows || frm.doc.rows.length === 0) {
 			frappe.msgprint(__("At least one row is required for a financial report template"));
 		}
@@ -36,6 +34,14 @@ 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);
 	},
 
@@ -316,8 +322,6 @@ 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 = "";
 
@@ -378,13 +382,8 @@ 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}>A list of numbers, one for each period: <code>[1000.0, 1200.0, 1150.0]</code></p>
+				<p ${text_style}>Numbers 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,5 +1,6 @@
 {
  "actions": [],
+ "allow_rename": 1,
  "autoname": "field:template_name",
  "creation": "2025-08-02 04:44:15.184541",
  "doctype": "DocType",
@@ -30,8 +31,7 @@
    "in_list_view": 1,
    "in_standard_filter": 1,
    "label": "Report Type",
-   "options": "\nProfit and Loss Statement\nBalance Sheet\nCash Flow\nCustom Financial Statement",
-   "reqd": 1
+   "options": "\nProfit and Loss Statement\nBalance Sheet\nCash Flow\nCustom Financial Statement"
   },
   {
    "depends_on": "eval:frappe.boot.developer_mode",
@@ -66,7 +66,7 @@
  "grid_page_length": 50,
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2026-02-23 01:04:05.797161",
+ "modified": "2025-11-14 00:11:03.508139",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Financial Report Template",

erpnext/accounts/doctype/financial_report_template/financial_report_template.py

@@ -31,19 +31,6 @@ 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

@@ -67,8 +67,8 @@ class ValidationResult:
 		self.warnings.append(issue)
 
 	def notify_user(self) -> None:
-		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)
+		warnings = "<br><br>".join(str(w) for w in self.warnings)
+		errors = "<br><br>".join(str(e) for e in self.issues)
 
 		if warnings:
 			frappe.msgprint(warnings, title=_("Warnings"), indicator="orange")
@@ -96,8 +96,9 @@ 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))
+			result.merge(self.formula_validator.validate(row, account_fields))
 
 		return result
 
@@ -379,8 +380,7 @@ class AccountFilterValidator(Validator):
 	"""Validates account filter expressions used in Account Data rows"""
 
 	def __init__(self, account_fields: set | None = None):
-		self.account_meta = frappe.get_meta("Account")
-		self.account_fields = account_fields or set(self.account_meta._valid_columns)
+		self.account_fields = account_fields or set(frappe.get_meta("Account")._valid_columns)
 
 	def validate(self, row) -> ValidationResult:
 		result = ValidationResult()
@@ -400,11 +400,7 @@ class AccountFilterValidator(Validator):
 
 		try:
 			filter_config = json.loads(row.calculation_formula)
-			error = self._validate_filter_structure(
-				filter_config,
-				self.account_fields,
-				row.advanced_filtering,
-			)
+			error = self._validate_filter_structure(filter_config, self.account_fields)
 
 			if error:
 				result.add_error(
@@ -426,12 +422,7 @@ class AccountFilterValidator(Validator):
 
 		return result
 
-	def _validate_filter_structure(
-		self,
-		filter_config,
-		account_fields: set,
-		advanced_filtering: bool = False,
-	) -> str | None:
+	def _validate_filter_structure(self, filter_config, account_fields: set) -> str | None:
 		# simple condition: [field, operator, value]
 		if isinstance(filter_config, list):
 			if len(filter_config) != 3:
@@ -442,10 +433,8 @@ 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 '{display}' is not a valid Account field"
+				return f"Field '{field}' is not a valid account field"
 
 			if operator.casefold() not in OPERATOR_MAP:
 				return f"Invalid operator '{operator}'"
@@ -468,7 +457,7 @@ class AccountFilterValidator(Validator):
 
 			# recursive
 			for condition in conditions:
-				error = self._validate_filter_structure(condition, account_fields, advanced_filtering)
+				error = self._validate_filter_structure(condition, account_fields)
 				if error:
 					return error
 		else:
@@ -484,7 +473,7 @@ class FormulaValidator(Validator):
 		self.calculation_validator = CalculationFormulaValidator(reference_codes)
 		self.account_filter_validator = AccountFilterValidator()
 
-	def validate(self, row) -> ValidationResult:
+	def validate(self, row, account_fields: set) -> ValidationResult:
 		result = ValidationResult()
 
 		if not row.calculation_formula:
@@ -494,6 +483,9 @@ 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

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

erpnext/accounts/doctype/financial_report_template/test_financial_report_template.py

@@ -2,16 +2,29 @@
 # For license information, please see license.txt
 
 import frappe
+from frappe.tests import IntegrationTestCase
+from frappe.tests.utils import make_test_records
 
-from erpnext.tests.utils import ERPNextTestSuite
+# 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 FinancialReportTemplateTestCase(ERPNextTestSuite):
+class TestFinancialReportTemplate(IntegrationTestCase):
+	pass
+
+
+class FinancialReportTemplateTestCase(IntegrationTestCase):
 	"""Utility class with common setup and helper methods for all test classes"""
 
-	def setUp(self):
+	@classmethod
+	def setUpClass(cls):
 		"""Set up test data"""
-		self.create_test_template()
+		make_test_records("Company")
+		make_test_records("Fiscal Year")
+		cls.create_test_template()
 
 	@classmethod
 	def create_test_template(cls):

erpnext/accounts/doctype/fiscal_year/test_fiscal_year.py

@@ -2,12 +2,13 @@
 # License: GNU General Public License v3. See license.txt
 
 import frappe
+from frappe.tests import IntegrationTestCase
 from frappe.utils import now_datetime
 
-from erpnext.tests.utils import ERPNextTestSuite
+IGNORE_TEST_RECORD_DEPENDENCIES = ["Company"]
 
 
-class TestFiscalYear(ERPNextTestSuite):
+class TestFiscalYear(IntegrationTestCase):
 	def test_extra_year(self):
 		if frappe.db.exists("Fiscal Year", "_Test Fiscal Year 2000"):
 			frappe.delete_doc("Fiscal Year", "_Test Fiscal Year 2000")

erpnext/accounts/doctype/gl_entry/gl_entry.json

@@ -5,7 +5,6 @@
  "doctype": "DocType",
  "document_type": "Document",
  "engine": "InnoDB",
- "is_submittable": 1,
  "field_order": [
   "dates_section",
   "posting_date",

erpnext/accounts/doctype/gl_entry/gl_entry.py

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

erpnext/accounts/doctype/gl_entry/test_gl_entry.py

@@ -3,13 +3,13 @@
 
 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(ERPNextTestSuite):
+class TestGLEntry(IntegrationTestCase):
 	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

@@ -2,16 +2,16 @@
 # See license.txt
 
 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(ERPNextTestSuite):
+class TestInvoiceDiscounting(IntegrationTestCase):
 	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,12 +47,3 @@ 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,15 +27,8 @@ 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

@@ -1,8 +1,8 @@
 # Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
 
-from erpnext.tests.utils import ERPNextTestSuite
+from frappe.tests import IntegrationTestCase
 
 
-class TestItemTaxTemplate(ERPNextTestSuite):
+class TestItemTaxTemplate(IntegrationTestCase):
 	pass

erpnext/accounts/doctype/item_tax_template/test_records.json

@@ -0,0 +1,79 @@
+[
+ {
+  "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,8 +6,7 @@
  "engine": "InnoDB",
  "field_order": [
   "tax_type",
-  "tax_rate",
-  "not_applicable"
+  "tax_rate"
  ],
  "fields": [
   {
@@ -22,30 +21,20 @@
    "fieldname": "tax_rate",
    "fieldtype": "Float",
    "in_list_view": 1,
-   "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"
+   "label": "Tax Rate"
   }
  ],
  "istable": 1,
  "links": [],
- "modified": "2025-12-26 17:19:18.791891",
+ "modified": "2024-03-27 13:09:55.735360",
  "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,7 +14,6 @@ class ItemTaxTemplateDetail(Document):
 	if TYPE_CHECKING:
 		from frappe.types import DF
 
-		not_applicable: DF.Check
 		parent: DF.Data
 		parentfield: DF.Data
 		parenttype: DF.Data

erpnext/accounts/doctype/journal_entry/journal_entry.js

@@ -648,7 +648,7 @@ $.extend(erpnext.journal_entry, {
 					reqd: 1,
 					default: frm.doc.posting_date,
 				},
-				{ fieldtype: "Small Text", fieldname: "remark", label: __("Remark") },
+				{ fieldtype: "Small Text", fieldname: "user_remark", label: __("User Remark") },
 				{
 					fieldtype: "Select",
 					fieldname: "naming_series",
@@ -665,14 +665,8 @@ $.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

@@ -39,7 +39,7 @@
   "clearance_date",
   "column_break_oizh",
   "user_remark",
-  "auto_repeat_section",
+  "subscription_section",
   "auto_repeat",
   "tax_withholding_tab",
   "section_tax_withholding_entry",
@@ -78,7 +78,6 @@
   "from_template",
   "title",
   "column_break3",
-  "custom_remark",
   "remark",
   "mode_of_payment",
   "party_not_required"
@@ -141,7 +140,6 @@
   {
    "fieldname": "company",
    "fieldtype": "Link",
-   "in_list_view": 1,
    "in_standard_filter": 1,
    "label": "Company",
    "oldfieldname": "company",
@@ -183,6 +181,7 @@
    "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,
@@ -203,7 +202,6 @@
   {
    "fieldname": "user_remark",
    "fieldtype": "Small Text",
-   "hidden": 1,
    "label": "User Remark",
    "no_copy": 1,
    "oldfieldname": "user_remark",
@@ -317,7 +315,7 @@
    "no_copy": 1,
    "oldfieldname": "remark",
    "oldfieldtype": "Small Text",
-   "read_only_depends_on": "eval: !doc.custom_remark"
+   "read_only": 1
   },
   {
    "depends_on": "eval:doc.voucher_type== \"Inter Company Journal Entry\"",
@@ -477,6 +475,11 @@
    "options": "Stock Entry",
    "read_only": 1
   },
+  {
+   "fieldname": "subscription_section",
+   "fieldtype": "Section Break",
+   "label": "Subscription"
+  },
   {
    "allow_on_submit": 1,
    "fieldname": "auto_repeat",
@@ -648,17 +651,6 @@
    "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",
@@ -673,7 +665,7 @@
    "table_fieldname": "payment_entries"
   }
  ],
- "modified": "2026-04-08 14:19:30.870894",
+ "modified": "2026-02-16 16:06:10.468482",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Journal Entry",

erpnext/accounts/doctype/journal_entry/journal_entry.py

@@ -62,7 +62,6 @@ 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
@@ -295,8 +294,6 @@ 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",
@@ -310,10 +307,6 @@ 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()
@@ -355,11 +348,8 @@ class JournalEntry(AccountsController):
 					frappe.throw(_("Account {0} should be of type Expense").format(d.account))
 
 	def validate_stock_accounts(self):
-		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.
+		if self.voucher_type == "Periodic Accounting Entry":
+			# Skip validation for periodic accounting entry
 			return
 
 		stock_accounts = get_stock_accounts(self.company, accounts=self.accounts)
@@ -1028,8 +1018,8 @@ class JournalEntry(AccountsController):
 		if self.flags.skip_remarks_creation:
 			return
 
-		if self.get("custom_remark"):
-			return
+		if self.user_remark:
+			r.append(_("Note: {0}").format(self.user_remark))
 
 		if self.cheque_no:
 			if self.cheque_date:
@@ -1554,42 +1544,35 @@ def get_payment_entry(ref_doc, args):
 
 @frappe.whitelist()
 @frappe.validate_and_sanitize_search_inputs
-def get_against_jv(
-	doctype: str,
-	txt: str,
-	searchfield: str,
-	start: int,
-	page_len: int,
-	filters: dict,
-):
+def get_against_jv(doctype: str, txt: str, searchfield: str, start: int, page_len: int, filters: dict):
 	if not frappe.db.has_column("Journal Entry", searchfield):
 		return []
 
-	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)
+	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,
+		),
 	)
 
-	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: str | dict):

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", "remark"],
+	add_fields: ["voucher_type", "posting_date", "total_debit", "company", "user_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,20 +2,19 @@
 # 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(ERPNextTestSuite):
-	def setUp(self):
-		self.load_test_records("Journal Entry")
-
-	@ERPNextTestSuite.change_settings("Accounts Settings", {"unlink_payment_on_cancellation_of_invoice": 1})
+class TestJournalEntry(IntegrationTestCase):
+	@IntegrationTestCase.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])
@@ -150,6 +149,7 @@ class TestJournalEntry(ERPNextTestSuite):
 
 		if account_bal == stock_bal:
 			self.assertRaises(StockAccountInvalidTransaction, jv.save)
+			frappe.db.rollback()
 		else:
 			jv.submit()
 			jv.cancel()
@@ -413,9 +413,9 @@ class TestJournalEntry(ERPNextTestSuite):
 		from erpnext.accounts.doctype.cost_center.test_cost_center import create_cost_center
 
 		# Configure Repost Accounting Ledger for JVs
-		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 = 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.save()
 
 		# Create JV with defaut cost center - _Test Cost Center
@@ -523,7 +523,7 @@ class TestJournalEntry(ERPNextTestSuite):
 		jv = frappe.new_doc("Journal Entry")
 		jv.posting_date = nowdate()
 		jv.company = "_Test Company"
-		jv.remark = "test"
+		jv.user_remark = "test"
 		jv.extend(
 			"accounts",
 			[
@@ -592,14 +592,6 @@ class TestJournalEntry(ERPNextTestSuite):
 
 		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)
@@ -628,7 +620,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.remark = "test"
+	jv.user_remark = "test"
 	jv.multi_currency = 1
 	jv.set(
 		"accounts",

erpnext/accounts/doctype/journal_entry_template/test_journal_entry_template.py

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

erpnext/accounts/doctype/ledger_health/test_ledger_health.py

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

erpnext/accounts/doctype/ledger_health_monitor/test_ledger_health_monitor.py

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

erpnext/accounts/doctype/ledger_merge/ledger_merge.py

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

erpnext/accounts/doctype/ledger_merge/test_ledger_merge.py

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

erpnext/accounts/doctype/loyalty_point_entry/test_loyalty_point_entry.py

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

erpnext/accounts/doctype/loyalty_program/test_loyalty_program.py

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