fix: TDS calculation on net total (#27058)

(cherry picked from commit 4eb7c2a011)

# Conflicts:
#	erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py
#	erpnext/accounts/doctype/tax_withholding_category/test_tax_withholding_category.py

.git-blame-ignore-revs

@@ -42,6 +42,3 @@ a308792ee7fda18a681e9181f4fd00b36385bc23
 # noisy typing refactoring of get_item_details
 7b7211ac79c248a79ba8a999ff34e734d874c0ae
 d827ed21adc7b36047e247cbb0dc6388d048a7f9
-
-# `frappe.flags.in_test` => `frappe.in_test`
-7a482a69985c952de0e8193c9d4e086aee65ee6d

.github/helper/install.sh

@@ -4,13 +4,9 @@ set -e
 
 cd ~ || exit
 
-
-curl -LsS https://r.mariadb.com/downloads/mariadb_repo_setup | sudo bash
 sudo apt update
 sudo apt remove mysql-server mysql-client
-sudo apt install libcups2-dev redis-server mariadb-client libmariadb-dev
-
-pip cache remove mysqlclient
+sudo apt install libcups2-dev redis-server mariadb-client
 
 pip install frappe-bench
 
@@ -70,7 +66,7 @@ sed -i 's/schedule:/# schedule:/g' Procfile
 sed -i 's/socketio:/# socketio:/g' Procfile
 sed -i 's/redis_socketio:/# redis_socketio:/g' Procfile
 
-bench get-app payments --branch develop
+bench get-app payments --branch ${githubbranch%"-hotfix"}
 bench get-app erpnext "${GITHUB_WORKSPACE}"
 
 if [ "$TYPE" == "server" ]; then bench setup requirements --dev; fi

.github/helper/site_config_mariadb.json

@@ -8,7 +8,6 @@
  "mail_login": "test@example.com",
  "mail_password": "test",
  "admin_password": "admin",
- "use_mysqlclient": 1,
  "root_login": "root",
  "root_password": "root",
  "host_name": "http://test_site:8000",

.github/release.yml

@@ -1,4 +0,0 @@
-changelog:
-  exclude:
-    labels:
-      - skip-release-notes

.github/workflows/backport.yml

@@ -5,9 +5,6 @@ on:
       - closed
       - labeled
 
-permissions:
-  contents: read
-
 jobs:
   main:
     runs-on: ubuntu-latest

.github/workflows/docker-release.yml

@@ -2,10 +2,6 @@ name: Trigger Docker build on release
 on:
   release:
     types: [released]
-
-permissions:
-  contents: read
-
 jobs:
   curl:
     runs-on: ubuntu-latest

.github/workflows/docs-checker.yml

@@ -3,9 +3,6 @@ on:
   pull_request:
     types: [ opened, synchronize, reopened, edited ]
 
-permissions:
-  contents: read
-
 jobs:
   build:
     runs-on: ubuntu-latest

.github/workflows/initiate_release.yml

@@ -2,10 +2,6 @@
 # To add/remove versions just modify the matrix.
 
 name: Create weekly release pull requests
-
-permissions:
-  contents: read
-
 on:
   schedule:
     # 9:30 UTC => 3 PM IST Tuesday

.github/workflows/label-base-on-title.yml

@@ -1,30 +0,0 @@
-name: "Auto-label PRs based on title"
-
-on:
-  pull_request_target:
-    types: [opened, reopened]
-
-jobs:
-  add-label-if-prefix-matches:
-    permissions:
-      contents: read
-      pull-requests: write
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check PR title and add label if it matches prefixes
-        uses: actions/github-script@v7
-        continue-on-error: true
-        with:
-          script: |
-            const title = context.payload.pull_request.title.toLowerCase();
-            const prefixes = ['chore', 'ci', 'style', 'test', 'refactor'];
-            
-            // Check if the PR title starts with any of the prefixes
-            if (prefixes.some(prefix => title.startsWith(prefix))) {
-              await github.rest.issues.addLabels({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: context.payload.pull_request.number,
-                labels: ['skip-release-notes']
-              });
-            }

.github/workflows/labeller.yml

@@ -3,10 +3,6 @@ on:
   pull_request_target:
     types: [opened, reopened]
 
-permissions:
-  issues: write
-  pull-requests: write
-
 jobs:
   triage:
     runs-on: ubuntu-latest

.github/workflows/linters.yml

@@ -3,9 +3,6 @@ name: Linters
 on:
   pull_request: { }
 
-permissions:
-  contents: read
-
 jobs:
 
   linters:

.github/workflows/patch.yml

@@ -10,9 +10,6 @@ on:
       - '**.csv'
   workflow_dispatch:
 
-permissions:
-  contents: read
-
 concurrency:
   group: patch-develop-${{ github.event_name }}-${{ github.event.number || github.event_name == 'workflow_dispatch' && github.run_id || '' }}
   cancel-in-progress: true
@@ -39,7 +36,7 @@ jobs:
 
       - name: Check for valid Python & Merge Conflicts
         run: |
-          python -m compileall -fq "${GITHUB_WORKSPACE}"
+          python -m compileall -f "${GITHUB_WORKSPACE}"
           if grep -lr --exclude-dir=node_modules "^<<<<<<< " "${GITHUB_WORKSPACE}"
               then echo "Found merge conflicts"
               exit 1

.github/workflows/patch_faux.yml

@@ -11,9 +11,6 @@ on:
       - "**.html"
       - "**.csv"
 
-permissions:
-  contents: read
-
 jobs:
   test:
     runs-on: ubuntu-latest

.github/workflows/release.yml

@@ -3,10 +3,6 @@ on:
   push:
     branches:
       - version-13
-
-permissions:
-  contents: read
-
 jobs:
   release:
     name: Release

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

@@ -7,9 +7,6 @@ concurrency:
   group: server-individual-tests-develop-${{ github.event_name }}-${{ github.event.number || github.event_name == 'workflow_dispatch' && github.run_id || '' }}
   cancel-in-progress: false
 
-permissions:
-  contents: read
-
 jobs:
   discover:
     runs-on: ubuntu-latest

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

@@ -10,9 +10,6 @@ on:
       - "**.md"
       - "**.html"
 
-permissions:
-  contents: read
-
 jobs:
   test:
     runs-on: ubuntu-latest

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

@@ -25,9 +25,6 @@ on:
         required: false
         type: string
 
-permissions:
-  contents: read
-
 concurrency:
   group: server-mariadb-develop-${{ github.event_name }}-${{ github.event.number || github.event_name == 'workflow_dispatch' && github.run_id || '' }}
   cancel-in-progress: true
@@ -68,7 +65,7 @@ jobs:
 
       - name: Check for valid Python & Merge Conflicts
         run: |
-          python -m compileall -fq "${GITHUB_WORKSPACE}"
+          python -m compileall -f "${GITHUB_WORKSPACE}"
           if grep -lr --exclude-dir=node_modules "^<<<<<<< " "${GITHUB_WORKSPACE}"
               then echo "Found merge conflicts"
               exit 1

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

@@ -12,9 +12,6 @@ concurrency:
   group: server-postgres-develop-${{ github.event_name }}-${{ github.event.number || github.event_name == 'workflow_dispatch' && github.run_id || '' }}
   cancel-in-progress: true
 
-permissions:
-  contents: read
-
 jobs:
   test:
     if: ${{ contains(github.event.pull_request.labels.*.name, 'postgres') }}
@@ -53,7 +50,7 @@ jobs:
 
       - name: Check for valid Python & Merge Conflicts
         run: |
-          python -m compileall -fq "${GITHUB_WORKSPACE}"
+          python -m compileall -f "${GITHUB_WORKSPACE}"
           if grep -lr --exclude-dir=node_modules "^<<<<<<< " "${GITHUB_WORKSPACE}"
               then echo "Found merge conflicts"
               exit 1

.pre-commit-config.yaml

@@ -1,5 +1,5 @@
 exclude: 'node_modules|.git'
-default_stages: [pre-commit]
+default_stages: [commit]
 fail_fast: false
 
 

README.md

@@ -1,5 +1,5 @@
 <div align="center">
-    <a href="https://frappe.io/erpnext">
+    <a href="https://erpnext.com">
 	<img src="./erpnext/public/images/v16/erpnext.svg" alt="ERPNext Logo" height="80px" width="80xp"/>
     </a>
     <h2>ERPNext</h2>
@@ -7,7 +7,6 @@
         <p>Powerful, Intuitive and Open-Source ERP</p>
     </p>
 
-[![Learn on Frappe School](https://img.shields.io/badge/Frappe%20School-Learn%20ERPNext-blue?style=flat-square)](https://frappe.school)<br><br>
 [![CI](https://github.com/frappe/erpnext/actions/workflows/server-tests-mariadb.yml/badge.svg?event=schedule)](https://github.com/frappe/erpnext/actions/workflows/server-tests-mariadb.yml)
 [![docker pulls](https://img.shields.io/docker/pulls/frappe/erpnext-worker.svg)](https://hub.docker.com/r/frappe/erpnext-worker)
 
@@ -18,11 +17,11 @@
 </div>
 
 <div align="center">
-	<a href="https://erpnext-demo.frappe.cloud/api/method/erpnext_demo.erpnext_demo.auth.login_demo">Live Demo</a>
+	<a href="https://erpnext-demo.frappe.cloud/app/home">Live Demo</a>
 	-
-	<a href="https://frappe.io/erpnext">Website</a>
+	<a href="https://erpnext.com">Website</a>
 	-
-	<a href="https://docs.frappe.io/erpnext/">Documentation</a>
+	<a href="https://docs.erpnext.com">Documentation</a>
 </div>
 
 ## ERPNext
@@ -115,23 +114,26 @@ To setup the repository locally follow the steps mentioned below:
 2. In a separate terminal window, run the following commands:
    ```
    # Create a new site
-   bench new-site erpnext.localhost
+   bench new-site erpnext.dev
+   
+   # Map your site to localhost
+   bench --site erpnext.dev add-to-hosts
    ```
-
+	
 3. Get the ERPNext app and install it
    ```
    # Get the ERPNext app
    bench get-app https://github.com/frappe/erpnext
-
+   
    # Install the app
-   bench --site erpnext.localhost install-app erpnext
+   bench --site erpnext.dev install-app erpnext
    ```
 
-4. Open the URL `http://erpnext.localhost:8000/app` in your browser, you should see the app running
+4. Open the URL `http://erpnext.dev:8000/app` in your browser, you should see the app running
 
 ## 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.
+1. [Frappe School](https://frappe.school) - 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.erpnext.com/) - Engage with community of ERPNext users and service providers.
 4. [Telegram Group](https://erpnext_public.t.me) - Get instant help from huge community of users.
@@ -142,7 +144,6 @@ To setup the repository locally follow the steps mentioned below:
 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)
 
 
 ## Logo and Trademark Policy

crowdin.yml

@@ -4,11 +4,7 @@ files:
 pull_request_title: "fix: sync translations from crowdin"
 pull_request_labels:
   - translation
-  - skip-release-notes
 pull_request_reviewers:
   - barredterra # change to your GitHub username if you copied this file
 commit_message: "fix: %language% translations"
 append_commit_message: false
-languages_mapping:
-  two_letters_code:
-    pt-BR: pt_BR

erpnext/__init__.py

@@ -57,7 +57,7 @@ def get_company_currency(company):
 
 def set_perpetual_inventory(enable=1, company=None):
 	if not company:
-		company = "_Test Company" if frappe.in_test else get_default_company()
+		company = "_Test Company" if frappe.flags.in_test else get_default_company()
 
 	company = frappe.get_doc("Company", company)
 	company.enable_perpetual_inventory = enable
@@ -77,7 +77,7 @@ def encode_company_abbr(name, company=None, abbr=None):
 
 def is_perpetual_inventory_enabled(company):
 	if not company:
-		company = "_Test Company" if frappe.in_test else get_default_company()
+		company = "_Test Company" if frappe.flags.in_test else get_default_company()
 
 	if not hasattr(frappe.local, "enable_perpetual_inventory"):
 		frappe.local.enable_perpetual_inventory = {}

erpnext/accounts/deferred_revenue.py

@@ -317,7 +317,7 @@ def get_already_booked_amount(doc, item):
 def book_deferred_income_or_expense(doc, deferred_process, posting_date=None):
 	enable_check = "enable_deferred_revenue" if doc.doctype == "Sales Invoice" else "enable_deferred_expense"
 
-	accounts_frozen_upto = frappe.get_single_value("Accounts Settings", "acc_frozen_upto")
+	accounts_frozen_upto = frappe.db.get_single_value("Accounts Settings", "acc_frozen_upto")
 
 	def _book_deferred_revenue_or_expense(
 		item,
@@ -526,7 +526,7 @@ def make_gl_entries(
 			make_gl_entries(gl_entries, cancel=(doc.docstatus == 2), merge_entries=True)
 			frappe.db.commit()
 		except Exception as e:
-			if frappe.in_test:
+			if frappe.flags.in_test:
 				doc.log_error(f"Error while processing deferred accounting for Invoice {doc.name}")
 				raise e
 			else:

erpnext/accounts/doctype/account/account.py

@@ -92,7 +92,7 @@ class Account(NestedSet):
 			super().on_update()
 
 	def onload(self):
-		frozen_accounts_modifier = frappe.get_single_value("Accounts Settings", "frozen_accounts_modifier")
+		frozen_accounts_modifier = frappe.db.get_single_value("Accounts Settings", "frozen_accounts_modifier")
 		if not frozen_accounts_modifier or frozen_accounts_modifier in frappe.get_roles():
 			self.set_onload("can_freeze_account", True)
 
@@ -500,7 +500,7 @@ def update_account_number(name, account_name, account_number=None, from_descenda
 				"name",
 			)
 
-			if old_name and not from_descendant:
+			if old_name:
 				# same account in parent company exists
 				allow_child_account_creation = _("Allow Account Creation Against Child Company")
 
@@ -602,10 +602,9 @@ def _ensure_idle_system():
 	# 1. Correctness: It's next to impossible to ensure that renamed account is not being used *right now*.
 	# 2. Performance: Renaming requires locking out many tables entirely and severely degrades performance.
 
-	if frappe.in_test:
+	if frappe.flags.in_test:
 		return
 
-	last_gl_update = None
 	try:
 		# We also lock inserts to GL entry table with for_update here.
 		last_gl_update = frappe.db.get_value("GL Entry", {}, "modified", for_update=True, wait=False)
@@ -613,9 +612,6 @@ def _ensure_idle_system():
 		# wait=False fails immediately if there's an active transaction.
 		last_gl_update = add_to_date(None, seconds=-1)
 
-	if not last_gl_update:
-		return
-
 	if last_gl_update > add_to_date(None, minutes=-5):
 		frappe.throw(
 			_(

erpnext/accounts/doctype/account/account_tree.js

@@ -139,11 +139,6 @@ frappe.treeview_settings["Account"] = {
 			description: __(
 				"Further accounts can be made under Groups, but entries can be made against non-Groups"
 			),
-			onchange: function () {
-				if (!this.value) {
-					this.layout.set_value("root_type", "");
-				}
-			},
 		},
 		{
 			fieldtype: "Select",

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

@@ -116,7 +116,6 @@ def identify_is_group(child):
 	return is_group
 
 
-@frappe.whitelist()
 def get_chart(chart_template, existing_company=None):
 	chart = {}
 	if existing_company:

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

@@ -96,20 +96,8 @@
                         "account_number": "1132.000"
                     }, 
                     "account_number": "1130.000"
-                },
-                "Pajak Dibayar di Muka": {
-                    "PPN Masukan": {
-                        "account_number": "1151.001", 
-                        "account_type": "Tax"
-                    },
-                    "PPh 23 Dibayar di Muka": {
-                        "account_number": "1152.001", 
-                        "account_type": "Tax"
-                    }, 
-                    "account_number": "1150.000"
-                },
+                }, 
                 "account_number": "1100.000"
-                
             }, 
             "Aktiva Tetap": {
                 "Aktiva": {
@@ -569,10 +557,6 @@
                     "Hutang Pajak": {
                         "account_number": "2141.000", 
                         "account_type": "Payable"
-                    },
-                    "PPN Keluaran": {
-                        "account_number": "2142.000", 
-                        "account_type": "Tax"
                     }, 
                     "account_number": "2140.000"
                 }, 

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

@@ -98,7 +98,7 @@
                 "Office Maintenance Expenses": {},
                 "Office Rent": {},
                 "Postal Expenses": {},
-                "Print and Stationery": {},
+                "Print and Stationary": {},
                 "Rounded Off": {
                     "account_type": "Round Off"
                 },

erpnext/accounts/doctype/account/test_records.json

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

erpnext/accounts/doctype/account/test_records.toml

@@ -0,0 +1,3 @@
+[[Account]]
+name = "_Test Account 1"
+

erpnext/accounts/doctype/account_closing_balance/test_account_closing_balance.py

@@ -2,7 +2,16 @@
 # See license.txt
 
 # import frappe
-from frappe.tests import IntegrationTestCase
+from frappe.tests import IntegrationTestCase, UnitTestCase
+
+
+class UnitTestAccountClosingBalance(UnitTestCase):
+	"""
+	Unit tests for AccountClosingBalance.
+	Use this class for testing individual functions and methods.
+	"""
+
+	pass
 
 
 class TestAccountClosingBalance(IntegrationTestCase):

erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py

@@ -83,7 +83,7 @@ class AccountingDimension(Document):
 				frappe.throw(_("Company {0} is added more than once").format(frappe.bold(default.company)))
 
 	def after_insert(self):
-		if frappe.in_test:
+		if frappe.flags.in_test:
 			make_dimension_in_accounting_doctypes(doc=self)
 		else:
 			frappe.enqueue(
@@ -91,7 +91,7 @@ class AccountingDimension(Document):
 			)
 
 	def on_trash(self):
-		if frappe.in_test:
+		if frappe.flags.in_test:
 			delete_accounting_dimension(doc=self)
 		else:
 			frappe.enqueue(delete_accounting_dimension, doc=self, queue="long", enqueue_after_commit=True)
@@ -213,7 +213,7 @@ def delete_accounting_dimension(doc):
 
 @frappe.whitelist()
 def disable_dimension(doc):
-	if frappe.in_test:
+	if frappe.flags.in_test:
 		toggle_disabling(doc=doc)
 	else:
 		frappe.enqueue(toggle_disabling, doc=doc)

erpnext/accounts/doctype/accounting_dimension/test_accounting_dimension.py

@@ -58,10 +58,6 @@ class TestAccountingDimension(IntegrationTestCase):
 		self.assertEqual(gle1.get("department"), "_Test Department - _TC")
 
 	def test_mandatory(self):
-		location = frappe.get_doc("Accounting Dimension", "Location")
-		location.dimension_defaults[0].mandatory_for_bs = True
-		location.save()
-
 		si = create_sales_invoice(do_not_save=1)
 		si.append(
 			"items",
@@ -125,6 +121,7 @@ def create_dimension():
 				"company": "_Test Company",
 				"reference_document": "Location",
 				"default_dimension": "Block 1",
+				"mandatory_for_bs": 1,
 			},
 		)
 

erpnext/accounts/doctype/accounts_settings/accounts_settings.js

@@ -22,21 +22,4 @@ frappe.ui.form.on("Accounts Settings", {
 			}
 		);
 	},
-
-	add_taxes_from_taxes_and_charges_template(frm) {
-		toggle_tax_settings(frm, "add_taxes_from_taxes_and_charges_template");
-	},
-	add_taxes_from_item_tax_template(frm) {
-		toggle_tax_settings(frm, "add_taxes_from_item_tax_template");
-	},
 });
-
-function toggle_tax_settings(frm, field_name) {
-	if (frm.doc[field_name]) {
-		const other_field =
-			field_name === "add_taxes_from_item_tax_template"
-				? "add_taxes_from_taxes_and_charges_template"
-				: "add_taxes_from_item_tax_template";
-		frm.set_value(other_field, 0);
-	}
-}

erpnext/accounts/doctype/accounts_settings/accounts_settings.json

@@ -19,7 +19,6 @@
   "column_break_17",
   "enable_common_party_accounting",
   "allow_multi_currency_invoices_against_single_party_account",
-  "confirm_before_resetting_posting_date",
   "journals_section",
   "merge_similar_account_heads",
   "deferred_accounting_settings_section",
@@ -32,7 +31,6 @@
   "determine_address_tax_category_from",
   "column_break_19",
   "add_taxes_from_item_tax_template",
-  "add_taxes_from_taxes_and_charges_template",
   "book_tax_discount_loss",
   "round_row_wise_tax",
   "print_settings",
@@ -40,14 +38,8 @@
   "show_taxes_as_table_in_print",
   "column_break_12",
   "show_payment_schedule_in_print",
-  "item_price_settings_section",
-  "maintain_same_internal_transaction_rate",
-  "column_break_feyo",
-  "maintain_same_rate_action",
-  "role_to_override_stop_action",
   "currency_exchange_section",
   "allow_stale",
-  "allow_pegged_currencies_exchange_rates",
   "column_break_yuug",
   "stale_days",
   "section_break_jpd0",
@@ -66,7 +58,6 @@
   "pos_tab",
   "pos_setting_section",
   "post_change_gl_entries",
-  "column_break_xrnd",
   "assets_tab",
   "asset_settings_section",
   "calculate_depr_using_total_days",
@@ -86,16 +77,11 @@
   "reports_tab",
   "remarks_section",
   "general_ledger_remarks_length",
+  "ignore_is_opening_check_for_reporting",
   "column_break_lvjk",
   "receivable_payable_remarks_length",
-  "accounts_receivable_payable_tuning_section",
-  "receivable_payable_fetch_method",
-  "legacy_section",
-  "ignore_is_opening_check_for_reporting",
   "payment_request_settings",
-  "create_pr_in_draft_status",
-  "budget_settings",
-  "use_new_budget_controller"
+  "create_pr_in_draft_status"
  ],
  "fields": [
   {
@@ -546,100 +532,14 @@
    "fieldtype": "Select",
    "label": "Posting Date Inheritance for Exchange Gain / Loss",
    "options": "Invoice\nPayment\nReconciliation Date"
-  },
-  {
-   "fieldname": "column_break_xrnd",
-   "fieldtype": "Column Break"
-  },
-  {
-   "default": "Buffered Cursor",
-   "fieldname": "receivable_payable_fetch_method",
-   "fieldtype": "Select",
-   "label": "Data Fetch Method",
-   "options": "Buffered Cursor\nUnBuffered Cursor"
-  },
-  {
-   "fieldname": "accounts_receivable_payable_tuning_section",
-   "fieldtype": "Section Break",
-   "label": "Accounts Receivable / Payable Tuning"
-  },
-  {
-   "fieldname": "legacy_section",
-   "fieldtype": "Section Break",
-   "label": "Legacy Fields"
-  },
-  {
-   "default": "0",
-   "fieldname": "maintain_same_internal_transaction_rate",
-   "fieldtype": "Check",
-   "label": "Maintain Same Rate Throughout Internal Transaction"
-  },
-  {
-   "default": "Stop",
-   "depends_on": "maintain_same_internal_transaction_rate",
-   "fieldname": "maintain_same_rate_action",
-   "fieldtype": "Select",
-   "label": "Action if Same Rate is Not Maintained Throughout  Internal Transaction",
-   "mandatory_depends_on": "maintain_same_internal_transaction_rate",
-   "options": "Stop\nWarn"
-  },
-  {
-   "depends_on": "eval: doc.maintain_same_internal_transaction_rate && doc.maintain_same_rate_action == 'Stop'",
-   "fieldname": "role_to_override_stop_action",
-   "fieldtype": "Link",
-   "label": "Role Allowed to Override Stop Action",
-   "options": "Role"
-  },
-  {
-   "fieldname": "budget_settings",
-   "fieldtype": "Tab Break",
-   "label": "Budget"
-  },
-  {
-   "default": "1",
-   "fieldname": "use_new_budget_controller",
-   "fieldtype": "Check",
-   "label": "Use New Budget Controller"
-  },
-  {
-   "default": "1",
-   "description": "If enabled, user will be alerted before resetting posting date to current date in relevant transactions",
-   "fieldname": "confirm_before_resetting_posting_date",
-   "fieldtype": "Check",
-   "label": "Confirm before resetting posting date"
-  },
-  {
-   "fieldname": "item_price_settings_section",
-   "fieldtype": "Section Break",
-   "label": "Item Price Settings"
-  },
-  {
-   "fieldname": "column_break_feyo",
-   "fieldtype": "Column Break"
-  },
-  {
-   "default": "0",
-   "description": "System will do an implicit conversion using the pegged currency. <br>\nEx: Instead of AED -&gt; INR, system will do AED -&gt; USD -&gt; INR using the pegged exchange rate of AED against USD.",
-   "documentation_url": "/app/pegged-currencies/Pegged Currencies",
-   "fieldname": "allow_pegged_currencies_exchange_rates",
-   "fieldtype": "Check",
-   "label": "Allow Implicit Pegged Currency Conversion"
-  },
-  {
-   "default": "0",
-   "description": "If no taxes are set, and Taxes and Charges Template is selected, the system will automatically apply the taxes from the chosen template.",
-   "fieldname": "add_taxes_from_taxes_and_charges_template",
-   "fieldtype": "Check",
-   "label": "Automatically Add Taxes from Taxes and Charges Template"
   }
  ],
- "grid_page_length": 50,
  "icon": "icon-cog",
  "idx": 1,
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2025-06-23 15:55:33.346398",
+ "modified": "2025-01-23 13:15:44.077853",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Accounts Settings",
@@ -664,9 +564,8 @@
   }
  ],
  "quick_entry": 1,
- "row_format": "Dynamic",
  "sort_field": "creation",
  "sort_order": "ASC",
  "states": [],
  "track_changes": 1
-}
+}

erpnext/accounts/doctype/accounts_settings/accounts_settings.py

@@ -25,9 +25,7 @@ class AccountsSettings(Document):
 
 		acc_frozen_upto: DF.Date | None
 		add_taxes_from_item_tax_template: DF.Check
-		add_taxes_from_taxes_and_charges_template: DF.Check
 		allow_multi_currency_invoices_against_single_party_account: DF.Check
-		allow_pegged_currencies_exchange_rates: DF.Check
 		allow_stale: DF.Check
 		auto_reconcile_payments: DF.Check
 		auto_reconciliation_job_trigger: DF.Int
@@ -39,7 +37,6 @@ class AccountsSettings(Document):
 		book_tax_discount_loss: DF.Check
 		calculate_depr_using_total_days: DF.Check
 		check_supplier_invoice_uniqueness: DF.Check
-		confirm_before_resetting_posting_date: DF.Check
 		create_pr_in_draft_status: DF.Check
 		credit_controller: DF.Link | None
 		delete_linked_ledger_entries: DF.Check
@@ -53,17 +50,13 @@ class AccountsSettings(Document):
 		general_ledger_remarks_length: DF.Int
 		ignore_account_closing_balance: DF.Check
 		ignore_is_opening_check_for_reporting: DF.Check
-		maintain_same_internal_transaction_rate: DF.Check
-		maintain_same_rate_action: DF.Literal["Stop", "Warn"]
 		make_payment_via_journal_entry: DF.Check
 		merge_similar_account_heads: DF.Check
 		over_billing_allowance: DF.Currency
 		post_change_gl_entries: DF.Check
-		receivable_payable_fetch_method: DF.Literal["Buffered Cursor", "UnBuffered Cursor"]
 		receivable_payable_remarks_length: DF.Int
 		reconciliation_queue_size: DF.Int
 		role_allowed_to_over_bill: DF.Link | None
-		role_to_override_stop_action: DF.Link | None
 		round_row_wise_tax: DF.Check
 		show_balance_in_coa: DF.Check
 		show_inclusive_tax_in_print: DF.Check
@@ -73,11 +66,9 @@ class AccountsSettings(Document):
 		submit_journal_entries: DF.Check
 		unlink_advance_payment_on_cancelation_of_order: DF.Check
 		unlink_payment_on_cancellation_of_invoice: DF.Check
-		use_new_budget_controller: DF.Check
 	# end: auto-generated types
 
 	def validate(self):
-		self.validate_auto_tax_settings()
 		old_doc = self.get_doc_before_save()
 		clear_cache = False
 
@@ -144,13 +135,3 @@ class AccountsSettings(Document):
 		if self.has_value_changed("reconciliation_queue_size"):
 			if cint(self.reconciliation_queue_size) < 5 or cint(self.reconciliation_queue_size) > 100:
 				frappe.throw(_("Queue Size should be between 5 and 100"))
-
-	def validate_auto_tax_settings(self):
-		if self.add_taxes_from_item_tax_template and self.add_taxes_from_taxes_and_charges_template:
-			frappe.throw(
-				_("You cannot enable both the settings '{0}' and '{1}'.").format(
-					frappe.bold(self.meta.get_label("add_taxes_from_item_tax_template")),
-					frappe.bold(self.meta.get_label("add_taxes_from_taxes_and_charges_template")),
-				),
-				title=_("Auto Tax Settings Error"),
-			)

erpnext/accounts/doctype/advance_payment_ledger_entry/test_advance_payment_ledger_entry.py

@@ -2,7 +2,7 @@
 # See license.txt
 
 import frappe
-from frappe.tests import IntegrationTestCase
+from frappe.tests import IntegrationTestCase, UnitTestCase
 from frappe.utils import nowdate, today
 
 from erpnext.accounts.doctype.payment_entry.test_payment_entry import get_payment_entry

erpnext/accounts/doctype/bank_clearance/bank_clearance.py

@@ -160,6 +160,9 @@ def get_payment_entries_for_bank_clearance(
 		as_dict=1,
 	)
 
+	if bank_account:
+		condition += "and bank_account = %(bank_account)s"
+
 	payment_entries = frappe.db.sql(
 		f"""
 			select
@@ -181,6 +184,7 @@ def get_payment_entries_for_bank_clearance(
 			"account": account,
 			"from": from_date,
 			"to": to_date,
+			"bank_account": bank_account,
 		},
 		as_dict=1,
 	)

erpnext/accounts/doctype/bank_clearance/test_bank_clearance.py

@@ -7,9 +7,6 @@ from frappe.tests import IntegrationTestCase
 from frappe.utils import add_months, getdate
 
 from erpnext.accounts.doctype.cost_center.test_cost_center import create_cost_center
-from erpnext.accounts.doctype.mode_of_payment.test_mode_of_payment import (
-	set_default_account_for_mode_of_payment,
-)
 from erpnext.accounts.doctype.payment_entry.test_payment_entry import get_payment_entry
 from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make_purchase_invoice
 from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
@@ -146,7 +143,7 @@ def make_payment_entry():
 
 	supplier = create_supplier(supplier_name="_Test Supplier")
 	pi = make_purchase_invoice(
-		supplier=supplier.name,
+		supplier=supplier,
 		supplier_warehouse="_Test Warehouse - _TC",
 		expense_account="Cost of Goods Sold - _TC",
 		uom="Nos",
@@ -175,13 +172,11 @@ def make_pos_sales_invoice():
 
 	customer = make_customer(customer="_Test Customer")
 
-	mode_of_payment = frappe.get_doc("Mode of Payment", "Wire Transfer")
-
-	set_default_account_for_mode_of_payment(mode_of_payment, "_Test Company", "_Test Bank Clearance - _TC")
-
 	si = create_sales_invoice(customer=customer, item="_Test Item", is_pos=1, qty=1, rate=1000, do_not_save=1)
 	si.set("payments", [])
-	si.append("payments", {"mode_of_payment": "Wire Transfer", "amount": 1000})
+	si.append(
+		"payments", {"mode_of_payment": "Cash", "account": "_Test Bank Clearance - _TC", "amount": 1000}
+	)
 	si.insert()
 	si.submit()
 

erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py

@@ -8,7 +8,6 @@ import frappe
 from frappe import _
 from frappe.model.document import Document
 from frappe.query_builder.custom import ConstantColumn
-from frappe.query_builder.functions import Sum
 from frappe.utils import cint, flt
 
 from erpnext import get_default_cost_center
@@ -373,38 +372,11 @@ def auto_reconcile_vouchers(
 	filter_by_reference_date=None,
 	from_reference_date=None,
 	to_reference_date=None,
-):
-	bank_transactions = get_bank_transactions(bank_account)
-
-	if len(bank_transactions) > 10:
-		frappe.enqueue(
-			method="erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.start_auto_reconcile",
-			queue="long",
-			bank_transactions=bank_transactions,
-			from_date=from_date,
-			to_date=to_date,
-			filter_by_reference_date=filter_by_reference_date,
-			from_reference_date=from_reference_date,
-			to_reference_date=to_reference_date,
-		)
-		frappe.msgprint(_("Auto Reconciliation has started in the background"))
-	else:
-		start_auto_reconcile(
-			bank_transactions,
-			from_date,
-			to_date,
-			filter_by_reference_date,
-			from_reference_date,
-			to_reference_date,
-		)
-
-
-def start_auto_reconcile(
-	bank_transactions, from_date, to_date, filter_by_reference_date, from_reference_date, to_reference_date
 ):
 	frappe.flags.auto_reconcile_vouchers = True
-
 	reconciled, partially_reconciled = set(), set()
+
+	bank_transactions = get_bank_transactions(bank_account)
 	for transaction in bank_transactions:
 		linked_payments = get_linked_payments(
 			transaction.name,
@@ -442,6 +414,7 @@ def start_auto_reconcile(
 	frappe.msgprint(title=_("Auto Reconciliation"), msg=alert_message, indicator=indicator)
 
 	frappe.flags.auto_reconcile_vouchers = False
+	return reconciled, partially_reconciled
 
 
 def get_auto_reconcile_message(partially_reconciled, reconciled):
@@ -518,23 +491,16 @@ def subtract_allocations(gl_account, vouchers):
 	voucher_allocated_amounts = get_total_allocated_amount(voucher_docs)
 
 	for voucher in vouchers:
-		if amount := get_allocated_amount(voucher_allocated_amounts, voucher, gl_account):
+		rows = voucher_allocated_amounts.get((voucher.get("doctype"), voucher.get("name"))) or []
+		filtered_row = list(filter(lambda row: row.get("gl_account") == gl_account, rows))
+
+		if amount := None if not filtered_row else filtered_row[0]["total"]:
 			voucher["paid_amount"] -= amount
 
 		copied.append(voucher)
 	return copied
 
 
-def get_allocated_amount(voucher_allocated_amounts, voucher, gl_account):
-	if not (voucher_details := voucher_allocated_amounts.get((voucher.get("doctype"), voucher.get("name")))):
-		return
-
-	if not (row := voucher_details.get(gl_account)):
-		return
-
-	return row.get("total")
-
-
 def check_matching(
 	bank_account,
 	company,
@@ -804,20 +770,26 @@ def get_je_matching_query(
 	je = frappe.qb.DocType("Journal Entry")
 	jea = frappe.qb.DocType("Journal Entry Account")
 
+	ref_condition = je.cheque_no == transaction.reference_number
+	ref_rank = frappe.qb.terms.Case().when(ref_condition, 1).else_(0)
+
 	amount_field = f"{cr_or_dr}_in_account_currency"
+	amount_equality = getattr(jea, amount_field) == transaction.unallocated_amount
+	amount_rank = frappe.qb.terms.Case().when(amount_equality, 1).else_(0)
 
 	filter_by_date = je.posting_date.between(from_date, to_date)
 	if cint(filter_by_reference_date):
 		filter_by_date = je.cheque_date.between(from_reference_date, to_reference_date)
 
-	subquery = (
+	query = (
 		frappe.qb.from_(jea)
 		.join(je)
 		.on(jea.parent == je.name)
 		.select(
-			Sum(getattr(jea, amount_field)).as_("paid_amount"),
+			(ref_rank + amount_rank + 1).as_("rank"),
 			ConstantColumn("Journal Entry").as_("doctype"),
 			je.name,
+			getattr(jea, amount_field).as_("paid_amount"),
 			je.cheque_no.as_("reference_no"),
 			je.cheque_date.as_("reference_date"),
 			je.pay_to_recd_from.as_("party"),
@@ -829,26 +801,13 @@ def get_je_matching_query(
 		.where(je.voucher_type != "Opening Entry")
 		.where(je.clearance_date.isnull())
 		.where(jea.account == common_filters.bank_account)
+		.where(amount_equality if exact_match else getattr(jea, amount_field) > 0.0)
 		.where(filter_by_date)
-		.groupby(je.name)
 		.orderby(je.cheque_date if cint(filter_by_reference_date) else je.posting_date)
 	)
 
 	if frappe.flags.auto_reconcile_vouchers is True:
-		subquery = subquery.where(je.cheque_no == transaction.reference_number)
-
-	ref_rank = frappe.qb.terms.Case().when(subquery.reference_no == transaction.reference_number, 1).else_(0)
-	amount_equality = subquery.paid_amount == transaction.unallocated_amount
-	amount_rank = frappe.qb.terms.Case().when(amount_equality, 1).else_(0)
-
-	query = (
-		frappe.qb.from_(subquery)
-		.select(
-			"*",
-			(ref_rank + amount_rank + 1).as_("rank"),
-		)
-		.where(amount_equality if exact_match else subquery.paid_amount > 0.0)
-	)
+		query = query.where(ref_condition)
 
 	return query
 

erpnext/accounts/doctype/bank_reconciliation_tool/test_bank_reconciliation_tool.py

@@ -40,7 +40,7 @@ class TestBankReconciliationTool(AccountsTestMixin, IntegrationTestCase):
 				{
 					"doctype": "Bank Account",
 					"account_name": "HDFC _current_",
-					"bank": bank.name,
+					"bank": bank,
 					"is_company_account": True,
 					"account": self.bank,  # account from Chart of Accounts
 				}

erpnext/accounts/doctype/bank_statement_import/bank_statement_import.js

@@ -70,7 +70,7 @@ frappe.ui.form.on("Bank Statement Import", {
 
 		frm.get_field("import_file").df.options = {
 			restrictions: {
-				allowed_file_types: [".csv", ".xls", ".xlsx", ".TXT", ".txt"],
+				allowed_file_types: [".csv", ".xls", ".xlsx"],
 			},
 		};
 
@@ -81,7 +81,6 @@ frappe.ui.form.on("Bank Statement Import", {
 
 	refresh(frm) {
 		frm.page.hide_icon_group();
-		frm.trigger("toggle_mt940_note");
 		frm.trigger("update_indicators");
 		frm.trigger("import_file");
 		frm.trigger("show_import_log");
@@ -193,24 +192,6 @@ frappe.ui.form.on("Bank Statement Import", {
 		});
 	},
 
-	import_mt940_fromat(frm) {
-		frm.trigger("toggle_mt940_note");
-		frm.save();
-	},
-
-	toggle_mt940_note(frm) {
-		if (!frm.doc.import_mt940_fromat) {
-			frm.set_df_property("custom_delimiters", "hidden", 0);
-			frm.set_df_property("google_sheets_url", "hidden", 0);
-			frm.set_df_property("html_5", "hidden", 0);
-		} else {
-			frm.set_df_property("custom_delimiters", "hidden", 1);
-			frm.set_df_property("google_sheets_url", "hidden", 1);
-			frm.set_df_property("html_5", "hidden", 1);
-		}
-		frm.set_value("import_mt940_fromat", frm.doc.import_mt940_fromat);
-	},
-
 	show_report_error_button(frm) {
 		if (frm.doc.status === "Error") {
 			frappe.db
@@ -309,45 +290,23 @@ frappe.ui.form.on("Bank Statement Import", {
 			.html(__("Loading import file..."))
 			.appendTo(frm.get_field("import_preview").$wrapper);
 
-		frappe.run_serially([
-			// Convert MT940 to CSV if .txt file
-			() => {
-				if (frm.doc.import_file && frm.doc.import_file.toLowerCase().endsWith(".txt")) {
-					return frm
-						.call({
-							method: "convert_mt940_to_csv",
-							args: {
-								data_import: frm.doc.name,
-								mt940_file_path: frm.doc.import_file,
-							},
-						})
-						.then((r) => {
-							const file_url = r.message;
-							frm.set_value("import_file", file_url);
-							frm.save();
-						});
-				}
+		frm.call({
+			method: "get_preview_from_template",
+			args: {
+				data_import: frm.doc.name,
+				import_file: frm.doc.import_file,
+				google_sheets_url: frm.doc.google_sheets_url,
 			},
-			() => {
-				frm.call({
-					method: "get_preview_from_template",
-					args: {
-						data_import: frm.doc.name,
-						import_file: frm.doc.import_file,
-						google_sheets_url: frm.doc.google_sheets_url,
-					},
-					error_handlers: {
-						TimestampMismatchError() {
-							// ignore this error
-						},
-					},
-				}).then((r) => {
-					let preview_data = r.message;
-					frm.events.show_import_preview(frm, preview_data);
-					frm.events.show_import_warnings(frm, preview_data);
-				});
+			error_handlers: {
+				TimestampMismatchError() {
+					// ignore this error
+				},
 			},
-		]);
+		}).then((r) => {
+			let preview_data = r.message;
+			frm.events.show_import_preview(frm, preview_data);
+			frm.events.show_import_warnings(frm, preview_data);
+		});
 	},
 	// method: 'frappe.core.doctype.data_import.data_import.get_preview_from_template',
 

erpnext/accounts/doctype/bank_statement_import/bank_statement_import.json

@@ -11,7 +11,6 @@
   "bank_account",
   "bank",
   "column_break_4",
-  "import_mt940_fromat",
   "custom_delimiters",
   "delimiter_options",
   "google_sheets_url",
@@ -21,7 +20,6 @@
   "download_template",
   "status",
   "template_options",
-  "use_csv_sniffer",
   "import_warnings_section",
   "template_warnings",
   "import_warnings",
@@ -209,28 +207,14 @@
    "fieldname": "delimiter_options",
    "fieldtype": "Data",
    "label": "Delimiter options"
-  },
-  {
-   "default": "0",
-   "fieldname": "use_csv_sniffer",
-   "fieldtype": "Check",
-   "hidden": 1,
-   "label": "Use CSV Sniffer"
-  },
-  {
-   "default": "0",
-   "fieldname": "import_mt940_fromat",
-   "fieldtype": "Check",
-   "label": "Import MT940 Fromat"
   }
  ],
  "hide_toolbar": 1,
  "links": [],
- "modified": "2025-06-11 02:23:22.159961",
+ "modified": "2024-06-25 17:32:07.658250",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Bank Statement Import",
- "naming_rule": "Expression",
  "owner": "Administrator",
  "permissions": [
   {
@@ -246,9 +230,8 @@
    "write": 1
   }
  ],
- "row_format": "Dynamic",
  "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
-}
+}

erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py

@@ -3,19 +3,15 @@
 
 
 import csv
-import io
 import json
 import re
-from datetime import date, datetime
 
 import frappe
-import mt940
 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.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
 from openpyxl.styles import Font
 from openpyxl.utils import get_column_letter
@@ -39,7 +35,6 @@ class BankStatementImport(DataImport):
 		delimiter_options: DF.Data | None
 		google_sheets_url: DF.Data | None
 		import_file: DF.Attach | None
-		import_mt940_fromat: DF.Check
 		import_type: DF.Literal["", "Insert New Records", "Update Existing Records"]
 		mute_emails: DF.Check
 		reference_doctype: DF.Link
@@ -48,7 +43,6 @@ class BankStatementImport(DataImport):
 		submit_after_import: DF.Check
 		template_options: DF.Code | None
 		template_warnings: DF.Code | None
-		use_csv_sniffer: DF.Check
 	# end: auto-generated types
 
 	def __init__(self, *args, **kwargs):
@@ -71,9 +65,8 @@ class BankStatementImport(DataImport):
 
 			self.template_warnings = ""
 
-		if self.import_file and not self.import_file.lower().endswith(".txt"):
-			self.validate_import_file()
-			self.validate_google_sheets_url()
+		self.validate_import_file()
+		self.validate_google_sheets_url()
 
 	def start_import(self):
 		preview = frappe.get_doc("Bank Statement Import", self.name).get_preview_from_template(
@@ -86,7 +79,7 @@ class BankStatementImport(DataImport):
 		from frappe.utils.background_jobs import is_job_enqueued
 		from frappe.utils.scheduler import is_scheduler_inactive
 
-		run_now = frappe.in_test or frappe.conf.developer_mode
+		run_now = frappe.flags.in_test or frappe.conf.developer_mode
 		if is_scheduler_inactive() and not run_now:
 			frappe.throw(_("Scheduler is inactive. Cannot import data."), title=_("Scheduler Inactive"))
 
@@ -111,68 +104,6 @@ class BankStatementImport(DataImport):
 		return None
 
 
-@frappe.whitelist()
-def convert_mt940_to_csv(data_import, mt940_file_path):
-	doc = frappe.get_doc("Bank Statement Import", data_import)
-
-	file_doc, content = get_file(mt940_file_path)
-
-	if not is_mt940_format(content):
-		frappe.throw(_("The uploaded file does not appear to be in valid MT940 format."))
-
-	if is_mt940_format(content) and not doc.import_mt940_fromat:
-		frappe.throw(_("MT940 file detected. Please enable 'Import MT940 Format' to proceed."))
-
-	try:
-		transactions = mt940.parse(content)
-	except Exception as e:
-		frappe.throw(_("Failed to parse MT940 format. Error: {0}").format(str(e)))
-
-	if not transactions:
-		frappe.throw(_("Parsed file is not in valid MT940 format or contains no transactions."))
-
-	# Use in-memory file buffer instead of writing to temp file
-	csv_buffer = io.StringIO()
-	writer = csv.writer(csv_buffer)
-
-	headers = ["Date", "Deposit", "Withdrawal", "Description", "Reference Number", "Bank Account", "Currency"]
-	writer.writerow(headers)
-
-	for txn in transactions:
-		txn_date = getattr(txn, "date", None)
-		raw_date = txn.data.get("date", "")
-
-		if txn_date:
-			date_str = txn_date.strftime("%Y-%m-%d")
-		elif isinstance(raw_date, date | datetime):
-			date_str = raw_date.strftime("%Y-%m-%d")
-		else:
-			date_str = str(raw_date)
-
-		raw_amount = str(txn.data.get("amount", ""))
-		parts = raw_amount.strip().split()
-		amount_value = float(parts[0]) if parts else 0.0
-
-		deposit = amount_value if amount_value > 0 else ""
-		withdrawal = abs(amount_value) if amount_value < 0 else ""
-		description = txn.data.get("extra_details") or ""
-		reference = txn.data.get("transaction_reference") or ""
-		currency = txn.data.get("currency", "")
-
-		writer.writerow([date_str, deposit, withdrawal, description, reference, doc.bank_account, currency])
-
-	# Prepare in-memory CSV for upload
-	csv_content = csv_buffer.getvalue().encode("utf-8")
-	csv_buffer.close()
-
-	filename = f"{frappe.utils.now_datetime().strftime('%Y%m%d%H%M%S')}_converted_mt940.csv"
-
-	# Save to File Manager
-	saved_file = save_file(filename, csv_content, doc.doctype, doc.name, is_private=True, df="import_file")
-
-	return saved_file.file_url
-
-
 @frappe.whitelist()
 def get_preview_from_template(data_import, import_file=None, google_sheets_url=None):
 	return frappe.get_doc("Bank Statement Import", data_import).get_preview_from_template(
@@ -197,12 +128,6 @@ def download_import_log(data_import_name):
 	return frappe.get_doc("Bank Statement Import", data_import_name).download_import_log()
 
 
-def is_mt940_format(content: str) -> bool:
-	"""Check if the content has key MT940 tags"""
-	required_tags = [":20:", ":25:", ":28C:", ":61:"]
-	return all(tag in content for tag in required_tags)
-
-
 def parse_data_from_template(raw_data):
 	data = []
 
@@ -354,7 +279,7 @@ def get_import_status(docname):
 
 @frappe.whitelist()
 def get_import_logs(docname: str):
-	frappe.has_permission("Bank Statement Import", throw=True)
+	frappe.has_permission("Bank Statement Import")
 
 	return frappe.get_all(
 		"Data Import Log",

erpnext/accounts/doctype/bank_transaction/auto_match_party.py

@@ -1,7 +1,6 @@
 import frappe
 from frappe.utils import flt
 from rapidfuzz import fuzz, process
-from rapidfuzz.utils import default_process
 
 
 class AutoMatchParty:
@@ -26,7 +25,7 @@ class AutoMatchParty:
 			deposit=self.deposit,
 		).match()
 
-		fuzzy_matching_enabled = frappe.get_single_value("Accounts Settings", "enable_fuzzy_matching")
+		fuzzy_matching_enabled = frappe.db.get_single_value("Accounts Settings", "enable_fuzzy_matching")
 		if not result and fuzzy_matching_enabled:
 			result = AutoMatchbyPartyNameDescription(
 				bank_party_name=self.bank_party_name, description=self.description, deposit=self.deposit
@@ -133,7 +132,6 @@ class AutoMatchbyPartyNameDescription:
 			query=self.get(field),
 			choices={row.get("name"): row.get("party_name") for row in names},
 			scorer=fuzz.token_set_ratio,
-			processor=default_process,
 		)
 		party_name, skip = self.process_fuzzy_result(result)
 

erpnext/accounts/doctype/bank_transaction/bank_transaction.js

@@ -2,21 +2,7 @@
 // For license information, please see license.txt
 
 frappe.ui.form.on("Bank Transaction", {
-	setup: function (frm) {
-		frm.set_query("party_type", function () {
-			return {
-				filters: {
-					name: ["in", Object.keys(frappe.boot.party_account_types)],
-				},
-			};
-		});
-
-		frm.set_query("bank_account", function () {
-			return {
-				filters: { is_company_account: 1 },
-			};
-		});
-
+	onload(frm) {
 		frm.set_query("payment_document", "payment_entries", function () {
 			const payment_doctypes = frm.events.get_payment_doctypes(frm);
 			return {
@@ -25,16 +11,7 @@ frappe.ui.form.on("Bank Transaction", {
 				},
 			};
 		});
-
-		frm.set_query("payment_entry", "payment_entries", function () {
-			return {
-				filters: {
-					docstatus: ["!=", 2],
-				},
-			};
-		});
 	},
-
 	refresh(frm) {
 		if (!frm.is_dirty() && frm.doc.payment_entries.length > 0) {
 			frm.add_custom_button(__("Unreconcile Transaction"), () => {
@@ -42,17 +19,51 @@ frappe.ui.form.on("Bank Transaction", {
 			});
 		}
 	},
-
 	bank_account: function (frm) {
 		set_bank_statement_filter(frm);
 	},
 
+	setup: function (frm) {
+		frm.set_query("party_type", function () {
+			return {
+				filters: {
+					name: ["in", Object.keys(frappe.boot.party_account_types)],
+				},
+			};
+		});
+	},
+
 	get_payment_doctypes: function () {
 		// get payment doctypes from all the apps
 		return ["Payment Entry", "Journal Entry", "Sales Invoice", "Purchase Invoice", "Bank Transaction"];
 	},
 });
 
+frappe.ui.form.on("Bank Transaction Payments", {
+	payment_entries_remove: function (frm, cdt, cdn) {
+		update_clearance_date(frm, cdt, cdn);
+	},
+});
+
+const update_clearance_date = (frm, cdt, cdn) => {
+	if (frm.doc.docstatus === 1) {
+		frappe
+			.xcall("erpnext.accounts.doctype.bank_transaction.bank_transaction.unclear_reference_payment", {
+				doctype: cdt,
+				docname: cdn,
+				bt_name: frm.doc.name,
+			})
+			.then((e) => {
+				if (e == "success") {
+					frappe.show_alert({
+						message: __("Document {0} successfully uncleared", [e]),
+						indicator: "green",
+					});
+				}
+			});
+	}
+};
+
 function set_bank_statement_filter(frm) {
 	frm.set_query("bank_statement", function () {
 		return {

erpnext/accounts/doctype/bank_transaction/bank_transaction.json

@@ -45,6 +45,7 @@
    "default": "ACC-BTN-.YYYY.-",
    "fieldname": "naming_series",
    "fieldtype": "Select",
+   "hidden": 1,
    "label": "Series",
    "no_copy": 1,
    "options": "ACC-BTN-.YYYY.-",
@@ -235,10 +236,9 @@
    "fieldtype": "Column Break"
   }
  ],
- "grid_page_length": 50,
  "is_submittable": 1,
  "links": [],
- "modified": "2025-06-18 17:24:57.044666",
+ "modified": "2023-11-18 18:32:47.203694",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Bank Transaction",
@@ -287,10 +287,9 @@
    "write": 1
   }
  ],
- "row_format": "Dynamic",
  "sort_field": "date",
  "sort_order": "DESC",
  "states": [],
  "title_field": "bank_account",
  "track_changes": 1
-}
+}

erpnext/accounts/doctype/bank_transaction/bank_transaction.py

@@ -5,7 +5,7 @@ import frappe
 from frappe import _
 from frappe.model.docstatus import DocStatus
 from frappe.model.document import Document
-from frappe.utils import flt, getdate
+from frappe.utils import flt
 
 
 class BankTransaction(Document):
@@ -84,16 +84,16 @@ class BankTransaction(Document):
 		if not self.payment_entries:
 			return
 
-		references = set()
+		pe = []
 		for row in self.payment_entries:
 			reference = (row.payment_document, row.payment_entry)
-			if reference in references:
+			if reference in pe:
 				frappe.throw(
 					_("{0} {1} is allocated twice in this Bank Transaction").format(
 						row.payment_document, row.payment_entry
 					)
 				)
-			references.add(reference)
+			pe.append(reference)
 
 	def update_allocated_amount(self):
 		allocated_amount = (
@@ -104,36 +104,22 @@ class BankTransaction(Document):
 		self.allocated_amount = flt(allocated_amount, self.precision("allocated_amount"))
 		self.unallocated_amount = flt(unallocated_amount, self.precision("unallocated_amount"))
 
-	def delink_old_payment_entries(self):
-		if self.flags.updating_linked_bank_transaction:
-			return
-
-		old_doc = self.get_doc_before_save()
-		payment_entry_names = set(pe.name for pe in self.payment_entries)
-
-		for old_pe in old_doc.payment_entries:
-			if old_pe.name in payment_entry_names:
-				continue
-
-			self.delink_payment_entry(old_pe)
-
 	def before_submit(self):
 		self.allocate_payment_entries()
 		self.set_status()
 
-		if frappe.get_single_value("Accounts Settings", "enable_party_matching"):
+		if frappe.db.get_single_value("Accounts Settings", "enable_party_matching"):
 			self.auto_set_party()
 
 	def before_update_after_submit(self):
 		self.validate_duplicate_references()
-		self.update_allocated_amount()
-		self.delink_old_payment_entries()
 		self.allocate_payment_entries()
+		self.update_allocated_amount()
 		self.set_status()
 
 	def on_cancel(self):
 		for payment_entry in self.payment_entries:
-			self.delink_payment_entry(payment_entry)
+			self.clear_linked_payment_entry(payment_entry, for_cancel=True)
 
 		self.set_status()
 
@@ -166,55 +152,43 @@ class BankTransaction(Document):
 		    - 0 > a: Error: already over-allocated
 		- clear means: set the latest transaction date as clearance date
 		"""
-		if self.flags.updating_linked_bank_transaction or not self.payment_entries:
-			return
-
 		remaining_amount = self.unallocated_amount
+		to_remove = []
 		payment_entry_docs = [(pe.payment_document, pe.payment_entry) for pe in self.payment_entries]
 		pe_bt_allocations = get_total_allocated_amount(payment_entry_docs)
-		gl_entries = get_related_bank_gl_entries(payment_entry_docs)
-		gl_bank_account = frappe.db.get_value("Bank Account", self.bank_account, "account")
 
-		for payment_entry in list(self.payment_entries):
-			if payment_entry.allocated_amount != 0:
-				continue
-
-			allocable_amount, should_clear, clearance_date = get_clearance_details(
-				self,
-				payment_entry,
-				pe_bt_allocations.get((payment_entry.payment_document, payment_entry.payment_entry)) or {},
-				gl_entries.get((payment_entry.payment_document, payment_entry.payment_entry)) or {},
-				gl_bank_account,
-			)
-
-			if allocable_amount < 0:
-				frappe.throw(_("Voucher {0} is over-allocated by {1}").format(allocable_amount))
-
-			if remaining_amount <= 0:
-				self.remove(payment_entry)
-				continue
-
-			if allocable_amount == 0:
-				if should_clear:
-					self.clear_linked_payment_entry(payment_entry, clearance_date=clearance_date)
-				self.remove(payment_entry)
-				continue
-
-			should_clear = should_clear and allocable_amount <= remaining_amount
-			payment_entry.allocated_amount = min(allocable_amount, remaining_amount)
-			remaining_amount = flt(
-				remaining_amount - payment_entry.allocated_amount,
-				self.precision("unallocated_amount"),
-			)
-
-			if payment_entry.payment_document == "Bank Transaction":
-				self.update_linked_bank_transaction(
-					payment_entry.payment_entry, payment_entry.allocated_amount
+		for payment_entry in self.payment_entries:
+			if payment_entry.allocated_amount == 0.0:
+				unallocated_amount, should_clear, latest_transaction = get_clearance_details(
+					self,
+					payment_entry,
+					pe_bt_allocations.get((payment_entry.payment_document, payment_entry.payment_entry))
+					or [],
 				)
-			elif should_clear:
-				self.clear_linked_payment_entry(payment_entry, clearance_date=clearance_date)
 
-		self.update_allocated_amount()
+				if 0.0 == unallocated_amount:
+					if should_clear:
+						latest_transaction.clear_linked_payment_entry(payment_entry)
+					to_remove.append(payment_entry)
+
+				elif remaining_amount <= 0.0:
+					to_remove.append(payment_entry)
+
+				elif 0.0 < unallocated_amount <= remaining_amount:
+					payment_entry.allocated_amount = unallocated_amount
+					remaining_amount -= unallocated_amount
+					if should_clear:
+						latest_transaction.clear_linked_payment_entry(payment_entry)
+
+				elif 0.0 < unallocated_amount:
+					payment_entry.allocated_amount = remaining_amount
+					remaining_amount = 0.0
+
+				elif 0.0 > unallocated_amount:
+					frappe.throw(_("Voucher {0} is over-allocated by {1}").format(unallocated_amount))
+
+		for payment_entry in to_remove:
+			self.remove(payment_entry)
 
 	@frappe.whitelist()
 	def remove_payment_entries(self):
@@ -225,64 +199,14 @@ class BankTransaction(Document):
 
 	def remove_payment_entry(self, payment_entry):
 		"Clear payment entry and clearance"
-		self.delink_payment_entry(payment_entry)
+		self.clear_linked_payment_entry(payment_entry, for_cancel=True)
 		self.remove(payment_entry)
 
-	def delink_payment_entry(self, payment_entry):
-		if payment_entry.payment_document == "Bank Transaction":
-			self.update_linked_bank_transaction(payment_entry.payment_entry, allocated_amount=None)
-		else:
-			self.clear_linked_payment_entry(payment_entry, clearance_date=None)
-
-	def clear_linked_payment_entry(self, payment_entry, clearance_date=None):
-		doctype = payment_entry.payment_document
-		docname = payment_entry.payment_entry
-
-		# might be a bank transaction
-		if doctype not in get_doctypes_for_bank_reconciliation():
-			return
-
-		if doctype == "Sales Invoice":
-			frappe.db.set_value(
-				"Sales Invoice Payment",
-				dict(parenttype=doctype, parent=docname),
-				"clearance_date",
-				clearance_date,
-			)
-			return
-
-		frappe.db.set_value(doctype, docname, "clearance_date", clearance_date)
-
-	def update_linked_bank_transaction(self, bank_transaction_name, allocated_amount=None):
-		"""For when a second bank transaction has fixed another, e.g. refund"""
-
-		bt = frappe.get_doc(self.doctype, bank_transaction_name)
-		if allocated_amount:
-			bt.append(
-				"payment_entries",
-				{
-					"payment_document": self.doctype,
-					"payment_entry": self.name,
-					"allocated_amount": allocated_amount,
-				},
-			)
-
-		else:
-			pe = next(
-				(
-					pe
-					for pe in bt.payment_entries
-					if pe.payment_document == self.doctype and pe.payment_entry == self.name
-				),
-				None,
-			)
-			if not pe:
-				return
-
-			bt.flags.updating_linked_bank_transaction = True
-			bt.remove(pe)
-
-		bt.save()
+	def clear_linked_payment_entry(self, payment_entry, for_cancel=False):
+		clearance_date = None if for_cancel else self.date
+		set_voucher_clearance(
+			payment_entry.payment_document, payment_entry.payment_entry, clearance_date, self
+		)
 
 	def auto_set_party(self):
 		from erpnext.accounts.doctype.bank_transaction.auto_match_party import AutoMatchParty
@@ -314,107 +238,71 @@ def get_doctypes_for_bank_reconciliation():
 	return frappe.get_hooks("bank_reconciliation_doctypes")
 
 
-def get_clearance_details(transaction, payment_entry, bt_allocations, gl_entries, gl_bank_account):
+def get_clearance_details(transaction, payment_entry, bt_allocations):
 	"""
-	There should only be one bank gl entry for a voucher, except for JE.
-	For JE, there can be multiple bank gl entries for the same account.
-	In this case, the allocable_amount will be the sum of amounts of all gl entries of the account.
-	There will be no gl entry for a Bank Transaction so return the unallocated amount.
-	Should only clear the voucher if all bank gl entries are allocated.
+	There should only be one bank gle for a voucher.
+	Could be none for a Bank Transaction.
+	But if a JE, could affect two banks.
+	Should only clear the voucher if all bank gles are allocated.
 	"""
+	gl_bank_account = frappe.db.get_value("Bank Account", transaction.bank_account, "account")
+	gles = get_related_bank_gl_entries(payment_entry.payment_document, payment_entry.payment_entry)
 
-	transaction_date = getdate(transaction.date)
-
-	if payment_entry.payment_document == "Bank Transaction":
-		bt = frappe.db.get_value(
-			"Bank Transaction",
-			payment_entry.payment_entry,
-			("unallocated_amount", "bank_account"),
-			as_dict=True,
-		)
-
-		if bt.bank_account != gl_bank_account:
-			frappe.throw(
-				_("Bank Account {} in Bank Transaction {} is not matching with Bank Account {}").format(
-					bt.bank_account, payment_entry.payment_entry, gl_bank_account
+	unallocated_amount = min(
+		transaction.unallocated_amount,
+		get_paid_amount(payment_entry, transaction.currency, gl_bank_account),
+	)
+	unmatched_gles = len(gles)
+	latest_transaction = transaction
+	for gle in gles:
+		if gle["gl_account"] == gl_bank_account:
+			if gle["amount"] <= 0.0:
+				frappe.throw(
+					_("Voucher {0} value is broken: {1}").format(payment_entry.payment_entry, gle["amount"])
 				)
-			)
 
-		return abs(bt.unallocated_amount), True, transaction_date
+			unmatched_gles -= 1
+			unallocated_amount = gle["amount"]
+			for a in bt_allocations:
+				if a["gl_account"] == gle["gl_account"]:
+					unallocated_amount = gle["amount"] - a["total"]
+					if frappe.utils.getdate(transaction.date) < a["latest_date"]:
+						latest_transaction = frappe.get_doc("Bank Transaction", a["latest_name"])
+		else:
+			# Must be a Journal Entry affecting more than one bank
+			for a in bt_allocations:
+				if a["gl_account"] == gle["gl_account"] and a["total"] == gle["amount"]:
+					unmatched_gles -= 1
 
-	if gl_bank_account not in gl_entries:
-		frappe.throw(
-			_("{} {} is not affecting bank account {}").format(
-				payment_entry.payment_document, payment_entry.payment_entry, gl_bank_account
-			)
-		)
-
-	allocable_amount = gl_entries.pop(gl_bank_account) or 0
-	if allocable_amount <= 0.0:
-		frappe.throw(
-			_("Invalid amount in accounting entries of {} {} for Account {}: {}").format(
-				payment_entry.payment_document, payment_entry.payment_entry, gl_bank_account, allocable_amount
-			)
-		)
-
-	matching_bt_allocaion = bt_allocations.pop(gl_bank_account, {})
-
-	allocable_amount = flt(
-		allocable_amount - matching_bt_allocaion.get("total", 0), transaction.precision("unallocated_amount")
-	)
-
-	should_clear = all(
-		gl_entries[gle_account] == bt_allocations.get(gle_account, {}).get("total", 0)
-		for gle_account in gl_entries
-	)
-
-	bt_allocation_date = matching_bt_allocaion.get("latest_date", None)
-	clearance_date = transaction_date if not bt_allocation_date else max(transaction_date, bt_allocation_date)
-
-	return allocable_amount, should_clear, clearance_date
+	return unallocated_amount, unmatched_gles == 0, latest_transaction
 
 
-def get_related_bank_gl_entries(docs):
+def get_related_bank_gl_entries(doctype, docname):
 	# nosemgrep: frappe-semgrep-rules.rules.frappe-using-db-sql
-	if not docs:
-		return {}
-
-	result = frappe.db.sql(
+	return frappe.db.sql(
 		"""
-        SELECT
-            gle.voucher_type AS doctype,
-            gle.voucher_no AS docname,
-            gle.account AS gl_account,
-            SUM(ABS(gle.credit_in_account_currency - gle.debit_in_account_currency)) AS amount
-        FROM
-            `tabGL Entry` gle
-        LEFT JOIN
-            `tabAccount` ac ON ac.name = gle.account
-        WHERE
-            ac.account_type = 'Bank'
-            AND (gle.voucher_type, gle.voucher_no) IN %(docs)s
-            AND gle.is_cancelled = 0
-        GROUP BY
-            gle.voucher_type, gle.voucher_no, gle.account
-        """,
-		{"docs": docs},
+		SELECT
+			ABS(gle.credit_in_account_currency - gle.debit_in_account_currency) AS amount,
+			gle.account AS gl_account
+		FROM
+			`tabGL Entry` gle
+		LEFT JOIN
+			`tabAccount` ac ON ac.name=gle.account
+		WHERE
+			ac.account_type = 'Bank'
+			AND gle.voucher_type = %(doctype)s
+			AND gle.voucher_no = %(docname)s
+			AND is_cancelled = 0
+		""",
+		dict(doctype=doctype, docname=docname),
 		as_dict=True,
 	)
 
-	entries = {}
-	for row in result:
-		key = (row["doctype"], row["docname"])
-		if key not in entries:
-			entries[key] = {}
-		entries[key][row["gl_account"]] = row["amount"]
-
-	return entries
-
 
 def get_total_allocated_amount(docs):
 	"""
 	Gets the sum of allocations for a voucher on each bank GL account
-	along with the latest bank transaction date
+	along with the latest bank transaction name & date
 	NOTE: query may also include just saved vouchers/payments but with zero allocated_amount
 	"""
 	if not docs:
@@ -423,10 +311,11 @@ def get_total_allocated_amount(docs):
 	# nosemgrep: frappe-semgrep-rules.rules.frappe-using-db-sql
 	result = frappe.db.sql(
 		"""
-		SELECT total, latest_date, gl_account, payment_document, payment_entry FROM (
+		SELECT total, latest_name, latest_date, gl_account, payment_document, payment_entry FROM (
 			SELECT
 				ROW_NUMBER() OVER w AS rownum,
 				SUM(btp.allocated_amount) OVER(PARTITION BY ba.account, btp.payment_document, btp.payment_entry) AS total,
+				FIRST_VALUE(bt.name) OVER w AS latest_name,
 				FIRST_VALUE(bt.date) OVER w AS latest_date,
 				ba.account AS gl_account,
 				btp.payment_document,
@@ -449,14 +338,104 @@ def get_total_allocated_amount(docs):
 
 	payment_allocation_details = {}
 	for row in result:
-		row["latest_date"] = getdate(row["latest_date"])
-		payment_allocation_details.setdefault((row["payment_document"], row["payment_entry"]), {})[
-			row["gl_account"]
-		] = row
+		# Why is this *sometimes* a byte string?
+		if isinstance(row["latest_name"], bytes):
+			row["latest_name"] = row["latest_name"].decode()
+		row["latest_date"] = frappe.utils.getdate(row["latest_date"])
+		payment_allocation_details.setdefault((row["payment_document"], row["payment_entry"]), []).append(row)
 
 	return payment_allocation_details
 
 
+def get_paid_amount(payment_entry, currency, gl_bank_account):
+	if payment_entry.payment_document in ["Payment Entry", "Sales Invoice", "Purchase Invoice"]:
+		paid_amount_field = "paid_amount"
+		if payment_entry.payment_document == "Payment Entry":
+			doc = frappe.get_doc("Payment Entry", payment_entry.payment_entry)
+
+			if doc.payment_type == "Receive":
+				paid_amount_field = (
+					"received_amount" if doc.paid_to_account_currency == currency else "base_received_amount"
+				)
+			elif doc.payment_type == "Pay":
+				paid_amount_field = (
+					"paid_amount" if doc.paid_from_account_currency == currency else "base_paid_amount"
+				)
+
+		return frappe.db.get_value(
+			payment_entry.payment_document, payment_entry.payment_entry, paid_amount_field
+		)
+
+	elif payment_entry.payment_document == "Journal Entry":
+		return abs(
+			frappe.db.get_value(
+				"Journal Entry Account",
+				{"parent": payment_entry.payment_entry, "account": gl_bank_account},
+				"sum(debit_in_account_currency-credit_in_account_currency)",
+			)
+			or 0
+		)
+
+	elif payment_entry.payment_document == "Expense Claim":
+		return frappe.db.get_value(
+			payment_entry.payment_document, payment_entry.payment_entry, "total_amount_reimbursed"
+		)
+
+	elif payment_entry.payment_document == "Loan Disbursement":
+		return frappe.db.get_value(
+			payment_entry.payment_document, payment_entry.payment_entry, "disbursed_amount"
+		)
+
+	elif payment_entry.payment_document == "Loan Repayment":
+		return frappe.db.get_value(payment_entry.payment_document, payment_entry.payment_entry, "amount_paid")
+
+	elif payment_entry.payment_document == "Bank Transaction":
+		dep, wth = frappe.db.get_value(
+			"Bank Transaction", payment_entry.payment_entry, ("deposit", "withdrawal")
+		)
+		return abs(flt(wth) - flt(dep))
+
+	else:
+		frappe.throw(
+			f"Please reconcile {payment_entry.payment_document}: {payment_entry.payment_entry} manually"
+		)
+
+
+def set_voucher_clearance(doctype, docname, clearance_date, self):
+	if doctype in get_doctypes_for_bank_reconciliation():
+		if (
+			doctype == "Payment Entry"
+			and frappe.db.get_value("Payment Entry", docname, "payment_type") == "Internal Transfer"
+			and len(get_reconciled_bank_transactions(doctype, docname)) < 2
+		):
+			return
+
+		if doctype == "Sales Invoice":
+			frappe.db.set_value(
+				"Sales Invoice Payment",
+				dict(parenttype=doctype, parent=docname),
+				"clearance_date",
+				clearance_date,
+			)
+			return
+
+		frappe.db.set_value(doctype, docname, "clearance_date", clearance_date)
+
+	elif doctype == "Bank Transaction":
+		# For when a second bank transaction has fixed another, e.g. refund
+		bt = frappe.get_doc(doctype, docname)
+		if clearance_date:
+			vouchers = [{"payment_doctype": "Bank Transaction", "payment_name": self.name}]
+			bt.add_payment_entries(vouchers)
+			bt.save()
+		else:
+			for pe in bt.payment_entries:
+				if pe.payment_document == self.doctype and pe.payment_entry == self.name:
+					bt.remove(pe)
+					bt.save()
+					break
+
+
 def get_reconciled_bank_transactions(doctype, docname):
 	return frappe.get_all(
 		"Bank Transaction Payments",
@@ -465,6 +444,13 @@ def get_reconciled_bank_transactions(doctype, docname):
 	)
 
 
+@frappe.whitelist()
+def unclear_reference_payment(doctype, docname, bt_name):
+	bt = frappe.get_doc("Bank Transaction", bt_name)
+	set_voucher_clearance(doctype, docname, None, bt)
+	return docname
+
+
 def remove_from_bank_transaction(doctype, docname):
 	"""Remove a (cancelled) voucher from all Bank Transactions."""
 	for bt_name in get_reconciled_bank_transactions(doctype, docname):

erpnext/accounts/doctype/bank_transaction/test_auto_match_party.py

@@ -2,12 +2,21 @@
 # License: GNU General Public License v3. See license.txt
 
 import frappe
-from frappe.tests import IntegrationTestCase
+from frappe.tests import IntegrationTestCase, UnitTestCase
 from frappe.utils import nowdate
 
 from erpnext.accounts.doctype.bank_transaction.test_bank_transaction import create_bank_account
 
 
+class UnitTestBankTransaction(UnitTestCase):
+	"""
+	Unit tests for BankTransaction.
+	Use this class for testing individual functions and methods.
+	"""
+
+	pass
+
+
 class TestAutoMatchParty(IntegrationTestCase):
 	@classmethod
 	def setUpClass(cls):

erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py

@@ -6,15 +6,12 @@ import json
 import frappe
 from frappe import utils
 from frappe.model.docstatus import DocStatus
-from frappe.tests import IntegrationTestCase
+from frappe.tests import IntegrationTestCase, UnitTestCase
 
 from erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool import (
 	get_linked_payments,
 	reconcile_vouchers,
 )
-from erpnext.accounts.doctype.mode_of_payment.test_mode_of_payment import (
-	set_default_account_for_mode_of_payment,
-)
 from erpnext.accounts.doctype.payment_entry.test_payment_entry import get_payment_entry
 from erpnext.accounts.doctype.pos_profile.test_pos_profile import make_pos_profile
 from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make_purchase_invoice
@@ -24,6 +21,15 @@ from erpnext.tests.utils import if_lending_app_installed
 EXTRA_TEST_RECORD_DEPENDENCIES = ["Item", "Cost Center"]
 
 
+class UnitTestBankTransaction(UnitTestCase):
+	"""
+	Unit tests for BankTransaction.
+	Use this class for testing individual functions and methods.
+	"""
+
+	pass
+
+
 class TestBankTransaction(IntegrationTestCase):
 	def setUp(self):
 		make_pos_profile()
@@ -424,13 +430,15 @@ def add_vouchers(gl_account="_Test Bank - _TC"):
 	except frappe.DuplicateEntryError:
 		pass
 
-	mode_of_payment = frappe.get_doc({"doctype": "Mode of Payment", "name": "Wire Transfer"})
+	mode_of_payment = frappe.get_doc({"doctype": "Mode of Payment", "name": "Cash"})
 
-	set_default_account_for_mode_of_payment(mode_of_payment, "_Test Company", gl_account)
+	if not frappe.db.get_value("Mode of Payment Account", {"company": "_Test Company", "parent": "Cash"}):
+		mode_of_payment.append("accounts", {"company": "_Test Company", "default_account": gl_account})
+		mode_of_payment.save()
 
 	si = create_sales_invoice(customer="Fayva", qty=1, rate=109080, do_not_save=1)
 	si.is_pos = 1
-	si.append("payments", {"mode_of_payment": "Wire Transfer", "amount": 109080})
+	si.append("payments", {"mode_of_payment": "Cash", "account": gl_account, "amount": 109080})
 	si.insert()
 	si.submit()
 

erpnext/accounts/doctype/bisect_accounting_statements/test_bisect_accounting_statements.py

@@ -2,7 +2,16 @@
 # See license.txt
 
 # import frappe
-from frappe.tests import IntegrationTestCase
+from frappe.tests import IntegrationTestCase, UnitTestCase
+
+
+class UnitTestBisectAccountingStatements(UnitTestCase):
+	"""
+	Unit tests for BisectAccountingStatements.
+	Use this class for testing individual functions and methods.
+	"""
+
+	pass
 
 
 class TestBisectAccountingStatements(IntegrationTestCase):

erpnext/accounts/doctype/bisect_nodes/test_bisect_nodes.py

@@ -2,7 +2,16 @@
 # See license.txt
 
 # import frappe
-from frappe.tests import IntegrationTestCase
+from frappe.tests import IntegrationTestCase, UnitTestCase
+
+
+class UnitTestBisectNodes(UnitTestCase):
+	"""
+	Unit tests for BisectNodes.
+	Use this class for testing individual functions and methods.
+	"""
+
+	pass
 
 
 class TestBisectNodes(IntegrationTestCase):

erpnext/accounts/doctype/budget/budget.js

@@ -23,11 +23,6 @@ frappe.ui.form.on("Budget", {
 		});
 
 		erpnext.accounts.dimensions.setup_dimension_filters(frm, frm.doctype);
-		frappe.db.get_single_value("Accounts Settings", "use_new_budget_controller").then((value) => {
-			if (!value) {
-				frm.get_field("control_action_for_cumulative_expense_section").hide();
-			}
-		});
 	},
 
 	refresh: function (frm) {

erpnext/accounts/doctype/budget/budget.json

@@ -7,10 +7,10 @@
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
-  "naming_series",
   "budget_against",
   "company",
   "cost_center",
+  "naming_series",
   "project",
   "fiscal_year",
   "column_break_3",
@@ -28,10 +28,6 @@
   "applicable_on_booking_actual_expenses",
   "action_if_annual_budget_exceeded",
   "action_if_accumulated_monthly_budget_exceeded",
-  "control_action_for_cumulative_expense_section",
-  "applicable_on_cumulative_expense",
-  "action_if_annual_exceeded_on_cumulative_expense",
-  "action_if_accumulated_monthly_exceeded_on_cumulative_expense",
   "section_break_21",
   "accounts"
  ],
@@ -199,46 +195,19 @@
   },
   {
    "fieldname": "naming_series",
-   "fieldtype": "Select",
+   "fieldtype": "Data",
+   "hidden": 1,
    "label": "Series",
    "no_copy": 1,
-   "options": "BUDGET-.YYYY.-",
    "print_hide": 1,
-   "reqd": 1,
+   "read_only": 1,
    "set_only_once": 1
-  },
-  {
-   "fieldname": "control_action_for_cumulative_expense_section",
-   "fieldtype": "Section Break",
-   "label": "Control Action for Cumulative Expense"
-  },
-  {
-   "default": "0",
-   "description": "(Purchase Order + Material Request + Actual Expense)",
-   "fieldname": "applicable_on_cumulative_expense",
-   "fieldtype": "Check",
-   "label": "Applicable on Cumulative Expense"
-  },
-  {
-   "depends_on": "eval:doc.applicable_on_cumulative_expense == 1",
-   "fieldname": "action_if_annual_exceeded_on_cumulative_expense",
-   "fieldtype": "Select",
-   "label": "Action if Anual Budget Exceeded on Cumulative Expense",
-   "options": "\nStop\nWarn\nIgnore"
-  },
-  {
-   "depends_on": "eval:doc.applicable_on_cumulative_expense == 1",
-   "fieldname": "action_if_accumulated_monthly_exceeded_on_cumulative_expense",
-   "fieldtype": "Select",
-   "label": "Action if Accumulative Monthly Budget Exceeded on Cumulative Expense",
-   "options": "\nStop\nWarn\nIgnore"
   }
  ],
- "grid_page_length": 50,
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2025-06-16 15:57:13.114981",
+ "modified": "2024-03-27 13:06:42.675933",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Budget",
@@ -262,9 +231,8 @@
    "write": 1
   }
  ],
- "row_format": "Dynamic",
  "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
-}
+}

erpnext/accounts/doctype/budget/budget.py

@@ -36,14 +36,11 @@ class Budget(Document):
 		action_if_accumulated_monthly_budget_exceeded: DF.Literal["", "Stop", "Warn", "Ignore"]
 		action_if_accumulated_monthly_budget_exceeded_on_mr: DF.Literal["", "Stop", "Warn", "Ignore"]
 		action_if_accumulated_monthly_budget_exceeded_on_po: DF.Literal["", "Stop", "Warn", "Ignore"]
-		action_if_accumulated_monthly_exceeded_on_cumulative_expense: DF.Literal["", "Stop", "Warn", "Ignore"]
 		action_if_annual_budget_exceeded: DF.Literal["", "Stop", "Warn", "Ignore"]
 		action_if_annual_budget_exceeded_on_mr: DF.Literal["", "Stop", "Warn", "Ignore"]
 		action_if_annual_budget_exceeded_on_po: DF.Literal["", "Stop", "Warn", "Ignore"]
-		action_if_annual_exceeded_on_cumulative_expense: DF.Literal["", "Stop", "Warn", "Ignore"]
 		amended_from: DF.Link | None
 		applicable_on_booking_actual_expenses: DF.Check
-		applicable_on_cumulative_expense: DF.Check
 		applicable_on_material_request: DF.Check
 		applicable_on_purchase_order: DF.Check
 		budget_against: DF.Literal["", "Cost Center", "Project"]
@@ -51,7 +48,7 @@ class Budget(Document):
 		cost_center: DF.Link | None
 		fiscal_year: DF.Link
 		monthly_distribution: DF.Link | None
-		naming_series: DF.Literal["BUDGET-.YYYY.-"]
+		naming_series: DF.Data | None
 		project: DF.Link | None
 	# end: auto-generated types
 
@@ -139,10 +136,13 @@ class Budget(Document):
 		):
 			self.applicable_on_booking_actual_expenses = 1
 
