chore: update POT file

.git-blame-ignore-revs

@@ -38,7 +38,3 @@ ec74a5e56617bbd76ac402451468fd4668af543d
 
 # ruff formatting
 a308792ee7fda18a681e9181f4fd00b36385bc23
-
-# noisy typing refactoring of get_item_details
-7b7211ac79c248a79ba8a999ff34e734d874c0ae
-d827ed21adc7b36047e247cbb0dc6388d048a7f9

.github/helper/install.sh

@@ -12,16 +12,9 @@ pip install frappe-bench
 
 githubbranch=${GITHUB_BASE_REF:-${GITHUB_REF##*/}}
 frappeuser=${FRAPPE_USER:-"frappe"}
-frappecommitish=${FRAPPE_BRANCH:-$githubbranch}
-
-mkdir frappe
-pushd frappe
-git init
-git remote add origin "https://github.com/${frappeuser}/frappe"
-git fetch origin "${frappecommitish}" --depth 1
-git checkout FETCH_HEAD
-popd
+frappebranch=${FRAPPE_BRANCH:-$githubbranch}
 
+git clone "https://github.com/${frappeuser}/frappe" --branch "${frappebranch}" --depth 1
 bench init --skip-assets --frappe-path ~/frappe --python "$(which python)" frappe-bench
 
 mkdir ~/frappe-bench/sites/test_site

.github/stale.yml

@@ -12,14 +12,6 @@ exemptProjects: true
 # Set to true to ignore issues in a milestone (defaults to false)
 exemptMilestones: true
 
-# Skip the stale action for draft PRs
-exemptDraftPr: true
-
-# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
-exemptLabels:
-  - hotfix
-  - no-stale
-
 pulls:
   daysUntilStale: 15
   daysUntilClose: 3

.github/workflows/patch.yml

@@ -137,8 +137,7 @@ jobs:
           update_to_version 15
 
           echo "Updating to latest version"
-          git -C "apps/frappe" fetch --depth 1 upstream "${GITHUB_BASE_REF:-${GITHUB_REF##*/}}"
-          git -C "apps/frappe" checkout -q -f FETCH_HEAD
+          git -C "apps/frappe" checkout -q -f "${GITHUB_BASE_REF:-${GITHUB_REF##*/}}"
           git -C "apps/erpnext" checkout -q -f "$GITHUB_SHA"
 
           pgrep honcho | xargs kill

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

@@ -1,130 +0,0 @@
-name: Individual
-
-on:
-  workflow_dispatch:
-
-concurrency:
-  group: server-individual-tests-develop-${{ github.event_name }}-${{ github.event.number || github.event_name == 'workflow_dispatch' && github.run_id || '' }}
-  cancel-in-progress: false
-
-jobs:
-  discover:
-    runs-on: ubuntu-latest
-    outputs:
-      matrix: ${{ steps.set-matrix.outputs.matrix }}
-    steps:
-    - name: Clone
-      uses: actions/checkout@v4
-    - id: set-matrix
-      run: |
-        # Use grep and find to get the list of test files
-        matrix=$(find . -path '*/doctype/*/test_*.py' | xargs grep -l 'def test_' | awk '{
-            # Remove ./ prefix, file extension, and replace / with .
-            gsub(/^\.\//, "", $0)
-            gsub(/\.py$/, "", $0)
-            gsub(/\//, ".", $0)
-            # Add to array
-            tests[NR] = $0
-        }
-        END {
-            # Start JSON array
-            printf "{\n  \"include\": [\n"
-            # Loop through array and create JSON objects
-            for (i=1; i<=NR; i++) {
-                printf "    {\"test\": \"%s\"}", tests[i]
-                if (i < NR) printf ","
-                printf "\n"
-            }
-            # Close JSON array
-            printf "  ]\n}"
-        }')
-
-        # Output the matrix
-        echo "matrix=$(echo "$matrix" | jq -c)" >> $GITHUB_OUTPUT
-
-        # For debugging (optional)
-        echo "Generated matrix:"
-        echo "$matrix"
-  test:
-    needs: discover
-    runs-on: ubuntu-latest
-    timeout-minutes: 60
-    env:
-      NODE_ENV: "production"
-
-    strategy:
-      fail-fast: false
-      matrix: ${{fromJson(needs.discover.outputs.matrix)}}
-
-    name: Test
-
-    services:
-      mysql:
-        image: mariadb:10.6
-        env:
-          MARIADB_ROOT_PASSWORD: 'root'
-        ports:
-          - 3306:3306
-        options: --health-cmd="mariadb-admin ping" --health-interval=5s --health-timeout=2s --health-retries=3
-
-    steps:
-      - name: Clone
-        uses: actions/checkout@v4
-
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.12'
-
-      - name: Setup Node
-        uses: actions/setup-node@v4
-        with:
-          node-version: 18
-          check-latest: true
-
-      - name: Add to Hosts
-        run: echo "127.0.0.1 test_site" | sudo tee -a /etc/hosts
-
-      - name: Cache pip
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/pyproject.toml') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
-            ${{ runner.os }}-
-
-      - name: Cache node modules
-        uses: actions/cache@v4
-        env:
-          cache-name: cache-node-modules
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-
-      - uses: actions/cache@v4
-        id: yarn-cache
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-
-      - name: Install
-        run: bash ${GITHUB_WORKSPACE}/.github/helper/install.sh
-        env:
-          DB: mariadb
-          TYPE: server
-          FRAPPE_USER: ${{ github.event.inputs.user }}
-          FRAPPE_BRANCH: ${{ github.event.inputs.branch }}
-
-      - name: Run Tests
-        run: 'cd ~/frappe-bench/ && bench --site test_site run-tests --app erpnext --module ${{ matrix.test }}'

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

@@ -1,8 +1,6 @@
 name: Server (Mariadb)
 
 on:
-  repository_dispatch:
-    types: [frappe-framework-change]
   pull_request:
     paths-ignore:
       - '**.js'
@@ -119,10 +117,10 @@ jobs:
           DB: mariadb
           TYPE: server
           FRAPPE_USER: ${{ github.event.inputs.user }}
-          FRAPPE_BRANCH: ${{ github.event.client_payload.sha || github.event.inputs.branch }}
+          FRAPPE_BRANCH: ${{ github.event.inputs.branch }}
 
       - name: Run Tests
-        run: 'cd ~/frappe-bench/ && bench --site test_site run-parallel-tests --app erpnext --total-builds ${{ strategy.job-total }} --build-number ${{ matrix.container }}'
+        run: 'cd ~/frappe-bench/ && bench --site test_site run-parallel-tests --app erpnext --total-builds 4 --build-number ${{ matrix.container }}'
         env:
           TYPE: server
           CAPTURE_COVERAGE: ${{ github.event_name != 'pull_request' }}

CODEOWNERS

@@ -3,22 +3,22 @@
 # These owners will be the default owners for everything in
 # the repo. Unless a later match takes precedence,
 
-erpnext/accounts/               @ruthra-kumar
-erpnext/assets/                 @khushi8112
-erpnext/regional                @ruthra-kumar
-erpnext/selling                 @ruthra-kumar
-erpnext/support/                @ruthra-kumar
+erpnext/accounts/               @deepeshgarg007 @ruthra-kumar
+erpnext/assets/                 @anandbaburajan @deepeshgarg007
+erpnext/regional                @deepeshgarg007 @ruthra-kumar
+erpnext/selling                 @deepeshgarg007 @ruthra-kumar
+erpnext/support/                @deepeshgarg007
 pos*                            
 
-erpnext/buying/                 @rohitwaghchaure
-erpnext/maintenance/            @rohitwaghchaure
-erpnext/manufacturing/          @rohitwaghchaure
-erpnext/quality_management/     @rohitwaghchaure
-erpnext/stock/                  @rohitwaghchaure
-erpnext/subcontracting          @rohitwaghchaure
+erpnext/buying/                 @rohitwaghchaure @s-aga-r
+erpnext/maintenance/            @rohitwaghchaure @s-aga-r
+erpnext/manufacturing/          @rohitwaghchaure @s-aga-r
+erpnext/quality_management/     @rohitwaghchaure @s-aga-r
+erpnext/stock/                  @rohitwaghchaure @s-aga-r
+erpnext/subcontracting          @rohitwaghchaure @s-aga-r
 
-erpnext/controllers/            @ruthra-kumar @rohitwaghchaure
-erpnext/patches/                @ruthra-kumar
+erpnext/controllers/            @deepeshgarg007 @rohitwaghchaure
+erpnext/patches/                @deepeshgarg007 
 
-.github/                        @ruthra-kumar
-pyproject.toml                  @akhilnarang
+.github/                        @deepeshgarg007
+pyproject.toml                  @phot0n

erpnext/__init__.py

@@ -1,9 +1,7 @@
 import functools
 import inspect
-from typing import TypeVar
 
 import frappe
-from frappe.model.document import Document
 from frappe.utils.user import is_website_user
 
 __version__ = "16.0.0-dev"
@@ -162,34 +160,3 @@ def check_app_permission():
 		return False
 
 	return True
-
-
-T = TypeVar("T")
-
-
-def normalize_ctx_input(T: type) -> callable:
-	"""
-	Normalizes the first argument (ctx) of the decorated function by:
-	- Converting Document objects to dictionaries
-	- Parsing JSON strings
-	- Casting the result to the specified type T
-	"""
-
-	def decorator(func: callable):
-		# conserve annotations for frappe.utils.typing_validations
-		@functools.wraps(func, assigned=(a for a in functools.WRAPPER_ASSIGNMENTS if a != "__annotations__"))
-		def wrapper(ctx: T | Document | dict | str, *args, **kwargs):
-			if isinstance(ctx, Document):
-				ctx = T(**ctx.as_dict())
-			elif isinstance(ctx, dict):
-				ctx = T(**ctx)
-			else:
-				ctx = T(**frappe.parse_json(ctx))
-
-			return func(ctx, *args, **kwargs)
-
-		# set annotations from function
-		wrapper.__annotations__.update({k: v for k, v in func.__annotations__.items() if k != "ctx"})
-		return wrapper
-
-	return decorator

erpnext/accounts/deferred_revenue.py

@@ -58,7 +58,7 @@ def build_conditions(process_type, account, company):
 	)
 
 	if account:
-		conditions += f"AND {deferred_account}={frappe.db.escape(account)}"
+		conditions += f"AND {deferred_account}='{account}'"
 	elif company:
 		conditions += f"AND p.company = {frappe.db.escape(company)}"
 

erpnext/accounts/doctype/account/account.py

@@ -102,12 +102,14 @@ class Account(NestedSet):
 		self.name = get_autoname_with_number(self.account_number, self.account_name, self.company)
 
 	def validate(self):
+		from erpnext.accounts.utils import validate_field_number
+
 		if frappe.local.flags.allow_unverified_charts:
 			return
 		self.validate_parent()
 		self.validate_parent_child_account_type()
 		self.validate_root_details()
-		self.validate_account_number()
+		validate_field_number("Account", self.name, self.account_number, self.company, "account_number")
 		self.validate_group_or_ledger()
 		self.set_root_and_report_type()
 		self.validate_mandatory()
@@ -308,22 +310,6 @@ class Account(NestedSet):
 			if frappe.db.get_value("GL Entry", {"account": self.name}):
 				frappe.throw(_("Currency can not be changed after making entries using some other currency"))
 
-	def validate_account_number(self, account_number=None):
-		if not account_number:
-			account_number = self.account_number
-
-		if account_number:
-			account_with_same_number = frappe.db.get_value(
-				"Account",
-				{"account_number": account_number, "company": self.company, "name": ["!=", self.name]},
-			)
-			if account_with_same_number:
-				frappe.throw(
-					_("Account Number {0} already used in account {1}").format(
-						account_number, account_with_same_number
-					)
-				)
-
 	def create_account_for_child_company(self, parent_acc_name_map, descendants, parent_acc_name):
 		for company in descendants:
 			company_bold = frappe.bold(company)
@@ -477,6 +463,19 @@ def get_account_autoname(account_number, account_name, company):
 	return " - ".join(parts)
 
 
+def validate_account_number(name, account_number, company):
+	if account_number:
+		account_with_same_number = frappe.db.get_value(
+			"Account", {"account_number": account_number, "company": company, "name": ["!=", name]}
+		)
+		if account_with_same_number:
+			frappe.throw(
+				_("Account Number {0} already used in account {1}").format(
+					account_number, account_with_same_number
+				)
+			)
+
+
 @frappe.whitelist()
 def update_account_number(name, account_name, account_number=None, from_descendant=False):
 	account = frappe.get_cached_doc("Account", name)
@@ -517,7 +516,7 @@ def update_account_number(name, account_name, account_number=None, from_descenda
 
 				frappe.throw(message, title=_("Rename Not Allowed"))
 
-	account.validate_account_number(account_number)
+	validate_account_number(name, account_number, account.company)
 	if account_number:
 		frappe.db.set_value("Account", name, "account_number", account_number.strip())
 	else:

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

@@ -109,8 +109,7 @@
                 "Utility Expenses": {},
                 "Write Off": {},
                 "Exchange Gain/Loss": {},
-                "Gain/Loss on Asset Disposal": {},
-                "Impairment": {}
+                "Gain/Loss on Asset Disposal": {}
             },
             "root_type": "Expense"
         },
@@ -133,8 +132,7 @@
         "Source of Funds (Liabilities)": {
             "Capital Account": {
                 "Reserves and Surplus": {},
-                "Shareholders Funds": {},
-                "Revaluation Surplus": {}
+                "Shareholders Funds": {}
             },
             "Current Liabilities": {
                 "Accounts Payable": {

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

@@ -72,7 +72,6 @@ def get():
 				_("Write Off"): {},
 				_("Exchange Gain/Loss"): {},
 				_("Gain/Loss on Asset Disposal"): {},
-				_("Impairment"): {},
 			},
 			"root_type": "Expense",
 		},
@@ -105,7 +104,6 @@ def get():
 			_("Dividends Paid"): {"account_type": "Equity"},
 			_("Opening Balance Equity"): {"account_type": "Equity"},
 			_("Retained Earnings"): {"account_type": "Equity"},
-			_("Revaluation Surplus"): {"account_type": "Equity"},
 			"root_type": "Equity",
 		},
 	}

erpnext/accounts/doctype/account/test_account.py

@@ -1,9 +1,11 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+
+
 import unittest
 
 import frappe
-from frappe.tests import IntegrationTestCase
+from frappe.test_runner import make_test_records
 from frappe.utils import nowdate
 
 from erpnext.accounts.doctype.account.account import (
@@ -13,10 +15,10 @@ from erpnext.accounts.doctype.account.account import (
 )
 from erpnext.stock import get_company_default_inventory_account, get_warehouse_account
 
-EXTRA_TEST_RECORD_DEPENDENCIES = ["Company"]
+test_dependencies = ["Company"]
 
 
-class TestAccount(IntegrationTestCase):
+class TestAccount(unittest.TestCase):
 	def test_rename_account(self):
 		if not frappe.db.exists("Account", "1210 - Debtors - _TC"):
 			acc = frappe.new_doc("Account")
@@ -201,6 +203,8 @@ class TestAccount(IntegrationTestCase):
 		In a parent->child company setup, child should inherit parent account currency if explicitly specified.
 		"""
 
+		make_test_records("Company")
+
 		frappe.local.flags.pop("ignore_root_company_validation", None)
 
 		def create_bank_account():
@@ -324,7 +328,7 @@ class TestAccount(IntegrationTestCase):
 
 
 def _make_test_records(verbose=None):
-	from frappe.tests.utils import make_test_objects
+	from frappe.test_runner import make_test_objects
 
 	accounts = [
 		# [account_name, parent_account, is_group]

erpnext/accounts/doctype/account/test_records.json

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

erpnext/accounts/doctype/account/test_records.toml

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

erpnext/accounts/doctype/account_closing_balance/account_closing_balance.py

@@ -113,9 +113,9 @@ def get_previous_closing_entries(company, closing_date, accounting_dimensions):
 	entries = []
 	last_period_closing_voucher = frappe.db.get_all(
 		"Period Closing Voucher",
-		filters={"docstatus": 1, "company": company, "period_end_date": ("<", closing_date)},
+		filters={"docstatus": 1, "company": company, "posting_date": ("<", closing_date)},
 		fields=["name"],
-		order_by="period_end_date desc",
+		order_by="posting_date desc",
 		limit=1,
 	)
 

erpnext/accounts/doctype/account_closing_balance/test_account_closing_balance.py

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

erpnext/accounts/doctype/accounting_dimension/accounting_dimension.js

@@ -58,7 +58,7 @@ frappe.ui.form.on("Accounting Dimension", {
 	},
 
 	label: function (frm) {
-		frm.set_value("fieldname", frm.doc.label.replace(/ /g, "_").replace(/-/g, "_").toLowerCase());
+		frm.set_value("fieldname", frappe.model.scrub(frm.doc.label));
 	},
 
 	document_type: function (frm) {

erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py

@@ -7,7 +7,6 @@ import json
 import frappe
 from frappe import _, scrub
 from frappe.custom.doctype.custom_field.custom_field import create_custom_field
-from frappe.database.schema import validate_column_name
 from frappe.model import core_doctypes_list
 from frappe.model.document import Document
 from frappe.utils import cstr
@@ -61,7 +60,6 @@ class AccountingDimension(Document):
 		if not self.is_new():
 			self.validate_document_type_change()
 
-		validate_column_name(self.fieldname)
 		self.validate_dimension_defaults()
 
 	def validate_document_type_change(self):

erpnext/accounts/doctype/accounting_dimension/test_accounting_dimension.py

@@ -1,17 +1,17 @@
 # Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
+
 import unittest
 
 import frappe
-from frappe.tests import IntegrationTestCase
 
 from erpnext.accounts.doctype.journal_entry.test_journal_entry import make_journal_entry
 from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
 
-EXTRA_TEST_RECORD_DEPENDENCIES = ["Cost Center", "Location", "Warehouse", "Department"]
+test_dependencies = ["Cost Center", "Location", "Warehouse", "Department"]
 
 
-class TestAccountingDimension(IntegrationTestCase):
+class TestAccountingDimension(unittest.TestCase):
 	def setUp(self):
 		create_dimension()
 

erpnext/accounts/doctype/accounting_dimension_filter/test_accounting_dimension_filter.py

@@ -12,7 +12,7 @@ from erpnext.accounts.doctype.accounting_dimension.test_accounting_dimension imp
 from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
 from erpnext.exceptions import InvalidAccountDimensionError, MandatoryAccountDimensionError
 
-EXTRA_TEST_RECORD_DEPENDENCIES = ["Location", "Cost Center", "Department"]
+test_dependencies = ["Location", "Cost Center", "Department"]
 
 
 class TestAccountingDimensionFilter(unittest.TestCase):

erpnext/accounts/doctype/accounting_period/accounting_period.py

@@ -101,8 +101,6 @@ def validate_accounting_period_on_doc_save(doc, method=None):
 			date = doc.available_for_use_date
 	elif doc.doctype == "Asset Repair":
 		date = doc.completion_date
-	elif doc.doctype == "Period Closing Voucher":
-		date = doc.period_end_date
 	else:
 		date = doc.posting_date
 

erpnext/accounts/doctype/accounting_period/test_accounting_period.py

@@ -1,9 +1,9 @@
 # Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
+
 import unittest
 
 import frappe
-from frappe.tests import IntegrationTestCase
 from frappe.utils import add_months, nowdate
 
 from erpnext.accounts.doctype.accounting_period.accounting_period import (
@@ -12,10 +12,10 @@ from erpnext.accounts.doctype.accounting_period.accounting_period import (
 )
 from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
 
-EXTRA_TEST_RECORD_DEPENDENCIES = ["Item"]
+test_dependencies = ["Item"]
 
 
-class TestAccountingPeriod(IntegrationTestCase):
+class TestAccountingPeriod(unittest.TestCase):
 	def test_overlap(self):
 		ap1 = create_accounting_period(
 			start_date="2018-04-01", end_date="2018-06-30", company="Wind Power LLC"

erpnext/accounts/doctype/accounts_settings/test_accounts_settings.py

@@ -1,10 +1,9 @@
 import unittest
 
 import frappe
-from frappe.tests import IntegrationTestCase
 
 
-class TestAccountsSettings(IntegrationTestCase):
+class TestAccountsSettings(unittest.TestCase):
 	def tearDown(self):
 		# Just in case `save` method succeeds, we need to take things back to default so that other tests
 		# don't break

erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.js

@@ -1,8 +0,0 @@
-// Copyright (c) 2024, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-// frappe.ui.form.on("Advance Payment Ledger Entry", {
-// 	refresh(frm) {
-
-// 	},
-// });

erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json

@@ -1,113 +0,0 @@
-{
- "actions": [],
- "allow_rename": 1,
- "creation": "2024-10-16 16:57:12.085072",
- "doctype": "DocType",
- "engine": "InnoDB",
- "field_order": [
-  "company",
-  "voucher_type",
-  "voucher_no",
-  "against_voucher_type",
-  "against_voucher_no",
-  "amount",
-  "currency",
-  "event"
- ],
- "fields": [
-  {
-   "fieldname": "voucher_type",
-   "fieldtype": "Link",
-   "label": "Voucher Type",
-   "options": "DocType",
-   "read_only": 1
-  },
-  {
-   "fieldname": "voucher_no",
-   "fieldtype": "Dynamic Link",
-   "label": "Voucher No",
-   "options": "voucher_type",
-   "read_only": 1
-  },
-  {
-   "fieldname": "against_voucher_type",
-   "fieldtype": "Link",
-   "label": "Against Voucher Type",
-   "options": "DocType",
-   "read_only": 1
-  },
-  {
-   "fieldname": "against_voucher_no",
-   "fieldtype": "Dynamic Link",
-   "label": "Against Voucher No",
-   "options": "against_voucher_type",
-   "read_only": 1
-  },
-  {
-   "fieldname": "amount",
-   "fieldtype": "Currency",
-   "label": "Amount",
-   "read_only": 1
-  },
-  {
-   "fieldname": "currency",
-   "fieldtype": "Link",
-   "label": "Currency",
-   "options": "Currency",
-   "read_only": 1
-  },
-  {
-   "fieldname": "event",
-   "fieldtype": "Data",
-   "label": "Event",
-   "read_only": 1
-  },
-  {
-   "fieldname": "company",
-   "fieldtype": "Link",
-   "label": "Company",
-   "options": "Company",
-   "read_only": 1
-  }
- ],
- "in_create": 1,
- "index_web_pages_for_search": 1,
- "links": [],
- "modified": "2024-11-05 10:31:28.736671",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Advance Payment Ledger Entry",
- "owner": "Administrator",
- "permissions": [
-  {
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Accounts User",
-   "share": 1
-  },
-  {
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Accounts Manager",
-   "share": 1
-  },
-  {
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Auditor",
-   "share": 1
-  }
- ],
- "sort_field": "creation",
- "sort_order": "DESC",
- "states": []
-}

erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.py

@@ -1,27 +0,0 @@
-# Copyright (c) 2024, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-# import frappe
-from frappe.model.document import Document
-
-
-class AdvancePaymentLedgerEntry(Document):
-	# begin: auto-generated types
-	# This code is auto-generated. Do not modify anything in this block.
-
-	from typing import TYPE_CHECKING
-
-	if TYPE_CHECKING:
-		from frappe.types import DF
-
-		against_voucher_no: DF.DynamicLink | None
-		against_voucher_type: DF.Link | None
-		amount: DF.Currency
-		company: DF.Link | None
-		currency: DF.Link | None
-		event: DF.Data | None
-		voucher_no: DF.DynamicLink | None
-		voucher_type: DF.Link | None
-	# end: auto-generated types
-
-	pass

erpnext/accounts/doctype/advance_payment_ledger_entry/test_advance_payment_ledger_entry.py

@@ -1,228 +0,0 @@
-# Copyright (c) 2024, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-
-import frappe
-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
-from erpnext.accounts.test.accounts_mixin import AccountsTestMixin
-from erpnext.buying.doctype.purchase_order.test_purchase_order import create_purchase_order
-from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
-
-# On IntegrationTestCase, the doctype test records and all
-# link-field test record depdendencies are recursively loaded
-# Use these module variables to add/remove to/from that list
-EXTRA_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
-IGNORE_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
-
-
-class TestAdvancePaymentLedgerEntry(AccountsTestMixin, IntegrationTestCase):
-	"""
-	Integration tests for AdvancePaymentLedgerEntry.
-	Use this class for testing interactions between multiple components.
-	"""
-
-	def setUp(self):
-		self.create_company()
-		self.create_usd_receivable_account()
-		self.create_usd_payable_account()
-		self.create_item()
-		self.clear_old_entries()
-
-	def tearDown(self):
-		frappe.db.rollback()
-
-	def create_sales_order(self, qty=1, rate=100, currency="INR", do_not_submit=False):
-		"""
-		Helper method
-		"""
-		so = make_sales_order(
-			company=self.company,
-			customer=self.customer,
-			currency=currency,
-			item=self.item,
-			qty=qty,
-			rate=rate,
-			transaction_date=today(),
-			do_not_submit=do_not_submit,
-		)
-		return so
-
-	def create_purchase_order(self, qty=1, rate=100, currency="INR", do_not_submit=False):
-		"""
-		Helper method
-		"""
-		po = create_purchase_order(
-			company=self.company,
-			customer=self.supplier,
-			currency=currency,
-			item=self.item,
-			qty=qty,
-			rate=rate,
-			transaction_date=today(),
-			do_not_submit=do_not_submit,
-		)
-		return po
-
-	def test_so_advance_paid_and_currency_with_payment(self):
-		self.create_customer("_Test USD Customer", "USD")
-
-		so = self.create_sales_order(currency="USD", do_not_submit=True)
-		so.conversion_rate = 80
-		so.submit()
-
-		pe_exchange_rate = 85
-		pe = get_payment_entry(so.doctype, so.name, bank_account=self.cash)
-		pe.reference_no = "1"
-		pe.reference_date = nowdate()
-		pe.paid_from = self.debtors_usd
-		pe.paid_from_account_currency = "USD"
-		pe.source_exchange_rate = pe_exchange_rate
-		pe.paid_amount = so.grand_total
-		pe.received_amount = pe_exchange_rate * pe.paid_amount
-		pe.references[0].outstanding_amount = 100
-		pe.references[0].total_amount = 100
-		pe.references[0].allocated_amount = 100
-		pe.save().submit()
-
-		so.reload()
-		self.assertEqual(so.advance_paid, 100)
-		self.assertEqual(so.party_account_currency, "USD")
-
-		# cancel advance payment
-		pe.reload()
-		pe.cancel()
-
-		so.reload()
-		self.assertEqual(so.advance_paid, 0)
-		self.assertEqual(so.party_account_currency, "USD")
-
-	def test_so_advance_paid_and_currency_with_journal(self):
-		self.create_customer("_Test USD Customer", "USD")
-
-		so = self.create_sales_order(currency="USD", do_not_submit=True)
-		so.conversion_rate = 80
-		so.submit()
-
-		je_exchange_rate = 85
-		je = frappe.get_doc(
-			{
-				"doctype": "Journal Entry",
-				"company": self.company,
-				"voucher_type": "Journal Entry",
-				"posting_date": so.transaction_date,
-				"multi_currency": True,
-				"accounts": [
-					{
-						"account": self.debtors_usd,
-						"party_type": "Customer",
-						"party": so.customer,
-						"credit": 8500,
-						"credit_in_account_currency": 100,
-						"is_advance": "Yes",
-						"reference_type": so.doctype,
-						"reference_name": so.name,
-						"exchange_rate": je_exchange_rate,
-					},
-					{
-						"account": self.cash,
-						"debit": 8500,
-						"debit_in_account_currency": 8500,
-					},
-				],
-			}
-		)
-		je.save().submit()
-		so.reload()
-		self.assertEqual(so.advance_paid, 100)
-		self.assertEqual(so.party_account_currency, "USD")
-
-		# cancel advance payment
-		je.reload()
-		je.cancel()
-
-		so.reload()
-		self.assertEqual(so.advance_paid, 0)
-		self.assertEqual(so.party_account_currency, "USD")
-
-	def test_po_advance_paid_and_currency_with_payment(self):
-		self.create_supplier("_Test USD Supplier", "USD")
-
-		po = self.create_purchase_order(currency="USD", do_not_submit=True)
-		po.conversion_rate = 80
-		po.submit()
-
-		pe_exchange_rate = 85
-		pe = get_payment_entry(po.doctype, po.name, bank_account=self.cash)
-		pe.reference_no = "1"
-		pe.reference_date = nowdate()
-		pe.paid_to = self.creditors_usd
-		pe.paid_to_account_currency = "USD"
-		pe.target_exchange_rate = pe_exchange_rate
-		pe.received_amount = po.grand_total
-		pe.paid_amount = pe_exchange_rate * pe.received_amount
-		pe.references[0].outstanding_amount = 100
-		pe.references[0].total_amount = 100
-		pe.references[0].allocated_amount = 100
-		pe.save().submit()
-
-		po.reload()
-		self.assertEqual(po.advance_paid, 100)
-		self.assertEqual(po.party_account_currency, "USD")
-
-		# cancel advance payment
-		pe.reload()
-		pe.cancel()
-
-		po.reload()
-		self.assertEqual(po.advance_paid, 0)
-		self.assertEqual(po.party_account_currency, "USD")
-
-	def test_po_advance_paid_and_currency_with_journal(self):
-		self.create_supplier("_Test USD Supplier", "USD")
-
-		po = self.create_purchase_order(currency="USD", do_not_submit=True)
-		po.conversion_rate = 80
-		po.submit()
-
-		je_exchange_rate = 85
-		je = frappe.get_doc(
-			{
-				"doctype": "Journal Entry",
-				"company": self.company,
-				"voucher_type": "Journal Entry",
-				"posting_date": po.transaction_date,
-				"multi_currency": True,
-				"accounts": [
-					{
-						"account": self.creditors_usd,
-						"party_type": "Supplier",
-						"party": po.supplier,
-						"debit": 8500,
-						"debit_in_account_currency": 100,
-						"is_advance": "Yes",
-						"reference_type": po.doctype,
-						"reference_name": po.name,
-						"exchange_rate": je_exchange_rate,
-					},
-					{
-						"account": self.cash,
-						"credit": 8500,
-						"credit_in_account_currency": 8500,
-					},
-				],
-			}
-		)
-		je.save().submit()
-		po.reload()
-		self.assertEqual(po.advance_paid, 100)
-		self.assertEqual(po.party_account_currency, "USD")
-
-		# cancel advance payment
-		je.reload()
-		je.cancel()
-
-		po.reload()
-		self.assertEqual(po.advance_paid, 0)
-		self.assertEqual(po.party_account_currency, "USD")

erpnext/accounts/doctype/advance_taxes_and_charges/advance_taxes_and_charges.json

@@ -13,7 +13,6 @@
   "col_break_1",
   "description",
   "included_in_paid_amount",
-  "set_by_item_tax_template",
   "accounting_dimensions_section",
   "cost_center",
   "dimension_col_break",
@@ -21,13 +20,11 @@
   "rate",
   "section_break_9",
   "currency",
-  "net_amount",
   "tax_amount",
   "total",
   "allocated_amount",
   "column_break_13",
   "base_tax_amount",
-  "base_net_amount",
   "base_total"
  ],
  "fields": [
@@ -177,40 +174,12 @@
    "label": "Account Currency",
    "options": "Currency",
    "read_only": 1
-  },
-  {
-   "columns": 2,
-   "fieldname": "net_amount",
-   "fieldtype": "Currency",
-   "in_list_view": 1,
-   "label": "Net Amount",
-   "options": "currency",
-   "read_only": 1
-  },
-  {
-   "fieldname": "base_net_amount",
-   "fieldtype": "Currency",
-   "label": "Net Amount (Company Currency)",
-   "oldfieldname": "tax_amount",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "read_only": 1
-  },
-  {
-   "default": "0",
-   "fieldname": "set_by_item_tax_template",
-   "fieldtype": "Check",
-   "hidden": 1,
-   "label": "Set by Item Tax Template",
-   "print_hide": 1,
-   "read_only": 1,
-   "report_hide": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2024-11-22 19:16:22.346267",
+ "modified": "2024-03-27 13:05:58.437605",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Advance Taxes and Charges",

erpnext/accounts/doctype/advance_taxes_and_charges/advance_taxes_and_charges.py

@@ -18,7 +18,6 @@ class AdvanceTaxesandCharges(Document):
 		account_head: DF.Link
 		add_deduct_tax: DF.Literal["Add", "Deduct"]
 		allocated_amount: DF.Currency
-		base_net_amount: DF.Currency
 		base_tax_amount: DF.Currency
 		base_total: DF.Currency
 		charge_type: DF.Literal[
@@ -28,13 +27,11 @@ class AdvanceTaxesandCharges(Document):
 		currency: DF.Link | None
 		description: DF.SmallText
 		included_in_paid_amount: DF.Check
-		net_amount: DF.Currency
 		parent: DF.Data
 		parentfield: DF.Data
 		parenttype: DF.Data
 		rate: DF.Float
 		row_id: DF.Data | None
-		set_by_item_tax_template: DF.Check
 		tax_amount: DF.Currency
 		total: DF.Currency
 	# end: auto-generated types

erpnext/accounts/doctype/bank/test_bank.py

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

erpnext/accounts/doctype/bank_account/bank_account.json

@@ -208,49 +208,8 @@
    "label": "Disabled"
   }
  ],
- "links": [
-  {
-   "group": "Transactions",
-   "link_doctype": "Payment Request",
-   "link_fieldname": "bank_account"
-  },
-  {
-   "group": "Transactions",
-   "link_doctype": "Payment Order",
-   "link_fieldname": "bank_account"
-  },
-  {
-   "group": "Transactions",
-   "link_doctype": "Bank Guarantee",
-   "link_fieldname": "bank_account"
-  },
-  {
-   "group": "Transactions",
-   "link_doctype": "Bank Transaction",
-   "link_fieldname": "bank_account"
-  },
-  {
-   "group": "Accounting",
-   "link_doctype": "Payment Entry",
-   "link_fieldname": "bank_account"
-  },
-  {
-   "group": "Accounting",
-   "link_doctype": "Journal Entry",
-   "link_fieldname": "bank_account"
-  },
-  {
-   "group": "Party",
-   "link_doctype": "Customer",
-   "link_fieldname": "default_bank_account"
-  },
-  {
-   "group": "Party",
-   "link_doctype": "Supplier",
-   "link_fieldname": "default_bank_account"
-  }
- ],
- "modified": "2024-10-30 09:41:14.113414",
+ "links": [],
+ "modified": "2024-03-27 13:06:37.049542",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Bank Account",

erpnext/accounts/doctype/bank_account/bank_account_dashboard.py

@@ -0,0 +1,20 @@
+from frappe import _
+
+
+def get_data():
+	return {
+		"fieldname": "bank_account",
+		"non_standard_fieldnames": {
+			"Customer": "default_bank_account",
+			"Supplier": "default_bank_account",
+		},
+		"transactions": [
+			{
+				"label": _("Payments"),
+				"items": ["Payment Entry", "Payment Request", "Payment Order", "Payroll Entry"],
+			},
+			{"label": _("Party"), "items": ["Customer", "Supplier"]},
+			{"items": ["Bank Guarantee"]},
+			{"items": ["Journal Entry"]},
+		],
+	}

erpnext/accounts/doctype/bank_account/test_bank_account.py

@@ -1,13 +1,15 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
+
 import unittest
 
 import frappe
 from frappe import ValidationError
-from frappe.tests import IntegrationTestCase
+
+# test_records = frappe.get_test_records('Bank Account')
 
 
-class TestBankAccount(IntegrationTestCase):
+class TestBankAccount(unittest.TestCase):
 	def test_validate_iban(self):
 		valid_ibans = [
 			"GB82 WEST 1234 5698 7654 32",

erpnext/accounts/doctype/bank_account_subtype/test_bank_account_subtype.py

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

erpnext/accounts/doctype/bank_account_type/test_bank_account_type.py

@@ -1,10 +1,9 @@
 # Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
+
 # import frappe
 import unittest
 
-from frappe.tests import IntegrationTestCase
 
-
-class TestBankAccountType(IntegrationTestCase):
+class TestBankAccountType(unittest.TestCase):
 	pass

erpnext/accounts/doctype/bank_clearance/bank_clearance.py

@@ -108,18 +108,8 @@ class BankClearance(Document):
 				if not d.clearance_date:
 					d.clearance_date = None
 
-				if d.payment_document == "Sales Invoice":
-					frappe.db.set_value(
-						"Sales Invoice Payment",
-						{"parent": d.payment_entry, "account": self.get("account"), "amount": [">", 0]},
-						"clearance_date",
-						d.clearance_date,
-					)
-
-				else:
-					frappe.db.set_value(
-						d.payment_document, d.payment_entry, "clearance_date", d.clearance_date
-					)
+				payment_entry = frappe.get_doc(d.payment_document, d.payment_entry)
+				payment_entry.db_set("clearance_date", d.clearance_date)
 
 				clearance_date_updated = True
 
@@ -168,7 +158,7 @@ def get_payment_entries_for_bank_clearance(
 				"Payment Entry" as payment_document, name as payment_entry,
 				reference_no as cheque_number, reference_date as cheque_date,
 				if(paid_from=%(account)s, paid_amount + total_taxes_and_charges, 0) as credit,
-				if(paid_from=%(account)s, 0, received_amount + total_taxes_and_charges) as debit,
+				if(paid_from=%(account)s, 0, received_amount) as debit,
 				posting_date, ifnull(party,if(paid_from=%(account)s,paid_to,paid_from)) as against_account, clearance_date,
 				if(paid_to=%(account)s, paid_to_account_currency, paid_from_account_currency) as account_currency
 			from `tabPayment Entry`

erpnext/accounts/doctype/bank_clearance/test_bank_clearance.py

@@ -1,32 +1,21 @@
 # Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
+
 import unittest
 
 import frappe
-from frappe.tests import IntegrationTestCase
 from frappe.utils import add_months, getdate
 
-from erpnext.accounts.doctype.cost_center.test_cost_center import create_cost_center
 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
-from erpnext.stock.doctype.item.test_item import create_item
-from erpnext.stock.doctype.warehouse.test_warehouse import create_warehouse
 from erpnext.tests.utils import if_lending_app_installed, if_lending_app_not_installed
 
 
-class TestBankClearance(IntegrationTestCase):
+class TestBankClearance(unittest.TestCase):
 	@classmethod
 	def setUpClass(cls):
-		super().setUpClass()
-		create_warehouse(
-			warehouse_name="_Test Warehouse",
-			properties={"parent_warehouse": "All Warehouses - _TC"},
-			company="_Test Company",
-		)
-		create_item("_Test Item")
-		create_cost_center(cost_center_name="_Test Cost Center", company="_Test Company")
-
+		clear_payment_entries()
+		clear_loan_transactions()
 		make_bank_account()
 		add_transactions()
 
@@ -94,31 +83,18 @@ class TestBankClearance(IntegrationTestCase):
 		bank_clearance.get_payment_entries()
 		self.assertEqual(len(bank_clearance.payment_entries), 3)
 
-	def test_update_clearance_date_on_si(self):
-		sales_invoice = make_pos_sales_invoice()
 
-		date = getdate()
-		bank_clearance = frappe.get_doc("Bank Clearance")
-		bank_clearance.account = "_Test Bank Clearance - _TC"
-		bank_clearance.from_date = add_months(date, -1)
-		bank_clearance.to_date = date
-		bank_clearance.include_pos_transactions = 1
-		bank_clearance.get_payment_entries()
+def clear_payment_entries():
+	frappe.db.delete("Payment Entry")
 
-		self.assertNotEqual(len(bank_clearance.payment_entries), 0)
-		for payment in bank_clearance.payment_entries:
-			if payment.payment_entry == sales_invoice.name:
-				payment.clearance_date = date
 
-		bank_clearance.update_clearance_date()
-
-		si_clearance_date = frappe.db.get_value(
-			"Sales Invoice Payment",
-			{"parent": sales_invoice.name, "account": bank_clearance.account},
-			"clearance_date",
-		)
-
-		self.assertEqual(si_clearance_date, date)
+@if_lending_app_installed
+def clear_loan_transactions():
+	for dt in [
+		"Loan Disbursement",
+		"Loan Repayment",
+	]:
+		frappe.db.delete(dt)
 
 
 def make_bank_account():
@@ -139,45 +115,9 @@ def add_transactions():
 
 
 def make_payment_entry():
-	from erpnext.buying.doctype.supplier.test_supplier import create_supplier
-
-	supplier = create_supplier(supplier_name="_Test Supplier")
-	pi = make_purchase_invoice(
-		supplier=supplier,
-		supplier_warehouse="_Test Warehouse - _TC",
-		expense_account="Cost of Goods Sold - _TC",
-		uom="Nos",
-		qty=1,
-		rate=690,
-	)
+	pi = make_purchase_invoice(supplier="_Test Supplier", qty=1, rate=690)
 	pe = get_payment_entry("Purchase Invoice", pi.name, bank_account="_Test Bank Clearance - _TC")
 	pe.reference_no = "Conrad Oct 18"
 	pe.reference_date = "2018-10-24"
 	pe.insert()
 	pe.submit()
-
-
-def make_pos_sales_invoice():
-	from erpnext.accounts.doctype.opening_invoice_creation_tool.test_opening_invoice_creation_tool import (
-		make_customer,
-	)
-
-	mode_of_payment = frappe.get_doc({"doctype": "Mode of Payment", "name": "Cash"})
-
-	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": "_Test Bank Clearance - _TC"}
-		)
-		mode_of_payment.save()
-
-	customer = make_customer(customer="_Test Customer")
-
-	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": "Cash", "account": "_Test Bank Clearance - _TC", "amount": 1000}
-	)
-	si.insert()
-	si.submit()
-
-	return si

erpnext/accounts/doctype/bank_guarantee/test_bank_guarantee.py

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

erpnext/accounts/doctype/bank_reconciliation_tool/test_bank_reconciliation_tool.py

@@ -4,7 +4,7 @@
 
 import frappe
 from frappe import qb
-from frappe.tests import IntegrationTestCase
+from frappe.tests.utils import FrappeTestCase
 from frappe.utils import add_days, today
 
 from erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool import (
@@ -15,7 +15,7 @@ from erpnext.accounts.doctype.payment_entry.test_payment_entry import create_pay
 from erpnext.accounts.test.accounts_mixin import AccountsTestMixin
 
 
-class TestBankReconciliationTool(AccountsTestMixin, IntegrationTestCase):
+class TestBankReconciliationTool(AccountsTestMixin, FrappeTestCase):
 	def setUp(self):
 		self.create_company()
 		self.create_customer()

erpnext/accounts/doctype/bank_statement_import/test_bank_statement_import.py

@@ -1,10 +1,9 @@
 # Copyright (c) 2020, Frappe Technologies and Contributors
 # See license.txt
+
 # import frappe
 import unittest
 
-from frappe.tests import IntegrationTestCase
 
-
-class TestBankStatementImport(IntegrationTestCase):
+class TestBankStatementImport(unittest.TestCase):
 	pass

erpnext/accounts/doctype/bank_transaction/test_auto_match_party.py

@@ -2,22 +2,13 @@
 # License: GNU General Public License v3. See license.txt
 
 import frappe
-from frappe.tests import IntegrationTestCase, UnitTestCase
+from frappe.tests.utils import FrappeTestCase
 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):
+class TestAutoMatchParty(FrappeTestCase):
 	@classmethod
 	def setUpClass(cls):
 		create_bank_account()

erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py

@@ -6,7 +6,7 @@ import json
 import frappe
 from frappe import utils
 from frappe.model.docstatus import DocStatus
-from frappe.tests import IntegrationTestCase, UnitTestCase
+from frappe.tests.utils import FrappeTestCase
 
 from erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool import (
 	get_linked_payments,
@@ -18,20 +18,19 @@ from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make
 from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
 from erpnext.tests.utils import if_lending_app_installed
 
-EXTRA_TEST_RECORD_DEPENDENCIES = ["Item", "Cost Center"]
+test_dependencies = ["Item", "Cost Center"]
 
 
-class UnitTestBankTransaction(UnitTestCase):
-	"""
-	Unit tests for BankTransaction.
-	Use this class for testing individual functions and methods.
-	"""
-
-	pass
-
-
-class TestBankTransaction(IntegrationTestCase):
+class TestBankTransaction(FrappeTestCase):
 	def setUp(self):
+		for dt in [
+			"Bank Transaction",
+			"Payment Entry",
+			"Payment Entry Reference",
+			"POS Profile",
+		]:
+			frappe.db.delete(dt)
+		clear_loan_transactions()
 		make_pos_profile()
 
 		# generate and use a uniq hash identifier for 'Bank Account' and it's linked GL 'Account' to avoid validation error
@@ -223,6 +222,11 @@ class TestBankTransaction(IntegrationTestCase):
 		self.assertEqual(linked_payments[0]["name"], repayment_entry.name)
 
 
+@if_lending_app_installed
+def clear_loan_transactions():
+	frappe.db.delete("Loan Repayment")
+
+
 def create_bank_account(
 	bank_name="Citi Bank", gl_account="_Test Bank - _TC", bank_account_name="Checking Account"
 ):

erpnext/accounts/doctype/bisect_accounting_statements/test_bisect_accounting_statements.py

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

erpnext/accounts/doctype/bisect_nodes/test_bisect_nodes.py

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

erpnext/accounts/doctype/budget/test_budget.py

@@ -1,9 +1,9 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
+
 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_actual_expense
@@ -11,10 +11,10 @@ from erpnext.accounts.doctype.journal_entry.test_journal_entry import make_journ
 from erpnext.accounts.utils import get_fiscal_year
 from erpnext.buying.doctype.purchase_order.test_purchase_order import create_purchase_order
 
-EXTRA_TEST_RECORD_DEPENDENCIES = ["Monthly Distribution"]
+test_dependencies = ["Monthly Distribution"]
 
 
-class TestBudget(IntegrationTestCase):
+class TestBudget(unittest.TestCase):
 	def test_monthly_budget_crossed_ignore(self):
 		set_total_expense_zero(nowdate(), "cost_center")
 

erpnext/accounts/doctype/campaign_item/campaign_item.json

@@ -13,13 +13,13 @@
    "fieldtype": "Link",
    "in_list_view": 1,
    "label": "Campaign",
-   "options": "UTM Campaign"
+   "options": "Campaign"
   }
  ],
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2024-06-28 11:04:09.815940",
+ "modified": "2024-03-27 13:06:44.142625",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Campaign Item",
@@ -29,4 +29,4 @@
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
-}
+}

erpnext/accounts/doctype/cashier_closing/test_cashier_closing.py

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

erpnext/accounts/doctype/chart_of_accounts_importer/test_chart_of_accounts_importer.py

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

erpnext/accounts/doctype/cheque_print_template/test_cheque_print_template.py

@@ -1,9 +1,10 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
+
 import unittest
 
-from frappe.tests import IntegrationTestCase
+# test_records = frappe.get_test_records('Cheque Print Template')
 
 
-class TestChequePrintTemplate(IntegrationTestCase):
+class TestChequePrintTemplate(unittest.TestCase):
 	pass

erpnext/accounts/doctype/cost_center/test_cost_center.py

@@ -1,13 +1,18 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+
 import unittest
 
 import frappe
-from frappe.tests import IntegrationTestCase
+
+test_records = frappe.get_test_records("Cost Center")
 
 
-class TestCostCenter(IntegrationTestCase):
+class TestCostCenter(unittest.TestCase):
 	def test_cost_center_creation_against_child_node(self):
+		if not frappe.db.get_value("Cost Center", {"name": "_Test Cost Center 2 - _TC"}):
+			frappe.get_doc(test_records[1]).insert()
+
 		cost_center = frappe.get_doc(
 			{
 				"doctype": "Cost Center",

erpnext/accounts/doctype/cost_center/test_records.json

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

erpnext/accounts/doctype/cost_center/test_records.toml

@@ -1,18 +0,0 @@
-[["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/test_cost_center_allocation.py

@@ -1,9 +1,9 @@
 # Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
+
 import unittest
 
 import frappe
-from frappe.tests import IntegrationTestCase
 from frappe.utils import add_days, today
 
 from erpnext.accounts.doctype.cost_center.test_cost_center import create_cost_center
@@ -17,15 +17,13 @@ from erpnext.accounts.doctype.cost_center_allocation.cost_center_allocation impo
 from erpnext.accounts.doctype.journal_entry.test_journal_entry import make_journal_entry
 
 
-class TestCostCenterAllocation(IntegrationTestCase):
+class TestCostCenterAllocation(unittest.TestCase):
 	def setUp(self):
 		cost_centers = [
 			"Main Cost Center 1",
 			"Main Cost Center 2",
-			"Main Cost Center 3",
 			"Sub Cost Center 1",
 			"Sub Cost Center 2",
-			"Sub Cost Center 3",
 		]
 		for cc in cost_centers:
 			create_cost_center(cost_center_name=cc, company="_Test Company")
@@ -38,7 +36,7 @@ class TestCostCenterAllocation(IntegrationTestCase):
 		)
 
 		jv = make_journal_entry(
-			"Cash - _TC", "Sales - _TC", 100, cost_center="Main Cost Center 1 - _TC", submit=True
+			"_Test Cash - _TC", "Sales - _TC", 100, cost_center="Main Cost Center 1 - _TC", submit=True
 		)
 
 		expected_values = [["Sub Cost Center 1 - _TC", 0.0, 60], ["Sub Cost Center 2 - _TC", 0.0, 40]]
@@ -122,7 +120,7 @@ class TestCostCenterAllocation(IntegrationTestCase):
 	def test_valid_from_based_on_existing_gle(self):
 		# GLE posted against Sub Cost Center 1 on today
 		jv = make_journal_entry(
-			"Cash - _TC",
+			"_Test Cash - _TC",
 			"Sales - _TC",
 			100,
 			cost_center="Main Cost Center 1 - _TC",
@@ -143,53 +141,6 @@ class TestCostCenterAllocation(IntegrationTestCase):
 
 		jv.cancel()
 
-	def test_multiple_cost_center_allocation_on_same_main_cost_center(self):
-		coa1 = create_cost_center_allocation(
-			"_Test Company",
-			"Main Cost Center 3 - _TC",
-			{"Sub Cost Center 1 - _TC": 30, "Sub Cost Center 2 - _TC": 30, "Sub Cost Center 3 - _TC": 40},
-			valid_from=add_days(today(), -5),
-		)
-
-		coa2 = create_cost_center_allocation(
-			"_Test Company",
-			"Main Cost Center 3 - _TC",
-			{"Sub Cost Center 1 - _TC": 50, "Sub Cost Center 2 - _TC": 50},
-			valid_from=add_days(today(), -1),
-		)
-
-		jv = make_journal_entry(
-			"Cash - _TC",
-			"Sales - _TC",
-			100,
-			cost_center="Main Cost Center 3 - _TC",
-			posting_date=today(),
-			submit=True,
-		)
-
-		expected_values = {"Sub Cost Center 1 - _TC": 50, "Sub Cost Center 2 - _TC": 50}
-
-		gle = frappe.qb.DocType("GL Entry")
-		gl_entries = (
-			frappe.qb.from_(gle)
-			.select(gle.cost_center, gle.debit, gle.credit)
-			.where(gle.voucher_type == "Journal Entry")
-			.where(gle.voucher_no == jv.name)
-			.where(gle.account == "Sales - _TC")
-			.orderby(gle.cost_center)
-		).run(as_dict=1)
-
-		self.assertTrue(gl_entries)
-
-		for gle in gl_entries:
-			self.assertTrue(gle.cost_center in expected_values)
-			self.assertEqual(gle.debit, 0)
-			self.assertEqual(gle.credit, expected_values[gle.cost_center])
-
-		coa1.cancel()
-		coa2.cancel()
-		jv.cancel()
-
 
 def create_cost_center_allocation(
 	company,

erpnext/accounts/doctype/coupon_code/coupon_code.json

@@ -62,7 +62,7 @@
    "unique": 1
   },
   {
-   "depends_on": "eval: !doc.from_external_ecomm_platform",
+   "depends_on": "eval !doc.from_external_ecomm_platform",
    "fieldname": "pricing_rule",
    "fieldtype": "Link",
    "label": "Pricing Rule",
@@ -125,7 +125,7 @@
   }
  ],
  "links": [],
- "modified": "2024-11-19 16:35:11.836441",
+ "modified": "2024-06-28 06:17:01.833399",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Coupon Code",
@@ -186,4 +186,4 @@
  "states": [],
  "title_field": "coupon_name",
  "track_changes": 1
-}
+}

erpnext/accounts/doctype/coupon_code/test_coupon_code.py

@@ -1,13 +1,13 @@
 # Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
+
 import unittest
 
 import frappe
-from frappe.tests import IntegrationTestCase
 
 from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
 
-EXTRA_TEST_RECORD_DEPENDENCIES = ["Item"]
+test_dependencies = ["Item"]
 
 
 def test_create_test_data():
@@ -110,7 +110,7 @@ def test_create_test_data():
 		coupon_code.insert()
 
 
-class TestCouponCode(IntegrationTestCase):
+class TestCouponCode(unittest.TestCase):
 	def setUp(self):
 		test_create_test_data()
 

erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.py

@@ -109,7 +109,7 @@ def get_api_endpoint(service_provider: str | None = None, use_http: bool = False
 		if service_provider == "exchangerate.host":
 			api = "api.exchangerate.host/convert"
 		elif service_provider == "frankfurter.app":
-			api = "api.frankfurter.app/{transaction_date}"
+			api = "frankfurter.app/{transaction_date}"
 
 		protocol = "https://"
 		if use_http:

erpnext/accounts/doctype/currency_exchange_settings/test_currency_exchange_settings.py

@@ -1,10 +1,9 @@
 # Copyright (c) 2021, Wahni Green Technologies Pvt. Ltd. and contributors
 # For license information, please see license.txt
+
 # import frappe
 import unittest
 
-from frappe.tests import IntegrationTestCase
 
-
-class TestCurrencyExchangeSettings(IntegrationTestCase):
+class TestCurrencyExchangeSettings(unittest.TestCase):
 	pass

erpnext/accounts/doctype/dunning/dunning.json

@@ -19,6 +19,16 @@
   "currency",
   "column_break_11",
   "conversion_rate",
+  "address_and_contact_section",
+  "customer_address",
+  "address_display",
+  "contact_person",
+  "contact_display",
+  "column_break_16",
+  "company_address",
+  "company_address_display",
+  "contact_mobile",
+  "contact_email",
   "section_break_6",
   "dunning_type",
   "column_break_8",
@@ -46,21 +56,7 @@
   "income_account",
   "column_break_48",
   "cost_center",
-  "amended_from",
-  "address_and_contact_tab",
-  "address_and_contact_section",
-  "customer_address",
-  "address_display",
-  "column_break_vodj",
-  "contact_person",
-  "contact_display",
-  "contact_mobile",
-  "contact_email",
-  "section_break_xban",
-  "column_break_16",
-  "company_address",
-  "company_address_display",
-  "column_break_lqmf"
+  "amended_from"
  ],
  "fields": [
   {
@@ -182,8 +178,10 @@
    "label": "Rate of Interest (%) Yearly"
   },
   {
+   "collapsible": 1,
    "fieldname": "address_and_contact_section",
-   "fieldtype": "Section Break"
+   "fieldtype": "Section Break",
+   "label": "Address and Contact"
   },
   {
    "fieldname": "address_display",
@@ -379,28 +377,11 @@
   {
    "fieldname": "column_break_48",
    "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "address_and_contact_tab",
-   "fieldtype": "Tab Break",
-   "label": "Address & Contact"
-  },
-  {
-   "fieldname": "column_break_vodj",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "section_break_xban",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "column_break_lqmf",
-   "fieldtype": "Column Break"
   }
  ],
  "is_submittable": 1,
  "links": [],
- "modified": "2024-11-26 13:46:07.760867",
+ "modified": "2024-03-27 13:08:19.176146",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Dunning",

erpnext/accounts/doctype/dunning/dunning.py

@@ -220,31 +220,19 @@ def get_linked_dunnings_as_per_state(sales_invoice, state):
 
 
 @frappe.whitelist()
-def get_dunning_letter_text(dunning_type: str, doc: str | dict, language: str | None = None) -> dict:
-	DOCTYPE = "Dunning Letter Text"
-	FIELDS = ["body_text", "closing_text", "language"]
-
+def get_dunning_letter_text(dunning_type, doc, language=None):
 	if isinstance(doc, str):
 		doc = json.loads(doc)
-
-	if not language:
-		language = doc.get("language")
-
 	if language:
-		letter_text = frappe.db.get_value(
-			DOCTYPE, {"parent": dunning_type, "language": language}, FIELDS, as_dict=1
-		)
-
-	if not letter_text:
-		letter_text = frappe.db.get_value(
-			DOCTYPE, {"parent": dunning_type, "is_default_language": 1}, FIELDS, as_dict=1
-		)
-
-	if not letter_text:
-		return {}
-
-	return {
-		"body_text": frappe.render_template(letter_text.body_text, doc),
-		"closing_text": frappe.render_template(letter_text.closing_text, doc),
-		"language": letter_text.language,
-	}
+		filters = {"parent": dunning_type, "language": language}
+	else:
+		filters = {"parent": dunning_type, "is_default_language": 1}
+	letter_text = frappe.db.get_value(
+		"Dunning Letter Text", filters, ["body_text", "closing_text", "language"], as_dict=1
+	)
+	if letter_text:
+		return {
+			"body_text": frappe.render_template(letter_text.body_text, doc),
+			"closing_text": frappe.render_template(letter_text.closing_text, doc),
+			"language": letter_text.language,
+		}

erpnext/accounts/doctype/dunning/test_dunning.py

@@ -1,7 +1,7 @@
 # Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
 import frappe
-from frappe.tests import IntegrationTestCase, UnitTestCase
+from frappe.tests.utils import FrappeTestCase
 from frappe.utils import add_days, nowdate, today
 
 from erpnext import get_default_cost_center
@@ -16,19 +16,10 @@ from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import (
 	create_sales_invoice_against_cost_center,
 )
 
-EXTRA_TEST_RECORD_DEPENDENCIES = ["Company", "Cost Center"]
+test_dependencies = ["Company", "Cost Center"]
 
 
-class UnitTestDunning(UnitTestCase):
-	"""
-	Unit tests for Dunning.
-	Use this class for testing individual functions and methods.
-	"""
-
-	pass
-
-
-class TestDunning(IntegrationTestCase):
+class TestDunning(FrappeTestCase):
 	@classmethod
 	def setUpClass(cls):
 		super().setUpClass()

erpnext/accounts/doctype/dunning_type/test_dunning_type.py

@@ -1,10 +1,9 @@
 # Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
+
 # import frappe
 import unittest
 
-from frappe.tests import IntegrationTestCase
 
-
-class TestDunningType(IntegrationTestCase):
+class TestDunningType(unittest.TestCase):
 	pass

erpnext/accounts/doctype/dunning_type/test_records.json

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

erpnext/accounts/doctype/dunning_type/test_records.toml

@@ -1,28 +0,0 @@
-[["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/exchange_rate_revaluation/exchange_rate_revaluation.py

@@ -74,21 +74,6 @@ class ExchangeRateRevaluation(Document):
 		if not (self.company and self.posting_date):
 			frappe.throw(_("Please select Company and Posting Date to getting entries"))
 
-	def before_submit(self):
-		self.remove_accounts_without_gain_loss()
-
-	def remove_accounts_without_gain_loss(self):
-		self.accounts = [account for account in self.accounts if account.gain_loss]
-
-		if not self.accounts:
-			frappe.throw(_("At least one account with exchange gain or loss is required"))
-
-		frappe.msgprint(
-			_("Removing rows without exchange gain or loss"),
-			alert=True,
-			indicator="yellow",
-		)
-
 	def on_cancel(self):
 		self.ignore_linked_doctypes = "GL Entry"
 
@@ -263,23 +248,23 @@ class ExchangeRateRevaluation(Document):
 				new_exchange_rate = get_exchange_rate(d.account_currency, company_currency, posting_date)
 				new_balance_in_base_currency = flt(d.balance_in_account_currency * new_exchange_rate)
 				gain_loss = flt(new_balance_in_base_currency, precision) - flt(d.balance, precision)
-
-				accounts.append(
-					{
-						"account": d.account,
-						"party_type": d.party_type,
-						"party": d.party,
-						"account_currency": d.account_currency,
-						"balance_in_base_currency": d.balance,
-						"balance_in_account_currency": d.balance_in_account_currency,
-						"zero_balance": d.zero_balance,
-						"current_exchange_rate": current_exchange_rate,
-						"new_exchange_rate": new_exchange_rate,
-						"new_balance_in_base_currency": new_balance_in_base_currency,
-						"new_balance_in_account_currency": d.balance_in_account_currency,
-						"gain_loss": gain_loss,
-					}
-				)
+				if gain_loss:
+					accounts.append(
+						{
+							"account": d.account,
+							"party_type": d.party_type,
+							"party": d.party,
+							"account_currency": d.account_currency,
+							"balance_in_base_currency": d.balance,
+							"balance_in_account_currency": d.balance_in_account_currency,
+							"zero_balance": d.zero_balance,
+							"current_exchange_rate": current_exchange_rate,
+							"new_exchange_rate": new_exchange_rate,
+							"new_balance_in_base_currency": new_balance_in_base_currency,
+							"new_balance_in_account_currency": d.balance_in_account_currency,
+							"gain_loss": gain_loss,
+						}
+					)
 
 			# Handle Accounts with '0' balance in Account/Base Currency
 			for d in [x for x in account_details if x.zero_balance]:
@@ -303,22 +288,23 @@ class ExchangeRateRevaluation(Document):
 						current_exchange_rate * d.balance_in_account_currency
 					)
 
-				accounts.append(
-					{
-						"account": d.account,
-						"party_type": d.party_type,
-						"party": d.party,
-						"account_currency": d.account_currency,
-						"balance_in_base_currency": d.balance,
-						"balance_in_account_currency": d.balance_in_account_currency,
-						"zero_balance": d.zero_balance,
-						"current_exchange_rate": current_exchange_rate,
-						"new_exchange_rate": new_exchange_rate,
-						"new_balance_in_base_currency": new_balance_in_base_currency,
-						"new_balance_in_account_currency": new_balance_in_account_currency,
-						"gain_loss": gain_loss,
-					}
-				)
+				if gain_loss:
+					accounts.append(
+						{
+							"account": d.account,
+							"party_type": d.party_type,
+							"party": d.party,
+							"account_currency": d.account_currency,
+							"balance_in_base_currency": d.balance,
+							"balance_in_account_currency": d.balance_in_account_currency,
+							"zero_balance": d.zero_balance,
+							"current_exchange_rate": current_exchange_rate,
+							"new_exchange_rate": new_exchange_rate,
+							"new_balance_in_base_currency": new_balance_in_base_currency,
+							"new_balance_in_account_currency": new_balance_in_account_currency,
+							"gain_loss": gain_loss,
+						}
+					)
 
 		return accounts
 

erpnext/accounts/doctype/exchange_rate_revaluation/test_exchange_rate_revaluation.py

@@ -3,7 +3,7 @@
 
 
 import frappe
-from frappe.tests import IntegrationTestCase
+from frappe.tests.utils import FrappeTestCase, change_settings
 from frappe.utils import add_days, flt, today
 
 from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry
@@ -11,7 +11,7 @@ from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sal
 from erpnext.accounts.test.accounts_mixin import AccountsTestMixin
 
 
-class TestExchangeRateRevaluation(AccountsTestMixin, IntegrationTestCase):
+class TestExchangeRateRevaluation(AccountsTestMixin, FrappeTestCase):
 	def setUp(self):
 		self.create_company()
 		self.create_usd_receivable_account()
@@ -35,7 +35,7 @@ class TestExchangeRateRevaluation(AccountsTestMixin, IntegrationTestCase):
 		company_doc.unrealized_exchange_gain_loss_account = company_doc.exchange_gain_loss_account
 		company_doc.save()
 
-	@IntegrationTestCase.change_settings(
+	@change_settings(
 		"Accounts Settings",
 		{"allow_multi_currency_invoices_against_single_party_account": 1, "allow_stale": 0},
 	)
@@ -88,7 +88,7 @@ class TestExchangeRateRevaluation(AccountsTestMixin, IntegrationTestCase):
 		)[0]
 		self.assertEqual(acc_balance.balance, 8500.0)
 
-	@IntegrationTestCase.change_settings(
+	@change_settings(
 		"Accounts Settings",
 		{"allow_multi_currency_invoices_against_single_party_account": 1, "allow_stale": 0},
 	)
@@ -158,7 +158,7 @@ class TestExchangeRateRevaluation(AccountsTestMixin, IntegrationTestCase):
 		self.assertEqual(acc_balance.balance, 0.0)
 		self.assertEqual(acc_balance.balance_in_account_currency, 0.0)
 
-	@IntegrationTestCase.change_settings(
+	@change_settings(
 		"Accounts Settings",
 		{"allow_multi_currency_invoices_against_single_party_account": 1, "allow_stale": 0},
 	)
@@ -247,7 +247,7 @@ class TestExchangeRateRevaluation(AccountsTestMixin, IntegrationTestCase):
 		self.assertEqual(flt(acc_balance.balance, precision), 0.0)
 		self.assertEqual(flt(acc_balance.balance_in_account_currency, precision), 0.0)
 
-	@IntegrationTestCase.change_settings(
+	@change_settings(
 		"Accounts Settings",
 		{"allow_multi_currency_invoices_against_single_party_account": 1, "allow_stale": 0},
 	)

erpnext/accounts/doctype/finance_book/test_finance_book.py

@@ -1,14 +1,14 @@
 # Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
+
 import unittest
 
 import frappe
-from frappe.tests import IntegrationTestCase
 
 from erpnext.accounts.doctype.journal_entry.test_journal_entry import make_journal_entry
 
 
-class TestFinanceBook(IntegrationTestCase):
+class TestFinanceBook(unittest.TestCase):
 	def test_finance_book(self):
 		finance_book = create_finance_book()
 

erpnext/accounts/doctype/fiscal_year/fiscal_year.js

@@ -4,7 +4,10 @@
 frappe.ui.form.on("Fiscal Year", {
 	onload: function (frm) {
 		if (frm.doc.__islocal) {
-			frm.set_value("year_start_date", frappe.datetime.year_start());
+			frm.set_value(
+				"year_start_date",
+				frappe.datetime.add_days(frappe.defaults.get_default("year_end_date"), 1)
+			);
 		}
 	},
 	year_start_date: function (frm) {

erpnext/accounts/doctype/fiscal_year/fiscal_year.json

@@ -72,10 +72,10 @@
   },
   {
    "default": "0",
-   "description": "More/Less than 12 months.",
+   "description": "Less than 12 months.",
    "fieldname": "is_short_year",
    "fieldtype": "Check",
-   "label": "Is Short/Long Year",
+   "label": "Is Short Year",
    "set_only_once": 1
   }
  ],

erpnext/accounts/doctype/fiscal_year/test_fiscal_year.py

@@ -1,15 +1,16 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+
+
 import unittest
 
 import frappe
-from frappe.tests import IntegrationTestCase
 from frappe.utils import now_datetime
 
-IGNORE_TEST_RECORD_DEPENDENCIES = ["Company"]
+test_ignore = ["Company"]
 
 
-class TestFiscalYear(IntegrationTestCase):
+class TestFiscalYear(unittest.TestCase):
 	def test_extra_year(self):
 		if frappe.db.exists("Fiscal Year", "_Test Fiscal Year 2000"):
 			frappe.delete_doc("Fiscal Year", "_Test Fiscal Year 2000")
@@ -38,21 +39,8 @@ def test_record_generator():
 	]
 
 	start = 2012
-	this_year = now_datetime().year
 	end = now_datetime().year + 25
-	# The current year fails to load with the following error:
-	# Year start date or end date is overlapping with 2024. To avoid please set company
-	# This is a quick-fix: if current FY is needed, please refactor test data properly
-	for year in range(start, this_year):
-		test_records.append(
-			{
-				"doctype": "Fiscal Year",
-				"year": f"_Test Fiscal Year {year}",
-				"year_start_date": f"{year}-01-01",
-				"year_end_date": f"{year}-12-31",
-			}
-		)
-	for year in range(this_year + 1, end):
+	for year in range(start, end):
 		test_records.append(
 			{
 				"doctype": "Fiscal Year",

erpnext/accounts/doctype/gl_entry/gl_entry.json

@@ -6,50 +6,38 @@
  "document_type": "Document",
  "engine": "InnoDB",
  "field_order": [
-  "dates_section",
   "posting_date",
   "transaction_date",
-  "column_break_avko",
-  "fiscal_year",
-  "due_date",
-  "account_details_section",
   "account",
-  "account_currency",
-  "column_break_ifvf",
-  "against",
   "party_type",
   "party",
-  "transaction_details_section",
-  "voucher_type",
-  "voucher_no",
-  "voucher_subtype",
-  "transaction_currency",
-  "column_break_dpsx",
+  "cost_center",
+  "debit",
+  "credit",
+  "account_currency",
+  "debit_in_account_currency",
+  "credit_in_account_currency",
+  "against",
   "against_voucher_type",
   "against_voucher",
+  "voucher_type",
+  "voucher_subtype",
+  "voucher_no",
   "voucher_detail_no",
-  "transaction_exchange_rate",
-  "amounts_section",
-  "debit_in_account_currency",
-  "debit",
-  "debit_in_transaction_currency",
-  "column_break_bm1w",
-  "credit_in_account_currency",
-  "credit",
-  "credit_in_transaction_currency",
-  "dimensions_section",
-  "cost_center",
-  "column_break_lmnm",
   "project",
-  "more_info_section",
-  "finance_book",
-  "company",
+  "remarks",
   "is_opening",
   "is_advance",
-  "column_break_8abq",
+  "fiscal_year",
+  "company",
+  "finance_book",
   "to_rename",
+  "due_date",
   "is_cancelled",
-  "remarks"
+  "transaction_currency",
+  "debit_in_transaction_currency",
+  "credit_in_transaction_currency",
+  "transaction_exchange_rate"
  ],
  "fields": [
   {
@@ -297,67 +285,13 @@
    "fieldname": "voucher_subtype",
    "fieldtype": "Small Text",
    "label": "Voucher Subtype"
-  },
-  {
-   "fieldname": "dates_section",
-   "fieldtype": "Section Break",
-   "label": "Dates"
-  },
-  {
-   "fieldname": "column_break_avko",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "account_details_section",
-   "fieldtype": "Section Break",
-   "label": "Account Details"
-  },
-  {
-   "fieldname": "column_break_ifvf",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "transaction_details_section",
-   "fieldtype": "Section Break",
-   "label": "Transaction Details"
-  },
-  {
-   "fieldname": "amounts_section",
-   "fieldtype": "Section Break",
-   "label": "Amounts"
-  },
-  {
-   "fieldname": "column_break_dpsx",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "more_info_section",
-   "fieldtype": "Section Break",
-   "label": "More Info"
-  },
-  {
-   "fieldname": "column_break_bm1w",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "dimensions_section",
-   "fieldtype": "Section Break",
-   "label": "Dimensions"
-  },
-  {
-   "fieldname": "column_break_lmnm",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "column_break_8abq",
-   "fieldtype": "Column Break"
   }
  ],
  "icon": "fa fa-list",
  "idx": 1,
  "in_create": 1,
  "links": [],
- "modified": "2024-08-22 13:03:39.997475",
+ "modified": "2024-03-27 13:09:45.205364",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "GL Entry",

erpnext/accounts/doctype/gl_entry/gl_entry.py

@@ -430,9 +430,8 @@ def update_against_account(voucher_type, voucher_no):
 
 
 def on_doctype_update():
+	frappe.db.add_index("GL Entry", ["against_voucher_type", "against_voucher"])
 	frappe.db.add_index("GL Entry", ["voucher_type", "voucher_no"])
-	frappe.db.add_index("GL Entry", ["posting_date", "company"])
-	frappe.db.add_index("GL Entry", ["party_type", "party"])
 
 
 def rename_gle_sle_docs():

erpnext/accounts/doctype/gl_entry/test_gl_entry.py

@@ -1,16 +1,17 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+
+
 import unittest
 
 import frappe
 from frappe.model.naming import parse_naming_series
-from frappe.tests import IntegrationTestCase
 
 from erpnext.accounts.doctype.gl_entry.gl_entry import rename_gle_sle_docs
 from erpnext.accounts.doctype.journal_entry.test_journal_entry import make_journal_entry
 
 
-class TestGLEntry(IntegrationTestCase):
+class TestGLEntry(unittest.TestCase):
 	def test_round_off_entry(self):
 		frappe.db.set_value("Company", "_Test Company", "round_off_account", "_Test Write Off - _TC")
 		frappe.db.set_value("Company", "_Test Company", "round_off_cost_center", "_Test Cost Center - _TC")

erpnext/accounts/doctype/invoice_discounting/test_invoice_discounting.py

@@ -1,9 +1,9 @@
 # Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
+
 import unittest
 
 import frappe
-from frappe.tests import IntegrationTestCase
 from frappe.utils import add_days, flt, nowdate
 
 from erpnext.accounts.doctype.account.test_account import create_account
@@ -12,7 +12,7 @@ from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sal
 from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import get_gl_entries
 
 
-class TestInvoiceDiscounting(IntegrationTestCase):
+class TestInvoiceDiscounting(unittest.TestCase):
 	def setUp(self):
 		self.ar_credit = create_account(
 			account_name="_Test Accounts Receivable Credit",

erpnext/accounts/doctype/item_tax_template/test_item_tax_template.py

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

erpnext/accounts/doctype/item_tax_template/test_records.json

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

erpnext/accounts/doctype/item_tax_template/test_records.toml

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

@@ -360,23 +360,21 @@ erpnext.accounts.JournalEntry = class JournalEntry extends frappe.ui.form.Contro
 
 	accounts_add(doc, cdt, cdn) {
 		var row = frappe.get_doc(cdt, cdn);
-		row.exchange_rate = 1;
 		$.each(doc.accounts, function (i, d) {
 			if (d.account && d.party && d.party_type) {
 				row.account = d.account;
 				row.party = d.party;
 				row.party_type = d.party_type;
-				row.exchange_rate = d.exchange_rate;
 			}
 		});
 
 		// set difference
 		if (doc.difference) {
 			if (doc.difference > 0) {
-				row.credit_in_account_currency = doc.difference / row.exchange_rate;
+				row.credit_in_account_currency = doc.difference;
 				row.credit = doc.difference;
 			} else {
-				row.debit_in_account_currency = -doc.difference / row.exchange_rate;
+				row.debit_in_account_currency = -doc.difference;
 				row.debit = -doc.difference;
 			}
 		}
@@ -682,7 +680,6 @@ $.extend(erpnext.journal_entry, {
 				callback: function (r) {
 					if (r.message) {
 						$.extend(d, r.message);
-						erpnext.journal_entry.set_amount_on_last_row(frm, dt, dn);
 						erpnext.journal_entry.set_debit_credit_in_company_currency(frm, dt, dn);
 						refresh_field("accounts");
 					}
@@ -690,26 +687,4 @@ $.extend(erpnext.journal_entry, {
 			});
 		}
 	},
-	set_amount_on_last_row: function (frm, dt, dn) {
-		let row = locals[dt][dn];
-		let length = frm.doc.accounts.length;
-		if (row.idx != length) return;
-
-		let difference = frm.doc.accounts.reduce((total, row) => {
-			if (row.idx == length) return total;
-
-			return total + row.debit - row.credit;
-		}, 0);
-
-		if (difference) {
-			if (difference > 0) {
-				row.credit_in_account_currency = difference / row.exchange_rate;
-				row.credit = difference;
-			} else {
-				row.debit_in_account_currency = -difference / row.exchange_rate;
-				row.debit = -difference;
-			}
-		}
-		refresh_field("accounts");
-	},
 });

erpnext/accounts/doctype/journal_entry/journal_entry.py

@@ -188,7 +188,6 @@ class JournalEntry(AccountsController):
 		self.validate_cheque_info()
 		self.check_credit_limit()
 		self.make_gl_entries()
-		self.make_advance_payment_ledger_entries()
 		self.update_advance_paid()
 		self.update_asset_value()
 		self.update_inter_company_jv()
@@ -196,11 +195,6 @@ class JournalEntry(AccountsController):
 		self.update_booked_depreciation()
 
 	def on_update_after_submit(self):
-		# Flag will be set on Reconciliation
-		# Reconciliation tool will anyways repost ledger entries. So, no need to check and do implicit repost.
-		if self.flags.get("ignore_reposting_on_reconciliation"):
-			return
-
 		self.needs_repost = self.check_if_fields_updated(fields_to_check=[], child_tables={"accounts": []})
 		if self.needs_repost:
 			self.validate_for_repost()
@@ -219,10 +213,8 @@ class JournalEntry(AccountsController):
 			"Repost Accounting Ledger Items",
 			"Unreconcile Payment",
 			"Unreconcile Payment Entries",
-			"Advance Payment Ledger Entry",
 		)
 		self.make_gl_entries(1)
-		self.make_advance_payment_ledger_entries()
 		self.update_advance_paid()
 		self.unlink_advance_entry_reference()
 		self.unlink_asset_reference()
@@ -265,7 +257,7 @@ class JournalEntry(AccountsController):
 			frappe.throw(_("Journal Entry type should be set as Depreciation Entry for asset depreciation"))
 
 	def validate_stock_accounts(self):
-		stock_accounts = get_stock_accounts(self.company, accounts=self.accounts)
+		stock_accounts = get_stock_accounts(self.company, self.doctype, self.name)
 		for account in stock_accounts:
 			account_bal, stock_bal, warehouse_list = get_stock_and_account_balance(
 				account, self.posting_date, self.company
@@ -1676,8 +1668,6 @@ def make_reverse_journal_entry(source_name, target_doc=None):
 					"debit": "credit",
 					"credit_in_account_currency": "debit_in_account_currency",
 					"credit": "debit",
-					"reference_type": "reference_type",
-					"reference_name": "reference_name",
 				},
 			},
 		},

erpnext/accounts/doctype/journal_entry/test_journal_entry.py

@@ -1,8 +1,11 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
 
+
+import unittest
+
 import frappe
-from frappe.tests import IntegrationTestCase, UnitTestCase
+from frappe.tests.utils import change_settings
 from frappe.utils import flt, nowdate
 
 from erpnext.accounts.doctype.account.test_account import get_inventory_account
@@ -10,36 +13,25 @@ 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}
-	)
+class TestJournalEntry(unittest.TestCase):
+	@change_settings("Accounts Settings", {"unlink_payment_on_cancellation_of_invoice": 1})
 	def test_journal_entry_with_against_jv(self):
-		jv_invoice = frappe.copy_doc(self.globalTestRecords["Journal Entry"][2])
-		base_jv = frappe.copy_doc(self.globalTestRecords["Journal Entry"][0])
+		jv_invoice = frappe.copy_doc(test_records[2])
+		base_jv = frappe.copy_doc(test_records[0])
 		self.jv_against_voucher_testcase(base_jv, jv_invoice)
 
 	def test_jv_against_sales_order(self):
 		from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
 
 		sales_order = make_sales_order(do_not_save=True)
-		base_jv = frappe.copy_doc(self.globalTestRecords["Journal Entry"][0])
+		base_jv = frappe.copy_doc(test_records[0])
 		self.jv_against_voucher_testcase(base_jv, sales_order)
 
 	def test_jv_against_purchase_order(self):
 		from erpnext.buying.doctype.purchase_order.test_purchase_order import create_purchase_order
 
 		purchase_order = create_purchase_order(do_not_save=True)
-		base_jv = frappe.copy_doc(self.globalTestRecords["Journal Entry"][1])
+		base_jv = frappe.copy_doc(test_records[1])
 		self.jv_against_voucher_testcase(base_jv, purchase_order)
 
 	def jv_against_voucher_testcase(self, base_jv, test_voucher):
@@ -523,72 +515,6 @@ class TestJournalEntry(IntegrationTestCase):
 				self.assertEqual(row.debit_in_account_currency, 100)
 				self.assertEqual(row.credit_in_account_currency, 100)
 
-	def test_toggle_debit_credit_if_negative(self):
-		from erpnext.accounts.general_ledger import process_gl_map
-
-		# Create JV with defaut cost center - _Test Cost Center
-		frappe.db.set_single_value("Accounts Settings", "merge_similar_account_heads", 0)
-
-		jv = frappe.new_doc("Journal Entry")
-		jv.posting_date = nowdate()
-		jv.company = "_Test Company"
-		jv.user_remark = "test"
-		jv.extend(
-			"accounts",
-			[
-				{
-					"account": "_Test Cash - _TC",
-					"debit": 100 * -1,
-					"debit_in_account_currency": 100 * -1,
-					"exchange_rate": 1,
-				},
-				{
-					"account": "_Test Bank - _TC",
-					"credit": 100 * -1,
-					"credit_in_account_currency": 100 * -1,
-					"exchange_rate": 1,
-				},
-			],
-		)
-
-		jv.flags.ignore_validate = True
-		jv.save()
-
-		self.assertEqual(len(jv.accounts), 2)
-
-		gl_map = jv.build_gl_map()
-
-		for row in gl_map:
-			if row.account == "_Test Cash - _TC":
-				self.assertEqual(row.debit, 100 * -1)
-				self.assertEqual(row.debit_in_account_currency, 100 * -1)
-				self.assertEqual(row.debit_in_transaction_currency, 100 * -1)
-
-		gl_map = process_gl_map(gl_map, False)
-
-		for row in gl_map:
-			if row.account == "_Test Cash - _TC":
-				self.assertEqual(row.credit, 100)
-				self.assertEqual(row.credit_in_account_currency, 100)
-				self.assertEqual(row.credit_in_transaction_currency, 100)
-
-	def test_transaction_exchange_rate_on_journals(self):
-		jv = make_journal_entry("_Test Bank - _TC", "_Test Receivable USD - _TC", 100, save=False)
-		jv.accounts[0].update({"debit_in_account_currency": 8500, "exchange_rate": 1})
-		jv.accounts[1].update({"party_type": "Customer", "party": "_Test Customer USD", "exchange_rate": 85})
-		jv.submit()
-		actual = frappe.db.get_all(
-			"GL Entry",
-			filters={"voucher_no": jv.name, "is_cancelled": 0},
-			fields=["account", "transaction_exchange_rate"],
-			order_by="account",
-		)
-		expected = [
-			{"account": "_Test Bank - _TC", "transaction_exchange_rate": 1.0},
-			{"account": "_Test Receivable USD - _TC", "transaction_exchange_rate": 85.0},
-		]
-		self.assertEqual(expected, actual)
-
 
 def make_journal_entry(
 	account1,
@@ -637,3 +563,6 @@ def make_journal_entry(
 			jv.submit()
 
 	return jv
+
+
+test_records = frappe.get_test_records("Journal Entry")

erpnext/accounts/doctype/journal_entry/test_records.json

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

@@ -1,81 +0,0 @@
-[["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/journal_entry_template/test_journal_entry_template.py

@@ -1,10 +1,9 @@
 # Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
+
 # import frappe
 import unittest
 
-from frappe.tests import IntegrationTestCase
 
-
-class TestJournalEntryTemplate(IntegrationTestCase):
+class TestJournalEntryTemplate(unittest.TestCase):
 	pass

erpnext/accounts/doctype/ledger_health/test_ledger_health.py

@@ -3,14 +3,14 @@
 
 import frappe
 from frappe import qb
-from frappe.tests import IntegrationTestCase
+from frappe.tests.utils import FrappeTestCase
 from frappe.utils import nowdate
 
 from erpnext.accounts.test.accounts_mixin import AccountsTestMixin
 from erpnext.accounts.utils import run_ledger_health_checks
 
 
-class TestLedgerHealth(AccountsTestMixin, IntegrationTestCase):
+class TestLedgerHealth(AccountsTestMixin, FrappeTestCase):
 	def setUp(self):
 		self.create_company()
 		self.create_customer()

erpnext/accounts/doctype/ledger_health_monitor/test_ledger_health_monitor.py

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

erpnext/accounts/doctype/ledger_merge/test_ledger_merge.py

@@ -1,14 +1,14 @@
 # Copyright (c) 2021, Wahni Green Technologies Pvt. Ltd. and Contributors
 # See license.txt
+
 import unittest
 
 import frappe
-from frappe.tests import IntegrationTestCase
 
 from erpnext.accounts.doctype.ledger_merge.ledger_merge import start_merge
 
 
-class TestLedgerMerge(IntegrationTestCase):
+class TestLedgerMerge(unittest.TestCase):
 	def test_merge_success(self):
 		if not frappe.db.exists("Account", "Indirect Expenses - _TC"):
 			acc = frappe.new_doc("Account")

erpnext/accounts/doctype/loyalty_point_entry/test_loyalty_point_entry.py

@@ -1,19 +1,18 @@
 # Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
+
 import unittest
 
 import frappe
-from frappe.tests import IntegrationTestCase
 from frappe.utils import today
 
 from erpnext.accounts.doctype.loyalty_program.test_loyalty_program import create_records
 from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
 
 
-class TestLoyaltyPointEntry(IntegrationTestCase):
+class TestLoyaltyPointEntry(unittest.TestCase):
 	@classmethod
 	def setUpClass(cls):
-		super().setUpClass()
 		# Create test records
 		create_records()
 		cls.loyalty_program_name = "Test Single Loyalty"

erpnext/accounts/doctype/loyalty_program/test_loyalty_program.py

@@ -1,9 +1,9 @@
 # Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
+
 import unittest
 
 import frappe
-from frappe.tests import IntegrationTestCase
 from frappe.utils import cint, flt, getdate, today
 
 from erpnext.accounts.doctype.loyalty_program.loyalty_program import (
@@ -13,10 +13,9 @@ from erpnext.accounts.doctype.loyalty_program.loyalty_program import (
 from erpnext.accounts.party import get_dashboard_info
 
 
-class TestLoyaltyProgram(IntegrationTestCase):
+class TestLoyaltyProgram(unittest.TestCase):
 	@classmethod
-	def setUpClass(cls):
-		super().setUpClass()
+	def setUpClass(self):
 		# create relevant item, customer, loyalty program, etc
 		create_records()
 

erpnext/accounts/doctype/mode_of_payment/test_mode_of_payment.py

@@ -1,9 +1,10 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
+
 import unittest
 
-from frappe.tests import IntegrationTestCase
+# test_records = frappe.get_test_records('Mode of Payment')
 
 
-class TestModeofPayment(IntegrationTestCase):
+class TestModeofPayment(unittest.TestCase):
 	pass

erpnext/accounts/doctype/monthly_distribution/test_monthly_distribution.py

@@ -1,10 +1,13 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors and Contributors
 # See license.txt
+
+
 import unittest
 
 import frappe
-from frappe.tests import IntegrationTestCase
+
+test_records = frappe.get_test_records("Monthly Distribution")
 
 
-class TestMonthlyDistribution(IntegrationTestCase):
+class TestMonthlyDistribution(unittest.TestCase):
 	pass

erpnext/accounts/doctype/monthly_distribution/test_records.json

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

erpnext/accounts/doctype/monthly_distribution/test_records.toml

@@ -1,52 +0,0 @@
-[["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.js

@@ -28,12 +28,7 @@ frappe.ui.form.on("Opening Invoice Creation Tool", {
 						frm.refresh_fields();
 						frm.page.clear_indicator();
 						frm.dashboard.hide_progress();
-
-						if (frm.doc.invoice_type == "Sales") {
-							frappe.msgprint(__("Opening Sales Invoices have been created."));
-						} else {
-							frappe.msgprint(__("Opening Purchase Invoices have been created."));
-						}
+						frappe.msgprint(__("Opening {0} Invoices created", [frm.doc.invoice_type]));
 					},
 					1500,
 					data.title
@@ -53,19 +48,12 @@ frappe.ui.form.on("Opening Invoice Creation Tool", {
 		!frm.doc.import_in_progress && frm.trigger("make_dashboard");
 		frm.page.set_primary_action(__("Create Invoices"), () => {
 			let btn_primary = frm.page.btn_primary.get(0);
-			let freeze_message;
-			if (frm.doc.invoice_type == "Sales") {
-				freeze_message = __("Creating Sales Invoices ...");
-			} else {
-				freeze_message = __("Creating Purchase Invoices ...");
-			}
-
 			return frm.call({
 				doc: frm.doc,
 				btn: $(btn_primary),
 				method: "make_invoices",
 				freeze: 1,
-				freeze_message: freeze_message,
+				freeze_message: __("Creating {0} Invoice", [frm.doc.invoice_type]),
 			});
 		});
 

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, UnitTestCase
+from frappe.tests.utils import FrappeTestCase
 
 from erpnext.accounts.doctype.accounting_dimension.test_accounting_dimension import (
 	create_dimension,
@@ -12,21 +12,12 @@ from erpnext.accounts.doctype.opening_invoice_creation_tool.opening_invoice_crea
 	get_temporary_opening_account,
 )
 
-EXTRA_TEST_RECORD_DEPENDENCIES = ["Customer", "Supplier", "Accounting Dimension"]
+test_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):
+class TestOpeningInvoiceCreationTool(FrappeTestCase):
 	@classmethod
-	def setUpClass(cls):
+	def setUpClass(self):
 		if not frappe.db.exists("Company", "_Test Opening Invoice Company"):
 			make_company()
 		create_dimension()

erpnext/accounts/doctype/party_link/test_party_link.py

@@ -1,10 +1,9 @@
 # Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
+
 # import frappe
 import unittest
 
-from frappe.tests import IntegrationTestCase
 
-
-class TestPartyLink(IntegrationTestCase):
+class TestPartyLink(unittest.TestCase):
 	pass

erpnext/accounts/doctype/payment_entry/payment_entry.js

@@ -26,10 +26,6 @@ frappe.ui.form.on("Payment Entry", {
 		}
 
 		erpnext.accounts.dimensions.setup_dimension_filters(frm, frm.doctype);
-
-		if (frm.is_new()) {
-			set_default_party_type(frm);
-		}
 	},
 
 	setup: function (frm) {
@@ -178,21 +174,6 @@ frappe.ui.form.on("Payment Entry", {
 			};
 		});
 
-		frm.set_query("payment_request", "references", function (doc, cdt, cdn) {
-			const row = frappe.get_doc(cdt, cdn);
-			return {
-				query: "erpnext.accounts.doctype.payment_request.payment_request.get_open_payment_requests_query",
-				filters: {
-					reference_doctype: row.reference_doctype,
-					reference_name: row.reference_name,
-					company: doc.company,
-					status: ["!=", "Paid"],
-					outstanding_amount: [">", 0], // for compatibility with old data
-					docstatus: 1,
-				},
-			};
-		});
-
 		frm.set_query("sales_taxes_and_charges_template", function () {
 			return {
 				filters: {
@@ -210,15 +191,7 @@ frappe.ui.form.on("Payment Entry", {
 				},
 			};
 		});
-
-		frm.add_fetch(
-			"payment_request",
-			"outstanding_amount",
-			"payment_request_outstanding",
-			"Payment Entry Reference"
-		);
 	},
-
 	refresh: function (frm) {
 		erpnext.hide_company(frm);
 		frm.events.hide_unhide_fields(frm);
@@ -243,7 +216,6 @@ frappe.ui.form.on("Payment Entry", {
 			);
 		}
 		erpnext.accounts.unreconcile_payment.add_unreconcile_btn(frm);
-		frappe.flags.allocate_payment_amount = true;
 	},
 
 	validate_company: (frm) => {
@@ -411,19 +383,9 @@ frappe.ui.form.on("Payment Entry", {
 	},
 
 	payment_type: function (frm) {
-		set_default_party_type(frm);
-
 		if (frm.doc.payment_type == "Internal Transfer") {
 			$.each(
-				[
-					"party",
-					"party_type",
-					"party_balance",
-					"paid_from",
-					"paid_to",
-					"references",
-					"total_allocated_amount",
-				],
+				["party", "party_balance", "paid_from", "paid_to", "references", "total_allocated_amount"],
 				function (i, field) {
 					frm.set_value(field, null);
 				}
@@ -827,7 +789,7 @@ frappe.ui.form.on("Payment Entry", {
 		);
 
 		if (frm.doc.payment_type == "Pay")
-			frm.events.allocate_party_amount_against_ref_docs(frm, frm.doc.received_amount, true);
+			frm.events.allocate_party_amount_against_ref_docs(frm, frm.doc.received_amount, 1);
 		else frm.events.set_unallocated_amount(frm);
 
 		frm.set_paid_amount_based_on_received_amount = false;
@@ -848,7 +810,7 @@ frappe.ui.form.on("Payment Entry", {
 		}
 
 		if (frm.doc.payment_type == "Receive")
-			frm.events.allocate_party_amount_against_ref_docs(frm, frm.doc.paid_amount, true);
+			frm.events.allocate_party_amount_against_ref_docs(frm, frm.doc.paid_amount, 1);
 		else frm.events.set_unallocated_amount(frm);
 	},
 
@@ -1019,7 +981,6 @@ frappe.ui.form.on("Payment Entry", {
 						c.outstanding_amount = d.outstanding_amount;
 						c.bill_no = d.bill_no;
 						c.payment_term = d.payment_term;
-						c.payment_term_outstanding = d.payment_term_outstanding;
 						c.allocated_amount = d.allocated_amount;
 						c.account = d.account;
 
@@ -1069,8 +1030,7 @@ frappe.ui.form.on("Payment Entry", {
 
 				frm.events.allocate_party_amount_against_ref_docs(
 					frm,
-					frm.doc.payment_type == "Receive" ? frm.doc.paid_amount : frm.doc.received_amount,
-					false
+					frm.doc.payment_type == "Receive" ? frm.doc.paid_amount : frm.doc.received_amount
 				);
 			},
 		});
@@ -1084,13 +1044,93 @@ frappe.ui.form.on("Payment Entry", {
 		return ["Sales Invoice", "Purchase Invoice"];
 	},
 
-	allocate_party_amount_against_ref_docs: async function (frm, paid_amount, paid_amount_change) {
-		await frm.call("allocate_amount_to_references", {
-			paid_amount: paid_amount,
-			paid_amount_change: paid_amount_change,
-			allocate_payment_amount: frappe.flags.allocate_payment_amount ?? false,
+	allocate_party_amount_against_ref_docs: function (frm, paid_amount, paid_amount_change) {
+		var total_positive_outstanding_including_order = 0;
+		var total_negative_outstanding = 0;
+		var total_deductions = frappe.utils.sum(
+			$.map(frm.doc.deductions || [], function (d) {
+				return flt(d.amount);
+			})
+		);
+
+		paid_amount -= total_deductions;
+
+		$.each(frm.doc.references || [], function (i, row) {
+			if (flt(row.outstanding_amount) > 0)
+				total_positive_outstanding_including_order += flt(row.outstanding_amount);
+			else total_negative_outstanding += Math.abs(flt(row.outstanding_amount));
 		});
 
+		var allocated_negative_outstanding = 0;
+		if (
+			(frm.doc.payment_type == "Receive" && frm.doc.party_type == "Customer") ||
+			(frm.doc.payment_type == "Pay" && frm.doc.party_type == "Supplier") ||
+			(frm.doc.payment_type == "Pay" && frm.doc.party_type == "Employee")
+		) {
+			if (total_positive_outstanding_including_order > paid_amount) {
+				var remaining_outstanding = total_positive_outstanding_including_order - paid_amount;
+				allocated_negative_outstanding =
+					total_negative_outstanding < remaining_outstanding
+						? total_negative_outstanding
+						: remaining_outstanding;
+			}
+
+			var allocated_positive_outstanding = paid_amount + allocated_negative_outstanding;
+		} else if (["Customer", "Supplier"].includes(frm.doc.party_type)) {
+			total_negative_outstanding = flt(total_negative_outstanding, precision("outstanding_amount"));
+			if (paid_amount > total_negative_outstanding) {
+				if (total_negative_outstanding == 0) {
+					frappe.msgprint(
+						__("Cannot {0} {1} {2} without any negative outstanding invoice", [
+							frm.doc.payment_type,
+							frm.doc.party_type == "Customer" ? "to" : "from",
+							frm.doc.party_type,
+						])
+					);
+					return false;
+				} else {
+					frappe.msgprint(
+						__("Paid Amount cannot be greater than total negative outstanding amount {0}", [
+							total_negative_outstanding,
+						])
+					);
+					return false;
+				}
+			} else {
+				allocated_positive_outstanding = total_negative_outstanding - paid_amount;
+				allocated_negative_outstanding =
+					paid_amount +
+					(total_positive_outstanding_including_order < allocated_positive_outstanding
+						? total_positive_outstanding_including_order
+						: allocated_positive_outstanding);
+			}
+		}
+
+		$.each(frm.doc.references || [], function (i, row) {
+			if (frappe.flags.allocate_payment_amount == 0) {
+				//If allocate payment amount checkbox is unchecked, set zero to allocate amount
+				row.allocated_amount = 0;
+			} else if (
+				frappe.flags.allocate_payment_amount != 0 &&
+				(!row.allocated_amount || paid_amount_change)
+			) {
+				if (row.outstanding_amount > 0 && allocated_positive_outstanding >= 0) {
+					row.allocated_amount =
+						row.outstanding_amount >= allocated_positive_outstanding
+							? allocated_positive_outstanding
+							: row.outstanding_amount;
+					allocated_positive_outstanding -= flt(row.allocated_amount);
+				} else if (row.outstanding_amount < 0 && allocated_negative_outstanding) {
+					row.allocated_amount =
+						Math.abs(row.outstanding_amount) >= allocated_negative_outstanding
+							? -1 * allocated_negative_outstanding
+							: row.outstanding_amount;
+					allocated_negative_outstanding -= Math.abs(flt(row.allocated_amount));
+				}
+			}
+		});
+
+		frm.refresh_fields();
 		frm.events.set_total_allocated_amount(frm);
 	},
 
@@ -1638,62 +1678,6 @@ frappe.ui.form.on("Payment Entry", {
 
 		return current_tax_amount;
 	},
-
-	cost_center: function (frm) {
-		if (frm.doc.posting_date && (frm.doc.paid_from || frm.doc.paid_to)) {
-			return frappe.call({
-				method: "erpnext.accounts.doctype.payment_entry.payment_entry.get_party_and_account_balance",
-				args: {
-					company: frm.doc.company,
-					date: frm.doc.posting_date,
-					paid_from: frm.doc.paid_from,
-					paid_to: frm.doc.paid_to,
-					ptype: frm.doc.party_type,
-					pty: frm.doc.party,
-					cost_center: frm.doc.cost_center,
-				},
-				callback: function (r, rt) {
-					if (r.message) {
-						frappe.run_serially([
-							() => {
-								frm.set_value(
-									"paid_from_account_balance",
-									r.message.paid_from_account_balance
-								);
-								frm.set_value("paid_to_account_balance", r.message.paid_to_account_balance);
-								frm.set_value("party_balance", r.message.party_balance);
-							},
-						]);
-					}
-				},
-			});
-		}
-	},
-
-	after_save: function (frm) {
-		const { matched_payment_requests } = frappe.last_response;
-		if (!matched_payment_requests) return;
-
-		const COLUMN_LABEL = [
-			[__("Reference DocType"), __("Reference Name"), __("Allocated Amount"), __("Payment Request")],
-		];
-
-		frappe.msgprint({
-			title: __("Unset Matched Payment Request"),
-			message: COLUMN_LABEL.concat(matched_payment_requests),
-			as_table: true,
-			wide: true,
-			primary_action: {
-				label: __("Allocate Payment Request"),
-				action() {
-					frappe.hide_msgprint();
-					frm.call("set_matched_payment_requests", { matched_payment_requests }, () => {
-						frm.dirty();
-					});
-				},
-			},
-		});
-	},
 });
 
 frappe.ui.form.on("Payment Entry Reference", {
@@ -1786,16 +1770,35 @@ frappe.ui.form.on("Payment Entry Deduction", {
 		frm.events.set_unallocated_amount(frm);
 	},
 });
-
-function set_default_party_type(frm) {
-	if (frm.doc.party) return;
-
-	let party_type;
-	if (frm.doc.payment_type == "Receive") {
-		party_type = "Customer";
-	} else if (frm.doc.payment_type == "Pay") {
-		party_type = "Supplier";
-	}
-
-	if (party_type) frm.set_value("party_type", party_type);
-}
+frappe.ui.form.on("Payment Entry", {
+	cost_center: function (frm) {
+		if (frm.doc.posting_date && (frm.doc.paid_from || frm.doc.paid_to)) {
+			return frappe.call({
+				method: "erpnext.accounts.doctype.payment_entry.payment_entry.get_party_and_account_balance",
+				args: {
+					company: frm.doc.company,
+					date: frm.doc.posting_date,
+					paid_from: frm.doc.paid_from,
+					paid_to: frm.doc.paid_to,
+					ptype: frm.doc.party_type,
+					pty: frm.doc.party,
+					cost_center: frm.doc.cost_center,
+				},
+				callback: function (r, rt) {
+					if (r.message) {
+						frappe.run_serially([
+							() => {
+								frm.set_value(
+									"paid_from_account_balance",
+									r.message.paid_from_account_balance
+								);
+								frm.set_value("paid_to_account_balance", r.message.paid_to_account_balance);
+								frm.set_value("party_balance", r.message.party_balance);
+							},
+						]);
+					}
+				},
+			});
+		}
+	},
+});

erpnext/accounts/doctype/payment_entry/payment_entry.py

@@ -7,10 +7,8 @@ from functools import reduce
 
 import frappe
 from frappe import ValidationError, _, qb, scrub, throw
-from frappe.query_builder import Tuple
-from frappe.query_builder.functions import Count
 from frappe.utils import cint, comma_or, flt, getdate, nowdate
-from frappe.utils.data import comma_and, fmt_money, get_link_to_form
+from frappe.utils.data import comma_and, fmt_money
 from pypika import Case
 from pypika.functions import Coalesce, Sum
 
@@ -182,18 +180,14 @@ class PaymentEntry(AccountsController):
 		self.set_status()
 		self.set_total_in_words()
 
-	def before_save(self):
-		self.set_matched_unset_payment_requests_to_response()
-
 	def on_submit(self):
 		if self.difference_amount:
 			frappe.throw(_("Difference Amount must be zero"))
 		self.make_gl_entries()
 		self.update_outstanding_amounts()
+		self.update_advance_paid()
 		self.update_payment_schedule()
-		self.update_payment_requests()
-		self.make_advance_payment_ledger_entries()
-		self.update_advance_paid()  # advance_paid_status depends on the payment request amount
+		self.set_payment_req_status()
 		self.set_status()
 
 	def set_liability_account(self):
@@ -234,21 +228,9 @@ class PaymentEntry(AccountsController):
 				self.is_opening = "No"
 				return
 
-		accounts = get_party_account(self.party_type, self.party, self.company, include_advance=True)
-
-		liability_account = accounts[1] if len(accounts) > 1 else None
-		fieldname = (
-			"default_advance_received_account"
-			if self.party_type == "Customer"
-			else "default_advance_paid_account"
-		)
-
-		if not liability_account:
-			throw(
-				_("Please set default {0} in Company {1}").format(
-					frappe.bold(frappe.get_meta("Company").get_label(fieldname)), frappe.bold(self.company)
-				)
-			)
+		liability_account = get_party_account(
+			self.party_type, self.party, self.company, include_advance=True
+		)[1]
 
 		self.set(self.party_account_field, liability_account)
 
@@ -273,40 +255,34 @@ class PaymentEntry(AccountsController):
 			"Repost Accounting Ledger Items",
 			"Unreconcile Payment",
 			"Unreconcile Payment Entries",
-			"Advance Payment Ledger Entry",
 		)
 		super().on_cancel()
 		self.make_gl_entries(cancel=1)
 		self.update_outstanding_amounts()
+		self.update_advance_paid()
 		self.delink_advance_entry_references()
 		self.update_payment_schedule(cancel=1)
-		self.update_payment_requests(cancel=True)
-		self.make_advance_payment_ledger_entries()
-		self.update_advance_paid()  # advance_paid_status depends on the payment request amount
+		self.set_payment_req_status()
 		self.set_status()
 
-	def update_payment_requests(self, cancel=False):
-		from erpnext.accounts.doctype.payment_request.payment_request import (
-			update_payment_requests_as_per_pe_references,
-		)
+	def set_payment_req_status(self):
+		from erpnext.accounts.doctype.payment_request.payment_request import update_payment_req_status
 
-		update_payment_requests_as_per_pe_references(self.references, cancel=cancel)
+		update_payment_req_status(self, None)
 
 	def update_outstanding_amounts(self):
 		self.set_missing_ref_details(force=True)
 
 	def validate_duplicate_entry(self):
-		reference_names = set()
+		reference_names = []
 		for d in self.get("references"):
-			key = (d.reference_doctype, d.reference_name, d.payment_term, d.payment_request)
-			if key in reference_names:
+			if (d.reference_doctype, d.reference_name, d.payment_term) in reference_names:
 				frappe.throw(
 					_("Row #{0}: Duplicate entry in References {1} {2}").format(
 						d.idx, d.reference_doctype, d.reference_name
 					)
 				)
-
-			reference_names.add(key)
+			reference_names.append((d.reference_doctype, d.reference_name, d.payment_term))
 
 	def set_bank_account_data(self):
 		if self.bank_account:
@@ -332,8 +308,6 @@ class PaymentEntry(AccountsController):
 		if self.payment_type == "Internal Transfer":
 			return
 
-		self.validate_allocated_amount_as_per_payment_request()
-
 		if self.party_type in ("Customer", "Supplier"):
 			self.validate_allocated_amount_with_latest_data()
 		else:
@@ -346,27 +320,6 @@ class PaymentEntry(AccountsController):
 				if flt(d.allocated_amount) < 0 and flt(d.allocated_amount) < flt(d.outstanding_amount):
 					frappe.throw(fail_message.format(d.idx))
 
-	def validate_allocated_amount_as_per_payment_request(self):
-		"""
-		Allocated amount should not be greater than the outstanding amount of the Payment Request.
-		"""
-		if not self.references:
-			return
-
-		pr_outstanding_amounts = get_payment_request_outstanding_set_in_references(self.references)
-
-		if not pr_outstanding_amounts:
-			return
-
-		for ref in self.references:
-			if ref.payment_request and ref.allocated_amount > pr_outstanding_amounts[ref.payment_request]:
-				frappe.throw(
-					msg=_(
-						"Row #{0}: Allocated Amount cannot be greater than Outstanding Amount of Payment Request {1}"
-					).format(ref.idx, get_link_to_form("Payment Request", ref.payment_request)),
-					title=_("Invalid Allocated Amount"),
-				)
-
 	def term_based_allocation_enabled_for_reference(
 		self, reference_doctype: str, reference_name: str
 	) -> bool:
@@ -571,10 +524,7 @@ class PaymentEntry(AccountsController):
 						continue
 
 					if field == "exchange_rate" or not d.get(field) or force:
-						if self.get("_action") in ("submit", "cancel"):
-							d.db_set(field, value)
-						else:
-							d.set(field, value)
+						d.db_set(field, value)
 
 	def validate_payment_type(self):
 		if self.payment_type not in ("Receive", "Pay", "Internal Transfer"):
@@ -1243,12 +1193,6 @@ class PaymentEntry(AccountsController):
 		if self.payment_type in ("Receive", "Pay") and not self.get("party_account_field"):
 			self.setup_party_account_field()
 
-		company_currency = erpnext.get_company_currency(self.company)
-		if self.paid_from_account_currency != company_currency:
-			self.currency = self.paid_from_account_currency
-		elif self.paid_to_account_currency != company_currency:
-			self.currency = self.paid_to_account_currency
-
 		gl_entries = []
 		self.add_party_gl_entries(gl_entries)
 		self.add_bank_gl_entries(gl_entries)
@@ -1272,10 +1216,6 @@ class PaymentEntry(AccountsController):
 		if not self.party_account:
 			return
 
-		advance_payment_doctypes = frappe.get_hooks("advance_payment_receivable_doctypes") + frappe.get_hooks(
-			"advance_payment_payable_doctypes"
-		)
-
 		if self.payment_type == "Receive":
 			against_account = self.paid_to
 		else:
@@ -1321,30 +1261,11 @@ class PaymentEntry(AccountsController):
 				{
 					dr_or_cr: allocated_amount_in_company_currency,
 					dr_or_cr + "_in_account_currency": d.allocated_amount,
+					"against_voucher_type": d.reference_doctype,
+					"against_voucher": d.reference_name,
 					"cost_center": cost_center,
 				}
 			)
-
-			if self.book_advance_payments_in_separate_party_account:
-				if d.reference_doctype in advance_payment_doctypes:
-					# Upon reconciliation, whole ledger will be reposted. So, reference to SO/PO is fine
-					gle.update(
-						{
-							"against_voucher_type": d.reference_doctype,
-							"against_voucher": d.reference_name,
-						}
-					)
-				else:
-					# Do not reference Invoices while Advance is in separate party account
-					gle.update({"against_voucher_type": self.doctype, "against_voucher": self.name})
-			else:
-				gle.update(
-					{
-						"against_voucher_type": d.reference_doctype,
-						"against_voucher": d.reference_name,
-					}
-				)
-
 			gl_entries.append(gle)
 
 		if self.unallocated_amount:
@@ -1353,22 +1274,13 @@ class PaymentEntry(AccountsController):
 			base_unallocated_amount = self.unallocated_amount * exchange_rate
 
 			gle = party_gl_dict.copy()
-
 			gle.update(
-				self.get_gl_dict(
-					{
-						"account": self.party_account,
-						"party_type": self.party_type,
-						"party": self.party,
-						"against": against_account,
-						"account_currency": self.party_account_currency,
-						"cost_center": self.cost_center,
-						dr_or_cr + "_in_account_currency": self.unallocated_amount,
-						dr_or_cr: base_unallocated_amount,
-					},
-					item=self,
-				)
+				{
+					dr_or_cr + "_in_account_currency": self.unallocated_amount,
+					dr_or_cr: base_unallocated_amount,
+				}
 			)
+
 			if self.book_advance_payments_in_separate_party_account:
 				gle.update(
 					{
@@ -1780,380 +1692,6 @@ class PaymentEntry(AccountsController):
 
 		return current_tax_fraction
 
-	def set_matched_unset_payment_requests_to_response(self):
-		"""
-		Find matched Payment Requests for those references which have no Payment Request set.\n
-		And set to `frappe.response` to show in the frontend for allocation.
-		"""
-		if not self.references:
-			return
-
-		matched_payment_requests = get_matched_payment_request_of_references(
-			[row for row in self.references if not row.payment_request]
-		)
-
-		if not matched_payment_requests:
-			return
-
-		frappe.response["matched_payment_requests"] = matched_payment_requests
-
-	@frappe.whitelist()
-	def allocate_amount_to_references(self, paid_amount, paid_amount_change, allocate_payment_amount):
-		"""
-		Allocate `Allocated Amount` and `Payment Request` against `Reference` based on `Paid Amount` and `Outstanding Amount`.\n
-		:param paid_amount: Paid Amount / Received Amount.
-		:param paid_amount_change: Flag to check if `Paid Amount` is changed or not.
-		:param allocate_payment_amount: Flag to allocate amount or not. (Payment Request is also dependent on this flag)
-		"""
-		if not self.references:
-			return
-
-		if not allocate_payment_amount:
-			for ref in self.references:
-				ref.allocated_amount = 0
-			return
-
-		# calculating outstanding amounts
-		precision = self.precision("paid_amount")
-		total_positive_outstanding_including_order = 0
-		total_negative_outstanding = 0
-		paid_amount -= sum(flt(d.amount, precision) for d in self.deductions)
-
-		for ref in self.references:
-			reference_outstanding_amount = ref.outstanding_amount
-			abs_outstanding_amount = abs(reference_outstanding_amount)
-
-			if reference_outstanding_amount > 0:
-				total_positive_outstanding_including_order += abs_outstanding_amount
-			else:
-				total_negative_outstanding += abs_outstanding_amount
-
-		# calculating allocated outstanding amounts
-		allocated_negative_outstanding = 0
-		allocated_positive_outstanding = 0
-
-		# checking party type and payment type
-		if (self.payment_type == "Receive" and self.party_type == "Customer") or (
-			self.payment_type == "Pay" and self.party_type in ("Supplier", "Employee")
-		):
-			if total_positive_outstanding_including_order > paid_amount:
-				remaining_outstanding = flt(
-					total_positive_outstanding_including_order - paid_amount, precision
-				)
-				allocated_negative_outstanding = min(remaining_outstanding, total_negative_outstanding)
-
-			allocated_positive_outstanding = paid_amount + allocated_negative_outstanding
-
-		elif self.party_type in ("Supplier", "Employee"):
-			if paid_amount > total_negative_outstanding:
-				if total_negative_outstanding == 0:
-					frappe.msgprint(
-						_("Cannot {0} from {1} without any negative outstanding invoice").format(
-							self.payment_type,
-							self.party_type,
-						)
-					)
-				else:
-					frappe.msgprint(
-						_("Paid Amount cannot be greater than total negative outstanding amount {0}").format(
-							total_negative_outstanding
-						)
-					)
-
-				return
-
-			else:
-				allocated_positive_outstanding = flt(total_negative_outstanding - paid_amount, precision)
-				allocated_negative_outstanding = paid_amount + min(
-					total_positive_outstanding_including_order, allocated_positive_outstanding
-				)
-
-		# inner function to set `allocated_amount` to those row which have no PR
-		def _allocation_to_unset_pr_row(
-			row, outstanding_amount, allocated_positive_outstanding, allocated_negative_outstanding
-		):
-			if outstanding_amount > 0 and allocated_positive_outstanding >= 0:
-				row.allocated_amount = min(allocated_positive_outstanding, outstanding_amount)
-				allocated_positive_outstanding = flt(
-					allocated_positive_outstanding - row.allocated_amount, precision
-				)
-			elif outstanding_amount < 0 and allocated_negative_outstanding:
-				row.allocated_amount = min(allocated_negative_outstanding, abs(outstanding_amount)) * -1
-				allocated_negative_outstanding = flt(
-					allocated_negative_outstanding - abs(row.allocated_amount), precision
-				)
-			return allocated_positive_outstanding, allocated_negative_outstanding
-
-		# allocate amount based on `paid_amount` is changed or not
-		if not paid_amount_change:
-			for ref in self.references:
-				allocated_positive_outstanding, allocated_negative_outstanding = _allocation_to_unset_pr_row(
-					ref,
-					ref.outstanding_amount,
-					allocated_positive_outstanding,
-					allocated_negative_outstanding,
-				)
-
-			allocate_open_payment_requests_to_references(self.references, self.precision("paid_amount"))
-
-		else:
-			payment_request_outstanding_amounts = (
-				get_payment_request_outstanding_set_in_references(self.references) or {}
-			)
-			references_outstanding_amounts = get_references_outstanding_amount(self.references) or {}
-			remaining_references_allocated_amounts = references_outstanding_amounts.copy()
-
-			# Re allocate amount to those references which have PR set (Higher priority)
-			for ref in self.references:
-				if not ref.payment_request:
-					continue
-
-				# fetch outstanding_amount of `Reference` (Payment Term) and `Payment Request` to allocate new amount
-				key = (ref.reference_doctype, ref.reference_name, ref.get("payment_term"))
-				reference_outstanding_amount = references_outstanding_amounts[key]
-				pr_outstanding_amount = payment_request_outstanding_amounts[ref.payment_request]
-
-				if reference_outstanding_amount > 0 and allocated_positive_outstanding >= 0:
-					# allocate amount according to outstanding amounts
-					outstanding_amounts = (
-						allocated_positive_outstanding,
-						reference_outstanding_amount,
-						pr_outstanding_amount,
-					)
-
-					ref.allocated_amount = min(outstanding_amounts)
-
-					# update amounts to track allocation
-					allocated_amount = ref.allocated_amount
-					allocated_positive_outstanding = flt(
-						allocated_positive_outstanding - allocated_amount, precision
-					)
-					remaining_references_allocated_amounts[key] = flt(
-						remaining_references_allocated_amounts[key] - allocated_amount, precision
-					)
-					payment_request_outstanding_amounts[ref.payment_request] = flt(
-						payment_request_outstanding_amounts[ref.payment_request] - allocated_amount, precision
-					)
-
-				elif reference_outstanding_amount < 0 and allocated_negative_outstanding:
-					# allocate amount according to outstanding amounts
-					outstanding_amounts = (
-						allocated_negative_outstanding,
-						abs(reference_outstanding_amount),
-						pr_outstanding_amount,
-					)
-
-					ref.allocated_amount = min(outstanding_amounts) * -1
-
-					# update amounts to track allocation
-					allocated_amount = abs(ref.allocated_amount)
-					allocated_negative_outstanding = flt(
-						allocated_negative_outstanding - allocated_amount, precision
-					)
-					remaining_references_allocated_amounts[key] += allocated_amount  # negative amount
-					payment_request_outstanding_amounts[ref.payment_request] = flt(
-						payment_request_outstanding_amounts[ref.payment_request] - allocated_amount, precision
-					)
-			# Re allocate amount to those references which have no PR (Lower priority)
-			for ref in self.references:
-				if ref.payment_request:
-					continue
-
-				key = (ref.reference_doctype, ref.reference_name, ref.get("payment_term"))
-				reference_outstanding_amount = remaining_references_allocated_amounts[key]
-
-				allocated_positive_outstanding, allocated_negative_outstanding = _allocation_to_unset_pr_row(
-					ref,
-					reference_outstanding_amount,
-					allocated_positive_outstanding,
-					allocated_negative_outstanding,
-				)
-
-	@frappe.whitelist()
-	def set_matched_payment_requests(self, matched_payment_requests):
-		"""
-		Set `Payment Request` against `Reference` based on `matched_payment_requests`.\n
-		:param matched_payment_requests: List of tuple of matched Payment Requests.
-
-		---
-		Example: [(reference_doctype, reference_name, allocated_amount, payment_request), ...]
-		"""
-		if not self.references or not matched_payment_requests:
-			return
-
-		if isinstance(matched_payment_requests, str):
-			matched_payment_requests = json.loads(matched_payment_requests)
-
-		# modify matched_payment_requests
-		# like (reference_doctype, reference_name, allocated_amount): payment_request
-		payment_requests = {}
-
-		for row in matched_payment_requests:
-			key = tuple(row[:3])
-			payment_requests[key] = row[3]
-
-		for ref in self.references:
-			if ref.payment_request:
-				continue
-
-			key = (ref.reference_doctype, ref.reference_name, ref.allocated_amount)
-
-			if key in payment_requests:
-				ref.payment_request = payment_requests[key]
-				del payment_requests[key]  # to avoid duplicate allocation
-
-
-def get_matched_payment_request_of_references(references=None):
-	"""
-	Get those `Payment Requests` which are matched with `References`.\n
-	    - Amount must be same.
-	    - Only single `Payment Request` available for this amount.
-
-	Example: [(reference_doctype, reference_name, allocated_amount, payment_request), ...]
-	"""
-	if not references:
-		return
-
-	# to fetch matched rows
-	refs = {
-		(row.reference_doctype, row.reference_name, row.allocated_amount)
-		for row in references
-		if row.reference_doctype and row.reference_name and row.allocated_amount
-	}
-
-	if not refs:
-		return
-
-	PR = frappe.qb.DocType("Payment Request")
-
-	# query to group by reference_doctype, reference_name, outstanding_amount
-	subquery = (
-		frappe.qb.from_(PR)
-		.select(
-			PR.reference_doctype,
-			PR.reference_name,
-			PR.outstanding_amount.as_("allocated_amount"),
-			PR.name.as_("payment_request"),
-			Count("*").as_("count"),
-		)
-		.where(Tuple(PR.reference_doctype, PR.reference_name, PR.outstanding_amount).isin(refs))
-		.where(PR.status != "Paid")
-		.where(PR.docstatus == 1)
-		.groupby(PR.reference_doctype, PR.reference_name, PR.outstanding_amount)
-	)
-
-	# query to fetch matched rows which are single
-	matched_prs = (
-		frappe.qb.from_(subquery)
-		.select(
-			subquery.reference_doctype,
-			subquery.reference_name,
-			subquery.allocated_amount,
-			subquery.payment_request,
-		)
-		.where(subquery.count == 1)
-		.run()
-	)
-
-	return matched_prs if matched_prs else None
-
-
-def get_references_outstanding_amount(references=None):
-	"""
-	Fetch accurate outstanding amount of `References`.\n
-	    - If `Payment Term` is set, then fetch outstanding amount from `Payment Schedule`.
-	    - If `Payment Term` is not set, then fetch outstanding amount from `References` it self.
-
-	Example: {(reference_doctype, reference_name, payment_term): outstanding_amount, ...}
-	"""
-	if not references:
-		return
-
-	refs_with_payment_term = get_outstanding_of_references_with_payment_term(references) or {}
-	refs_without_payment_term = get_outstanding_of_references_with_no_payment_term(references) or {}
-
-	return {**refs_with_payment_term, **refs_without_payment_term}
-
-
-def get_outstanding_of_references_with_payment_term(references=None):
-	"""
-	Fetch outstanding amount of `References` which have `Payment Term` set.\n
-	Example: {(reference_doctype, reference_name, payment_term): outstanding_amount, ...}
-	"""
-	if not references:
-		return
-
-	refs = {
-		(row.reference_doctype, row.reference_name, row.payment_term)
-		for row in references
-		if row.reference_doctype and row.reference_name and row.payment_term
-	}
-
-	if not refs:
-		return
-
-	PS = frappe.qb.DocType("Payment Schedule")
-
-	response = (
-		frappe.qb.from_(PS)
-		.select(PS.parenttype, PS.parent, PS.payment_term, PS.outstanding)
-		.where(Tuple(PS.parenttype, PS.parent, PS.payment_term).isin(refs))
-	).run(as_dict=True)
-
-	if not response:
-		return
-
-	return {(row.parenttype, row.parent, row.payment_term): row.outstanding for row in response}
-
-
-def get_outstanding_of_references_with_no_payment_term(references):
-	"""
-	Fetch outstanding amount of `References` which have no `Payment Term` set.\n
-	    - Fetch outstanding amount from `References` it self.
-
-	Note: `None` is used for allocation of `Payment Request`
-	Example: {(reference_doctype, reference_name, None): outstanding_amount, ...}
-	"""
-	if not references:
-		return
-
-	outstanding_amounts = {}
-
-	for ref in references:
-		if ref.payment_term:
-			continue
-
-		key = (ref.reference_doctype, ref.reference_name, None)
-
-		if key not in outstanding_amounts:
-			outstanding_amounts[key] = ref.outstanding_amount
-
-	return outstanding_amounts
-
-
-def get_payment_request_outstanding_set_in_references(references=None):
-	"""
-	Fetch outstanding amount of `Payment Request` which are set in `References`.\n
-	Example: {payment_request: outstanding_amount, ...}
-	"""
-	if not references:
-		return
-
-	referenced_payment_requests = {row.payment_request for row in references if row.payment_request}
-
-	if not referenced_payment_requests:
-		return
-
-	PR = frappe.qb.DocType("Payment Request")
-
-	response = (
-		frappe.qb.from_(PR)
-		.select(PR.name, PR.outstanding_amount)
-		.where(PR.name.isin(referenced_payment_requests))
-	).run()
-
-	return dict(response) if response else None
-
 
 def validate_inclusive_tax(tax, doc):
 	def _on_previous_row_error(row_range):
@@ -2606,9 +2144,7 @@ def get_party_details(company, party_type, party, date, cost_center=None):
 	account_balance = get_balance_on(party_account, date, cost_center=cost_center)
 	_party_name = "title" if party_type == "Shareholder" else party_type.lower() + "_name"
 	party_name = frappe.db.get_value(party_type, party, _party_name)
-	party_balance = get_balance_on(
-		party_type=party_type, party=party, company=company, cost_center=cost_center
-	)
+	party_balance = get_balance_on(party_type=party_type, party=party, cost_center=cost_center)
 	if party_type in ["Customer", "Supplier"]:
 		party_bank_account = get_party_bank_account(party_type, party)
 		bank_account = get_default_company_bank_account(company, party_type, party)
@@ -2787,7 +2323,6 @@ def get_payment_entry(
 	payment_type=None,
 	reference_date=None,
 	ignore_permissions=False,
-	created_from_payment_request=False,
 ):
 	doc = frappe.get_doc(dt, dn)
 	over_billing_allowance = frappe.db.get_single_value("Accounts Settings", "over_billing_allowance")
@@ -2937,179 +2472,9 @@ def get_payment_entry(
 
 		pe.set_difference_amount()
 
-	# If PE is created from PR directly, then no need to find open PRs for the references
-	if not created_from_payment_request:
-		allocate_open_payment_requests_to_references(pe.references, pe.precision("paid_amount"))
-
 	return pe
 
 
-def get_open_payment_requests_for_references(references=None):
-	"""
-	Fetch all unpaid Payment Requests for the references. \n
-	    - Each reference can have multiple Payment Requests. \n
-
-	Example: {("Sales Invoice", "SINV-00001"): {"PREQ-00001": 1000, "PREQ-00002": 2000}}
-	"""
-	if not references:
-		return
-
-	refs = {
-		(row.reference_doctype, row.reference_name)
-		for row in references
-		if row.reference_doctype and row.reference_name and row.allocated_amount
-	}
-
-	if not refs:
-		return
-
-	PR = frappe.qb.DocType("Payment Request")
-
-	response = (
-		frappe.qb.from_(PR)
-		.select(PR.name, PR.reference_doctype, PR.reference_name, PR.outstanding_amount)
-		.where(Tuple(PR.reference_doctype, PR.reference_name).isin(list(refs)))
-		.where(PR.status != "Paid")
-		.where(PR.docstatus == 1)
-		.orderby(Coalesce(PR.transaction_date, PR.creation), order=frappe.qb.asc)
-	).run(as_dict=True)
-
-	if not response:
-		return
-
-	reference_payment_requests = {}
-
-	for row in response:
-		key = (row.reference_doctype, row.reference_name)
-
-		if key not in reference_payment_requests:
-			reference_payment_requests[key] = {row.name: row.outstanding_amount}
-		else:
-			reference_payment_requests[key][row.name] = row.outstanding_amount
-
-	return reference_payment_requests
-
-
-def allocate_open_payment_requests_to_references(references=None, precision=None):
-	"""
-	Allocate unpaid Payment Requests to the references. \n
-	---
-	- Allocation based on below factors
-	    - Reference Allocated Amount
-	    - Reference Outstanding Amount (With Payment Terms or without Payment Terms)
-	    - Reference Payment Request's outstanding amount
-	---
-	- Allocation based on below scenarios
-	    - Reference's Allocated Amount == Payment Request's Outstanding Amount
-	        - Allocate the Payment Request to the reference
-	        - This PR will not be allocated further
-	    - Reference's Allocated Amount < Payment Request's Outstanding Amount
-	        - Allocate the Payment Request to the reference
-	        - Reduce the PR's outstanding amount by the allocated amount
-	        - This PR can be allocated further
-	    - Reference's Allocated Amount > Payment Request's Outstanding Amount
-	        - Allocate the Payment Request to the reference
-	        - Reduce Allocated Amount of the reference by the PR's outstanding amount
-	        - Create a new row for the remaining amount until the Allocated Amount is 0
-	            - Allocate PR if available
-	---
-	- Note:
-	    - Priority is given to the first Payment Request of respective references.
-	    - Single Reference can have multiple rows.
-	        - With Payment Terms or without Payment Terms
-	        - With Payment Request or without Payment Request
-	"""
-	if not references:
-		return
-
-	# get all unpaid payment requests for the references
-	references_open_payment_requests = get_open_payment_requests_for_references(references)
-
-	if not references_open_payment_requests:
-		return
-
-	if not precision:
-		precision = references[0].precision("allocated_amount")
-
-	# to manage new rows
-	row_number = 1
-	MOVE_TO_NEXT_ROW = 1
-	TO_SKIP_NEW_ROW = 2
-
-	while row_number <= len(references):
-		row = references[row_number - 1]
-		reference_key = (row.reference_doctype, row.reference_name)
-
-		# update the idx to maintain the order
-		row.idx = row_number
-
-		# unpaid payment requests for the reference
-		reference_payment_requests = references_open_payment_requests.get(reference_key)
-
-		if not reference_payment_requests:
-			row_number += MOVE_TO_NEXT_ROW  # to move to next reference row
-			continue
-
-		# get the first payment request and its outstanding amount
-		payment_request, pr_outstanding_amount = next(iter(reference_payment_requests.items()))
-		allocated_amount = row.allocated_amount
-
-		# allocate the payment request to the reference and PR's outstanding amount
-		row.payment_request = payment_request
-
-		if pr_outstanding_amount == allocated_amount:
-			del reference_payment_requests[payment_request]
-			row_number += MOVE_TO_NEXT_ROW
-
-		elif pr_outstanding_amount > allocated_amount:
-			# reduce the outstanding amount of the payment request
-			reference_payment_requests[payment_request] -= allocated_amount
-			row_number += MOVE_TO_NEXT_ROW
-
-		else:
-			# split the reference row to allocate the remaining amount
-			del reference_payment_requests[payment_request]
-			row.allocated_amount = pr_outstanding_amount
-			allocated_amount = flt(allocated_amount - pr_outstanding_amount, precision)
-
-			# set the remaining amount to the next row
-			while allocated_amount:
-				# create a new row for the remaining amount
-				new_row = frappe.copy_doc(row)
-				references.insert(row_number, new_row)
-
-				# get the first payment request and its outstanding amount
-				payment_request, pr_outstanding_amount = next(
-					iter(reference_payment_requests.items()), (None, None)
-				)
-
-				# update new row
-				new_row.idx = row_number + 1
-				new_row.payment_request = payment_request
-				new_row.allocated_amount = min(
-					pr_outstanding_amount if pr_outstanding_amount else allocated_amount, allocated_amount
-				)
-
-				if not payment_request or not pr_outstanding_amount:
-					row_number += TO_SKIP_NEW_ROW
-					break
-
-				elif pr_outstanding_amount == allocated_amount:
-					del reference_payment_requests[payment_request]
-					row_number += TO_SKIP_NEW_ROW
-					break
-
-				elif pr_outstanding_amount > allocated_amount:
-					reference_payment_requests[payment_request] -= allocated_amount
-					row_number += TO_SKIP_NEW_ROW
-					break
-
-				else:
-					allocated_amount = flt(allocated_amount - pr_outstanding_amount, precision)
-					del reference_payment_requests[payment_request]
-					row_number += MOVE_TO_NEXT_ROW
-
-
 def update_accounting_dimensions(pe, doc):
 	"""
 	Updates accounting dimensions in Payment Entry based on the accounting dimensions in the reference document

erpnext/accounts/doctype/payment_entry/test_payment_entry.py

@@ -4,7 +4,7 @@
 
 import frappe
 from frappe import qb
-from frappe.tests import IntegrationTestCase, UnitTestCase
+from frappe.tests.utils import FrappeTestCase, change_settings
 from frappe.utils import add_days, flt, nowdate
 
 from erpnext.accounts.doctype.account.test_account import create_account
@@ -25,19 +25,10 @@ from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import (
 from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
 from erpnext.setup.doctype.employee.test_employee import make_employee
 
-EXTRA_TEST_RECORD_DEPENDENCIES = ["Item", "Currency Exchange"]
+test_dependencies = ["Item"]
 
 
-class UnitTestPaymentEntry(UnitTestCase):
-	"""
-	Unit tests for PaymentEntry.
-	Use this class for testing individual functions and methods.
-	"""
-
-	pass
-
-
-class TestPaymentEntry(IntegrationTestCase):
+class TestPaymentEntry(FrappeTestCase):
 	def tearDown(self):
 		frappe.db.rollback()
 
@@ -392,7 +383,7 @@ class TestPaymentEntry(IntegrationTestCase):
 		self.assertEqual(si.payment_schedule[0].outstanding, 0)
 		self.assertEqual(si.payment_schedule[0].discounted_amount, 50)
 
-	@IntegrationTestCase.change_settings(
+	@change_settings(
 		"Accounts Settings",
 		{
 			"allow_multi_currency_invoices_against_single_party_account": 1,
@@ -619,9 +610,12 @@ class TestPaymentEntry(IntegrationTestCase):
 		self.assertEqual(flt(pe.references[0].exchange_gain_loss, 2), -94.74)
 
 	def test_payment_entry_retrieves_last_exchange_rate(self):
-		from erpnext.setup.doctype.currency_exchange.test_currency_exchange import save_new_records
+		from erpnext.setup.doctype.currency_exchange.test_currency_exchange import (
+			save_new_records,
+			test_records,
+		)
 
-		save_new_records(self.globalTestRecords["Currency Exchange"])
+		save_new_records(test_records)
 
 		pe = frappe.new_doc("Payment Entry")
 		pe.payment_type = "Pay"
@@ -962,50 +956,6 @@ class TestPaymentEntry(IntegrationTestCase):
 		self.assertEqual(flt(expected_party_balance), party_balance)
 		self.assertEqual(flt(expected_party_account_balance, 2), flt(party_account_balance, 2))
 
-	def test_gl_of_multi_currency_payment_transaction(self):
-		from erpnext.setup.doctype.currency_exchange.test_currency_exchange import save_new_records
-
-		save_new_records(self.globalTestRecords["Currency Exchange"])
-		paid_from = create_account(
-			parent_account="Current Liabilities - _TC",
-			account_name="_Test Cash USD",
-			company="_Test Company",
-			account_type="Cash",
-			account_currency="USD",
-		)
-		payment_entry = create_payment_entry(
-			party="_Test Supplier USD",
-			paid_from=paid_from,
-			paid_to="_Test Payable USD - _TC",
-			paid_amount=100,
-			save=True,
-		)
-		payment_entry.source_exchange_rate = 84.4
-		payment_entry.target_exchange_rate = 84.4
-		payment_entry.save()
-		payment_entry = payment_entry.submit()
-		gle = qb.DocType("GL Entry")
-		gl_entries = (
-			qb.from_(gle)
-			.select(
-				gle.account,
-				gle.debit,
-				gle.credit,
-				gle.debit_in_account_currency,
-				gle.credit_in_account_currency,
-				gle.debit_in_transaction_currency,
-				gle.credit_in_transaction_currency,
-			)
-			.orderby(gle.account)
-			.where(gle.voucher_no == payment_entry.name)
-			.run()
-		)
-		expected_gl_entries = (
-			(paid_from, 0.0, 8440.0, 0.0, 100.0, 0.0, 100.0),
-			("_Test Payable USD - _TC", 8440.0, 0.0, 100.0, 0.0, 100.0, 0.0),
-		)
-		self.assertEqual(gl_entries, expected_gl_entries)
-
 	def test_multi_currency_payment_entry_with_taxes(self):
 		payment_entry = create_payment_entry(
 			party="_Test Supplier USD", paid_to="_Test Payable USD - _TC", save=True
@@ -1140,7 +1090,7 @@ class TestPaymentEntry(IntegrationTestCase):
 		}
 		self.assertDictEqual(ref_details, expected_response)
 
-	@IntegrationTestCase.change_settings(
+	@change_settings(
 		"Accounts Settings",
 		{
 			"unlink_payment_on_cancellation_of_invoice": 1,
@@ -1235,7 +1185,7 @@ class TestPaymentEntry(IntegrationTestCase):
 		si3.cancel()
 		si3.delete()
 
-	@IntegrationTestCase.change_settings(
+	@change_settings(
 		"Accounts Settings",
 		{
 			"unlink_payment_on_cancellation_of_invoice": 1,
@@ -1841,79 +1791,6 @@ class TestPaymentEntry(IntegrationTestCase):
 		# 'Is Opening' should always be 'No' for normal advance payments
 		self.assertEqual(gl_with_opening_set, [])
 
-	@IntegrationTestCase.change_settings("Accounts Settings", {"delete_linked_ledger_entries": 1})
-	def test_delete_linked_exchange_gain_loss_journal(self):
-		from erpnext.accounts.doctype.account.test_account import create_account
-		from erpnext.accounts.doctype.opening_invoice_creation_tool.test_opening_invoice_creation_tool import (
-			make_customer,
-		)
-
-		debtors = create_account(
-			account_name="Debtors USD",
-			parent_account="Accounts Receivable - _TC",
-			company="_Test Company",
-			account_currency="USD",
-			account_type="Receivable",
-		)
-
-		# create a customer
-		customer = make_customer(customer="_Test Party USD")
-		cust_doc = frappe.get_doc("Customer", customer)
-		cust_doc.default_currency = "USD"
-		test_account_details = {
-			"company": "_Test Company",
-			"account": debtors,
-		}
-		cust_doc.append("accounts", test_account_details)
-		cust_doc.save()
-
-		# create a sales invoice
-		si = create_sales_invoice(
-			customer=customer,
-			currency="USD",
-			conversion_rate=83.970000000,
-			debit_to=debtors,
-			do_not_save=1,
-		)
-		si.party_account_currency = "USD"
-		si.save()
-		si.submit()
-
-		# create a payment entry for the invoice
-		pe = get_payment_entry("Sales Invoice", si.name)
-		pe.reference_no = "1"
-		pe.reference_date = frappe.utils.nowdate()
-		pe.paid_amount = 100
-		pe.source_exchange_rate = 90
-		pe.append(
-			"deductions",
-			{
-				"account": "_Test Exchange Gain/Loss - _TC",
-				"cost_center": "_Test Cost Center - _TC",
-				"amount": 2710,
-			},
-		)
-		pe.save()
-		pe.submit()
-
-		# check creation of journal entry
-		jv = frappe.get_all(
-			"Journal Entry Account",
-			{"reference_type": pe.doctype, "reference_name": pe.name, "docstatus": 1},
-			pluck="parent",
-		)
-		self.assertTrue(jv)
-
-		# check cancellation of payment entry and journal entry
-		pe.cancel()
-		self.assertTrue(pe.docstatus == 2)
-		self.assertTrue(frappe.db.get_value("Journal Entry", {"name": jv[0]}, "docstatus") == 2)
-
-		# check deletion of payment entry and journal entry
-		pe.delete()
-		self.assertRaises(frappe.DoesNotExistError, frappe.get_doc, pe.doctype, pe.name)
-		self.assertRaises(frappe.DoesNotExistError, frappe.get_doc, "Journal Entry", jv[0])
-
 
 def create_payment_entry(**args):
 	payment_entry = frappe.new_doc("Payment Entry")

erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json

@@ -10,7 +10,6 @@
   "due_date",
   "bill_no",
   "payment_term",
-  "payment_term_outstanding",
   "account_type",
   "payment_type",
   "column_break_4",
@@ -19,9 +18,7 @@
   "allocated_amount",
   "exchange_rate",
   "exchange_gain_loss",
-  "account",
-  "payment_request",
-  "payment_request_outstanding"
+  "account"
  ],
  "fields": [
   {
@@ -123,33 +120,12 @@
    "fieldname": "payment_type",
    "fieldtype": "Data",
    "label": "Payment Type"
-  },
-  {
-   "fieldname": "payment_request",
-   "fieldtype": "Link",
-   "label": "Payment Request",
-   "options": "Payment Request"
-  },
-  {
-   "depends_on": "eval: doc.payment_term",
-   "fieldname": "payment_term_outstanding",
-   "fieldtype": "Float",
-   "label": "Payment Term Outstanding",
-   "read_only": 1
-  },
-  {
-   "depends_on": "eval: doc.payment_request && doc.payment_request_outstanding",
-   "fieldname": "payment_request_outstanding",
-   "fieldtype": "Float",
-   "is_virtual": 1,
-   "label": "Payment Request Outstanding",
-   "read_only": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2024-09-16 18:11:50.019343",
+ "modified": "2024-04-05 09:44:08.310593",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Entry Reference",