ci: set TZ: 'Asia/Kolkata' on Python Tests

fix: clear conditions table when calculate_based_on is set to Fixed

.github/CONTRIBUTING.md

@@ -1,4 +1,4 @@
-### Introduction (first timers)
+### Introduction (for 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 information asked 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 requested information and re-open it.
 
 ### General Issue Guidelines
 
-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.
+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.
 
 ### 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.
-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`.
+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.
 
 ### Feature Request Guidelines
 
-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.
+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.
 
-### 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 to improve ERPNext
+about: Suggest an idea or enhancement for ERPNext
 title: ''
 labels: feature-request
 assignees: ''
@@ -17,17 +17,21 @@ 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 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 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 to a feature, please try the following channels to get paid developments done quickly:
+If you're in urgent need of 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. I'm always frustrated when [...]
+A clear and concise description of what the problem is. Ex. As a [role], I have to [painful task] because [missing feature].
 
 **Describe the solution you'd like**
 A clear and concise description of what you want to happen.
@@ -35,5 +39,17 @@ 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/workflows/generate-pot-file.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branch: ["develop"]
+        branch: ["develop", "version-16-hotfix"]
     permissions:
       contents: write
 
@@ -30,6 +30,11 @@ jobs:
           with:
             python-version: "3.14"
 
+        - name: Setup Node
+          uses: actions/setup-node@v6
+          with:
+            node-version: 24
+
         - name: Run script to update POT file
           run: |
             bash ${GITHUB_WORKSPACE}/.github/helper/update_pot_file.sh

.github/workflows/initiate_release.yml

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

.github/workflows/patch.yml

@@ -143,6 +143,7 @@ jobs:
           }
 
           update_to_version 15 3.13
+          update_to_version 16 3.14
 
           echo "Updating to latest version"
           git -C "apps/frappe" fetch --depth 1 upstream "${GITHUB_BASE_REF:-${GITHUB_REF##*/}}"

.github/workflows/release.yml

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

.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' }}
 

.mergify.yml

@@ -50,13 +50,13 @@ pull_request_rules:
           - version-15-hotfix
         assignees:
           - "{{ author }}"
-  - name: backport to version-16-beta
+  - name: backport to version-16-hotfix
     conditions:
-      - label="backport version-16-beta"
+      - label="backport version-16-hotfix"
     actions:
       backport:
         branches:
-          - version-16-beta
+          - version-16-hotfix
         assignees:
           - "{{ author }}"
   - name: Automatic merge on CI success and review

.releaserc

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

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
+erpnext/maintenance/            @rohitwaghchaure @mihir-kandoi
 erpnext/manufacturing/          @rohitwaghchaure @mihir-kandoi
-erpnext/quality_management/     @rohitwaghchaure
+erpnext/quality_management/     @rohitwaghchaure @mihir-kandoi
 erpnext/stock/                  @rohitwaghchaure @mihir-kandoi
-erpnext/subcontracting          @mihir-kandoi
+erpnext/subcontracting/         @mihir-kandoi
+erpnext/projects/               @nishkagosalia
 
 erpnext/controllers/            @ruthra-kumar @rohitwaghchaure @mihir-kandoi
-erpnext/patches/                @ruthra-kumar
+erpnext/patches/                @ruthra-kumar @rohitwaghchaure @mihir-kandoi
 
-.github/                        @ruthra-kumar
+.github/                        @ruthra-kumar @mihir-kandoi
 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="80xp"/>
+	<img src="./erpnext/public/images/v16/erpnext.svg" alt="ERPNext Logo" height="80px" width="80px"/>
     </a>
     <h2>ERPNext</h2>
-    <p align="center">
+    <div align="center">
         <p>Powerful, Intuitive and Open-Source ERP</p>
-    </p>
+    </div>
 
 [![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"/>
+	<img src="./erpnext/public/images/v16/hero_image.png" alt="ERPNext Hero Image"/>
 </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 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.
+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.
 
 ### 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 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.
+- **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.
 
 <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 with peace of mind.
+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.
 
-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.
+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.
 
 <div>
-	<a href="https://erpnext-demo.frappe.cloud/app/home" target="_blank">
+	<a href="https://erpnext-demo.frappe.cloud/app/home" target="_blank" rel="noopener noreferrer">
 		<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,25 +75,48 @@ It takes care of installation, setup, upgrades, monitoring, maintenance and supp
 </div>
 
 
-
 ### Self-Hosted
 #### Docker
 
-Prerequisites: docker, docker-compose, git. Refer [Docker Documentation](https://docs.docker.com) for more details on Docker setup.
+See [Frappe Docker Documentation](https://github.com/frappe/frappe_docker) for full documentation & FAQ on Docker setup
 
-Run following commands:
+#### Prerequisites
 
-```
+- [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
-docker compose -f pwd.yml up -d
 ```
 
-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
+Then run:
 
-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.
+```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
 
 
 ## Development Setup
@@ -101,7 +124,7 @@ See [Frappe Docker](https://github.com/frappe/frappe_docker?tab=readme-ov-file#t
 
 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
@@ -130,20 +153,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 community of ERPNext users and service providers.
+3. [Discussion Forum](https://discuss.frappe.io/c/erpnext/6) - Engage with the 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)
-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)
+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)
 
 
 ## Logo and Trademark Policy

SECURITY.md

@@ -1,7 +1,7 @@
 # Security Policy
 
-The ERPNext team and community take security issues seriously. To report a security issue, fill out the form at [https://erpnext.com/security/report](https://erpnext.com/security/report).
+The ERPNext team and community take security issues seriously. To report a security issue, please go through the information mentioned [here](https://frappe.io/security).
 
-You can help us make ERPNext and all it's users more secure by following the [Reporting guidelines](https://erpnext.com/security).
+You can help us make ERPNext and all its users more secure by following the [Reporting guidelines](https://frappe.io/security).
 
-We appreciate your efforts to responsibly disclose your findings. We'll endeavor to respond quickly, and will keep you updated throughout the process.
+We appreciate your efforts to responsibly disclose your findings. We'll endeavor to respond quickly, and will keep you updated throughout the process.

TRADEMARK_POLICY.md

@@ -18,8 +18,9 @@ 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/__init__.py

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

erpnext/accounts/custom/address.py

@@ -52,7 +52,7 @@ class ERPNextAddress(Address):
 
 
 @frappe.whitelist()
-def get_shipping_address(company, address=None):
+def get_shipping_address(company: str, address: str | None = None):
 	filters = [
 		["Dynamic Link", "link_doctype", "=", "Company"],
 		["Dynamic Link", "link_name", "=", company],

erpnext/accounts/dashboard_chart_source/account_balance_timeline/account_balance_timeline.js

@@ -17,6 +17,15 @@ 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, get_link_to_form, getdate, nowdate
+from frappe.utils import add_to_date, formatdate, 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
@@ -13,15 +13,15 @@ from frappe.utils.nestedset import get_descendants_of
 @frappe.whitelist()
 @cache_source
 def get(
-	chart_name=None,
-	chart=None,
-	no_cache=None,
-	filters=None,
-	from_date=None,
-	to_date=None,
-	timespan=None,
-	time_interval=None,
-	heatmap_year=None,
+	chart_name: str | None = None,
+	chart: str | dict | None = None,
+	no_cache: bool | None = None,
+	filters: str | dict | None = None,
+	from_date: str | None = None,
+	to_date: str | None = None,
+	timespan: str | None = None,
+	time_interval: str | None = None,
+	heatmap_year: str | None = None,
 ):
 	if chart_name:
 		chart = frappe.get_doc("Dashboard Chart", chart_name)
@@ -37,21 +37,14 @@ def get(
 	filters = frappe.parse_json(filters) or frappe.parse_json(chart.filters_json)
 
 	account = filters.get("account")
-	filters.get("company")
+	company = filters.get("company")
 
-	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 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 to_date:
 		to_date = nowdate()

erpnext/accounts/deferred_revenue.py

@@ -7,7 +7,6 @@ from frappe.utils import (
 	cint,
 	date_diff,
 	flt,
-	formatdate,
 	get_first_day,
 	get_last_day,
 	get_link_to_form,

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

@@ -471,7 +471,7 @@ class Account(NestedSet):
 
 @frappe.whitelist()
 @frappe.validate_and_sanitize_search_inputs
-def get_parent_account(doctype, txt, searchfield, start, page_len, filters):
+def get_parent_account(doctype: str, txt: str, searchfield: str, start: int, page_len: int, filters: dict):
 	return frappe.db.sql(
 		"""select name from tabAccount
 		where is_group = 1 and docstatus != 2 and company = {}
@@ -515,7 +515,9 @@ def get_account_autoname(account_number, account_name, company):
 
 
 @frappe.whitelist()
-def update_account_number(name, account_name, account_number=None, from_descendant=False):
+def update_account_number(
+	name: str, account_name: str, account_number: str | None = None, from_descendant: bool = False
+):
 	_ensure_idle_system()
 	account = frappe.get_cached_doc("Account", name)
 	if not account:
@@ -577,7 +579,7 @@ def update_account_number(name, account_name, account_number=None, from_descenda
 
 
 @frappe.whitelist()
-def merge_account(old, new):
+def merge_account(old: str, new: str):
 	_ensure_idle_system()
 	# Validate properties before merging
 	new_account = frappe.get_cached_doc("Account", new)
@@ -614,7 +616,7 @@ def merge_account(old, new):
 
 
 @frappe.whitelist()
-def get_root_company(company):
+def get_root_company(company: str):
 	# return the topmost company in the hierarchy
 	ancestors = get_ancestors_of("Company", company, "lft asc")
 	return [ancestors[0]] if ancestors else []

erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py

@@ -99,7 +99,7 @@ def identify_is_group(child):
 
 
 @frappe.whitelist()
-def get_chart(chart_template, existing_company=None):
+def get_chart(chart_template: str | None, existing_company: str | None = None):
 	chart = {}
 	if existing_company:
 		return get_account_tree_from_existing_company(existing_company)
@@ -132,7 +132,7 @@ def get_chart(chart_template, existing_company=None):
 
 
 @frappe.whitelist()
-def get_charts_for_country(country, with_standard=False):
+def get_charts_for_country(country: str, with_standard: bool = False):
 	charts = []
 
 	def _get_chart_name(content):
@@ -225,7 +225,7 @@ def build_account_tree(tree, parent, all_accounts):
 
 
 @frappe.whitelist()
-def validate_bank_account(coa, bank_account):
+def validate_bank_account(coa: str, bank_account: str):
 	accounts = []
 	chart = get_chart(coa)
 
@@ -244,7 +244,9 @@ def validate_bank_account(coa, bank_account):
 
 
 @frappe.whitelist()
-def build_tree_from_json(chart_template, chart_data=None, from_coa_importer=False):
+def build_tree_from_json(
+	chart_template: str, chart_data: dict | None = None, from_coa_importer: bool = False
+):
 	"""get chart template from its folder and parse the json to be rendered as tree"""
 	chart = chart_data or get_chart(chart_template)
 

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

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

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

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

erpnext/accounts/doctype/account/test_account.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
-import unittest
 
 import frappe
 from frappe.utils import nowdate

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,18 +22,6 @@
    "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,
@@ -47,7 +32,7 @@
    "link_fieldname": "account_category"
   }
  ],
- "modified": "2026-03-05 06:49:34.430723",
+ "modified": "2026-02-23 01:19:49.589393",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Account Category",
@@ -84,7 +69,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_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) {
-
-// 	},
-// });
+frappe.ui.form.on("Account Closing Balance", {
+	refresh(frm) {
+		frm.page.btn_secondary.hide();
+	},
+});

erpnext/accounts/doctype/account_closing_balance/account_closing_balance.json

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

erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py

@@ -206,7 +206,7 @@ def delete_accounting_dimension(doc):
 
 
 @frappe.whitelist()
-def disable_dimension(doc):
+def disable_dimension(doc: str):
 	if frappe.in_test:
 		toggle_disabling(doc=doc)
 	else:
@@ -274,7 +274,7 @@ def get_dimension_with_children(doctype, dimensions):
 
 
 @frappe.whitelist()
-def get_dimensions(with_cost_center_and_project=False):
+def get_dimensions(with_cost_center_and_project: str | bool = False):
 	c = frappe.qb.DocType("Accounting Dimension Detail")
 	p = frappe.qb.DocType("Accounting Dimension")
 	dimension_filters = (

erpnext/accounts/doctype/accounting_dimension/test_accounting_dimension.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import unittest
 
 import frappe
 

erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.py

@@ -3,7 +3,7 @@
 
 
 import frappe
-from frappe import _, scrub
+from frappe import _
 from frappe.model.document import Document
 
 

erpnext/accounts/doctype/accounting_dimension_filter/test_accounting_dimension_filter.py

@@ -1,8 +1,6 @@
 # Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
 
-import unittest
-
 import frappe
 
 from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice

erpnext/accounts/doctype/accounting_period/test_accounting_period.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import unittest
 
 import frappe
 from frappe.utils import add_months, nowdate

erpnext/accounts/doctype/accounts_settings/accounts_settings.json

@@ -719,7 +719,6 @@
   }
  ],
  "grid_page_length": 50,
- "hide_toolbar": 0,
  "icon": "icon-cog",
  "idx": 1,
  "index_web_pages_for_search": 1,

erpnext/accounts/doctype/accounts_settings/test_accounts_settings.py

@@ -1,5 +1,3 @@
-import unittest
-
 import frappe
 
 from erpnext.tests.utils import ERPNextTestSuite

erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.js

@@ -3,6 +3,7 @@
 
 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,6 +4,7 @@
  "creation": "2024-10-16 16:57:12.085072",
  "doctype": "DocType",
  "engine": "InnoDB",
+ "is_submittable": 1,
  "field_order": [
   "company",
   "voucher_type",

erpnext/accounts/doctype/bank/test_bank.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import unittest
 
 from erpnext.tests.utils import ERPNextTestSuite
 

erpnext/accounts/doctype/bank_account/bank_account.py

@@ -115,7 +115,7 @@ def get_default_company_bank_account(company, party_type, party):
 
 
 @frappe.whitelist()
-def get_bank_account_details(bank_account):
+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,6 +1,5 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import unittest
 
 from erpnext.tests.utils import ERPNextTestSuite
 

erpnext/accounts/doctype/bank_account_subtype/test_bank_account_subtype.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import unittest
 
 from erpnext.tests.utils import ERPNextTestSuite
 

erpnext/accounts/doctype/bank_account_type/test_bank_account_type.py

@@ -1,7 +1,6 @@
 # Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
 # import frappe
-import unittest
 
 from erpnext.tests.utils import ERPNextTestSuite
 

erpnext/accounts/doctype/bank_clearance/test_bank_clearance.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import unittest
 
 import frappe
 from frappe.utils import add_months, getdate

erpnext/accounts/doctype/bank_guarantee/test_bank_guarantee.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import unittest
 
 from erpnext.tests.utils import ERPNextTestSuite
 

erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py

@@ -1,8 +1,8 @@
 # Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
 # For license information, please see license.txt
 
-
 import json
+from datetime import date
 
 import frappe
 from frappe import _
@@ -47,7 +47,9 @@ class BankReconciliationTool(Document):
 
 
 @frappe.whitelist()
-def get_bank_transactions(bank_account, from_date=None, to_date=None):
+def get_bank_transactions(
+	bank_account: str, from_date: str | date | None = None, to_date: str | date | None = None
+):
 	# returns bank transactions for a bank account
 	filters = []
 	filters.append(["bank_account", "=", bank_account])
@@ -57,7 +59,7 @@ def get_bank_transactions(bank_account, from_date=None, to_date=None):
 		filters.append(["date", "<=", to_date])
 	if from_date:
 		filters.append(["date", ">=", from_date])
-	transactions = frappe.get_all(
+	transactions = frappe.get_list(
 		"Bank Transaction",
 		fields=[
 			"date",
@@ -80,8 +82,9 @@ def get_bank_transactions(bank_account, from_date=None, to_date=None):
 
 
 @frappe.whitelist()
-def get_account_balance(bank_account, till_date, company):
+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(
 		{
@@ -106,7 +109,9 @@ def get_account_balance(bank_account, till_date, company):
 
 
 @frappe.whitelist()
-def update_bank_transaction(bank_transaction_name, reference_number, party_type=None, party=None):
+def update_bank_transaction(
+	bank_transaction_name: str, reference_number: str, party_type: str | None = None, party: str | None = None
+):
 	# updates bank transaction based on the new parameters provided by the user from Vouchers
 	bank_transaction = frappe.get_doc("Bank Transaction", bank_transaction_name)
 	bank_transaction.reference_number = reference_number
@@ -135,16 +140,16 @@ def update_bank_transaction(bank_transaction_name, reference_number, party_type=
 
 @frappe.whitelist()
 def create_journal_entry_bts(
-	bank_transaction_name,
-	reference_number=None,
-	reference_date=None,
-	posting_date=None,
-	entry_type=None,
-	second_account=None,
-	mode_of_payment=None,
-	party_type=None,
-	party=None,
-	allow_edit=None,
+	bank_transaction_name: str,
+	reference_number: str | None = None,
+	reference_date: str | None = None,
+	posting_date: str | date | None = None,
+	entry_type: str | None = None,
+	second_account: str | None = None,
+	mode_of_payment: str | None = None,
+	party_type: str | None = None,
+	party: str | None = None,
+	allow_edit: bool | None = None,
 ):
 	# Create a new journal entry based on the bank transaction
 	bank_transaction = frappe.db.get_values(
@@ -294,17 +299,17 @@ def create_journal_entry_bts(
 
 @frappe.whitelist()
 def create_payment_entry_bts(
-	bank_transaction_name,
-	reference_number=None,
-	reference_date=None,
-	party_type=None,
-	party=None,
-	posting_date=None,
-	mode_of_payment=None,
-	project=None,
-	cost_center=None,
-	allow_edit=None,
-	company_bank_account=None,
+	bank_transaction_name: str,
+	reference_number: str | None = None,
+	reference_date: str | None = None,
+	party_type: str | None = None,
+	party: str | None = None,
+	posting_date: str | None = None,
+	mode_of_payment: str | None = None,
+	project: str | None = None,
+	cost_center: str | None = None,
+	allow_edit: bool | None = None,
+	company_bank_account: str | None = None,
 ):
 	# Create a new payment entry based on the bank transaction
 	bank_transaction = frappe.db.get_values(
@@ -371,12 +376,12 @@ def create_payment_entry_bts(
 
 @frappe.whitelist()
 def auto_reconcile_vouchers(
-	bank_account,
-	from_date=None,
-	to_date=None,
-	filter_by_reference_date=None,
-	from_reference_date=None,
-	to_reference_date=None,
+	bank_account: str,
+	from_date: str | date | None = None,
+	to_date: str | date | None = None,
+	filter_by_reference_date: bool | None = None,
+	from_reference_date: bool | None = None,
+	to_reference_date: str | None = None,
 ):
 	bank_transactions = get_bank_transactions(bank_account)
 
@@ -471,7 +476,7 @@ def get_auto_reconcile_message(partially_reconciled, reconciled):
 
 
 @frappe.whitelist()
-def reconcile_vouchers(bank_transaction_name, vouchers):
+def reconcile_vouchers(bank_transaction_name: str, vouchers: str):
 	# updated clear date of all the vouchers based on the bank transaction
 	vouchers = json.loads(vouchers)
 	transaction = frappe.get_doc("Bank Transaction", bank_transaction_name)
@@ -487,13 +492,13 @@ def reconcile_vouchers(bank_transaction_name, vouchers):
 
 @frappe.whitelist()
 def get_linked_payments(
-	bank_transaction_name,
-	document_types=None,
-	from_date=None,
-	to_date=None,
-	filter_by_reference_date=None,
-	from_reference_date=None,
-	to_reference_date=None,
+	bank_transaction_name: str,
+	document_types: str | list[str] | None = None,
+	from_date: str | date | None = None,
+	to_date: str | date | None = None,
+	filter_by_reference_date: bool | None = None,
+	from_reference_date: bool | None = None,
+	to_reference_date: str | None = None,
 ):
 	# get all matching payments for a bank transaction
 	transaction = frappe.get_doc("Bank Transaction", bank_transaction_name)

erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py

@@ -14,7 +14,6 @@ import openpyxl
 from frappe import _
 from frappe.core.doctype.data_import.data_import import DataImport
 from frappe.core.doctype.data_import.importer import Importer, ImportFile
-from frappe.query_builder.functions import Count
 from frappe.utils.background_jobs import enqueue
 from frappe.utils.file_manager import get_file, save_file
 from frappe.utils.xlsxutils import ILLEGAL_CHARACTERS_RE, handle_html
@@ -144,7 +143,7 @@ def preprocess_mt940_content(content: str) -> str:
 
 
 @frappe.whitelist()
-def convert_mt940_to_csv(data_import, mt940_file_path):
+def convert_mt940_to_csv(data_import: str, mt940_file_path: str):
 	doc = frappe.get_doc("Bank Statement Import", data_import)
 
 	_file_doc, content = get_file(mt940_file_path)
@@ -209,26 +208,28 @@ def convert_mt940_to_csv(data_import, mt940_file_path):
 
 
 @frappe.whitelist()
-def get_preview_from_template(data_import, import_file=None, google_sheets_url=None):
+def get_preview_from_template(
+	data_import: str, import_file: str | None = None, google_sheets_url: str | None = None
+):
 	return frappe.get_doc("Bank Statement Import", data_import).get_preview_from_template(
 		import_file, google_sheets_url
 	)
 
 
 @frappe.whitelist()
-def form_start_import(data_import):
+def form_start_import(data_import: str):
 	job_id = frappe.get_doc("Bank Statement Import", data_import).start_import()
 	return job_id is not None
 
 
 @frappe.whitelist()
-def download_errored_template(data_import_name):
+def download_errored_template(data_import_name: str):
 	data_import = frappe.get_doc("Bank Statement Import", data_import_name)
 	data_import.export_errored_rows()
 
 
 @frappe.whitelist()
-def download_import_log(data_import_name):
+def download_import_log(data_import_name: str):
 	return frappe.get_doc("Bank Statement Import", data_import_name).download_import_log()
 
 
@@ -364,7 +365,7 @@ def write_xlsx(data, sheet_name, wb=None, column_widths=None, file_path=None):
 
 
 @frappe.whitelist()
-def get_import_status(docname):
+def get_import_status(docname: str):
 	import_status = {}
 
 	data_import = frappe.get_doc("Bank Statement Import", docname)

erpnext/accounts/doctype/bank_transaction/bank_transaction_upload.py

@@ -35,7 +35,7 @@ def upload_bank_statement():
 
 
 @frappe.whitelist()
-def create_bank_entries(columns, data, bank_account):
+def create_bank_entries(columns: str, data: str, bank_account: str):
 	header_map = get_header_mapping(columns, bank_account)
 
 	success = 0

erpnext/accounts/doctype/budget/budget.py

@@ -2,14 +2,12 @@
 # For license information, please see license.txt
 
 
-from datetime import date
-
 import frappe
 from frappe import _
 from frappe.model.document import Document
 from frappe.query_builder.functions import Sum
-from frappe.utils import add_months, flt, fmt_money, get_last_day, getdate, month_diff
-from frappe.utils.data import get_first_day, nowdate
+from frappe.utils import add_months, flt, fmt_money, get_last_day, getdate
+from frappe.utils.data import get_first_day
 
 from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import (
 	get_accounting_dimensions,
@@ -847,7 +845,7 @@ def get_fiscal_year_date_range(from_fiscal_year, to_fiscal_year):
 
 
 @frappe.whitelist()
-def revise_budget(budget_name):
+def revise_budget(budget_name: str):
 	old_budget = frappe.get_doc("Budget", budget_name)
 
 	if old_budget.docstatus == 1:

erpnext/accounts/doctype/budget/test_budget.py

@@ -1,10 +1,8 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import unittest
 
 import frappe
-from frappe.client import submit
-from frappe.utils import add_days, flt, get_first_day, get_last_day, getdate, now_datetime, nowdate
+from frappe.utils import flt, now_datetime, nowdate
 
 from erpnext.accounts.doctype.budget.budget import (
 	BudgetError,

erpnext/accounts/doctype/cashier_closing/test_cashier_closing.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import unittest
 
 from erpnext.tests.utils import ERPNextTestSuite
 

erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py

@@ -57,7 +57,7 @@ def validate_columns(data):
 
 
 @frappe.whitelist()
-def validate_company(company):
+def validate_company(company: str):
 	parent_company, allow_account_creation_against_child_company = frappe.get_cached_value(
 		"Company", company, ["parent_company", "allow_account_creation_against_child_company"]
 	)
@@ -74,7 +74,7 @@ def validate_company(company):
 
 
 @frappe.whitelist()
-def import_coa(file_name, company):
+def import_coa(file_name: str, company: str):
 	# delete existing data for accounts
 	unset_existing_data(company)
 
@@ -159,7 +159,9 @@ def generate_data_from_excel(file_doc, extension, as_dict=False):
 
 
 @frappe.whitelist()
-def get_coa(doctype, parent, is_root=False, file_name=None, for_validate=0):
+def get_coa(
+	doctype: str, parent: str, is_root: bool = False, file_name: str | None = None, for_validate: int = 0
+):
 	"""called by tree view (to fetch node's children)"""
 
 	file_doc, extension = get_file(file_name)
@@ -307,7 +309,7 @@ def build_response_as_excel(writer):
 
 
 @frappe.whitelist()
-def download_template(file_type, template_type, company):
+def download_template(file_type: str, template_type: str, company: str):
 	writer = get_template(template_type, company)
 
 	if file_type == "CSV":
@@ -361,7 +363,7 @@ def get_sample_template(writer, company):
 
 
 @frappe.whitelist()
-def validate_accounts(file_doc, extension):
+def validate_accounts(file_doc: Document, extension: str):
 	if extension == "csv":
 		accounts = generate_data_from_csv(file_doc, as_dict=True)
 	else:

erpnext/accounts/doctype/chart_of_accounts_importer/test_chart_of_accounts_importer.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import unittest
 
 from erpnext.tests.utils import ERPNextTestSuite
 

erpnext/accounts/doctype/cheque_print_template/cheque_print_template.py

@@ -47,7 +47,7 @@ class ChequePrintTemplate(Document):
 
 
 @frappe.whitelist()
-def create_or_update_cheque_print_format(template_name):
+def create_or_update_cheque_print_format(template_name: str):
 	if not frappe.db.exists("Print Format", template_name):
 		cheque_print = frappe.new_doc("Print Format")
 		cheque_print.update(

erpnext/accounts/doctype/cheque_print_template/test_cheque_print_template.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import unittest
 
 from erpnext.tests.utils import ERPNextTestSuite
 

erpnext/accounts/doctype/cost_center/test_cost_center.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
-import unittest
 
 import frappe
 

erpnext/accounts/doctype/cost_center_allocation/test_cost_center_allocation.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import unittest
 
 import frappe
 from frappe.query_builder.functions import Sum

erpnext/accounts/doctype/coupon_code/test_coupon_code.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import unittest
 
 import frappe
 

erpnext/accounts/doctype/currency_exchange_settings/test_currency_exchange_settings.py

@@ -1,7 +1,6 @@
 # Copyright (c) 2021, Wahni Green Technologies Pvt. Ltd. and contributors
 # For license information, please see license.txt
 # import frappe
-import unittest
 
 from erpnext.tests.utils import ERPNextTestSuite
 

erpnext/accounts/doctype/dunning_type/test_dunning_type.py

@@ -1,7 +1,6 @@
 # Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
 # import frappe
-import unittest
 
 from erpnext.tests.utils import ERPNextTestSuite
 

erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py

@@ -1,6 +1,7 @@
 # Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
 # For license information, please see license.txt
 
+from datetime import date
 
 import frappe
 from frappe import _, qb
@@ -614,7 +615,12 @@ def calculate_exchange_rate_using_last_gle(company, account, party_type, party):
 
 @frappe.whitelist()
 def get_account_details(
-	company, posting_date, account, party_type=None, party=None, rounding_loss_allowance: float | None = None
+	company: str,
+	posting_date: str | date,
+	account: str,
+	party_type: str | None = None,
+	party: str | None = None,
+	rounding_loss_allowance: float = 0.0,
 ):
 	if not (company and posting_date):
 		frappe.throw(_("Company and Posting Date is mandatory"))

erpnext/accounts/doctype/finance_book/test_finance_book.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import unittest
 
 import frappe
 

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

@@ -5,7 +5,6 @@ import os
 import shutil
 
 import frappe
-from frappe import _
 from frappe.model.document import Document
 
 from erpnext.accounts.doctype.account_category.account_category import import_account_categories

erpnext/accounts/doctype/financial_report_template/financial_report_validation.py

@@ -1,18 +1,15 @@
 # Copyright (c) 2025, Frappe Technologies Pvt. Ltd. and contributors
 # For license information, please see license.txt
 
-import ast
 import json
 import re
 from abc import ABC, abstractmethod
 from dataclasses import dataclass, field
-from enum import Enum
-from typing import Any, ClassVar
+from typing import Any
 
 import frappe
 from frappe import _
 from frappe.database.operator_map import OPERATOR_MAP
-from frappe.database.query import SQLFunctionParser
 
 
 @dataclass

erpnext/accounts/doctype/financial_report_template/test_financial_report_engine.py

@@ -5,14 +5,10 @@ import frappe
 from frappe.utils import flt
 
 from erpnext.accounts.doctype.financial_report_template.financial_report_engine import (
-	AccountData,
-	DataCollector,
 	DependencyResolver,
 	FilterExpressionParser,
 	FinancialQueryBuilder,
-	FinancialReportEngine,
 	FormulaCalculator,
-	PeriodValue,
 )
 from erpnext.accounts.doctype.financial_report_template.test_financial_report_template import (
 	FinancialReportTemplateTestCase,
@@ -1953,159 +1949,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"
@@ -2179,210 +2022,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/fiscal_year/test_fiscal_year.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
-import unittest
 
 import frappe
 from frappe.utils import now_datetime

erpnext/accounts/doctype/gl_entry/gl_entry.json

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

erpnext/accounts/doctype/gl_entry/test_gl_entry.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
-import unittest
 
 import frappe
 from frappe.model.naming import parse_naming_series

erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py

@@ -317,7 +317,7 @@ class InvoiceDiscounting(AccountsController):
 
 
 @frappe.whitelist()
-def get_invoices(filters):
+def get_invoices(filters: str):
 	filters = frappe._dict(json.loads(filters))
 	cond = []
 	if filters.customer:

erpnext/accounts/doctype/invoice_discounting/test_invoice_discounting.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import unittest
 
 import frappe
 from frappe.utils import add_days, flt, nowdate

erpnext/accounts/doctype/item_tax_template/test_item_tax_template.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import unittest
 
 from erpnext.tests.utils import ERPNextTestSuite
 

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

@@ -78,7 +78,6 @@
   "from_template",
   "title",
   "column_break3",
-  "custom_remark",
   "remark",
   "mode_of_payment",
   "party_not_required"
@@ -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\"",
@@ -653,12 +651,6 @@
    "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-03-09 17:15:26.569327",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Journal Entry",

erpnext/accounts/doctype/journal_entry/journal_entry.py

@@ -1,12 +1,13 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
 
-
 import json
+from datetime import date
 
 import frappe
 from frappe import _, msgprint, scrub
 from frappe.core.doctype.submission_queue.submission_queue import queue_submission
+from frappe.model.document import Document
 from frappe.utils import comma_and, cstr, flt, fmt_money, formatdate, get_link_to_form, nowdate
 
 import erpnext
@@ -61,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
@@ -1027,8 +1027,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:
@@ -1225,7 +1225,7 @@ class JournalEntry(AccountsController):
 				cancel_exchange_gain_loss_journal(frappe._dict(doctype=self.doctype, name=self.name))
 
 	@frappe.whitelist()
-	def get_balance(self, difference_account=None):
+	def get_balance(self, difference_account: str | None = None):
 		if not self.get("accounts"):
 			msgprint(_("'Entries' cannot be empty"), raise_exception=True)
 		else:
@@ -1331,7 +1331,12 @@ class JournalEntry(AccountsController):
 
 @frappe.whitelist()
 def get_default_bank_cash_account(
-	company, account_type=None, mode_of_payment=None, account=None, *, fetch_balance=True
+	company: str,
+	account_type: str | None = None,
+	mode_of_payment: str | None = None,
+	account: str | None = None,
+	*,
+	fetch_balance: bool = True,
 ):
 	from erpnext.accounts.doctype.sales_invoice.sales_invoice import get_bank_cash_account
 
@@ -1380,7 +1385,12 @@ def get_default_bank_cash_account(
 
 @frappe.whitelist()
 def get_payment_entry_against_order(
-	dt, dn, amount=None, debit_in_account_currency=None, journal_entry=False, bank_account=None
+	dt: str,
+	dn: str,
+	amount: float | None = None,
+	debit_in_account_currency: str | float | None = None,
+	journal_entry: bool = False,
+	bank_account: str | None = None,
 ):
 	ref_doc = frappe.get_doc(dt, dn)
 
@@ -1425,7 +1435,12 @@ def get_payment_entry_against_order(
 
 @frappe.whitelist()
 def get_payment_entry_against_invoice(
-	dt, dn, amount=None, debit_in_account_currency=None, journal_entry=False, bank_account=None
+	dt: str,
+	dn: str,
+	amount: float | None = None,
+	debit_in_account_currency: str | None = None,
+	journal_entry: bool = False,
+	bank_account: str | None = None,
 ):
 	ref_doc = frappe.get_doc(dt, dn)
 	if dt == "Sales Invoice":
@@ -1538,7 +1553,14 @@ def get_payment_entry(ref_doc, args):
 
 @frappe.whitelist()
 @frappe.validate_and_sanitize_search_inputs
-def get_against_jv(doctype, txt, searchfield, start, page_len, filters):
+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 []
 
@@ -1549,7 +1571,7 @@ def get_against_jv(doctype, txt, searchfield, start, page_len, filters):
 		frappe.qb.from_(JournalEntry)
 		.join(JournalEntryAccount)
 		.on(JournalEntryAccount.parent == JournalEntry.name)
-		.select(JournalEntry.name, JournalEntry.posting_date, JournalEntry.remark)
+		.select(JournalEntry.name, JournalEntry.posting_date, JournalEntry.user_remark)
 		.where(JournalEntryAccount.account == filters.get("account"))
 		.where(JournalEntryAccount.reference_type.isnull() | (JournalEntryAccount.reference_type == ""))
 		.where(JournalEntry.docstatus == 1)
@@ -1569,7 +1591,7 @@ def get_against_jv(doctype, txt, searchfield, start, page_len, filters):
 
 
 @frappe.whitelist()
-def get_outstanding(args):
+def get_outstanding(args: str | dict):
 	if not frappe.has_permission("Account"):
 		frappe.msgprint(_("No Permission"), raise_exception=1)
 
@@ -1629,7 +1651,7 @@ def get_outstanding(args):
 
 
 @frappe.whitelist()
-def get_party_account_and_currency(company, party_type, party):
+def get_party_account_and_currency(company: str, party_type: str, party: str):
 	if not frappe.has_permission("Account"):
 		frappe.msgprint(_("No Permission"), raise_exception=1)
 
@@ -1642,7 +1664,14 @@ def get_party_account_and_currency(company, party_type, party):
 
 
 @frappe.whitelist()
-def get_account_details_and_party_type(account, date, company, debit=None, credit=None, exchange_rate=None):
+def get_account_details_and_party_type(
+	account: str,
+	date: str,
+	company: str,
+	debit: float | str | None = None,
+	credit: float | str | None = None,
+	exchange_rate: float | str | None = None,
+):
 	"""Returns dict of account details and party type to be set in Journal Entry on selection of account."""
 	if not frappe.has_permission("Account"):
 		frappe.msgprint(_("No Permission"), raise_exception=1)
@@ -1691,15 +1720,15 @@ def get_account_details_and_party_type(account, date, company, debit=None, credi
 
 @frappe.whitelist()
 def get_exchange_rate(
-	posting_date,
-	account=None,
-	account_currency=None,
-	company=None,
-	reference_type=None,
-	reference_name=None,
-	debit=None,
-	credit=None,
-	exchange_rate=None,
+	posting_date: str | date,
+	account: str | None = None,
+	account_currency: str | None = None,
+	company: str | None = None,
+	reference_type: str | None = None,
+	reference_name: str | None = None,
+	debit: float | str | None = None,
+	credit: float | str | None = None,
+	exchange_rate: str | float | None = None,
 ):
 	# Ensure exchange_rate is always numeric to avoid calculation errors
 	if isinstance(exchange_rate, str):
@@ -1736,7 +1765,7 @@ def get_exchange_rate(
 
 
 @frappe.whitelist()
-def get_average_exchange_rate(account):
+def get_average_exchange_rate(account: str):
 	exchange_rate = 0
 	bank_balance_in_account_currency = get_balance_on(account)
 	if bank_balance_in_account_currency:
@@ -1747,7 +1776,7 @@ def get_average_exchange_rate(account):
 
 
 @frappe.whitelist()
-def make_inter_company_journal_entry(name, voucher_type, company):
+def make_inter_company_journal_entry(name: str, voucher_type: str, company: str):
 	journal_entry = frappe.new_doc("Journal Entry")
 	journal_entry.voucher_type = voucher_type
 	journal_entry.company = company
@@ -1757,7 +1786,7 @@ def make_inter_company_journal_entry(name, voucher_type, company):
 
 
 @frappe.whitelist()
-def make_reverse_journal_entry(source_name, target_doc=None):
+def make_reverse_journal_entry(source_name: str, target_doc: str | Document | None = None):
 	existing_reverse = frappe.db.exists("Journal Entry", {"reversal_of": source_name, "docstatus": 1})
 	if existing_reverse:
 		frappe.throw(

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

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

@@ -293,7 +293,7 @@
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2026-02-16 16:04:16.022407",
+ "modified": "2026-02-19 17:01:22.642454",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Journal Entry Account",

erpnext/accounts/doctype/journal_entry_template/test_journal_entry_template.py

@@ -1,7 +1,6 @@
 # Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
 # import frappe
-import unittest
 
 from erpnext.tests.utils import ERPNextTestSuite
 

erpnext/accounts/doctype/ledger_merge/ledger_merge.py

@@ -55,7 +55,7 @@ class LedgerMerge(Document):
 
 
 @frappe.whitelist()
-def form_start_merge(docname):
+def form_start_merge(docname: str):
 	return frappe.get_doc("Ledger Merge", docname).start_merge()
 
 

erpnext/accounts/doctype/ledger_merge/test_ledger_merge.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2021, Wahni Green Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import unittest
 
 import frappe
 

erpnext/accounts/doctype/loyalty_point_entry/test_loyalty_point_entry.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import unittest
 
 import frappe
 from frappe.utils import today

erpnext/accounts/doctype/loyalty_program/loyalty_program.py

@@ -1,6 +1,7 @@
 # Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
 # For license information, please see license.txt
 
+from datetime import date
 
 import frappe
 from frappe import _
@@ -88,13 +89,13 @@ def get_loyalty_details(
 
 @frappe.whitelist()
 def get_loyalty_program_details_with_points(
-	customer,
-	loyalty_program=None,
-	expiry_date=None,
-	company=None,
-	silent=False,
-	include_expired_entry=False,
-	current_transaction_amount=0,
+	customer: str,
+	loyalty_program: str | None = None,
+	expiry_date: str | date | None = None,
+	company: str | None = None,
+	silent: bool = False,
+	include_expired_entry: bool = False,
+	current_transaction_amount: int | float = 0,
 ):
 	lp_details = get_loyalty_program_details(customer, loyalty_program, company=company, silent=silent)
 	loyalty_program = frappe.get_doc("Loyalty Program", loyalty_program)
@@ -119,12 +120,12 @@ def get_loyalty_program_details_with_points(
 
 @frappe.whitelist()
 def get_loyalty_program_details(
-	customer,
-	loyalty_program=None,
-	expiry_date=None,
-	company=None,
-	silent=False,
-	include_expired_entry=False,
+	customer: str,
+	loyalty_program: str | None = None,
+	expiry_date: str | date | None = None,
+	company: str | None = None,
+	silent: bool = False,
+	include_expired_entry: bool = False,
 ):
 	lp_details = frappe._dict()
 
@@ -146,7 +147,7 @@ def get_loyalty_program_details(
 
 
 @frappe.whitelist()
-def get_redeemption_factor(loyalty_program=None, customer=None):
+def get_redeemption_factor(loyalty_program: str | None = None, customer: str | None = None):
 	customer_loyalty_program = None
 	if not loyalty_program:
 		customer_loyalty_program = frappe.db.get_value("Customer", customer, "loyalty_program")

erpnext/accounts/doctype/mode_of_payment/test_mode_of_payment.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import unittest
 
 import frappe
 

erpnext/accounts/doctype/monthly_distribution/test_monthly_distribution.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors and Contributors
 # See license.txt
-import unittest
 
 from erpnext.tests.utils import ERPNextTestSuite
 

erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py

@@ -311,7 +311,7 @@ def publish(index, total, doctype):
 
 
 @frappe.whitelist()
-def get_temporary_opening_account(company=None):
+def get_temporary_opening_account(company: str | None = None):
 	if not company:
 		return
 

erpnext/accounts/doctype/party_link/party_link.py

@@ -67,7 +67,7 @@ class PartyLink(Document):
 
 
 @frappe.whitelist()
-def create_party_link(primary_role, primary_party, secondary_party):
+def create_party_link(primary_role: str, primary_party: str, secondary_party: str):
 	party_link = frappe.new_doc("Party Link")
 	party_link.primary_role = primary_role
 	party_link.primary_party = primary_party

erpnext/accounts/doctype/party_link/test_party_link.py

@@ -1,7 +1,6 @@
 # Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
 # import frappe
-import unittest
 
 from erpnext.tests.utils import ERPNextTestSuite
 

erpnext/accounts/doctype/payment_entry/payment_entry.py

@@ -1,18 +1,18 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
 # For license information, please see license.txt
 
-
 import json
+from datetime import date
 from functools import reduce
 
 import frappe
 from frappe import ValidationError, _, qb, scrub, throw
+from frappe.model.document import Document
 from frappe.model.meta import get_field_precision
 from frappe.query_builder import Tuple
 from frappe.query_builder.functions import Count
 from frappe.utils import cint, comma_or, flt, getdate, nowdate
 from frappe.utils.data import comma_and, fmt_money, get_link_to_form
-from pypika import Case
 from pypika.functions import Coalesce, Sum
 
 import erpnext
@@ -1884,7 +1884,9 @@ class PaymentEntry(AccountsController):
 		frappe.response["matched_payment_requests"] = matched_payment_requests
 
 	@frappe.whitelist()
-	def allocate_amount_to_references(self, paid_amount, paid_amount_change, allocate_payment_amount):
+	def allocate_amount_to_references(
+		self, paid_amount: float, paid_amount_change: bool, allocate_payment_amount: bool
+	):
 		"""
 		Allocate `Allocated Amount` and `Payment Request` against `Reference` based on `Paid Amount` and `Outstanding Amount`.\n
 		:param paid_amount: Paid Amount / Received Amount.
@@ -2056,7 +2058,7 @@ class PaymentEntry(AccountsController):
 				)
 
 	@frappe.whitelist()
-	def set_matched_payment_requests(self, matched_payment_requests):
+	def set_matched_payment_requests(self, matched_payment_requests: str | list | None):
 		"""
 		Set `Payment Request` against `Reference` based on `matched_payment_requests`.\n
 		:param matched_payment_requests: List of tuple of matched Payment Requests.
@@ -2272,7 +2274,7 @@ def validate_inclusive_tax(tax, doc):
 
 
 @frappe.whitelist()
-def get_outstanding_reference_documents(args, validate=False):
+def get_outstanding_reference_documents(args: str | dict, validate: bool = False):
 	if isinstance(args, str):
 		args = json.loads(args)
 
@@ -2306,20 +2308,22 @@ def get_outstanding_reference_documents(args, validate=False):
 	# Get positive outstanding sales /purchase invoices
 	condition = ""
 	if args.get("voucher_type") and args.get("voucher_no"):
-		condition = f" and voucher_type={frappe.db.escape(args['voucher_type'])} and voucher_no={frappe.db.escape(args['voucher_no'])}"
+		condition = " and voucher_type={} and voucher_no={}".format(
+			frappe.db.escape(args["voucher_type"]), frappe.db.escape(args["voucher_no"])
+		)
 		common_filter.append(ple.voucher_type == args["voucher_type"])
 		common_filter.append(ple.voucher_no == args["voucher_no"])
 
 	# Add cost center condition
 	if args.get("cost_center"):
-		condition += f" and cost_center={frappe.db.escape(args.get('cost_center'))}"
+		condition += " and cost_center='%s'" % args.get("cost_center")
 		accounting_dimensions_filter.append(ple.cost_center == args.get("cost_center"))
 
 	# dynamic dimension filters
 	active_dimensions = get_dimensions()[0]
 	for dim in active_dimensions:
 		if args.get(dim.fieldname):
-			condition += f" and {dim.fieldname}={frappe.db.escape(args.get(dim.fieldname))}"
+			condition += f" and {dim.fieldname}='{args.get(dim.fieldname)}'"
 			accounting_dimensions_filter.append(ple[dim.fieldname] == args.get(dim.fieldname))
 
 	date_fields_dict = {
@@ -2328,19 +2332,18 @@ def get_outstanding_reference_documents(args, validate=False):
 	}
 
 	for fieldname, date_fields in date_fields_dict.items():
-		from_date = frappe.db.escape(str(args.get(date_fields[0]))) if args.get(date_fields[0]) else None
-		to_date = frappe.db.escape(str(args.get(date_fields[1]))) if args.get(date_fields[1]) else None
-
 		if args.get(date_fields[0]) and args.get(date_fields[1]):
-			condition += f" and {fieldname} between {from_date} and {to_date}"
+			condition += " and {} between '{}' and '{}'".format(
+				fieldname, args.get(date_fields[0]), args.get(date_fields[1])
+			)
 			posting_and_due_date.append(ple[fieldname][args.get(date_fields[0]) : args.get(date_fields[1])])
 		elif args.get(date_fields[0]):
 			# if only from date is supplied
-			condition += f" and {fieldname} >= {from_date}"
+			condition += f" and {fieldname} >= '{args.get(date_fields[0])}'"
 			posting_and_due_date.append(ple[fieldname].gte(args.get(date_fields[0])))
 		elif args.get(date_fields[1]):
 			# if only to date is supplied
-			condition += f" and {fieldname} <= {to_date}"
+			condition += f" and {fieldname} <= '{args.get(date_fields[1])}'"
 			posting_and_due_date.append(ple[fieldname].lte(args.get(date_fields[1])))
 
 	if args.get("company"):
@@ -2560,7 +2563,7 @@ def get_orders_to_be_billed(
 	active_dimensions = get_dimensions(True)[0]
 	for dim in active_dimensions:
 		if filters.get(dim.fieldname):
-			condition += f" and {dim.fieldname}={frappe.db.escape(filters.get(dim.fieldname))}"
+			condition += f" and {dim.fieldname}='{filters.get(dim.fieldname)}'"
 
 	if party_account_currency == company_currency:
 		grand_total_field = "base_grand_total"
@@ -2681,7 +2684,7 @@ def get_negative_outstanding_invoices(
 
 
 @frappe.whitelist()
-def get_party_details(company, party_type, party, date, cost_center=None):
+def get_party_details(company: str, party_type: str, party: str, date: str, cost_center: str | None = None):
 	bank_account = ""
 	party_bank_account = ""
 
@@ -2707,7 +2710,7 @@ def get_party_details(company, party_type, party, date, cost_center=None):
 
 
 @frappe.whitelist()
-def get_account_details(account, date, cost_center=None):
+def get_account_details(account: str, date: str | date, cost_center: str | None = None):
 	frappe.has_permission("Payment Entry", throw=True)
 
 	# to check if the passed account is accessible under reference doctype Payment Entry
@@ -2727,7 +2730,7 @@ def get_account_details(account, date, cost_center=None):
 
 
 @frappe.whitelist()
-def get_company_defaults(company):
+def get_company_defaults(company: str):
 	fields = ["write_off_account", "exchange_gain_loss_account", "cost_center"]
 	return frappe.get_cached_value("Company", company, fields, as_dict=1)
 
@@ -2766,7 +2769,11 @@ def get_outstanding_on_journal_entry(voucher_no, party_type, party):
 
 @frappe.whitelist()
 def get_reference_details(
-	reference_doctype, reference_name, party_account_currency, party_type=None, party=None
+	reference_doctype: str,
+	reference_name: str,
+	party_account_currency: str,
+	party_type: str | None = None,
+	party: str | None = None,
 ):
 	total_amount = outstanding_amount = exchange_rate = account = None
 
@@ -2857,15 +2864,15 @@ def get_reference_details(
 
 @frappe.whitelist()
 def get_payment_entry(
-	dt,
-	dn,
-	party_amount=None,
-	bank_account=None,
-	bank_amount=None,
-	party_type=None,
-	payment_type=None,
-	reference_date=None,
-	created_from_payment_request=False,
+	dt: str,
+	dn: str,
+	party_amount: int | float | None = None,
+	bank_account: str | None = None,
+	bank_amount: int | float | None = None,
+	party_type: str | None = None,
+	payment_type: str | None = None,
+	reference_date: str | date | None = None,
+	created_from_payment_request: bool | None = None,
 ):
 	doc = frappe.get_doc(dt, dn)
 	over_billing_allowance = frappe.get_single_value("Accounts Settings", "over_billing_allowance")
@@ -3531,7 +3538,7 @@ def get_paid_amount(dt, dn, party_type, party, account, due_date):
 
 
 @frappe.whitelist()
-def make_payment_order(source_name, target_doc=None):
+def make_payment_order(source_name: str, target_doc: str | Document | None = None):
 	from frappe.model.mapper import get_mapped_doc
 
 	def set_missing_values(source, target):

erpnext/accounts/doctype/payment_entry/payment_entry_list.js

@@ -1,4 +1,20 @@
 frappe.listview_settings["Payment Entry"] = {
+	add_fields: ["unallocated_amount", "docstatus"],
+	get_indicator: function (doc) {
+		if (doc.docstatus === 2) {
+			return [__("Cancelled"), "red", "docstatus,=,2"];
+		}
+
+		if (doc.docstatus === 0) {
+			return [__("Draft"), "orange", "docstatus,=,0"];
+		}
+
+		if (flt(doc.unallocated_amount) > 0) {
+			return [__("Unreconciled"), "orange", "docstatus,=,1|unallocated_amount,>,0"];
+		}
+
+		return [__("Reconciled"), "green", "docstatus,=,1|unallocated_amount,=,0"];
+	},
 	onload: function (listview) {
 		if (listview.page.fields_dict.party_type) {
 			listview.page.fields_dict.party_type.get_query = function () {

erpnext/accounts/doctype/payment_entry/test_payment_entry.py

@@ -195,30 +195,6 @@ class TestPaymentEntry(ERPNextTestSuite):
 		outstanding_amount = flt(frappe.db.get_value("Sales Invoice", si.name, "outstanding_amount"))
 		self.assertEqual(outstanding_amount, 100)
 
-	def test_reference_outstanding_amount_on_advance_pull(self):
-		from erpnext.selling.doctype.sales_order.sales_order import make_sales_invoice
-
-		so = make_sales_order(qty=1, rate=1000)
-		pe = get_payment_entry("Sales Order", so.name, bank_account="_Test Cash - _TC")
-		pe.paid_amount = pe.received_amount = 500
-		pe.references[0].allocated_amount = 500
-		pe.insert()
-		pe.submit()
-
-		so.reload()
-		self.assertEqual(so.advance_paid, 500)
-
-		si = make_sales_invoice(so.name)
-		si.allocate_advances_automatically = 1
-		si.save()
-		self.assertEqual(si.get("advances")[0].allocated_amount, 500)
-		self.assertEqual(si.get("advances")[0].reference_name, pe.name)
-		si.submit()
-
-		pe.load_from_db()
-		self.assertEqual(pe.references[0].reference_name, si.name)
-		self.assertEqual(pe.references[0].outstanding_amount, si.outstanding_amount)
-
 	def test_payment_entry_against_pi(self):
 		pi = make_purchase_invoice(
 			supplier="_Test Supplier USD",
@@ -2129,37 +2105,6 @@ class TestPaymentEntry(ERPNextTestSuite):
 			self.assertEqual(ref.voucher_no, so.name)
 			self.assertIsNotNone(ref.payment_term)
 
-	def test_project_name_in_exchange_gain_loss_entry(self):
-		si = create_sales_invoice(
-			customer="_Test Customer USD",
-			debit_to="_Test Receivable USD - _TC",
-			currency="USD",
-			conversion_rate=50,
-			do_not_submit=True,
-		)
-		from erpnext.projects.doctype.project.test_project import make_project
-
-		si.project = make_project({"project_name": "_Test Project for Exchange Gain Loss Entry"}).name
-
-		si.submit()
-
-		pe = get_payment_entry("Sales Invoice", si.name)
-
-		pe.source_exchange_rate = 100
-
-		pe.insert()
-		pe.submit()
-
-		rows = frappe.get_all(
-			"Journal Entry Account",
-			or_filters=[{"reference_name": pe.name}, {"reference_name": si.name}],
-			fields=["project"],
-		)
-		self.assertEqual(len(rows), 2)
-
-		self.assertEqual(rows[0].project, si.project)
-		self.assertEqual(rows[1].project, si.project)
-
 
 def create_payment_entry(**args):
 	payment_entry = frappe.new_doc("Payment Entry")

erpnext/accounts/doctype/payment_gateway_account/test_payment_gateway_account.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import unittest
 
 from erpnext.tests.utils import ERPNextTestSuite
 

erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.js

@@ -2,6 +2,7 @@
 // For license information, please see license.txt
 
 frappe.ui.form.on("Payment Ledger Entry", {
-	// refresh: function(frm) {
-	// }
+	refresh(frm) {
+		frm.page.btn_secondary.hide();
+	},
 });

erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json

@@ -5,6 +5,7 @@
  "doctype": "DocType",
  "editable_grid": 1,
  "engine": "InnoDB",
+ "is_submittable": 1,
  "field_order": [
   "posting_date",
   "company",

erpnext/accounts/doctype/payment_order/payment_order.py

@@ -59,7 +59,7 @@ class PaymentOrder(Document):
 
 @frappe.whitelist()
 @frappe.validate_and_sanitize_search_inputs
-def get_mop_query(doctype, txt, searchfield, start, page_len, filters):
+def get_mop_query(doctype: str, txt: str, searchfield: str, start: int, page_len: int, filters: dict):
 	return frappe.db.sql(
 		""" select mode_of_payment from `tabPayment Order Reference`
 		where parent = %(parent)s and mode_of_payment like %(txt)s
@@ -70,7 +70,7 @@ def get_mop_query(doctype, txt, searchfield, start, page_len, filters):
 
 @frappe.whitelist()
 @frappe.validate_and_sanitize_search_inputs
-def get_supplier_query(doctype, txt, searchfield, start, page_len, filters):
+def get_supplier_query(doctype: str, txt: str, searchfield: str, start: int, page_len: int, filters: dict):
 	return frappe.db.sql(
 		""" select supplier from `tabPayment Order Reference`
 		where parent = %(parent)s and supplier like %(txt)s and
@@ -81,7 +81,7 @@ def get_supplier_query(doctype, txt, searchfield, start, page_len, filters):
 
 
 @frappe.whitelist()
-def make_payment_records(name, supplier, mode_of_payment=None):
+def make_payment_records(name: str, supplier: str, mode_of_payment: str | None = None):
 	doc = frappe.get_doc("Payment Order", name)
 	make_journal_entry(doc, supplier, mode_of_payment)
 

erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py

@@ -433,7 +433,9 @@ class PaymentReconciliation(Document):
 		return frappe.get_single_value("Accounts Settings", "auto_reconcile_payments")
 
 	@frappe.whitelist()
-	def calculate_difference_on_allocation_change(self, payment_entry, invoice, allocated_amount):
+	def calculate_difference_on_allocation_change(
+		self, payment_entry: list, invoice: list, allocated_amount: float
+	):
 		invoice_exchange_map = self.get_invoice_exchange_map(invoice, payment_entry)
 		invoice[0]["exchange_rate"] = invoice_exchange_map.get(invoice[0].get("invoice_number"))
 		if payment_entry[0].get("reference_type") in ["Sales Invoice", "Purchase Invoice"]:
@@ -445,7 +447,7 @@ class PaymentReconciliation(Document):
 		return new_difference_amount
 
 	@frappe.whitelist()
-	def allocate_entries(self, args):
+	def allocate_entries(self, args: dict):
 		self.validate_entries()
 
 		exc_gain_loss_posting_date = frappe.db.get_single_value(

erpnext/accounts/doctype/payment_reconciliation/test_payment_reconciliation.py

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

erpnext/accounts/doctype/payment_request/payment_request.py

@@ -102,8 +102,8 @@ class PaymentRequest(Document):
 		subscription_plans: DF.Table[SubscriptionPlanDetail]
 		swift_number: DF.ReadOnly | None
 		transaction_date: DF.Date | None
-
 	# end: auto-generated types
+
 	def on_discard(self):
 		self.db_set("status", "Cancelled")
 
@@ -938,7 +938,7 @@ def get_payment_gateway_account(filter):
 
 
 @frappe.whitelist()
-def get_print_format_list(ref_doctype):
+def get_print_format_list(ref_doctype: str):
 	print_format_list = ["Standard"]
 
 	print_format_list.extend(
@@ -949,13 +949,14 @@ def get_print_format_list(ref_doctype):
 
 
 @frappe.whitelist()
-def resend_payment_email(docname):
+def resend_payment_email(docname: str):
 	return frappe.get_doc("Payment Request", docname).send_email()
 
 
 @frappe.whitelist()
-def make_payment_entry(docname):
+def make_payment_entry(docname: str):
 	doc = frappe.get_doc("Payment Request", docname)
+	doc.check_permission("read")
 	return doc.create_payment_entry(submit=False).as_dict()
 
 
@@ -1047,7 +1048,7 @@ def get_dummy_message(doc):
 
 
 @frappe.whitelist()
-def get_subscription_details(reference_doctype, reference_name):
+def get_subscription_details(reference_doctype: str, reference_name: str):
 	if reference_doctype == "Sales Invoice":
 		subscriptions = frappe.db.sql(
 			"""SELECT parent as sub_name FROM `tabSubscription Invoice` WHERE invoice=%s""",
@@ -1063,7 +1064,7 @@ def get_subscription_details(reference_doctype, reference_name):
 
 
 @frappe.whitelist()
-def make_payment_order(source_name, target_doc=None):
+def make_payment_order(source_name: str, target_doc: str | Document | None = None):
 	from frappe.model.mapper import get_mapped_doc
 
 	def set_missing_values(source, target):
@@ -1111,7 +1112,9 @@ def validate_payment(doc, method=None):
 
 
 @frappe.whitelist()
-def get_open_payment_requests_query(doctype, txt, searchfield, start, page_len, filters):
+def get_open_payment_requests_query(
+	doctype: str, txt: str, searchfield: str, start: int, page_len: int, filters: dict
+):
 	# permission checks in `get_list()`
 	filters = frappe._dict(filters)
 
@@ -1153,7 +1156,7 @@ def get_irequests_of_payment_request(doc: str | None = None) -> list:
 
 
 @frappe.whitelist()
-def get_available_payment_schedules(reference_doctype, reference_name):
+def get_available_payment_schedules(reference_doctype: str, reference_name: str):
 	ref_doc = frappe.get_doc(reference_doctype, reference_name)
 
 	if not hasattr(ref_doc, "payment_schedule") or not ref_doc.payment_schedule:

erpnext/accounts/doctype/payment_request/test_payment_request.py

@@ -3,7 +3,6 @@
 
 import json
 import re
-import unittest
 from unittest.mock import patch
 
 import frappe

erpnext/accounts/doctype/payment_term/test_payment_term.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import unittest
 
 from erpnext.tests.utils import ERPNextTestSuite