+	def before_naming(self):
+		self.naming_series = f"{{{frappe.scrub(self.budget_against)}}}./.{self.fiscal_year}/.###"
+
 
 def validate_expense_against_budget(args, expense_amount=0):
 	args = frappe._dict(args)
-	if not frappe.db.count("Budget", cache=True):
+	if not frappe.get_all("Budget", limit=1):
 		return
 
 	if args.get("company") and not args.fiscal_year:
@@ -151,7 +151,7 @@ def validate_expense_against_budget(args, expense_amount=0):
 			"Company", args.get("company"), "exception_budget_approver_role"
 		)
 
-	if not frappe.db.get_value("Budget", {"fiscal_year": args.fiscal_year, "company": args.company}):
+	if not frappe.get_cached_value("Budget", {"fiscal_year": args.fiscal_year, "company": args.company}):  # nosec
 		return
 
 	if not args.account:
@@ -510,7 +510,7 @@ def get_accumulated_monthly_budget(monthly_distribution, posting_date, fiscal_ye
 	accumulated_percentage = 0.0
 
 	while dt <= getdate(posting_date):
-		if monthly_distribution and distribution:
+		if monthly_distribution:
 			accumulated_percentage += distribution.get(getdate(dt).strftime("%B"), 0)
 		else:
 			accumulated_percentage += 100.0 / 12

erpnext/accounts/doctype/budget/test_budget.py

@@ -3,29 +3,18 @@
 import unittest
 
 import frappe
+from frappe.tests import IntegrationTestCase
 from frappe.utils import now_datetime, nowdate
 
-from erpnext.accounts.doctype.budget.budget import (
-	BudgetError,
-	get_accumulated_monthly_budget,
-	get_actual_expense,
-)
+from erpnext.accounts.doctype.budget.budget import BudgetError, get_actual_expense
 from erpnext.accounts.doctype.journal_entry.test_journal_entry import make_journal_entry
 from erpnext.accounts.utils import get_fiscal_year
 from erpnext.buying.doctype.purchase_order.test_purchase_order import create_purchase_order
-from erpnext.tests.utils import ERPNextTestSuite
+
+EXTRA_TEST_RECORD_DEPENDENCIES = ["Monthly Distribution"]
 
 
-class TestBudget(ERPNextTestSuite):
-	@classmethod
-	def setUpClass(cls):
-		super().setUpClass()
-		cls.make_monthly_distribution()
-		cls.make_projects()
-
-	def setUp(self):
-		frappe.db.set_single_value("Accounts Settings", "use_new_budget_controller", True)
-
+class TestBudget(IntegrationTestCase):
 	def test_monthly_budget_crossed_ignore(self):
 		set_total_expense_zero(nowdate(), "cost_center")
 
@@ -54,13 +43,10 @@ class TestBudget(ERPNextTestSuite):
 
 		frappe.db.set_value("Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop")
 
-		accumulated_limit = get_accumulated_monthly_budget(
-			budget.monthly_distribution, nowdate(), budget.fiscal_year, budget.accounts[0].budget_amount
-		)
 		jv = make_journal_entry(
 			"_Test Account Cost for Goods Sold - _TC",
 			"_Test Bank - _TC",
-			accumulated_limit + 1,
+			40000,
 			"_Test Cost Center - _TC",
 			posting_date=nowdate(),
 		)
@@ -77,13 +63,10 @@ class TestBudget(ERPNextTestSuite):
 
 		frappe.db.set_value("Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop")
 
-		accumulated_limit = get_accumulated_monthly_budget(
-			budget.monthly_distribution, nowdate(), budget.fiscal_year, budget.accounts[0].budget_amount
-		)
 		jv = make_journal_entry(
 			"_Test Account Cost for Goods Sold - _TC",
 			"_Test Bank - _TC",
-			accumulated_limit + 1,
+			40000,
 			"_Test Cost Center - _TC",
 			posting_date=nowdate(),
 		)
@@ -140,7 +123,6 @@ class TestBudget(ERPNextTestSuite):
 
 		budget.load_from_db()
 		budget.cancel()
-		mr.cancel()
 
 	def test_monthly_budget_crossed_for_po(self):
 		budget = make_budget(
@@ -153,12 +135,7 @@ class TestBudget(ERPNextTestSuite):
 		frappe.db.set_value("Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop")
 		frappe.db.set_value("Budget", budget.name, "fiscal_year", fiscal_year)
 
-		accumulated_limit = get_accumulated_monthly_budget(
-			budget.monthly_distribution, nowdate(), budget.fiscal_year, budget.accounts[0].budget_amount
-		)
-		po = create_purchase_order(
-			transaction_date=nowdate(), qty=1, rate=accumulated_limit + 1, do_not_submit=True
-		)
+		po = create_purchase_order(transaction_date=nowdate(), do_not_submit=True)
 
 		po.set_missing_values()
 
@@ -176,13 +153,11 @@ class TestBudget(ERPNextTestSuite):
 		frappe.db.set_value("Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop")
 
 		project = frappe.get_value("Project", {"project_name": "_Test Project"})
-		accumulated_limit = get_accumulated_monthly_budget(
-			budget.monthly_distribution, nowdate(), budget.fiscal_year, budget.accounts[0].budget_amount
-		)
+
 		jv = make_journal_entry(
 			"_Test Account Cost for Goods Sold - _TC",
 			"_Test Bank - _TC",
-			accumulated_limit + 1,
+			40000,
 			"_Test Cost Center - _TC",
 			project=project,
 			posting_date=nowdate(),
@@ -297,13 +272,10 @@ class TestBudget(ERPNextTestSuite):
 		budget = make_budget(budget_against="Cost Center", cost_center="_Test Company - _TC")
 		frappe.db.set_value("Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop")
 
-		accumulated_limit = get_accumulated_monthly_budget(
-			budget.monthly_distribution, nowdate(), budget.fiscal_year, budget.accounts[0].budget_amount
-		)
 		jv = make_journal_entry(
 			"_Test Account Cost for Goods Sold - _TC",
 			"_Test Bank - _TC",
-			accumulated_limit + 1,
+			40000,
 			"_Test Cost Center 2 - _TC",
 			posting_date=nowdate(),
 		)
@@ -330,13 +302,10 @@ class TestBudget(ERPNextTestSuite):
 		budget = make_budget(budget_against="Cost Center", cost_center=cost_center)
 		frappe.db.set_value("Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop")
 
-		accumulated_limit = get_accumulated_monthly_budget(
-			budget.monthly_distribution, nowdate(), budget.fiscal_year, budget.accounts[0].budget_amount
-		)
 		jv = make_journal_entry(
 			"_Test Account Cost for Goods Sold - _TC",
 			"_Test Bank - _TC",
-			accumulated_limit + 1,
+			40000,
 			cost_center,
 			posting_date=nowdate(),
 		)
@@ -380,44 +349,6 @@ class TestBudget(ERPNextTestSuite):
 
 		self.assertRaises(BudgetError, jv.submit)
 
-	def test_action_for_cumulative_limit(self):
-		set_total_expense_zero(nowdate(), "cost_center")
-
-		budget = make_budget(budget_against="Cost Center", applicable_on_cumulative_expense=True)
-
-		accumulated_limit = get_accumulated_monthly_budget(
-			budget.monthly_distribution, nowdate(), budget.fiscal_year, budget.accounts[0].budget_amount
-		)
-
-		jv = make_journal_entry(
-			"_Test Account Cost for Goods Sold - _TC",
-			"_Test Bank - _TC",
-			accumulated_limit - 1,
-			"_Test Cost Center - _TC",
-			posting_date=nowdate(),
-		)
-		jv.submit()
-
-		frappe.db.set_value(
-			"Budget", budget.name, "action_if_accumulated_monthly_exceeded_on_cumulative_expense", "Stop"
-		)
-		po = create_purchase_order(
-			transaction_date=nowdate(), qty=1, rate=accumulated_limit + 1, do_not_submit=True
-		)
-		po.set_missing_values()
-
-		self.assertRaises(BudgetError, po.submit)
-
-		frappe.db.set_value(
-			"Budget", budget.name, "action_if_accumulated_monthly_exceeded_on_cumulative_expense", "Ignore"
-		)
-		po.submit()
-
-		budget.load_from_db()
-		budget.cancel()
-		po.cancel()
-		jv.cancel()
-
 
 def set_total_expense_zero(posting_date, budget_against_field=None, budget_against_CC=None):
 	if budget_against_field == "project":
@@ -492,7 +423,6 @@ def make_budget(**args):
 
 	monthly_distribution = frappe.get_doc("Monthly Distribution", "_Test Distribution")
 	monthly_distribution.fiscal_year = fiscal_year
-	monthly_distribution.save()
 
 	budget.fiscal_year = fiscal_year
 	budget.monthly_distribution = "_Test Distribution"
@@ -517,15 +447,6 @@ def make_budget(**args):
 			args.action_if_accumulated_monthly_budget_exceeded_on_po or "Warn"
 		)
 
-	if args.applicable_on_cumulative_expense:
-		budget.applicable_on_cumulative_expense = 1
-		budget.action_if_annual_exceeded_on_cumulative_expense = (
-			args.action_if_annual_exceeded_on_cumulative_expense or "Warn"
-		)
-		budget.action_if_accumulated_monthly_exceeded_on_cumulative_expense = (
-			args.action_if_accumulated_monthly_exceeded_on_cumulative_expense or "Warn"
-		)
-
 	budget.insert()
 	budget.submit()
 

erpnext/accounts/doctype/cost_center/test_records.json

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

erpnext/accounts/doctype/cost_center/test_records.toml

@@ -0,0 +1,18 @@
+[["Cost Center"]]
+company = "_Test Company"
+cost_center_name = "_Test Cost Center"
+is_group = 0
+parent_cost_center = "_Test Company - _TC"
+
+[["Cost Center"]]
+company = "_Test Company"
+cost_center_name = "_Test Cost Center 2"
+is_group = 0
+parent_cost_center = "_Test Company - _TC"
+
+[["Cost Center"]]
+company = "_Test Company"
+cost_center_name = "_Test Write Off Cost Center"
+is_group = 0
+parent_cost_center = "_Test Company - _TC"
+

erpnext/accounts/doctype/cost_center_allocation/cost_center_allocation.py

@@ -154,7 +154,3 @@ class CostCenterAllocation(Document):
 					).format(d.cost_center),
 					InvalidChildCostCenter,
 				)
-
-	def clear_cache(self):
-		frappe.clear_cache(doctype="Cost Center")
-		return super().clear_cache()

erpnext/accounts/doctype/coupon_code/test_coupon_code.py

@@ -128,7 +128,7 @@ class TestCouponCode(IntegrationTestCase):
 			item_code="_Test Tesla Car",
 			rate=5000,
 			qty=1,
-			do_not_save=True,
+			do_not_submit=True,
 		)
 
 		self.assertEqual(so.items[0].rate, 5000)

erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.py

@@ -36,7 +36,7 @@ class CurrencyExchangeSettings(Document):
 
 	def validate(self):
 		self.set_parameters_and_result()
-		if frappe.in_test or frappe.flags.in_install or frappe.flags.in_setup_wizard:
+		if frappe.flags.in_test or frappe.flags.in_install or frappe.flags.in_setup_wizard:
 			return
 		response, value = self.validate_parameters()
 		self.validate_result(response, value)

erpnext/accounts/doctype/dunning/dunning.py

@@ -230,7 +230,6 @@ def get_dunning_letter_text(dunning_type: str, doc: str | dict, language: str |
 	if not language:
 		language = doc.get("language")
 
-	letter_text = None
 	if language:
 		letter_text = frappe.db.get_value(
 			DOCTYPE, {"parent": dunning_type, "language": language}, FIELDS, as_dict=1

erpnext/accounts/doctype/dunning/test_dunning.py

@@ -1,10 +1,7 @@
 # Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import json
-
 import frappe
-from frappe.model import mapper
-from frappe.tests import IntegrationTestCase
+from frappe.tests import IntegrationTestCase, UnitTestCase
 from frappe.utils import add_days, nowdate, today
 
 from erpnext import get_default_cost_center
@@ -22,6 +19,15 @@ from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import (
 EXTRA_TEST_RECORD_DEPENDENCIES = ["Company", "Cost Center"]
 
 
+class UnitTestDunning(UnitTestCase):
+	"""
+	Unit tests for Dunning.
+	Use this class for testing individual functions and methods.
+	"""
+
+	pass
+
+
 class TestDunning(IntegrationTestCase):
 	@classmethod
 	def setUpClass(cls):
@@ -71,36 +77,6 @@ class TestDunning(IntegrationTestCase):
 		dunning.reload()
 		self.assertEqual(dunning.status, "Resolved")
 
-	def test_fetch_overdue_payments(self):
-		"""
-		Create SI with overdue payment. Check if overdue payment is fetched in Dunning.
-		"""
-		si1 = create_sales_invoice_against_cost_center(
-			posting_date=add_days(today(), -1 * 6),
-			qty=1,
-			rate=100,
-		)
-
-		si2 = create_sales_invoice_against_cost_center(
-			posting_date=add_days(today(), -1 * 6),
-			qty=1,
-			rate=300,
-		)
-
-		dunning = create_dunning_from_sales_invoice(si1.name)
-		dunning.overdue_payments = []
-
-		method = "erpnext.accounts.doctype.sales_invoice.sales_invoice.create_dunning"
-		updated_dunning = mapper.map_docs(method, json.dumps([si1.name, si2.name]), dunning)
-
-		self.assertEqual(len(updated_dunning.overdue_payments), 2)
-
-		self.assertEqual(updated_dunning.overdue_payments[0].sales_invoice, si1.name)
-		self.assertEqual(updated_dunning.overdue_payments[0].outstanding, si1.outstanding_amount)
-
-		self.assertEqual(updated_dunning.overdue_payments[1].sales_invoice, si2.name)
-		self.assertEqual(updated_dunning.overdue_payments[1].outstanding, si2.outstanding_amount)
-
 	def test_dunning_and_payment_against_partially_due_invoice(self):
 		"""
 		Create SI with first installment overdue. Check impact of Dunning and Payment Entry.

erpnext/accounts/doctype/dunning_type/test_records.json

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

erpnext/accounts/doctype/dunning_type/test_records.toml

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

erpnext/accounts/doctype/fiscal_year/fiscal_year.py

@@ -123,7 +123,7 @@ def check_duplicate_fiscal_year(doc):
 	)
 	for fiscal_year, ysd, yed in year_start_end_dates:
 		if (getdate(doc.year_start_date) == ysd and getdate(doc.year_end_date) == yed) and (
-			not frappe.in_test
+			not frappe.flags.in_test
 		):
 			frappe.throw(
 				_(

erpnext/accounts/doctype/gl_entry/gl_entry.json

@@ -105,8 +105,7 @@
    "label": "Cost Center",
    "oldfieldname": "cost_center",
    "oldfieldtype": "Link",
-   "options": "Cost Center",
-   "search_index": 1
+   "options": "Cost Center"
   },
   {
    "fieldname": "debit",
@@ -280,8 +279,7 @@
   {
    "fieldname": "transaction_exchange_rate",
    "fieldtype": "Float",
-   "label": "Transaction Exchange Rate",
-   "precision": "9"
+   "label": "Transaction Exchange Rate"
   },
   {
    "fieldname": "debit_in_transaction_currency",
@@ -359,7 +357,7 @@
  "idx": 1,
  "in_create": 1,
  "links": [],
- "modified": "2025-03-21 15:29:11.221890",
+ "modified": "2024-08-22 13:03:39.997475",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "GL Entry",

erpnext/accounts/doctype/gl_entry/gl_entry.py

@@ -7,7 +7,7 @@ from frappe import _
 from frappe.model.document import Document
 from frappe.model.meta import get_field_precision
 from frappe.model.naming import set_name_from_naming_options
-from frappe.utils import create_batch, flt, fmt_money, now
+from frappe.utils import flt, fmt_money
 
 import erpnext
 from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import (
@@ -451,15 +451,12 @@ def rename_gle_sle_docs():
 def rename_temporarily_named_docs(doctype):
 	"""Rename temporarily named docs using autoname options"""
 	docs_to_rename = frappe.get_all(doctype, {"to_rename": "1"}, order_by="creation", limit=50000)
-	autoname = frappe.get_meta(doctype).autoname
-
-	for batch in create_batch(docs_to_rename, 100):
-		for doc in batch:
-			oldname = doc.name
-			set_name_from_naming_options(autoname, doc)
-			newname = doc.name
-			frappe.db.sql(
-				f"UPDATE `tab{doctype}` SET name = %s, to_rename = 0, modified = %s where name = %s",
-				(newname, now(), oldname),
-			)
-		frappe.db.commit()
+	for doc in docs_to_rename:
+		oldname = doc.name
+		set_name_from_naming_options(frappe.get_meta(doctype).autoname, doc)
+		newname = doc.name
+		frappe.db.sql(
+			f"UPDATE `tab{doctype}` SET name = %s, to_rename = 0 where name = %s",
+			(newname, oldname),
+			auto_commit=True,
+		)

erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js

@@ -197,7 +197,7 @@ frappe.ui.form.on("Invoice Discounting", {
 						from_date: frm.doc.posting_date,
 						to_date: moment(frm.doc.modified).format("YYYY-MM-DD"),
 						company: frm.doc.company,
-						categorize_by: "Categorize by Voucher (Consolidated)",
+						group_by: "Group by Voucher (Consolidated)",
 						show_cancelled_entries: frm.doc.docstatus === 2,
 					};
 					frappe.set_route("query-report", "General Ledger");

erpnext/accounts/doctype/item_tax_template/item_tax_template.py

@@ -39,16 +39,7 @@ class ItemTaxTemplate(Document):
 		check_list = []
 		for d in self.get("taxes"):
 			if d.tax_type:
-				account_type, account_company = frappe.get_cached_value(
-					"Account", d.tax_type, ["account_type", "company"]
-				)
-
-				if account_company != self.company:
-					frappe.throw(
-						_("Item Tax Row {0}: Account must belong to Company - {1}").format(
-							d.idx, frappe.bold(self.company)
-						)
-					)
+				account_type = frappe.get_cached_value("Account", d.tax_type, "account_type")
 
 				if account_type not in [
 					"Tax",

erpnext/accounts/doctype/item_tax_template/test_records.json

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

erpnext/accounts/doctype/item_tax_template/test_records.toml

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

erpnext/accounts/doctype/journal_entry/journal_entry.js

@@ -20,39 +20,6 @@ frappe.ui.form.on("Journal Entry", {
 			"Unreconcile Payment Entries",
 			"Bank Transaction",
 		];
-
-		frm.trigger("set_queries");
-	},
-
-	set_queries(frm) {
-		frm.set_query("periodic_entry_difference_account", function () {
-			return {
-				filters: {
-					is_group: 0,
-					company: frm.doc.company,
-				},
-			};
-		});
-
-		frm.set_query("stock_asset_account", function () {
-			return {
-				filters: {
-					is_group: 0,
-					account_type: "Stock",
-					company: frm.doc.company,
-				},
-			};
-		});
-	},
-
-	get_balance_for_periodic_accounting(frm) {
-		frm.call({
-			method: "get_balance_for_periodic_accounting",
-			doc: frm.doc,
-			callback: function (r) {
-				refresh_field("accounts");
-			},
-		});
 	},
 
 	refresh: function (frm) {
@@ -68,7 +35,7 @@ frappe.ui.form.on("Journal Entry", {
 						to_date: moment(frm.doc.modified).format("YYYY-MM-DD"),
 						company: frm.doc.company,
 						finance_book: frm.doc.finance_book,
-						categorize_by: "",
+						group_by: "",
 						show_cancelled_entries: frm.doc.docstatus === 2,
 					};
 					frappe.set_route("query-report", "General Ledger");

erpnext/accounts/doctype/journal_entry/journal_entry.json

@@ -13,21 +13,15 @@
   "title",
   "voucher_type",
   "naming_series",
+  "finance_book",
   "process_deferred_accounting",
   "reversal_of",
+  "tax_withholding_category",
   "column_break1",
   "from_template",
   "company",
   "posting_date",
-  "finance_book",
   "apply_tds",
-  "tax_withholding_category",
-  "section_break_tcvw",
-  "for_all_stock_asset_accounts",
-  "column_break_wpau",
-  "stock_asset_account",
-  "periodic_entry_difference_account",
-  "get_balance_for_periodic_accounting",
   "2_add_edit_gl_entries",
   "accounts",
   "section_break99",
@@ -95,7 +89,7 @@
    "label": "Entry Type",
    "oldfieldname": "voucher_type",
    "oldfieldtype": "Select",
-   "options": "Journal Entry\nInter Company Journal Entry\nBank Entry\nCash Entry\nCredit Card Entry\nDebit Note\nCredit Note\nContra Entry\nExcise Entry\nWrite Off Entry\nOpening Entry\nDepreciation Entry\nAsset Disposal\nPeriodic Accounting Entry\nExchange Rate Revaluation\nExchange Gain Or Loss\nDeferred Revenue\nDeferred Expense",
+   "options": "Journal Entry\nInter Company Journal Entry\nBank Entry\nCash Entry\nCredit Card Entry\nDebit Note\nCredit Note\nContra Entry\nExcise Entry\nWrite Off Entry\nOpening Entry\nDepreciation Entry\nExchange Rate Revaluation\nExchange Gain Or Loss\nDeferred Revenue\nDeferred Expense",
    "reqd": 1,
    "search_index": 1
   },
@@ -549,42 +543,6 @@
    "label": "Is System Generated",
    "no_copy": 1,
    "read_only": 1
-  },
-  {
-   "depends_on": "eval:doc.voucher_type === \"Periodic Accounting Entry\"",
-   "fieldname": "periodic_entry_difference_account",
-   "fieldtype": "Link",
-   "label": "Periodic Entry Difference Account",
-   "mandatory_depends_on": "eval:doc.voucher_type === \"Periodic Accounting Entry\"",
-   "options": "Account"
-  },
-  {
-   "depends_on": "eval:doc.voucher_type === \"Periodic Accounting Entry\"",
-   "fieldname": "section_break_tcvw",
-   "fieldtype": "Section Break",
-   "label": "Periodic Accounting"
-  },
-  {
-   "default": "1",
-   "fieldname": "for_all_stock_asset_accounts",
-   "fieldtype": "Check",
-   "label": "For All Stock Asset Accounts"
-  },
-  {
-   "depends_on": "eval:doc.for_all_stock_asset_accounts === 0",
-   "fieldname": "stock_asset_account",
-   "fieldtype": "Link",
-   "label": "Stock Asset Account",
-   "options": "Account"
-  },
-  {
-   "fieldname": "column_break_wpau",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "get_balance_for_periodic_accounting",
-   "fieldtype": "Button",
-   "label": "Get Balance"
   }
  ],
  "icon": "fa fa-file-text",
@@ -599,7 +557,7 @@
    "table_fieldname": "payment_entries"
   }
  ],
- "modified": "2025-06-17 15:18:13.322681",
+ "modified": "2024-07-18 15:32:29.413598",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Journal Entry",
@@ -644,11 +602,10 @@
    "role": "Auditor"
   }
  ],
- "row_format": "Dynamic",
  "search_fields": "voucher_type,posting_date, due_date, cheque_no",
  "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "title_field": "title",
  "track_changes": 1
-}
+}

erpnext/accounts/doctype/journal_entry/journal_entry.py

@@ -62,7 +62,6 @@ class JournalEntry(AccountsController):
 		difference: DF.Currency
 		due_date: DF.Date | None
 		finance_book: DF.Link | None
-		for_all_stock_asset_accounts: DF.Check
 		from_template: DF.Link | None
 		inter_company_journal_entry_reference: DF.Link | None
 		is_opening: DF.Literal["No", "Yes"]
@@ -74,13 +73,11 @@ class JournalEntry(AccountsController):
 		paid_loan: DF.Data | None
 		pay_to_recd_from: DF.Data | None
 		payment_order: DF.Link | None
-		periodic_entry_difference_account: DF.Link | None
 		posting_date: DF.Date
 		process_deferred_accounting: DF.Link | None
 		remark: DF.SmallText | None
 		reversal_of: DF.Link | None
 		select_print_heading: DF.Link | None
-		stock_asset_account: DF.Link | None
 		stock_entry: DF.Link | None
 		tax_withholding_category: DF.Link | None
 		title: DF.Data | None
@@ -103,8 +100,6 @@ class JournalEntry(AccountsController):
 			"Write Off Entry",
 			"Opening Entry",
 			"Depreciation Entry",
-			"Asset Disposal",
-			"Periodic Accounting Entry",
 			"Exchange Rate Revaluation",
 			"Exchange Gain Or Loss",
 			"Deferred Revenue",
@@ -145,14 +140,14 @@ class JournalEntry(AccountsController):
 		self.validate_credit_debit_note()
 		self.validate_empty_accounts_table()
 		self.validate_inter_company_accounts()
-		self.validate_depr_account_and_depr_entry_voucher_type()
-		self.validate_company_in_accounting_dimension()
+		self.validate_depr_entry_voucher_type()
 		self.validate_advance_accounts()
 
 		if self.docstatus == 0:
 			self.apply_tax_withholding()
 
-		self.title = self.get_title()
+		if not self.title:
+			self.title = self.get_title()
 
 	def validate_advance_accounts(self):
 		journal_accounts = set([x.account for x in self.accounts])
@@ -200,76 +195,7 @@ class JournalEntry(AccountsController):
 		self.update_asset_value()
 		self.update_inter_company_jv()
 		self.update_invoice_discounting()
-
-	@frappe.whitelist()
-	def get_balance_for_periodic_accounting(self):
-		self.validate_company_for_periodic_accounting()
-
-		stock_accounts = self.get_stock_accounts_for_periodic_accounting()
-		self.set("accounts", [])
-		for account in stock_accounts:
-			account_bal, stock_bal, warehouse_list = get_stock_and_account_balance(
-				account, self.posting_date, self.company
-			)
-
-			difference_value = flt(stock_bal - account_bal, self.precision("difference"))
-
-			if difference_value == 0:
-				frappe.msgprint(
-					_("No difference found for stock account {0}").format(frappe.bold(account)),
-					alert=True,
-				)
-				continue
-
-			self.append(
-				"accounts",
-				{
-					"account": account,
-					"debit_in_account_currency": difference_value if difference_value > 0 else 0,
-					"credit_in_account_currency": abs(difference_value) if difference_value < 0 else 0,
-				},
-			)
-
-			self.append(
-				"accounts",
-				{
-					"account": self.periodic_entry_difference_account,
-					"credit_in_account_currency": difference_value if difference_value > 0 else 0,
-					"debit_in_account_currency": abs(difference_value) if difference_value < 0 else 0,
-				},
-			)
-
-	def validate_company_for_periodic_accounting(self):
-		if erpnext.is_perpetual_inventory_enabled(self.company):
-			frappe.throw(
-				_(
-					"Periodic Accounting Entry is not allowed for company {0} with perpetual inventory enabled"
-				).format(self.company)
-			)
-
-		if not self.periodic_entry_difference_account:
-			frappe.throw(_("Please select Periodic Accounting Entry Difference Account"))
-
-	def get_stock_accounts_for_periodic_accounting(self):
-		if self.voucher_type != "Periodic Accounting Entry":
-			return []
-
-		if self.for_all_stock_asset_accounts:
-			return frappe.get_all(
-				"Account",
-				filters={
-					"company": self.company,
-					"account_type": "Stock",
-					"root_type": "Asset",
-					"is_group": 0,
-				},
-				pluck="name",
-			)
-
-		if not self.stock_asset_account:
-			frappe.throw(_("Please select Stock Asset Account"))
-
-		return [self.stock_asset_account]
+		self.update_booked_depreciation()
 
 	def on_update_after_submit(self):
 		# Flag will be set on Reconciliation
@@ -305,6 +231,7 @@ class JournalEntry(AccountsController):
 		self.unlink_inter_company_jv()
 		self.unlink_asset_adjustment_entry()
 		self.update_invoice_discounting()
+		self.update_booked_depreciation(1)
 
 	def get_title(self):
 		return self.pay_to_recd_from or self.accounts[0].account
@@ -325,38 +252,21 @@ class JournalEntry(AccountsController):
 
 	def validate_inter_company_accounts(self):
 		if self.voucher_type == "Inter Company Journal Entry" and self.inter_company_journal_entry_reference:
-			doc = frappe.db.get_value(
-				"Journal Entry",
-				self.inter_company_journal_entry_reference,
-				["company", "total_debit", "total_credit"],
-				as_dict=True,
-			)
+			doc = frappe.get_doc("Journal Entry", self.inter_company_journal_entry_reference)
 			account_currency = frappe.get_cached_value("Company", self.company, "default_currency")
 			previous_account_currency = frappe.get_cached_value("Company", doc.company, "default_currency")
 			if account_currency == previous_account_currency:
-				credit_precision = self.precision("total_credit")
-				debit_precision = self.precision("total_debit")
-				if (flt(self.total_credit, credit_precision) != flt(doc.total_debit, debit_precision)) or (
-					flt(self.total_debit, debit_precision) != flt(doc.total_credit, credit_precision)
-				):
+				if self.total_credit != doc.total_debit or self.total_debit != doc.total_credit:
 					frappe.throw(_("Total Credit/ Debit Amount should be same as linked Journal Entry"))
 
-	def validate_depr_account_and_depr_entry_voucher_type(self):
-		for d in self.get("accounts"):
-			if d.account_type == "Depreciation":
-				if self.voucher_type != "Depreciation Entry":
-					frappe.throw(
-						_("Journal Entry type should be set as Depreciation Entry for asset depreciation")
-					)
-
-				if frappe.get_cached_value("Account", d.account, "root_type") != "Expense":
-					frappe.throw(_("Account {0} should be of type Expense").format(d.account))
+	def validate_depr_entry_voucher_type(self):
+		if (
+			any(d.account_type == "Depreciation" for d in self.get("accounts"))
+			and self.voucher_type != "Depreciation Entry"
+		):
+			frappe.throw(_("Journal Entry type should be set as Depreciation Entry for asset depreciation"))
 
 	def validate_stock_accounts(self):
-		if self.voucher_type == "Periodic Accounting Entry":
-			# Skip validation for periodic accounting entry
-			return
-
 		stock_accounts = get_stock_accounts(self.company, accounts=self.accounts)
 		for account in stock_accounts:
 			account_bal, stock_bal, warehouse_list = get_stock_and_account_balance(
@@ -459,11 +369,7 @@ class JournalEntry(AccountsController):
 			self.remove(d)
 
 	def update_asset_value(self):
-		self.update_asset_on_depreciation()
-		self.update_asset_on_disposal()
-
-	def update_asset_on_depreciation(self):
-		if self.voucher_type != "Depreciation Entry":
+		if self.flags.planned_depr_entry or self.voucher_type != "Depreciation Entry":
 			return
 
 		for d in self.get("accounts"):
@@ -473,59 +379,22 @@ class JournalEntry(AccountsController):
 				and d.account_type == "Depreciation"
 				and d.debit
 			):
-				asset = frappe.get_cached_doc("Asset", d.reference_name)
+				asset = frappe.get_doc("Asset", d.reference_name)
 
 				if asset.calculate_depreciation:
-					self.update_journal_entry_link_on_depr_schedule(asset, d)
-					self.update_value_after_depreciation(asset, d.debit)
+					fb_idx = 1
+					if self.finance_book:
+						for fb_row in asset.get("finance_books"):
+							if fb_row.finance_book == self.finance_book:
+								fb_idx = fb_row.idx
+								break
+					fb_row = asset.get("finance_books")[fb_idx - 1]
+					fb_row.value_after_depreciation -= d.debit
+					fb_row.db_update()
+				else:
+					asset.db_set("value_after_depreciation", asset.value_after_depreciation - d.debit)
 
-				asset.db_set("value_after_depreciation", asset.value_after_depreciation - d.debit)
 				asset.set_status()
-				asset.set_total_booked_depreciations()
-
-	def update_value_after_depreciation(self, asset, depr_amount):
-		fb_idx = 1
-		if self.finance_book:
-			for fb_row in asset.get("finance_books"):
-				if fb_row.finance_book == self.finance_book:
-					fb_idx = fb_row.idx
-					break
-		fb_row = asset.get("finance_books")[fb_idx - 1]
-		fb_row.value_after_depreciation -= depr_amount
-		frappe.db.set_value(
-			"Asset Finance Book", fb_row.name, "value_after_depreciation", fb_row.value_after_depreciation
-		)
-
-	def update_journal_entry_link_on_depr_schedule(self, asset, je_row):
-		depr_schedule = get_depr_schedule(asset.name, "Active", self.finance_book)
-		for d in depr_schedule or []:
-			if (
-				d.schedule_date == self.posting_date
-				and not d.journal_entry
-				and d.depreciation_amount == flt(je_row.debit)
-			):
-				frappe.db.set_value("Depreciation Schedule", d.name, "journal_entry", self.name)
-
-	def update_asset_on_disposal(self):
-		if self.voucher_type == "Asset Disposal":
-			disposed_assets = []
-			for d in self.get("accounts"):
-				if (
-					d.reference_type == "Asset"
-					and d.reference_name
-					and d.reference_name not in disposed_assets
-				):
-					frappe.db.set_value(
-						"Asset",
-						d.reference_name,
-						{
-							"disposal_date": self.posting_date,
-							"journal_entry_for_scrap": self.name,
-						},
-					)
-					asset_doc = frappe.get_doc("Asset", d.reference_name)
-					asset_doc.set_status()
-					disposed_assets.append(d.reference_name)
 
 	def update_inter_company_jv(self):
 		if self.voucher_type == "Inter Company Journal Entry" and self.inter_company_journal_entry_reference:
@@ -580,6 +449,25 @@ class JournalEntry(AccountsController):
 			if status:
 				inv_disc_doc.set_status(status=status)
 
+	def update_booked_depreciation(self, cancel=0):
+		for d in self.get("accounts"):
+			if (
+				self.voucher_type == "Depreciation Entry"
+				and d.reference_type == "Asset"
+				and d.reference_name
+				and frappe.get_cached_value("Account", d.account, "root_type") == "Expense"
+				and d.debit
+			):
+				asset = frappe.get_doc("Asset", d.reference_name)
+				for fb_row in asset.get("finance_books"):
+					if fb_row.finance_book == self.finance_book:
+						if cancel:
+							fb_row.total_number_of_booked_depreciations -= 1
+						else:
+							fb_row.total_number_of_booked_depreciations += 1
+						fb_row.db_update()
+						break
+
 	def unlink_advance_entry_reference(self):
 		for d in self.get("accounts"):
 			if d.is_advance == "Yes" and d.reference_type in ("Sales Invoice", "Purchase Invoice"):
@@ -629,9 +517,9 @@ class JournalEntry(AccountsController):
 						fb_row = asset.get("finance_books")[fb_idx - 1]
 						fb_row.value_after_depreciation += d.debit
 						fb_row.db_update()
-				asset.db_set("value_after_depreciation", asset.value_after_depreciation + d.debit)
+				else:
+					asset.db_set("value_after_depreciation", asset.value_after_depreciation + d.debit)
 				asset.set_status()
-				asset.set_total_booked_depreciations()
 			elif self.voucher_type == "Journal Entry" and d.reference_type == "Asset" and d.reference_name:
 				journal_entry_for_scrap = frappe.db.get_value(
 					"Asset", d.reference_name, "journal_entry_for_scrap"
@@ -690,22 +578,8 @@ class JournalEntry(AccountsController):
 		if customers:
 			from erpnext.selling.doctype.customer.customer import check_credit_limit
 
-			customer_details = frappe._dict(
-				frappe.db.get_all(
-					"Customer Credit Limit",
-					filters={
-						"parent": ["in", customers],
-						"parenttype": ["=", "Customer"],
-						"company": ["=", self.company],
-					},
-					fields=["parent", "bypass_credit_limit_check"],
-					as_list=True,
-				)
-			)
-
 			for customer in customers:
-				ignore_outstanding_sales_order = bool(customer_details.get(customer))
-				check_credit_limit(customer, self.company, ignore_outstanding_sales_order)
+				check_credit_limit(customer, self.company)
 
 	def validate_cheque_info(self):
 		if self.voucher_type in ["Bank Entry"]:
@@ -953,13 +827,14 @@ class JournalEntry(AccountsController):
 				"Debit Note",
 				"Credit Note",
 			]:
-				invoice = frappe.get_doc(reference_type, reference_name)
+				invoice = frappe.db.get_value(
+					reference_type, reference_name, ["docstatus", "outstanding_amount"], as_dict=1
+				)
 
 				if invoice.docstatus != 1:
 					frappe.throw(_("{0} {1} is not submitted").format(reference_type, reference_name))
 
-				precision = invoice.precision("outstanding_amount")
-				if total and flt(invoice.outstanding_amount, precision) < flt(total, precision):
+				if total and flt(invoice.outstanding_amount) < total:
 					frappe.throw(
 						_("Payment against {0} {1} cannot be greater than Outstanding Amount {2}").format(
 							reference_type, reference_name, invoice.outstanding_amount
@@ -1187,15 +1062,14 @@ class JournalEntry(AccountsController):
 		gl_map = []
 
 		company_currency = erpnext.get_company_currency(self.company)
-		self.transaction_currency = company_currency
-		self.transaction_exchange_rate = 1
 		if self.multi_currency:
 			for row in self.get("accounts"):
 				if row.account_currency != company_currency:
-					# Journal assumes the first foreign currency as transaction currency
-					self.transaction_currency = row.account_currency
-					self.transaction_exchange_rate = row.exchange_rate
+					self.currency = row.account_currency
+					self.conversion_rate = row.exchange_rate
 					break
+		else:
+			self.currency = company_currency
 
 		for d in self.get("accounts"):
 			if d.debit or d.credit or (self.voucher_type == "Exchange Gain Or Loss"):
@@ -1220,18 +1094,6 @@ class JournalEntry(AccountsController):
 							"credit_in_account_currency": flt(
 								d.credit_in_account_currency, d.precision("credit_in_account_currency")
 							),
-							"transaction_currency": self.transaction_currency,
-							"transaction_exchange_rate": self.transaction_exchange_rate,
-							"debit_in_transaction_currency": flt(
-								d.debit_in_account_currency, d.precision("debit_in_account_currency")
-							)
-							if self.transaction_currency == d.account_currency
-							else flt(d.debit, d.precision("debit")) / self.transaction_exchange_rate,
-							"credit_in_transaction_currency": flt(
-								d.credit_in_account_currency, d.precision("credit_in_account_currency")
-							)
-							if self.transaction_currency == d.account_currency
-							else flt(d.credit, d.precision("credit")) / self.transaction_exchange_rate,
 							"against_voucher_type": d.reference_type,
 							"against_voucher": d.reference_name,
 							"remarks": remarks,
@@ -1248,7 +1110,7 @@ class JournalEntry(AccountsController):
 	def make_gl_entries(self, cancel=0, adv_adj=0):
 		from erpnext.accounts.general_ledger import make_gl_entries
 
-		merge_entries = frappe.get_single_value("Accounts Settings", "merge_similar_account_heads")
+		merge_entries = frappe.db.get_single_value("Accounts Settings", "merge_similar_account_heads")
 
 		gl_map = self.build_gl_map()
 		if self.voucher_type in ("Deferred Revenue", "Deferred Expense"):
@@ -1374,7 +1236,7 @@ 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, account_type=None, mode_of_payment=None, account=None, ignore_permissions=False
 ):
 	from erpnext.accounts.doctype.sales_invoice.sales_invoice import get_bank_cash_account
 
@@ -1409,14 +1271,15 @@ def get_default_bank_cash_account(
 		account_details = frappe.get_cached_value(
 			"Account", account, ["account_currency", "account_type"], as_dict=1
 		)
-		result = {
-			"account": account,
-			"account_currency": account_details.account_currency,
-			"account_type": account_details.account_type,
-		}
-		if fetch_balance:
-			result["balance"] = get_balance_on(account)
-		return frappe._dict(result)
+
+		return frappe._dict(
+			{
+				"account": account,
+				"balance": get_balance_on(account, ignore_account_permission=ignore_permissions),
+				"account_currency": account_details.account_currency,
+				"account_type": account_details.account_type,
+			}
+		)
 	else:
 		return frappe._dict()
 

erpnext/accounts/doctype/journal_entry/test_journal_entry.py

@@ -2,7 +2,7 @@
 # License: GNU General Public License v3. See license.txt
 
 import frappe
-from frappe.tests import IntegrationTestCase
+from frappe.tests import IntegrationTestCase, UnitTestCase
 from frappe.utils import flt, nowdate
 
 from erpnext.accounts.doctype.account.test_account import get_inventory_account
@@ -10,6 +10,15 @@ from erpnext.accounts.doctype.journal_entry.journal_entry import StockAccountInv
 from erpnext.exceptions import InvalidAccountCurrency
 
 
+class UnitTestJournalEntry(UnitTestCase):
+	"""
+	Unit tests for JournalEntry.
+	Use this class for testing individual functions and methods.
+	"""
+
+	pass
+
+
 class TestJournalEntry(IntegrationTestCase):
 	@IntegrationTestCase.change_settings(
 		"Accounts Settings", {"unlink_payment_on_cancellation_of_invoice": 1}
@@ -574,7 +583,7 @@ class TestJournalEntry(IntegrationTestCase):
 			order_by="account",
 		)
 		expected = [
-			{"account": "_Test Bank - _TC", "transaction_exchange_rate": 85.0},
+			{"account": "_Test Bank - _TC", "transaction_exchange_rate": 1.0},
 			{"account": "_Test Receivable USD - _TC", "transaction_exchange_rate": 85.0},
 		]
 		self.assertEqual(expected, actual)
@@ -590,14 +599,13 @@ def make_journal_entry(
 	save=True,
 	submit=False,
 	project=None,
-	company=None,
 ):
 	if not cost_center:
 		cost_center = "_Test Cost Center - _TC"
 
 	jv = frappe.new_doc("Journal Entry")
 	jv.posting_date = posting_date or nowdate()
-	jv.company = company or "_Test Company"
+	jv.company = "_Test Company"
 	jv.user_remark = "test"
 	jv.multi_currency = 1
 	jv.set(

erpnext/accounts/doctype/journal_entry/test_records.json

@@ -1,94 +0,0 @@
-[
-	{
-		"cheque_date": "2013-03-14",
-		"cheque_no": "33",
-		"company": "_Test Company",
-		"doctype": "Journal Entry",
-		"accounts": [
-			{
-				"account": "Debtors - _TC",
-				"party_type": "Customer",
-				"party": "_Test Customer",
-				"credit_in_account_currency": 400.0,
-				"debit_in_account_currency": 0.0,
-				"doctype": "Journal Entry Account",
-				"parentfield": "accounts",
-				"cost_center": "_Test Cost Center - _TC"
-			},
-			{
-				"account": "_Test Bank - _TC",
-				"credit_in_account_currency": 0.0,
-				"debit_in_account_currency": 400.0,
-				"doctype": "Journal Entry Account",
-				"parentfield": "accounts",
-				"cost_center": "_Test Cost Center - _TC"
-			}
-		],
-		"naming_series": "_T-Journal Entry-",
-		"posting_date": "2013-02-14",
-		"user_remark": "test",
-		"voucher_type": "Bank Entry"
-	},
-
-	{
-		"cheque_date": "2013-02-14",
-		"cheque_no": "33",
-		"company": "_Test Company",
-		"doctype": "Journal Entry",
-		"accounts": [
-			{
-				"account": "_Test Payable - _TC",
-				"party_type": "Supplier",
-				"party": "_Test Supplier",
-				"credit_in_account_currency": 0.0,
-				"debit_in_account_currency": 400.0,
-				"doctype": "Journal Entry Account",
-				"parentfield": "accounts",
-				"cost_center": "_Test Cost Center - _TC"
-			},
-			{
-				"account": "_Test Bank - _TC",
-				"credit_in_account_currency": 400.0,
-				"debit_in_account_currency": 0.0,
-				"doctype": "Journal Entry Account",
-				"parentfield": "accounts",
-				"cost_center": "_Test Cost Center - _TC"
-			}
-		],
-		"naming_series": "_T-Journal Entry-",
-		"posting_date": "2013-02-14",
-		"user_remark": "test",
-		"voucher_type": "Bank Entry"
-	},
-
-	{
-		"cheque_date": "2013-02-14",
-		"cheque_no": "33",
-		"company": "_Test Company",
-		"doctype": "Journal Entry",
-		"accounts": [
-			{
-				"account": "Debtors - _TC",
-				"party_type": "Customer",
-				"party": "_Test Customer",
-				"credit_in_account_currency": 0.0,
-				"debit_in_account_currency": 400.0,
-				"doctype": "Journal Entry Account",
-				"parentfield": "accounts",
-				"cost_center": "_Test Cost Center - _TC"
-			},
-			{
-				"account": "Sales - _TC",
-				"credit_in_account_currency": 400.0,
-				"debit_in_account_currency": 0.0,
-				"doctype": "Journal Entry Account",
-				"parentfield": "accounts",
-				"cost_center": "_Test Cost Center - _TC"
-			}
-		],
-		"naming_series": "_T-Journal Entry-",
-		"posting_date": "2013-02-14",
-		"user_remark": "test",
-		"voucher_type": "Bank Entry"
-	}
-]

erpnext/accounts/doctype/journal_entry/test_records.toml

@@ -0,0 +1,81 @@
+[["Journal Entry"]]
+cheque_date = "2013-03-14"
+cheque_no = "33"
+company = "_Test Company"
+naming_series = "_T-Journal Entry-"
+posting_date = "2013-02-14"
+user_remark = "test"
+voucher_type = "Bank Entry"
+[["Journal Entry".accounts]]
+account = "Debtors - _TC"
+party_type = "Customer"
+party = "_Test Customer"
+credit_in_account_currency = 400.0
+debit_in_account_currency = 0.0
+doctype = "Journal Entry Account"
+parentfield = "accounts"
+cost_center = "_Test Cost Center - _TC"
+
+[["Journal Entry".accounts]]
+account = "_Test Bank - _TC"
+credit_in_account_currency = 0.0
+debit_in_account_currency = 400.0
+doctype = "Journal Entry Account"
+parentfield = "accounts"
+cost_center = "_Test Cost Center - _TC"
+
+
+[["Journal Entry"]]
+cheque_date = "2013-02-14"
+cheque_no = "33"
+company = "_Test Company"
+naming_series = "_T-Journal Entry-"
+posting_date = "2013-02-14"
+user_remark = "test"
+voucher_type = "Bank Entry"
+[["Journal Entry".accounts]]
+account = "_Test Payable - _TC"
+party_type = "Supplier"
+party = "_Test Supplier"
+credit_in_account_currency = 0.0
+debit_in_account_currency = 400.0
+doctype = "Journal Entry Account"
+parentfield = "accounts"
+cost_center = "_Test Cost Center - _TC"
+
+[["Journal Entry".accounts]]
+account = "_Test Bank - _TC"
+credit_in_account_currency = 400.0
+debit_in_account_currency = 0.0
+doctype = "Journal Entry Account"
+parentfield = "accounts"
+cost_center = "_Test Cost Center - _TC"
+
+
+[["Journal Entry"]]
+cheque_date = "2013-02-14"
+cheque_no = "33"
+company = "_Test Company"
+naming_series = "_T-Journal Entry-"
+posting_date = "2013-02-14"
+user_remark = "test"
+voucher_type = "Bank Entry"
+[["Journal Entry".accounts]]
+account = "Debtors - _TC"
+party_type = "Customer"
+party = "_Test Customer"
+credit_in_account_currency = 0.0
+debit_in_account_currency = 400.0
+doctype = "Journal Entry Account"
+parentfield = "accounts"
+cost_center = "_Test Cost Center - _TC"
+
+[["Journal Entry".accounts]]
+account = "Sales - _TC"
+credit_in_account_currency = 400.0
+debit_in_account_currency = 0.0
+doctype = "Journal Entry Account"
+parentfield = "accounts"
+cost_center = "_Test Cost Center - _TC"
+
+

erpnext/accounts/doctype/ledger_health_monitor/test_ledger_health_monitor.py

@@ -2,7 +2,16 @@
 # See license.txt
 
 # import frappe
-from frappe.tests import IntegrationTestCase
+from frappe.tests import IntegrationTestCase, UnitTestCase
+
+
+class UnitTestLedgerHealthMonitor(UnitTestCase):
+	"""
+	Unit tests for LedgerHealthMonitor.
+	Use this class for testing individual functions and methods.
+	"""
+
+	pass
 
 
 class TestLedgerHealthMonitor(IntegrationTestCase):

erpnext/accounts/doctype/ledger_merge/ledger_merge.py

@@ -35,7 +35,7 @@ class LedgerMerge(Document):
 		from frappe.utils.background_jobs import enqueue
 		from frappe.utils.scheduler import is_scheduler_inactive
 
-		if is_scheduler_inactive() and not frappe.in_test:
+		if is_scheduler_inactive() and not frappe.flags.in_test:
 			frappe.throw(_("Scheduler is inactive. Cannot merge accounts."), title=_("Scheduler Inactive"))
 
 		job_id = f"ledger_merge::{self.name}"
@@ -47,7 +47,7 @@ class LedgerMerge(Document):
 				event="ledger_merge",
 				job_id=job_id,
 				docname=self.name,
-				now=frappe.conf.developer_mode or frappe.in_test,
+				now=frappe.conf.developer_mode or frappe.flags.in_test,
 			)
 			return True
 

erpnext/accounts/doctype/loyalty_program/loyalty_program.py

@@ -178,9 +178,8 @@ def validate_loyalty_points(ref_doc, points_to_redeem):
 
 		loyalty_amount = flt(points_to_redeem * loyalty_program_details.conversion_factor)
 
-		total_amount = ref_doc.grand_total if ref_doc.is_rounded_total_disabled() else ref_doc.rounded_total
-		if loyalty_amount > total_amount:
-			frappe.throw(_("You can't redeem Loyalty Points having more value than the Total Amount."))
+		if loyalty_amount > ref_doc.rounded_total:
+			frappe.throw(_("You can't redeem Loyalty Points having more value than the Rounded Total."))
 
 		if not ref_doc.loyalty_amount and ref_doc.loyalty_amount != loyalty_amount:
 			ref_doc.loyalty_amount = loyalty_amount

erpnext/accounts/doctype/mode_of_payment/test_mode_of_payment.py

@@ -2,26 +2,8 @@
 # See license.txt
 import unittest
 
-import frappe
 from frappe.tests import IntegrationTestCase
 
 
 class TestModeofPayment(IntegrationTestCase):
 	pass
-
-
-def set_default_account_for_mode_of_payment(mode_of_payment, company, account):
-	mode_of_payment.reload()
-	if frappe.db.exists(
-		"Mode of Payment Account", {"parent": mode_of_payment.mode_of_payment, "company": company}
-	):
-		frappe.db.set_value(
-			"Mode of Payment Account",
-			{"parent": mode_of_payment.mode_of_payment, "company": company},
-			"default_account",
-			account,
-		)
-		return
-
-	mode_of_payment.append("accounts", {"company": company, "default_account": account})
-	mode_of_payment.save()

erpnext/accounts/doctype/monthly_distribution/test_records.toml

@@ -0,0 +1,52 @@
+[["Monthly Distribution"]]
+distribution_id = "_Test Distribution"
+fiscal_year = "_Test Fiscal Year 2013"
+[["Monthly Distribution".percentages]]
+month = "January"
+percentage_allocation = "8"
+
+[["Monthly Distribution".percentages]]
+month = "February"
+percentage_allocation = "8"
+
+[["Monthly Distribution".percentages]]
+month = "March"
+percentage_allocation = "8"
+
+[["Monthly Distribution".percentages]]
+month = "April"
+percentage_allocation = "8"
+
+[["Monthly Distribution".percentages]]
+month = "May"
+percentage_allocation = "8"
+
+[["Monthly Distribution".percentages]]
+month = "June"
+percentage_allocation = "8"
+
+[["Monthly Distribution".percentages]]
+month = "July"
+percentage_allocation = "8"
+
+[["Monthly Distribution".percentages]]
+month = "August"
+percentage_allocation = "8"
+
+[["Monthly Distribution".percentages]]
+month = "September"
+percentage_allocation = "8"
+
+[["Monthly Distribution".percentages]]
+month = "October"
+percentage_allocation = "8"
+
+[["Monthly Distribution".percentages]]
+month = "November"
+percentage_allocation = "10"
+
+[["Monthly Distribution".percentages]]
+month = "December"
+percentage_allocation = "10"
+
+

erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py

@@ -229,7 +229,7 @@ class OpeningInvoiceCreationTool(Document):
 		else:
 			from frappe.utils.scheduler import is_scheduler_inactive
 
-			if is_scheduler_inactive() and not frappe.in_test:
+			if is_scheduler_inactive() and not frappe.flags.in_test:
 				frappe.throw(_("Scheduler is inactive. Cannot import data."), title=_("Scheduler Inactive"))
 
 			job_id = f"opening_invoice::{self.name}"
@@ -242,7 +242,7 @@ class OpeningInvoiceCreationTool(Document):
 					event="opening_invoice_creation",
 					job_id=job_id,
 					invoices=invoices,
-					now=frappe.conf.developer_mode or frappe.in_test,
+					now=frappe.conf.developer_mode or frappe.flags.in_test,
 				)
 
 

erpnext/accounts/doctype/opening_invoice_creation_tool/test_opening_invoice_creation_tool.py

@@ -2,7 +2,7 @@
 # See license.txt
 
 import frappe
-from frappe.tests import IntegrationTestCase
+from frappe.tests import IntegrationTestCase, UnitTestCase
 
 from erpnext.accounts.doctype.accounting_dimension.test_accounting_dimension import (
 	create_dimension,
@@ -15,6 +15,15 @@ from erpnext.accounts.doctype.opening_invoice_creation_tool.opening_invoice_crea
 EXTRA_TEST_RECORD_DEPENDENCIES = ["Customer", "Supplier", "Accounting Dimension"]
 
 
+class UnitTestOpeningInvoiceCreationTool(UnitTestCase):
+	"""
+	Unit tests for OpeningInvoiceCreationTool.
+	Use this class for testing individual functions and methods.
+	"""
+
+	pass
+
+
 class TestOpeningInvoiceCreationTool(IntegrationTestCase):
 	@classmethod
 	def setUpClass(cls):

erpnext/accounts/doctype/payment_entry/payment_entry.js

@@ -410,7 +410,7 @@ frappe.ui.form.on("Payment Entry", {
 						from_date: frm.doc.posting_date,
 						to_date: moment(frm.doc.modified).format("YYYY-MM-DD"),
 						company: frm.doc.company,
-						categorize_by: "",
+						group_by: "",
 						show_cancelled_entries: frm.doc.docstatus === 2,
 					};
 					frappe.set_route("query-report", "General Ledger");

erpnext/accounts/doctype/payment_entry/payment_entry.json

@@ -21,6 +21,7 @@
   "party_name",
   "book_advance_payments_in_separate_party_account",
   "reconcile_on_advance_payment_date",
+  "advance_reconciliation_takes_effect_on",
   "column_break_11",
   "bank_account",
   "party_bank_account",
@@ -199,14 +200,14 @@
    "fieldtype": "Column Break"
   },
   {
-   "depends_on": "eval: doc.party && doc.party_type !== \"Employee\"",
+   "depends_on": "party",
    "fieldname": "contact_person",
    "fieldtype": "Link",
    "label": "Contact",
    "options": "Contact"
   },
   {
-   "depends_on": "eval: (doc.contact_person || doc.party_type === \"Employee\") && doc.contact_email",
+   "depends_on": "contact_person",
    "fieldname": "contact_email",
    "fieldtype": "Data",
    "label": "Email",
@@ -753,9 +754,18 @@
    "options": "No\nYes",
    "print_hide": 1,
    "search_index": 1
+  },
+  {
+   "default": "Oldest Of Invoice Or Advance",
+   "fetch_from": "company.reconciliation_takes_effect_on",
+   "fieldname": "advance_reconciliation_takes_effect_on",
+   "fieldtype": "Select",
+   "hidden": 1,
+   "label": "Advance Reconciliation Takes Effect On",
+   "no_copy": 1,
+   "options": "Advance Payment Date\nOldest Of Invoice Or Advance\nReconciliation Date"
   }
  ],
- "grid_page_length": 50,
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [
@@ -767,7 +777,7 @@
    "table_fieldname": "payment_entries"
   }
  ],
- "modified": "2025-05-08 11:18:10.238085",
+ "modified": "2025-01-31 11:24:58.076393",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Entry",
@@ -807,7 +817,6 @@
    "write": 1
   }
  ],
- "row_format": "Dynamic",
  "show_name_in_global_search": 1,
  "sort_field": "creation",
  "sort_order": "DESC",

erpnext/accounts/doctype/payment_entry/test_payment_entry.py

@@ -4,7 +4,7 @@
 
 import frappe
 from frappe import qb
-from frappe.tests import IntegrationTestCase
+from frappe.tests import IntegrationTestCase, UnitTestCase
 from frappe.utils import add_days, flt, nowdate
 
 from erpnext.accounts.doctype.account.test_account import create_account
@@ -28,6 +28,15 @@ from erpnext.setup.doctype.employee.test_employee import make_employee
 EXTRA_TEST_RECORD_DEPENDENCIES = ["Item", "Currency Exchange"]
 
 
+class UnitTestPaymentEntry(UnitTestCase):
+	"""
+	Unit tests for PaymentEntry.
+	Use this class for testing individual functions and methods.
+	"""
+
+	pass
+
+
 class TestPaymentEntry(IntegrationTestCase):
 	def tearDown(self):
 		frappe.db.rollback()
@@ -49,8 +58,6 @@ class TestPaymentEntry(IntegrationTestCase):
 		pe.insert()
 		pe.submit()
 
-		self.assertEqual(pe.paid_to_account_type, "Cash")
-
 		expected_gle = dict(
 			(d[0], d) for d in [["Debtors - _TC", 0, 1000, so.name], ["_Test Cash - _TC", 1000.0, 0, None]]
 		)
@@ -562,8 +569,6 @@ class TestPaymentEntry(IntegrationTestCase):
 		pe.insert()
 		pe.submit()
 
-		self.assertEqual(pe.paid_from_account_type, "Bank")
-
 		outstanding_amount, status = frappe.db.get_value(
 			"Purchase Invoice", pi.name, ["outstanding_amount", "status"]
 		)

erpnext/accounts/doctype/payment_ledger_entry/test_payment_ledger_entry.py

@@ -3,7 +3,7 @@
 
 import frappe
 from frappe import qb
-from frappe.tests import IntegrationTestCase
+from frappe.tests import IntegrationTestCase, UnitTestCase
 from frappe.utils import nowdate
 
 from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry
@@ -13,6 +13,15 @@ from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_orde
 from erpnext.stock.doctype.item.test_item import create_item
 
 
+class UnitTestPaymentLedgerEntry(UnitTestCase):
+	"""
+	Unit tests for PaymentLedgerEntry.
+	Use this class for testing individual functions and methods.
+	"""
+
+	pass
+
+
 class TestPaymentLedgerEntry(IntegrationTestCase):
 	def setUp(self):
 		self.ple = qb.DocType("Payment Ledger Entry")

erpnext/accounts/doctype/payment_order/test_payment_order.py

@@ -3,7 +3,7 @@
 
 
 import frappe
-from frappe.tests import IntegrationTestCase
+from frappe.tests import IntegrationTestCase, UnitTestCase
 from frappe.utils import getdate
 
 from erpnext.accounts.doctype.bank_transaction.test_bank_transaction import (
@@ -17,6 +17,15 @@ from erpnext.accounts.doctype.payment_entry.payment_entry import (
 from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make_purchase_invoice
 
 
+class UnitTestPaymentOrder(UnitTestCase):
+	"""
+	Unit tests for PaymentOrder.
+	Use this class for testing individual functions and methods.
+	"""
+
+	pass
+
+
 class TestPaymentOrder(IntegrationTestCase):
 	def setUp(self):
 		# generate and use a uniq hash identifier for 'Bank Account' and it's linked GL 'Account' to avoid validation error

erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py

@@ -407,7 +407,7 @@ class PaymentReconciliation(Document):
 
 	@frappe.whitelist()
 	def is_auto_process_enabled(self):
-		return frappe.get_single_value("Accounts Settings", "auto_reconcile_payments")
+		return frappe.db.get_single_value("Accounts Settings", "auto_reconcile_payments")
 
 	@frappe.whitelist()
 	def calculate_difference_on_allocation_change(self, payment_entry, invoice, allocated_amount):
@@ -532,7 +532,7 @@ class PaymentReconciliation(Document):
 
 	@frappe.whitelist()
 	def reconcile(self):
-		if frappe.get_single_value("Accounts Settings", "auto_reconcile_payments"):
+		if frappe.db.get_single_value("Accounts Settings", "auto_reconcile_payments"):
 			running_doc = is_any_doc_running(
 				dict(
 					company=self.company,

erpnext/accounts/doctype/payment_reconciliation/test_payment_reconciliation.py

@@ -4,7 +4,7 @@
 
 import frappe
 from frappe import qb
-from frappe.tests import IntegrationTestCase
+from frappe.tests import IntegrationTestCase, UnitTestCase
 from frappe.utils import add_days, add_years, flt, getdate, nowdate, today
 from frappe.utils.data import getdate as convert_to_date
 
@@ -21,6 +21,15 @@ from erpnext.stock.doctype.item.test_item import create_item
 EXTRA_TEST_RECORD_DEPENDENCIES = ["Item"]
 
 
+class UnitTestPaymentReconciliation(UnitTestCase):
+	"""
+	Unit tests for PaymentReconciliation.
+	Use this class for testing individual functions and methods.
+	"""
+
+	pass
+
+
 class TestPaymentReconciliation(IntegrationTestCase):
 	def setUp(self):
 		self.create_company()
@@ -1979,9 +1988,7 @@ class TestPaymentReconciliation(IntegrationTestCase):
 
 	def test_reconciliation_on_closed_period_payment(self):
 		# create backdated fiscal year
-		first_fy_start_date = frappe.db.get_value(
-			"Fiscal Year", {"disabled": 0}, [{"MIN": "year_start_date"}]
-		)
+		first_fy_start_date = frappe.db.get_value("Fiscal Year", {"disabled": 0}, "min(year_start_date)")
 		prev_fy_start_date = add_years(first_fy_start_date, -1)
 		prev_fy_end_date = add_days(first_fy_start_date, -1)
 		create_fiscal_year(

erpnext/accounts/doctype/payment_request/payment_request.py

@@ -1,9 +1,9 @@
 import json
 
 import frappe
-from frappe import _
+from frappe import _, qb
 from frappe.model.document import Document
-from frappe.query_builder.functions import Sum
+from frappe.query_builder.functions import Abs, Sum
 from frappe.utils import flt, nowdate
 from frappe.utils.background_jobs import enqueue
 
@@ -12,6 +12,7 @@ from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import (
 	get_accounting_dimensions,
 )
 from erpnext.accounts.doctype.payment_entry.payment_entry import (
+	get_company_defaults,
 	get_payment_entry,
 )
 from erpnext.accounts.doctype.subscription_plan.subscription_plan import get_plan_rate
@@ -121,14 +122,16 @@ class PaymentRequest(Document):
 				title=_("Invalid Amount"),
 			)
 
+		existing_payment_request_amount = flt(
+			get_existing_payment_request_amount(self.reference_doctype, self.reference_name)
+		)
+
 		ref_doc = frappe.get_doc(self.reference_doctype, self.reference_name)
 		if not hasattr(ref_doc, "order_type") or ref_doc.order_type != "Shopping Cart":
 			ref_amount = get_amount(ref_doc, self.payment_account)
 			if not ref_amount:
 				frappe.throw(_("Payment Entry is already created"))
 
-			existing_payment_request_amount = flt(get_existing_payment_request_amount(ref_doc))
-
 			if existing_payment_request_amount + flt(self.grand_total) > ref_amount:
 				frappe.throw(
 					_("Total Payment Request amount cannot be greater than {0} amount").format(
@@ -551,8 +554,19 @@ def make_payment_request(**args):
 		ref_doc.db_update()
 		grand_total = grand_total - loyalty_amount
 
+	bank_account = (
+		get_party_bank_account(args.get("party_type"), args.get("party")) if args.get("party_type") else ""
+	)
+
+	draft_payment_request = frappe.db.get_value(
+		"Payment Request",
+		{"reference_doctype": ref_doc.doctype, "reference_name": ref_doc.name, "docstatus": 0},
+	)
+
 	# fetches existing payment request `grand_total` amount
-	existing_payment_request_amount = get_existing_payment_request_amount(ref_doc)
+	existing_payment_request_amount = get_existing_payment_request_amount(ref_doc.doctype, ref_doc.name)
+
+	existing_paid_amount = get_existing_paid_amount(ref_doc.doctype, ref_doc.name)
 
 	def validate_and_calculate_grand_total(grand_total, existing_payment_request_amount):
 		grand_total -= existing_payment_request_amount
@@ -564,7 +578,7 @@ def make_payment_request(**args):
 		if args.order_type == "Shopping Cart":
 			# If Payment Request is in an advanced stage, then create for remaining amount.
 			if get_existing_payment_request_amount(
-				ref_doc, ["Initiated", "Partially Paid", "Payment Ordered", "Paid"]
+				ref_doc.doctype, ref_doc.name, ["Initiated", "Partially Paid", "Payment Ordered", "Paid"]
 			):
 				grand_total = validate_and_calculate_grand_total(grand_total, existing_payment_request_amount)
 			else:
@@ -573,10 +587,14 @@ def make_payment_request(**args):
 		else:
 			grand_total = validate_and_calculate_grand_total(grand_total, existing_payment_request_amount)
 
-	draft_payment_request = frappe.db.get_value(
-		"Payment Request",
-		{"reference_doctype": ref_doc.doctype, "reference_name": ref_doc.name, "docstatus": 0},
-	)
+	if existing_paid_amount:
+		if ref_doc.party_account_currency == ref_doc.currency:
+			if ref_doc.conversion_rate:
+				grand_total -= flt(existing_paid_amount / ref_doc.conversion_rate)
+			else:
+				grand_total -= flt(existing_paid_amount)
+		else:
+			grand_total -= flt(existing_paid_amount / ref_doc.conversion_rate)
 
 	if draft_payment_request:
 		frappe.db.set_value(
@@ -584,11 +602,6 @@ def make_payment_request(**args):
 		)
 		pr = frappe.get_doc("Payment Request", draft_payment_request)
 	else:
-		bank_account = (
-			get_party_bank_account(args.get("party_type"), args.get("party"))
-			if args.get("party_type")
-			else ""
-		)
 		pr = frappe.new_doc("Payment Request")
 
 		if not args.get("payment_request_type"):
@@ -668,40 +681,22 @@ def make_payment_request(**args):
 
 def get_amount(ref_doc, payment_account=None):
 	"""get amount based on doctype"""
-	grand_total = 0
-
 	dt = ref_doc.doctype
 	if dt in ["Sales Order", "Purchase Order"]:
-		advance_amount = flt(ref_doc.advance_paid)
-		if ref_doc.party_account_currency != ref_doc.currency:
-			advance_amount = flt(flt(ref_doc.advance_paid) / ref_doc.conversion_rate)
-
-		grand_total = (flt(ref_doc.rounded_total) or flt(ref_doc.grand_total)) - advance_amount
-
+		grand_total = flt(ref_doc.rounded_total) or flt(ref_doc.grand_total)
 	elif dt in ["Sales Invoice", "Purchase Invoice"]:
-		if (
-			dt == "Sales Invoice"
-			and ref_doc.is_pos
-			and ref_doc.payments
-			and any(
-				[
-					payment.type == "Phone" and payment.account == payment_account
-					for payment in ref_doc.payments
-				]
-			)
-		):
-			grand_total = sum(
-				[
-					payment.amount
-					for payment in ref_doc.payments
-					if payment.type == "Phone" and payment.account == payment_account
-				]
-			)
-		else:
+		if not ref_doc.get("is_pos"):
 			if ref_doc.party_account_currency == ref_doc.currency:
-				grand_total = flt(ref_doc.outstanding_amount)
+				grand_total = flt(ref_doc.rounded_total or ref_doc.grand_total)
 			else:
-				grand_total = flt(flt(ref_doc.outstanding_amount) / ref_doc.conversion_rate)
+				grand_total = flt(
+					flt(ref_doc.base_rounded_total or ref_doc.base_grand_total) / ref_doc.conversion_rate
+				)
+		elif dt == "Sales Invoice":
+			for pay in ref_doc.payments:
+				if pay.type == "Phone" and pay.account == payment_account:
+					grand_total = pay.amount
+					break
 	elif dt == "POS Invoice":
 		for pay in ref_doc.payments:
 			if pay.type == "Phone" and pay.account == payment_account:
@@ -710,7 +705,10 @@ def get_amount(ref_doc, payment_account=None):
 	elif dt == "Fees":
 		grand_total = ref_doc.outstanding_amount
 
-	return flt(grand_total, get_currency_precision()) if grand_total > 0 else 0
+	if grand_total > 0:
+		return flt(grand_total, get_currency_precision())
+	else:
+		frappe.throw(_("Payment Entry is already created"))
 
 
 def get_irequest_status(payment_requests: None | list = None) -> list:
@@ -753,7 +751,7 @@ def cancel_old_payment_requests(ref_dt, ref_dn):
 						frappe.db.set_value("Integration Request", ireq.name, "status", "Cancelled")
 
 
-def get_existing_payment_request_amount(ref_doc, statuses: list | None = None) -> list:
+def get_existing_payment_request_amount(ref_dt, ref_dn, statuses: list | None = None) -> list:
 	"""
 	Return the total amount of Payment Requests against a reference document.
 	"""
@@ -761,9 +759,9 @@ def get_existing_payment_request_amount(ref_doc, statuses: list | None = None) -
 
 	query = (
 		frappe.qb.from_(PR)
-		.select(Sum(PR.outstanding_amount))
-		.where(PR.reference_doctype == ref_doc.doctype)
-		.where(PR.reference_name == ref_doc.name)
+		.select(Sum(PR.grand_total))
+		.where(PR.reference_doctype == ref_dt)
+		.where(PR.reference_name == ref_dn)
 		.where(PR.docstatus == 1)
 	)
 
@@ -772,12 +770,33 @@ def get_existing_payment_request_amount(ref_doc, statuses: list | None = None) -
 
 	response = query.run()
 
-	os_amount_in_transaction_currency = flt(response[0][0] if response[0] else 0)
+	return response[0][0] if response[0] else 0
 
-	if ref_doc.currency != ref_doc.party_account_currency:
-		os_amount_in_transaction_currency = flt(os_amount_in_transaction_currency / ref_doc.conversion_rate)
 
-	return os_amount_in_transaction_currency
+def get_existing_paid_amount(doctype, name):
+	PL = frappe.qb.DocType("Payment Ledger Entry")
+	PER = frappe.qb.DocType("Payment Entry Reference")
+
+	query = (
+		frappe.qb.from_(PL)
+		.left_join(PER)
+		.on(
+			(PL.against_voucher_type == PER.reference_doctype)
+			& (PL.against_voucher_no == PER.reference_name)
+			& (PL.voucher_type == PER.parenttype)
+			& (PL.voucher_no == PER.parent)
+		)
+		.select(Abs(Sum(PL.amount)).as_("total_paid_amount"))
+		.where(PL.against_voucher_type.eq(doctype))
+		.where(PL.against_voucher_no.eq(name))
+		.where(PL.amount < 0)
+		.where(PL.delinked == 0)
+		.where(PER.docstatus == 1)
+		.where(PER.payment_request.isnull())
+	)
+	response = query.run()
+
+	return response[0][0] if response[0] else 0
 
 
 def get_gateway_details(args):  # nosemgrep

erpnext/accounts/doctype/payment_request/test_payment_request.py

@@ -6,7 +6,7 @@ import unittest
 from unittest.mock import patch
 
 import frappe
-from frappe.tests import IntegrationTestCase
+from frappe.tests import IntegrationTestCase, UnitTestCase
 
 from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry
 from erpnext.accounts.doctype.payment_entry.test_payment_entry import create_payment_terms_template
@@ -58,6 +58,15 @@ payment_method = [
 ]
 
 
+class UnitTestPaymentRequest(UnitTestCase):
+	"""
+	Unit tests for PaymentRequest.
+	Use this class for testing individual functions and methods.
+	"""
+
+	pass
+
+
 class TestPaymentRequest(IntegrationTestCase):
 	def setUp(self):
 		for payment_gateway in payment_gateways:
@@ -456,16 +465,6 @@ class TestPaymentRequest(IntegrationTestCase):
 		self.assertEqual(pr.outstanding_amount, 800)
 		self.assertEqual(pr.grand_total, 1000)
 
-		self.assertRaisesRegex(
-			frappe.exceptions.ValidationError,
-			re.compile(r"Payment Request is already created"),
-			make_payment_request,
-			dt="Sales Order",
-			dn=so.name,
-			mute_email=1,
-			submit_doc=1,
-			return_doc=1,
-		)
 		# complete payment
 		pe = pr.create_payment_entry()
 
@@ -485,7 +484,7 @@ class TestPaymentRequest(IntegrationTestCase):
 		# creating a more payment Request must not allowed
 		self.assertRaisesRegex(
 			frappe.exceptions.ValidationError,
-			re.compile(r"Payment Entry is already created"),
+			re.compile(r"Payment Request is already created"),
 			make_payment_request,
 			dt="Sales Order",
 			dn=so.name,
@@ -517,17 +516,6 @@ class TestPaymentRequest(IntegrationTestCase):
 		self.assertEqual(pr.party_account_currency, "INR")
 		self.assertEqual(pr.status, "Initiated")
 
-		self.assertRaisesRegex(
-			frappe.exceptions.ValidationError,
-			re.compile(r"Payment Request is already created"),
-			make_payment_request,
-			dt="Purchase Invoice",
-			dn=pi.name,
-			mute_email=1,
-			submit_doc=1,
-			return_doc=1,
-		)
-
 		# to make partial payment
 		pe = pr.create_payment_entry(submit=False)
 		pe.paid_amount = 2000
@@ -556,7 +544,7 @@ class TestPaymentRequest(IntegrationTestCase):
 		# creating a more payment Request must not allowed
 		self.assertRaisesRegex(
 			frappe.exceptions.ValidationError,
-			re.compile(r"Payment Entry is already created"),
+			re.compile(r"Payment Request is already created"),
 			make_payment_request,
 			dt="Purchase Invoice",
 			dn=pi.name,
@@ -760,56 +748,29 @@ class TestPaymentRequest(IntegrationTestCase):
 		pi.load_from_db()
 		self.assertEqual(pr_2.grand_total, pi.outstanding_amount)
 
-	def test_consider_journal_entry_and_return_invoice(self):
-		from erpnext.accounts.doctype.journal_entry.test_journal_entry import make_journal_entry
 
-		si = create_sales_invoice(currency="INR", qty=5, rate=500)
+def test_partial_paid_invoice_with_submitted_payment_entry(self):
+	pi = make_purchase_invoice(currency="INR", qty=1, rate=5000)
+	pi.save()
+	pi.submit()
 
-		je = make_journal_entry("_Test Cash - _TC", "Debtors - _TC", 500, save=False)
-		je.accounts[1].party_type = "Customer"
-		je.accounts[1].party = si.customer
-		je.accounts[1].reference_type = "Sales Invoice"
-		je.accounts[1].reference_name = si.name
-		je.accounts[1].credit_in_account_currency = 500
-		je.submit()
+	pe = get_payment_entry("Purchase Invoice", pi.name, bank_account="_Test Bank - _TC")
+	pe.reference_no = "PURINV0001"
+	pe.reference_date = frappe.utils.nowdate()
+	pe.paid_amount = 2500
+	pe.references[0].allocated_amount = 2500
+	pe.save()
+	pe.submit()
+	pe.cancel()
 
-		pe = get_payment_entry("Sales Invoice", si.name)
-		pe.paid_amount = 500
-		pe.references[0].allocated_amount = 500
-		pe.save()
-		pe.submit()
+	pe = get_payment_entry("Purchase Invoice", pi.name, bank_account="_Test Bank - _TC")
+	pe.reference_no = "PURINV0002"
+	pe.reference_date = frappe.utils.nowdate()
+	pe.paid_amount = 2500
+	pe.references[0].allocated_amount = 2500
+	pe.save()
+	pe.submit()
 
-		cr_note = create_sales_invoice(qty=-1, rate=500, is_return=1, return_against=si.name, do_not_save=1)
-		cr_note.update_outstanding_for_self = 0
-		cr_note.save()
-		cr_note.submit()
-
-		si.load_from_db()
-		pr = make_payment_request(dt="Sales Invoice", dn=si.name, mute_email=1)
-		self.assertEqual(pr.grand_total, si.outstanding_amount)
-
-	def test_partial_paid_invoice_with_submitted_payment_entry(self):
-		pi = make_purchase_invoice(currency="INR", qty=1, rate=5000)
-		pi.save()
-		pi.submit()
-
-		pe = get_payment_entry("Purchase Invoice", pi.name, bank_account="_Test Bank - _TC")
-		pe.reference_no = "PURINV0001"
-		pe.reference_date = frappe.utils.nowdate()
-		pe.paid_amount = 2500
-		pe.references[0].allocated_amount = 2500
-		pe.save()
-		pe.submit()
-		pe.cancel()
-
-		pe = get_payment_entry("Purchase Invoice", pi.name, bank_account="_Test Bank - _TC")
-		pe.reference_no = "PURINV0002"
-		pe.reference_date = frappe.utils.nowdate()
-		pe.paid_amount = 2500
-		pe.references[0].allocated_amount = 2500
-		pe.save()
-		pe.submit()
-
-		pi.load_from_db()
-		pr = make_payment_request(dt="Purchase Invoice", dn=pi.name, mute_email=1)
-		self.assertEqual(pr.grand_total, pi.outstanding_amount)
+	pi.load_from_db()
+	pr = make_payment_request(dt="Purchase Invoice", dn=pi.name, mute_email=1)
+	self.assertEqual(pr.grand_total, pi.outstanding_amount)

erpnext/accounts/doctype/payment_schedule/payment_schedule.json

@@ -24,9 +24,7 @@
   "paid_amount",
   "discounted_amount",
   "column_break_3",
-  "base_payment_amount",
-  "base_outstanding",
-  "base_paid_amount"
+  "base_payment_amount"
  ],
  "fields": [
   {
@@ -157,34 +155,18 @@
    "fieldtype": "Currency",
    "label": "Payment Amount (Company Currency)",
    "options": "Company:company:default_currency"
-  },
-  {
-   "fieldname": "base_outstanding",
-   "fieldtype": "Currency",
-   "label": "Outstanding (Company Currency)",
-   "options": "Company:company:default_currency",
-   "read_only": 1
-  },
-  {
-   "depends_on": "base_paid_amount",
-   "fieldname": "base_paid_amount",
-   "fieldtype": "Currency",
-   "label": "Paid Amount (Company Currency)",
-   "options": "Company:company:default_currency",
-   "read_only": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2025-03-11 11:06:51.792982",
+ "modified": "2024-03-27 13:10:11.356171",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Schedule",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "row_format": "Dynamic",
  "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],

erpnext/accounts/doctype/payment_schedule/payment_schedule.py

@@ -14,8 +14,6 @@ class PaymentSchedule(Document):
 	if TYPE_CHECKING:
 		from frappe.types import DF
 
-		base_outstanding: DF.Currency
-		base_paid_amount: DF.Currency
 		base_payment_amount: DF.Currency
 		description: DF.SmallText | None
 		discount: DF.Float

erpnext/accounts/doctype/payment_term/test_records.json

@@ -1,34 +0,0 @@
-[
-  {
-    "doctype":"Payment Term",
-    "due_date_based_on":"Day(s) after invoice date",
-    "payment_term_name":"_Test N30",
-    "description":"_Test Net 30 Days",
-    "invoice_portion":50,
-    "credit_days":30
-  },
-  {
-    "doctype":"Payment Term",
-    "due_date_based_on":"Day(s) after invoice date",
-    "payment_term_name":"_Test COD",
-    "description":"_Test Cash on Delivery",
-    "invoice_portion":50,
-    "credit_days":0
-  },
-  {
-    "doctype":"Payment Term",
-    "due_date_based_on":"Month(s) after the end of the invoice month",
-    "payment_term_name":"_Test EONM",
-    "description":"_Test End of Next Month",
-    "invoice_portion":100,
-    "credit_months":1
-  },
-  {
-    "doctype":"Payment Term",
-    "due_date_based_on":"Day(s) after invoice date",
-    "payment_term_name":"_Test N30 1",
-    "description":"_Test Net 30 Days",
-    "invoice_portion":100,
-    "credit_days":30
-  }
-]

erpnext/accounts/doctype/payment_term/test_records.toml

@@ -0,0 +1,28 @@
+[["Payment Term"]]
+due_date_based_on = "Day(s) after invoice date"
+payment_term_name = "_Test N30"
+description = "_Test Net 30 Days"
+invoice_portion = 50
+credit_days = 30
+
+[["Payment Term"]]
+due_date_based_on = "Day(s) after invoice date"
+payment_term_name = "_Test COD"
+description = "_Test Cash on Delivery"
+invoice_portion = 50
+credit_days = 0
+
+[["Payment Term"]]
+due_date_based_on = "Month(s) after the end of the invoice month"
+payment_term_name = "_Test EONM"
+description = "_Test End of Next Month"
+invoice_portion = 100
+credit_months = 1
+
+[["Payment Term"]]
+due_date_based_on = "Day(s) after invoice date"
+payment_term_name = "_Test N30 1"
+description = "_Test Net 30 Days"
+invoice_portion = 100
+credit_days = 30
+