fix: only show pay button for specific doctype in portal

(cherry picked from commit fc2cac62c1)

# Conflicts:
#	erpnext/accounts/doctype/payment_request/payment_request.py
#	erpnext/templates/pages/order.py

.github/helper/documentation.py

@@ -10,7 +10,6 @@ WEBSITE_REPOS = [
 
 DOCUMENTATION_DOMAINS = [
 	"docs.erpnext.com",
-	"docs.frappe.io",
 	"frappeframework.com",
 ]
 

.github/helper/install.sh

@@ -6,7 +6,7 @@ cd ~ || exit
 
 sudo apt update
 sudo apt remove mysql-server mysql-client
-sudo apt install libcups2-dev redis-server mariadb-client
+sudo apt install libcups2-dev redis-server mariadb-client-10.6
 
 pip install frappe-bench
 
@@ -44,9 +44,13 @@ fi
 
 
 install_whktml() {
-    wget -O /tmp/wkhtmltox.deb https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-2/wkhtmltox_0.12.6.1-2.jammy_amd64.deb
-    sudo apt install /tmp/wkhtmltox.deb
-
+    if [ "$(lsb_release -rs)" = "22.04" ]; then
+        wget -O /tmp/wkhtmltox.deb https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-2/wkhtmltox_0.12.6.1-2.jammy_amd64.deb
+        sudo apt install /tmp/wkhtmltox.deb
+    else
+        echo "Please update this script to support wkhtmltopdf for $(lsb_release -ds)"
+        exit 1
+    fi
 }
 install_whktml &
 wkpid=$!

.github/release.yml

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

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

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

.github/workflows/patch.yml

@@ -57,7 +57,7 @@ jobs:
         run: echo "127.0.0.1 test_site" | sudo tee -a /etc/hosts
 
       - name: Cache pip
-        uses: actions/cache@v4
+        uses: actions/cache@v2
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/pyproject.toml') }}
@@ -66,7 +66,7 @@ jobs:
             ${{ runner.os }}-
 
       - name: Cache node modules
-        uses: actions/cache@v4
+        uses: actions/cache@v2
         env:
           cache-name: cache-node-modules
         with:
@@ -81,7 +81,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
 
-      - uses: actions/cache@v4
+      - uses: actions/cache@v2
         id: yarn-cache
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}

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

@@ -76,7 +76,7 @@ jobs:
         run: echo "127.0.0.1 test_site" | sudo tee -a /etc/hosts
 
       - name: Cache pip
-        uses: actions/cache@v4
+        uses: actions/cache@v2
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/pyproject.toml') }}
@@ -85,7 +85,7 @@ jobs:
             ${{ runner.os }}-
 
       - name: Cache node modules
-        uses: actions/cache@v4
+        uses: actions/cache@v2
         env:
           cache-name: cache-node-modules
         with:
@@ -100,7 +100,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
 
-      - uses: actions/cache@v4
+      - uses: actions/cache@v2
         id: yarn-cache
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}

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

@@ -66,7 +66,7 @@ jobs:
         run: echo "127.0.0.1 test_site" | sudo tee -a /etc/hosts
 
       - name: Cache pip
-        uses: actions/cache@v4
+        uses: actions/cache@v2
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/pyproject.toml') }}
@@ -75,7 +75,7 @@ jobs:
             ${{ runner.os }}-
 
       - name: Cache node modules
-        uses: actions/cache@v4
+        uses: actions/cache@v2
         env:
           cache-name: cache-node-modules
         with:
@@ -90,7 +90,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
 
-      - uses: actions/cache@v4
+      - uses: actions/cache@v2
         id: yarn-cache
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}

.pre-commit-config.yaml

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

CODEOWNERS

@@ -4,21 +4,21 @@
 # the repo. Unless a later match takes precedence,
 
 erpnext/accounts/               @deepeshgarg007 @ruthra-kumar
-erpnext/assets/                 @khushi8112 @deepeshgarg007
+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/            @deepeshgarg007 @rohitwaghchaure
 erpnext/patches/                @deepeshgarg007 
 
 .github/                        @deepeshgarg007
-pyproject.toml                  @akhilnarang
+pyproject.toml                  @phot0n

README.md

@@ -62,7 +62,7 @@ New passwords will be created for the ERPNext "Administrator" user, the MariaDB
 
 ## Learning and community
 
-1. [Frappe School](https://school.frappe.io) - Learn Frappe Framework and ERPNext from the various courses by the maintainers or from the community.
+1. [Frappe School](https://frappe.school) - Learn Frappe Framework and ERPNext from the various courses by the maintainers or from the community.
 2. [Official documentation](https://docs.erpnext.com/) - Extensive documentation for ERPNext.
 3. [Discussion Forum](https://discuss.erpnext.com/) - Engage with community of ERPNext users and service providers.
 4. [Telegram Group](https://erpnext_public.t.me) - Get instant help from huge community of users.

erpnext/__init__.py

@@ -4,7 +4,7 @@ import inspect
 import frappe
 from frappe.utils.user import is_website_user
 
-__version__ = "15.66.1"
+__version__ = "15.28.2"
 
 
 def get_default_company(user=None):

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}='{frappe.db.escape(account)}'"
 	elif company:
 		conditions += f"AND p.company = {frappe.db.escape(company)}"
 

erpnext/accounts/doctype/account/account.json

@@ -121,14 +121,14 @@
    "label": "Account Type",
    "oldfieldname": "account_type",
    "oldfieldtype": "Select",
-   "options": "\nAccumulated Depreciation\nAsset Received But Not Billed\nBank\nCash\nChargeable\nCapital Work in Progress\nCost of Goods Sold\nCurrent Asset\nCurrent Liability\nDepreciation\nDirect Expense\nDirect Income\nEquity\nExpense Account\nExpenses Included In Asset Valuation\nExpenses Included In Valuation\nFixed Asset\nIncome Account\nIndirect Expense\nIndirect Income\nLiability\nPayable\nReceivable\nRound Off\nRound Off for Opening\nStock\nStock Adjustment\nStock Received But Not Billed\nService Received But Not Billed\nTax\nTemporary",
+   "options": "\nAccumulated Depreciation\nAsset Received But Not Billed\nBank\nCash\nChargeable\nCapital Work in Progress\nCost of Goods Sold\nCurrent Asset\nCurrent Liability\nDepreciation\nDirect Expense\nDirect Income\nEquity\nExpense Account\nExpenses Included In Asset Valuation\nExpenses Included In Valuation\nFixed Asset\nIncome Account\nIndirect Expense\nIndirect Income\nLiability\nPayable\nReceivable\nRound Off\nStock\nStock Adjustment\nStock Received But Not Billed\nService Received But Not Billed\nTax\nTemporary",
    "search_index": 1
   },
   {
    "description": "Rate at which this tax is applied",
    "fieldname": "tax_rate",
    "fieldtype": "Float",
-   "label": "Tax Rate",
+   "label": "Rate",
    "oldfieldname": "tax_rate",
    "oldfieldtype": "Currency"
   },
@@ -191,7 +191,7 @@
  "idx": 1,
  "is_tree": 1,
  "links": [],
- "modified": "2024-08-19 15:19:11.095045",
+ "modified": "2024-06-27 16:23:04.444354",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Account",

erpnext/accounts/doctype/account/account.py

@@ -4,7 +4,7 @@
 
 import frappe
 from frappe import _, throw
-from frappe.utils import add_to_date, cint, cstr, pretty_date
+from frappe.utils import cint, cstr
 from frappe.utils.nestedset import NestedSet, get_ancestors_of, get_descendants_of
 
 import erpnext
@@ -60,7 +60,6 @@ class Account(NestedSet):
 			"Payable",
 			"Receivable",
 			"Round Off",
-			"Round Off for Opening",
 			"Stock",
 			"Stock Adjustment",
 			"Stock Received But Not Billed",
@@ -481,7 +480,6 @@ def get_account_autoname(account_number, account_name, company):
 
 @frappe.whitelist()
 def update_account_number(name, account_name, account_number=None, from_descendant=False):
-	_ensure_idle_system()
 	account = frappe.get_cached_doc("Account", name)
 	if not account:
 		return
@@ -502,7 +500,7 @@ def update_account_number(name, account_name, account_number=None, from_descenda
 				"name",
 			)
 
-			if old_name and not from_descendant:
+			if old_name:
 				# same account in parent company exists
 				allow_child_account_creation = _("Allow Account Creation Against Child Company")
 
@@ -543,7 +541,6 @@ def update_account_number(name, account_name, account_number=None, from_descenda
 
 @frappe.whitelist()
 def merge_account(old, new):
-	_ensure_idle_system()
 	# Validate properties before merging
 	new_account = frappe.get_cached_doc("Account", new)
 	old_account = frappe.get_cached_doc("Account", old)
@@ -597,31 +594,3 @@ def sync_update_account_number_in_child(
 
 	for d in frappe.db.get_values("Account", filters=filters, fieldname=["company", "name"], as_dict=True):
 		update_account_number(d["name"], account_name, account_number, from_descendant=True)
-
-
-def _ensure_idle_system():
-	# Don't allow renaming if accounting entries are actively being updated, there are two main reasons:
-	# 1. Correctness: It's next to impossible to ensure that renamed account is not being used *right now*.
-	# 2. Performance: Renaming requires locking out many tables entirely and severely degrades performance.
-
-	if frappe.flags.in_test:
-		return
-
-	last_gl_update = None
-	try:
-		# We also lock inserts to GL entry table with for_update here.
-		last_gl_update = frappe.db.get_value("GL Entry", {}, "modified", for_update=True, wait=False)
-	except frappe.QueryTimeoutError:
-		# wait=False fails immediately if there's an active transaction.
-		last_gl_update = add_to_date(None, seconds=-1)
-
-	if not last_gl_update:
-		return
-
-	if last_gl_update > add_to_date(None, minutes=-5):
-		frappe.throw(
-			_(
-				"Last GL Entry update was done {}. This operation is not allowed while system is actively being used. Please wait for 5 minutes before retrying."
-			).format(pretty_date(last_gl_update)),
-			title=_("System In Use"),
-		)

erpnext/accounts/doctype/account/account_tree.js

@@ -138,11 +138,6 @@ frappe.treeview_settings["Account"] = {
 			description: __(
 				"Further accounts can be made under Groups, but entries can be made against non-Groups"
 			),
-			onchange: function () {
-				if (!this.value) {
-					this.layout.set_value("root_type", "");
-				}
-			},
 		},
 		{
 			fieldtype: "Select",
@@ -242,22 +237,19 @@ frappe.treeview_settings["Account"] = {
 	},
 	post_render: function (treeview) {
 		frappe.treeview_settings["Account"].treeview["tree"] = treeview.tree;
-		if (treeview.can_create) {
-			treeview.page.set_primary_action(
-				__("New"),
-				function () {
-					let root_company = treeview.page.fields_dict.root_company.get_value();
-					if (root_company) {
-						frappe.throw(__("Please add the account to root level Company - {0}"), [
-							root_company,
-						]);
-					} else {
-						treeview.new_node();
-					}
-				},
-				"add"
-			);
-		}
+		treeview.page.set_primary_action(
+			__("New"),
+			function () {
+				let root_company = treeview.page.fields_dict.root_company.get_value();
+
+				if (root_company) {
+					frappe.throw(__("Please add the account to root level Company - {0}"), [root_company]);
+				} else {
+					treeview.new_node();
+				}
+			},
+			"add"
+		);
 	},
 	toolbar: [
 		{

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

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

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

@@ -1,532 +0,0 @@
-{
-	"country_code": "ch",
-	"name": "240812 Schulkontenrahmen VEB - DE",    
-    "tree": {
-        "Aktiven": {
-            "account_number": "1",
-            "is_group": 1,
-            "root_type": "Asset",
-            "Umlaufvermögen": {
-                "account_number": "10",
-                "is_group": 1,
-                "Flüssige Mittel": {
-                    "account_number": "100",
-                    "is_group": 1,
-                    "Kasse": {
-                        "account_number": "1000",
-                        "account_type": "Cash"
-                    },
-                    "Bankguthaben": {
-                        "account_number": "1020",
-                        "account_type": "Bank"
-                    }
-                },
-                "Kurzfristig gehaltene Aktiven mit Börsenkurs": {
-                    "account_number": "106",
-                    "is_group": 1,
-                    "Wertschriften": {
-                        "account_number": "1060"
-                    },
-                    "Wertberichtigungen Wertschriften": {
-                        "account_number": "1069"
-                    }
-                },
-                "Forderungen aus Lieferungen und Leistungen": {
-                    "account_number": "110",
-                    "is_group": 1,
-                    "Forderungen aus Lieferungen und Leistungen (Debitoren)": {
-                        "account_number": "1100"
-                    },
-                    "Delkredere": {
-                        "account_number": "1109"
-                    }
-                },
-                "Übrige kurzfristige Forderungen": {
-                    "account_number": "114",
-                    "is_group": 1,
-                    "Vorschüsse und Darlehen": {
-                        "account_number": "1140"
-                    },
-                    "Wertberichtigungen Vorschüsse und Darlehen": {
-                        "account_number": "1149"
-                    },
-                    "Vorsteuer MWST Material, Waren, Dienstleistungen, Energie": {
-                        "account_number": "1170"
-                    },
-                    "Vorsteuer MWST Investitionen, übriger Betriebsaufwand": {
-                        "account_number": "1171"
-                    },
-                    "Verrechnungssteuer": {
-                        "account_number": "1176"
-                    },
-                    "Forderungen gegenüber Sozialversicherungen und Vorsorgeeinrichtungen": {
-                        "account_number": "1180"
-                    },
-                    "Quellensteuer": {
-                        "account_number": "1189"
-                    },
-                    "Sonstige kurzfristige Forderungen": {
-                        "account_number": "1190"
-                    },
-                    "Wertberichtigungen sonstige kurzfristige Forderungen": {
-                        "account_number": "1199"
-                    }
-                },
-                "Vorräte und nicht fakturierte Dienstleistungen": {
-                    "account_number": "120",
-                    "is_group": 1,
-                    "Handelswaren": {
-                        "account_number": "1200"
-                    },
-                    "Rohstoffe": {
-                        "account_number": "1210"
-                    },
-                    "Werkstoffe": {
-                        "account_number": "1220"
-                    },
-                    "Hilfs- und Verbrauchsmaterial": {
-                        "account_number": "1230"
-                    },
-                    "Handelswaren in Konsignation": {
-                        "account_number": "1250"
-                    },
-                    "Fertige Erzeugnisse": {
-                        "account_number": "1260"
-                    },
-                    "Unfertige Erzeugnisse": {
-                        "account_number": "1270"
-                    },
-                    "Nicht fakturierte Dienstleistungen": {
-                        "account_number": "1280"
-                    }
-                },
-                "Aktive Rechnungsabgrenzungen": {
-                    "account_number": "130",
-                    "is_group": 1,
-                    "Bezahlter Aufwand des Folgejahres": {
-                        "account_number": "1300"
-                    },
-                    "Noch nicht erhaltener Ertrag": {
-                        "account_number": "1301"
-                    }
-                }
-            },
-            "Anlagevermögen": {
-                "account_number": "14",
-                "is_group": 1,
-                "Finanzanlagen": {
-                    "account_number": "140",
-                    "is_group": 1,
-                    "Wertschriften": {
-                        "account_number": "1400"
-                    },
-                    "Wertberichtigungen Wertschriften": {
-                        "account_number": "1409"
-                    },
-                    "Darlehen": {
-                        "account_number": "1440"
-                    },
-                    "Hypotheken": {
-                        "account_number": "1441"
-                    },
-                    "Wertberichtigungen langfristige Forderungen": {
-                        "account_number": "1449"
-                    }
-                },
-                "Beteiligungen": {
-                    "account_number": "148",
-                    "is_group": 1,
-                    "Beteiligungen": {
-                        "account_number": "1480"
-                    },
-                    "Wertberichtigungen Beteiligungen": {
-                        "account_number": "1489"
-                    }
-                },
-                "Mobile Sachanlagen": {
-                    "account_number": "150",
-                    "is_group": 1,
-                    "Maschinen und Apparate": {
-                        "account_number": "1500"
-                    },
-                    "Wertberichtigungen Maschinen und Apparate": {
-                        "account_number": "1509"
-                    },
-                    "Mobiliar und Einrichtungen": {
-                        "account_number": "1510"
-                    },
-                    "Wertberichtigungen Mobiliar und Einrichtungen": {
-                        "account_number": "1519"
-                    },
-                    "Büromaschinen, Informatik, Kommunikationstechnologie": {
-                        "account_number": "1520"
-                    },
-                    "Wertberichtigungen Büromaschinen, Informatik, Kommunikationstechnologie": {
-                        "account_number": "1529"
-                    },
-                    "Fahrzeuge": {
-                        "account_number": "1530"
-                    },
-                    "Wertberichtigungen Fahrzeuge": {
-                        "account_number": "1539"
-                    },
-                    "Werkzeuge und Geräte": {
-                        "account_number": "1540"
-                    },
-                    "Wertberichtigungen Werkzeuge und Geräte": {
-                        "account_number": "1549"
-                    }
-                },
-                "Immobile Sachanlagen": {
-                    "account_number": "160",
-                    "is_group": 1,
-                    "Geschäftsliegenschaften": {
-                        "account_number": "1600"
-                    },
-                    "Wertberichtigungen Geschäftsliegenschaften": {
-                        "account_number": "1609"
-                    }
-                },
-                "Immaterielle Werte": {
-                    "account_number": "170",
-                    "is_group": 1,
-                    "Patente, Know-how, Lizenzen, Rechte, Entwicklungen": {
-                        "account_number": "1700"
-                    },
-                    "Wertberichtigungen Patente, Know-how, Lizenzen, Rechte, Entwicklungen": {
-                        "account_number": "1709"
-                    },
-                    "Goodwill": {
-                        "account_number": "1770"
-                    },
-                    "Wertberichtigungen Goodwill": {
-                        "account_number": "1779"
-                    }
-                },
-                "Nicht einbezahltes Grund-, Gesellschafter- oder Stiftungskapital": {
-                    "account_number": "180",
-                    "is_group": 1,
-                    "Nicht einbezahltes Aktien-, Stamm-, Anteilschein- oder Stiftungskapital": {
-                        "account_number": "1850"
-                    }
-                }
-            }
-        },
-        "Passiven": {
-        "account_number": "2",
-        "is_group": 1,
-        "root_type": "Liability",
-            "Kurzfristiges Fremdkapital": {
-                "account_number": "20",
-                "is_group": 1,
-                "Verbindlichkeiten aus Lieferungen und Leistungen": {
-                    "account_number": "200",
-                    "is_group": 1,
-                    "Verbindlichkeiten aus Lieferungen und Leistungen (Kreditoren)": {
-                        "account_number": "2000"
-                    },
-                    "Erhaltene Anzahlungen": {
-                        "account_number": "2030"
-                    }
-                },
-                "Kurzfristige verzinsliche Verbindlichkeiten": {
-                    "account_number": "210",
-                    "is_group": 1,
-                    "Bankverbindlichkeiten": {
-                        "account_number": "2100"
-                    },
-                    "Verbindlichkeiten aus Finanzierungsleasing": {
-                        "account_number": "2120"
-                    },
-                    "Übrige verzinsliche Verbindlichkeiten": {
-                        "account_number": "2140"
-                    }
-                },
-                "Übrige kurzfristige Verbindlichkeiten": {
-                    "account_number": "220",
-                    "is_group": 1,
-                    "Geschuldete MWST (Umsatzsteuer)": {
-                        "account_number": "2200"
-                    },
-                    "Abrechnungskonto MWST": {
-                        "account_number": "2201"
-                    },
-                    "Verrechnungssteuer": {
-                        "account_number": "2206"
-                    },
-                    "Direkte Steuern": {
-                        "account_number": "2208"
-                    },
-                    "Sonstige kurzfristige Verbindlichkeiten": {
-                        "account_number": "2210"
-                    },
-                    "Beschlossene Ausschüttungen": {
-                        "account_number": "2261"
-                    },
-                    "Sozialversicherungen und Vorsorgeeinrichtungen": {
-                        "account_number": "2270"
-                    },
-                    "Quellensteuer": {
-                        "account_number": "2279"
-                    }
-                },
-                "Passive Rechnungsabgrenzungen und kurzfristige Rückstellungen": {
-                    "account_number": "230",
-                    "is_group": 1,
-                    "Noch nicht bezahlter Aufwand": {
-                        "account_number": "2300"
-                    },
-                    "Erhaltener Ertrag des Folgejahres": {
-                        "account_number": "2301"
-                    },
-                    "Kurzfristige Rückstellungen": {
-                        "account_number": "2330"
-                    }
-                }
-            },
-            "Langfristiges Fremdkapital": {
-                "account_number": "24",
-                "is_group": 1,
-                "Langfristige verzinsliche Verbindlichkeiten": {
-                    "account_number": "240",
-                    "is_group": 1,
-                    "Bankverbindlichkeiten": {
-                        "account_number": "2400"
-                    },
-                    "Verbindlichkeiten aus Finanzierungsleasing": {
-                        "account_number": "2420"
-                    },
-                    "Obligationenanleihen": {
-                        "account_number": "2430"
-                    },
-                    "Darlehen": {
-                        "account_number": "2450"
-                    },
-                    "Hypotheken": {
-                        "account_number": "2451"
-                    }
-                },
-                "Übrige langfristige Verbindlichkeiten": {
-                    "account_number": "250",
-                    "is_group": 1,
-                    "Übrige langfristige Verbindlichkeiten (unverzinslich)": {
-                        "account_number": "2500"
-                    }
-                },
-                "Rückstellungen sowie vom Gesetz vorgesehene ähnliche Positionen": {
-                    "account_number": "260",
-                    "is_group": 1,
-                    "Rückstellungen": {
-                        "account_number": "2600"
-                    }
-                }
-            },
-            "Eigenkapital (juristische Personen)": {
-                "account_number": "28",
-                "is_group": 1,
-                "Grund-, Gesellschafter- oder Stiftungskapital": {
-                    "account_number": "280",
-                    "is_group": 1,
-                    "Aktien-, Stamm-, Anteilschein- oder Stiftungskapital": {
-                        "account_number": "2800"
-                    }
-                },
-                "Reserven und Jahresgewinn oder Jahresverlust": {
-                    "account_number": "290",
-                    "is_group": 1,
-                    "Gesetzliche Kapitalreserve": {
-                        "account_number": "2900"
-                    },
-                    "Reserve für eigene Kapitalanteile": {
-                        "account_number": "2930"
-                    },
-                    "Aufwertungsreserve": {
-                        "account_number": "2940"
-                    },
-                    "Gesetzliche Gewinnreserve": {
-                        "account_number": "2950"
-                    },
-                    "Freiwillige Gewinnreserven": {
-                        "account_number": "2960"
-                    },
-                    "Gewinnvortrag oder Verlustvortrag": {
-                        "account_number": "2970"
-                    },
-                    "Jahresgewinn oder Jahresverlust": {
-                        "account_number": "2979"
-                    },
-                    "Eigene Aktien, Stammanteile oder Anteilscheine (Minusposten)": {
-                        "account_number": "2980"
-                    }
-                }
-            }
-        },
-        "Betrieblicher Ertrag aus Lieferungen und Leistungen": {
-            "account_number": "3",
-            "is_group": 1,
-            "root_type": "Income",
-            "Produktionserlöse": {
-                "account_number": "3000"
-            },
-            "Handelserlöse": {
-                "account_number": "3200"
-            },
-            "Dienstleistungserlöse": {
-                "account_number": "3400"
-            },
-            "Übrige Erlöse aus Lieferungen und Leistungen": {
-                "account_number": "3600"
-            },
-            "Eigenleistungen": {
-                "account_number": "3700"
-            },
-            "Eigenverbrauch": {
-                "account_number": "3710"
-            },
-            "Erlösminderungen": {
-                "account_number": "3800"
-            },
-            "Verluste Forderungen (Debitoren), Veränderung Delkredere": {
-                "account_number": "3805"
-            },
-            "Bestandesänderungen unfertige Erzeugnisse": {
-                "account_number": "3900"
-            },
-            "Bestandesänderungen fertige Erzeugnisse": {
-                "account_number": "3901"
-            },
-            "Bestandesänderungen nicht fakturierte Dienstleistungen": {
-                "account_number": "3940"
-            }
-        },
-        "Aufwand für Material, Handelswaren, Dienstleistungen und Energie": {
-            "account_number": "4",
-            "is_group": 1,
-            "root_type": "Expense",
-            "Materialaufwand Produktion": {
-                "account_number": "4000"
-            },
-            "Handelswarenaufwand": {
-                "account_number": "4200"
-            },
-            "Aufwand für bezogene Dienstleistungen": {
-                "account_number": "4400"
-            },
-            "Energieaufwand zur Leistungserstellung": {
-                "account_number": "4500"
-            },
-            "Aufwandminderungen": {
-                "account_number": "4900"
-            }
-        },
-        "Personalaufwand": {
-            "account_number": "5",
-            "is_group": 1,
-            "root_type": "Expense",
-            "Lohnaufwand": {
-                "account_number": "5000"
-            },
-            "Sozialversicherungsaufwand": {
-                "account_number": "5700"
-            },
-            "Übriger Personalaufwand": {
-                "account_number": "5800"
-            },
-            "Leistungen Dritter": {
-                "account_number": "5900"
-            }
-        },
-        "Übriger betrieblicher Aufwand, Abschreibungen und Wertberichtigungen sowie Finanzergebnis": {
-            "account_number": "6",
-            "is_group": 1,
-            "root_type": "Expense",
-            "Raumaufwand": {
-                "account_number": "6000"
-            },
-            "Unterhalt, Reparaturen, Ersatz mobile Sachanlagen": {
-                "account_number": "6100"
-            },
-            "Leasingaufwand mobile Sachanlagen": {
-                "account_number": "6105"
-            },
-            "Fahrzeug- und Transportaufwand": {
-                "account_number": "6200"
-            },
-            "Fahrzeugleasing und -mieten": {
-                "account_number": "6260"
-            },
-            "Sachversicherungen, Abgaben, Gebühren, Bewilligungen": {
-                "account_number": "6300"
-            },
-            "Energie- und Entsorgungsaufwand": {
-                "account_number": "6400"
-            },
-            "Verwaltungsaufwand": {
-                "account_number": "6500"
-            },
-            "Informatikaufwand inkl. Leasing": {
-                "account_number": "6570"
-            },
-            "Werbeaufwand": {
-                "account_number": "6600"
-            },
-            "Sonstiger betrieblicher Aufwand": {
-                "account_number": "6700"
-            },
-            "Abschreibungen und Wertberichtigungen auf Positionen des Anlagevermögens": {
-                "account_number": "6800"
-            },
-            "Finanzaufwand": {
-                "account_number": "6900"
-            },
-            "Finanzertrag": {
-                "account_number": "6950"
-            }
-        },
-        "Betrieblicher Nebenerfolg": {
-            "account_number": "7",
-            "is_group": 1,
-            "root_type": "Income",
-            "Ertrag Nebenbetrieb": {
-                "account_number": "7000"
-            },
-            "Aufwand Nebenbetrieb": {
-                "account_number": "7010"
-            },
-            "Ertrag betriebliche Liegenschaft": {
-                "account_number": "7500"
-            },
-            "Aufwand betriebliche Liegenschaft": {
-                "account_number": "7510"
-            }
-        },
-        "Betriebsfremder, ausserordentlicher, einmaliger oder periodenfremder Aufwand und Ertrag": {
-            "account_number": "8",
-            "is_group": 1,
-            "root_type": "Expense",
-            "Betriebsfremder Aufwand": {
-                "account_number": "8000"
-            },
-            "Betriebsfremder Ertrag": {
-                "account_number": "8100"
-            },
-            "Ausserordentlicher, einmaliger oder periodenfremder Aufwand": {
-                "account_number": "8500"
-            },
-            "Ausserordentlicher, einmaliger oder periodenfremder Ertrag": {
-                "account_number": "8510"
-            },
-            "Direkte Steuern": {
-                "account_number": "8900"
-            }
-        },
-        "Abschluss": {
-            "account_number": "9",
-            "is_group": 1,
-            "root_type": "Equity",
-            "Jahresgewinn oder Jahresverlust": {
-                "account_number": "9200"
-            }
-        }
-    }
-}

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

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

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

@@ -1,34 +0,0 @@
-import json
-from pathlib import Path
-
-syscohada_countries = [
-	"bj",  # Bénin
-	"bf",  # Burkina-Faso
-	"cm",  # Cameroun
-	"cf",  # Centrafrique
-	"ci",  # Côte d'Ivoire
-	"cg",  # Congo
-	"km",  # Comores
-	"ga",  # Gabon
-	"gn",  # Guinée
-	"gw",  # Guinée-Bissau
-	"gq",  # Guinée Equatoriale
-	"ml",  # Mali
-	"ne",  # Niger
-	"cd",  # République Démocratique du Congo
-	"sn",  # Sénégal
-	"td",  # Tchad
-	"tg",  # Togo
-]
-
-folder = Path(__file__).parent
-generic_charts = Path(folder).glob("syscohada*.json")
-
-for file in generic_charts:
-	with open(file) as f:
-		chart = json.load(f)
-	for country in syscohada_countries:
-		chart["country_code"] = country
-		json_object = json.dumps(chart, indent=4)
-		with open(Path(folder, file.name.replace("syscohada", country)), "w") as outfile:
-			outfile.write(json_object)

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

@@ -31,8 +31,7 @@
    "label": "Reference Document Type",
    "options": "DocType",
    "read_only_depends_on": "eval:!doc.__islocal",
-   "reqd": 1,
-   "search_index": 1
+   "reqd": 1
   },
   {
    "default": "0",

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
@@ -41,11 +40,6 @@ class AccountingDimension(Document):
 		self.set_fieldname_and_label()
 
 	def validate(self):
-		self.validate_doctype()
-		validate_column_name(self.fieldname)
-		self.validate_dimension_defaults()
-
-	def validate_doctype(self):
 		if self.document_type in (
 			*core_doctypes_list,
 			"Accounting Dimension",
@@ -54,7 +48,6 @@ class AccountingDimension(Document):
 			"Accounting Dimension Detail",
 			"Company",
 			"Account",
-			"Finance Book",
 		):
 			msg = _("Not allowed to create accounting dimension for {0}").format(self.document_type)
 			frappe.throw(msg)
@@ -67,6 +60,8 @@ class AccountingDimension(Document):
 		if not self.is_new():
 			self.validate_document_type_change()
 
+		self.validate_dimension_defaults()
+
 	def validate_document_type_change(self):
 		doctype_before_save = frappe.db.get_value("Accounting Dimension", self.name, "document_type")
 		if doctype_before_save != self.document_type:
@@ -105,7 +100,6 @@ class AccountingDimension(Document):
 
 	def on_update(self):
 		frappe.flags.accounting_dimensions = None
-		frappe.flags.accounting_dimensions_details = None
 
 
 def make_dimension_in_accounting_doctypes(doc, doclist=None):
@@ -266,7 +260,7 @@ def get_checks_for_pl_and_bs_accounts():
 		frappe.flags.accounting_dimensions_details = frappe.db.sql(
 			"""SELECT p.label, p.disabled, p.fieldname, c.default_dimension, c.company, c.mandatory_for_pl, c.mandatory_for_bs
 			FROM `tabAccounting Dimension`p ,`tabAccounting Dimension Detail` c
-			WHERE p.name = c.parent AND p.disabled = 0""",
+			WHERE p.name = c.parent""",
 			as_dict=1,
 		)
 

erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.py

@@ -74,12 +74,12 @@ def get_dimension_filter_map():
 				a.applicable_on_account, d.dimension_value, p.accounting_dimension,
 				p.allow_or_restrict, a.is_mandatory
 			FROM
-				`tabApplicable On Account` a,
+				`tabApplicable On Account` a, `tabAllowed Dimension` d,
 				`tabAccounting Dimension Filter` p
-			LEFT JOIN `tabAllowed Dimension` d ON d.parent = p.name
 			WHERE
 				p.name = a.parent
 				AND p.disabled = 0
+				AND p.name = d.parent
 		""",
 			as_dict=1,
 		)
@@ -97,6 +97,7 @@ def get_dimension_filter_map():
 				f.allow_or_restrict,
 				f.is_mandatory,
 			)
+
 		frappe.flags.dimension_filter_map = dimension_filter_map
 
 	return frappe.flags.dimension_filter_map

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

@@ -12,7 +12,7 @@ frappe.ui.form.on("Accounts Settings", {
 		msg += " ";
 		msg += __("Please enable only if the understand the effects of enabling this.");
 		msg += "<br>";
-		msg += __("Do you still want to enable immutable ledger?");
+		msg += "Do you still want to enable immutable ledger?";
 
 		frappe.confirm(
 			msg,
@@ -22,21 +22,4 @@ frappe.ui.form.on("Accounts Settings", {
 			}
 		);
 	},
-
-	add_taxes_from_taxes_and_charges_template(frm) {
-		toggle_tax_settings(frm, "add_taxes_from_taxes_and_charges_template");
-	},
-	add_taxes_from_item_tax_template(frm) {
-		toggle_tax_settings(frm, "add_taxes_from_item_tax_template");
-	},
 });
-
-function toggle_tax_settings(frm, field_name) {
-	if (frm.doc[field_name]) {
-		const other_field =
-			field_name === "add_taxes_from_item_tax_template"
-				? "add_taxes_from_taxes_and_charges_template"
-				: "add_taxes_from_item_tax_template";
-		frm.set_value(other_field, 0);
-	}
-}

erpnext/accounts/doctype/accounts_settings/accounts_settings.json

@@ -31,7 +31,6 @@
   "determine_address_tax_category_from",
   "column_break_19",
   "add_taxes_from_item_tax_template",
-  "add_taxes_from_taxes_and_charges_template",
   "book_tax_discount_loss",
   "round_row_wise_tax",
   "print_settings",
@@ -39,22 +38,11 @@
   "show_taxes_as_table_in_print",
   "column_break_12",
   "show_payment_schedule_in_print",
-  "item_price_settings_section",
-  "maintain_same_internal_transaction_rate",
-  "column_break_feyo",
-  "maintain_same_rate_action",
-  "role_to_override_stop_action",
   "currency_exchange_section",
   "allow_stale",
-  "allow_pegged_currencies_exchange_rates",
-  "column_break_yuug",
-  "stale_days",
   "section_break_jpd0",
   "auto_reconcile_payments",
-  "auto_reconciliation_job_trigger",
-  "reconciliation_queue_size",
-  "column_break_resa",
-  "exchange_gain_loss_posting_date",
+  "stale_days",
   "invoicing_settings_tab",
   "accounts_transactions_settings_section",
   "over_billing_allowance",
@@ -86,10 +74,6 @@
   "general_ledger_remarks_length",
   "column_break_lvjk",
   "receivable_payable_remarks_length",
-  "accounts_receivable_payable_tuning_section",
-  "receivable_payable_fetch_method",
-  "legacy_section",
-  "ignore_is_opening_check_for_reporting",
   "payment_request_settings",
   "create_pr_in_draft_status"
  ],
@@ -400,7 +384,7 @@
   {
    "fieldname": "section_break_jpd0",
    "fieldtype": "Section Break",
-   "label": "Payment Reconciliation Settings"
+   "label": "Payment Reconciliations"
   },
   {
    "default": "0",
@@ -505,110 +489,6 @@
    "fieldname": "create_pr_in_draft_status",
    "fieldtype": "Check",
    "label": "Create in Draft Status"
-  },
-  {
-   "fieldname": "column_break_yuug",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "column_break_resa",
-   "fieldtype": "Column Break"
-  },
-  {
-   "default": "15",
-   "description": "Interval should be between 1 to 59 MInutes",
-   "fieldname": "auto_reconciliation_job_trigger",
-   "fieldtype": "Int",
-   "label": "Auto Reconciliation Job Trigger"
-  },
-  {
-   "default": "5",
-   "description": "Documents Processed on each trigger. Queue Size should be between 5 and 100",
-   "fieldname": "reconciliation_queue_size",
-   "fieldtype": "Int",
-   "label": "Reconciliation Queue Size"
-  },
-  {
-   "default": "0",
-   "description": "Ignores legacy Is Opening field in GL Entry that allows adding opening balance post the system is in use while generating reports",
-   "fieldname": "ignore_is_opening_check_for_reporting",
-   "fieldtype": "Check",
-   "label": "Ignore Is Opening check for reporting"
-  },
-  {
-   "default": "Payment",
-   "description": "Only applies for Normal Payments",
-   "fieldname": "exchange_gain_loss_posting_date",
-   "fieldtype": "Select",
-   "label": "Posting Date Inheritance for Exchange Gain / Loss",
-   "options": "Invoice\nPayment\nReconciliation Date"
-  },
-  {
-   "fieldname": "column_break_xrnd",
-   "fieldtype": "Column Break"
-  },
-  {
-   "default": "Buffered Cursor",
-   "fieldname": "receivable_payable_fetch_method",
-   "fieldtype": "Select",
-   "label": "Data Fetch Method",
-   "options": "Buffered Cursor\nUnBuffered Cursor"
-  },
-  {
-   "fieldname": "accounts_receivable_payable_tuning_section",
-   "fieldtype": "Section Break",
-   "label": "Accounts Receivable / Payable Tuning"
-  },
-  {
-   "fieldname": "legacy_section",
-   "fieldtype": "Section Break",
-   "label": "Legacy Fields"
-  },
-  {
-   "default": "0",
-   "fieldname": "maintain_same_internal_transaction_rate",
-   "fieldtype": "Check",
-   "label": "Maintain Same Rate Throughout Internal Transaction"
-  },
-  {
-   "default": "Stop",
-   "depends_on": "maintain_same_internal_transaction_rate",
-   "fieldname": "maintain_same_rate_action",
-   "fieldtype": "Select",
-   "label": "Action if Same Rate is Not Maintained Throughout  Internal Transaction",
-   "mandatory_depends_on": "maintain_same_internal_transaction_rate",
-   "options": "Stop\nWarn"
-  },
-  {
-   "depends_on": "eval: doc.maintain_same_internal_transaction_rate && doc.maintain_same_rate_action == 'Stop'",
-   "fieldname": "role_to_override_stop_action",
-   "fieldtype": "Link",
-   "label": "Role Allowed to Override Stop Action",
-   "options": "Role"
-  },
-  {
-   "fieldname": "item_price_settings_section",
-   "fieldtype": "Section Break",
-   "label": "Item Price Settings"
-  },
-  {
-   "fieldname": "column_break_feyo",
-   "fieldtype": "Column Break"
-  },
-  {
-   "default": "0",
-   "description": "System will do an implicit conversion using the pegged currency. <br>\nEx: Instead of AED -&gt; INR, system will do AED -&gt; USD -&gt; INR using the pegged exchange rate of AED against USD.",
-   "documentation_url": "/app/pegged-currencies/Pegged Currencies",
-   "fieldname": "allow_pegged_currencies_exchange_rates",
-   "fieldtype": "Check",
-   "label": "Allow Implicit Pegged Currency Conversion"
-  },
-  {
-   "default": "0",
-   "description": "If no taxes are set, and Taxes and Charges Template is selected, the system will automatically apply the taxes from the chosen template.",
-   "fieldname": "add_taxes_from_taxes_and_charges_template",
-   "fieldtype": "Check",
-   "label": "Automatically Add Taxes from Taxes and Charges Template"
   }
  ],
  "icon": "icon-cog",
@@ -616,7 +496,7 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2025-06-23 15:55:33.346398",
+ "modified": "2024-07-26 06:48:52.714630",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Accounts Settings",
@@ -645,4 +525,4 @@
  "sort_order": "ASC",
  "states": [],
  "track_changes": 1
-}
+}

erpnext/accounts/doctype/accounts_settings/accounts_settings.py

@@ -10,7 +10,6 @@ from frappe.custom.doctype.property_setter.property_setter import make_property_
 from frappe.model.document import Document
 from frappe.utils import cint
 
-from erpnext.accounts.utils import sync_auto_reconcile_config
 from erpnext.stock.utils import check_pending_reposting
 
 
@@ -25,12 +24,9 @@ class AccountsSettings(Document):
 
 		acc_frozen_upto: DF.Date | None
 		add_taxes_from_item_tax_template: DF.Check
-		add_taxes_from_taxes_and_charges_template: DF.Check
 		allow_multi_currency_invoices_against_single_party_account: DF.Check
-		allow_pegged_currencies_exchange_rates: DF.Check
 		allow_stale: DF.Check
 		auto_reconcile_payments: DF.Check
-		auto_reconciliation_job_trigger: DF.Int
 		automatically_fetch_payment_terms: DF.Check
 		automatically_process_deferred_accounting_entry: DF.Check
 		book_asset_depreciation_entry_automatically: DF.Check
@@ -47,22 +43,15 @@ class AccountsSettings(Document):
 		enable_fuzzy_matching: DF.Check
 		enable_immutable_ledger: DF.Check
 		enable_party_matching: DF.Check
-		exchange_gain_loss_posting_date: DF.Literal["Invoice", "Payment", "Reconciliation Date"]
 		frozen_accounts_modifier: DF.Link | None
 		general_ledger_remarks_length: DF.Int
 		ignore_account_closing_balance: DF.Check
-		ignore_is_opening_check_for_reporting: DF.Check
-		maintain_same_internal_transaction_rate: DF.Check
-		maintain_same_rate_action: DF.Literal["Stop", "Warn"]
 		make_payment_via_journal_entry: DF.Check
 		merge_similar_account_heads: DF.Check
 		over_billing_allowance: DF.Currency
 		post_change_gl_entries: DF.Check
-		receivable_payable_fetch_method: DF.Literal["Buffered Cursor", "UnBuffered Cursor"]
 		receivable_payable_remarks_length: DF.Int
-		reconciliation_queue_size: DF.Int
 		role_allowed_to_over_bill: DF.Link | None
-		role_to_override_stop_action: DF.Link | None
 		round_row_wise_tax: DF.Check
 		show_balance_in_coa: DF.Check
 		show_inclusive_tax_in_print: DF.Check
@@ -75,7 +64,6 @@ class AccountsSettings(Document):
 	# end: auto-generated types
 
 	def validate(self):
-		self.validate_auto_tax_settings()
 		old_doc = self.get_doc_before_save()
 		clear_cache = False
 
@@ -102,8 +90,6 @@ class AccountsSettings(Document):
 		if clear_cache:
 			frappe.clear_cache()
 
-		self.validate_and_sync_auto_reconcile_config()
-
 	def validate_stale_days(self):
 		if not self.allow_stale and cint(self.stale_days) <= 0:
 			frappe.msgprint(
@@ -128,27 +114,3 @@ class AccountsSettings(Document):
 	def validate_pending_reposts(self):
 		if self.acc_frozen_upto:
 			check_pending_reposting(self.acc_frozen_upto)
-
-	def validate_and_sync_auto_reconcile_config(self):
-		if self.has_value_changed("auto_reconciliation_job_trigger"):
-			if (
-				cint(self.auto_reconciliation_job_trigger) > 0
-				and cint(self.auto_reconciliation_job_trigger) < 60
-			):
-				sync_auto_reconcile_config(self.auto_reconciliation_job_trigger)
-			else:
-				frappe.throw(_("Cron Interval should be between 1 and 59 Min"))
-
-		if self.has_value_changed("reconciliation_queue_size"):
-			if cint(self.reconciliation_queue_size) < 5 or cint(self.reconciliation_queue_size) > 100:
-				frappe.throw(_("Queue Size should be between 5 and 100"))
-
-	def validate_auto_tax_settings(self):
-		if self.add_taxes_from_item_tax_template and self.add_taxes_from_taxes_and_charges_template:
-			frappe.throw(
-				_("You cannot enable both the settings '{0}' and '{1}'.").format(
-					frappe.bold(self.meta.get_label("add_taxes_from_item_tax_template")),
-					frappe.bold(self.meta.get_label("add_taxes_from_taxes_and_charges_template")),
-				),
-				title=_("Auto Tax Settings Error"),
-			)

erpnext/accounts/doctype/advance_payment_ledger_entry/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,222 +0,0 @@
-# Copyright (c) 2024, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-
-import frappe
-from frappe.tests.utils import FrappeTestCase
-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
-
-
-class TestAdvancePaymentLedgerEntry(AccountsTestMixin, FrappeTestCase):
-	"""
-	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

@@ -101,7 +101,7 @@
    "fieldname": "rate",
    "fieldtype": "Float",
    "in_list_view": 1,
-   "label": "Tax Rate",
+   "label": "Rate",
    "oldfieldname": "rate",
    "oldfieldtype": "Currency"
   },

erpnext/accounts/doctype/bank_account/bank_account.json

@@ -224,6 +224,11 @@
    "link_doctype": "Bank Guarantee",
    "link_fieldname": "bank_account"
   },
+  {
+   "group": "Transactions",
+   "link_doctype": "Payroll Entry",
+   "link_fieldname": "bank_account"
+  },
   {
    "group": "Transactions",
    "link_doctype": "Bank Transaction",
@@ -250,7 +255,7 @@
    "link_fieldname": "default_bank_account"
   }
  ],
- "modified": "2024-10-30 09:41:14.113414",
+ "modified": "2024-09-24 06:57:41.292970",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Bank Account",

erpnext/accounts/doctype/bank_account/bank_account.py

@@ -48,7 +48,7 @@ class BankAccount(Document):
 		self.name = self.account_name + " - " + self.bank
 
 	def on_trash(self):
-		delete_contact_and_address("Bank Account", self.name)
+		delete_contact_and_address("BankAccount", self.name)
 
 	def validate(self):
 		self.validate_company()

erpnext/accounts/doctype/bank_clearance/bank_clearance.py

@@ -117,9 +117,9 @@ class BankClearance(Document):
 					)
 
 				else:
-					# using db_set to trigger notification
-					payment_entry = frappe.get_doc(d.payment_document, d.payment_entry)
-					payment_entry.db_set("clearance_date", d.clearance_date)
+					frappe.db.set_value(
+						d.payment_document, d.payment_entry, "clearance_date", d.clearance_date
+					)
 
 				clearance_date_updated = True
 
@@ -159,6 +159,9 @@ def get_payment_entries_for_bank_clearance(
 		as_dict=1,
 	)
 
+	if bank_account:
+		condition += "and bank_account = %(bank_account)s"
+
 	payment_entries = frappe.db.sql(
 		f"""
 			select
@@ -180,6 +183,7 @@ def get_payment_entries_for_bank_clearance(
 			"account": account,
 			"from": from_date,
 			"to": to_date,
+			"bank_account": bank_account,
 		},
 		as_dict=1,
 	)

erpnext/accounts/doctype/bank_clearance/test_bank_clearance.py

@@ -7,9 +7,6 @@ import frappe
 from frappe.utils import add_months, getdate
 
 from erpnext.accounts.doctype.cost_center.test_cost_center import create_cost_center
-from erpnext.accounts.doctype.mode_of_payment.test_mode_of_payment import (
-	set_default_account_for_mode_of_payment,
-)
 from erpnext.accounts.doctype.payment_entry.test_payment_entry import get_payment_entry
 from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make_purchase_invoice
 from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
@@ -194,13 +191,11 @@ def make_pos_sales_invoice():
 
 	customer = make_customer(customer="_Test Customer")
 
-	mode_of_payment = frappe.get_doc("Mode of Payment", "Wire Transfer")
-
-	set_default_account_for_mode_of_payment(mode_of_payment, "_Test Company", "_Test Bank Clearance - _TC")
-
 	si = create_sales_invoice(customer=customer, item="_Test Item", is_pos=1, qty=1, rate=1000, do_not_save=1)
 	si.set("payments", [])
-	si.append("payments", {"mode_of_payment": "Wire Transfer", "amount": 1000})
+	si.append(
+		"payments", {"mode_of_payment": "Cash", "account": "_Test Bank Clearance - _TC", "amount": 1000}
+	)
 	si.insert()
 	si.submit()
 

erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js

@@ -19,15 +19,10 @@ frappe.ui.form.on("Bank Reconciliation Tool", {
 	},
 
 	onload: function (frm) {
-		if (!frm.doc.company) {
-			frm.set_value("company", frappe.defaults.get_default("company"));
-		}
-
 		// Set default filter dates
 		let today = frappe.datetime.get_today();
 		frm.doc.bank_statement_from_date = frappe.datetime.add_months(today, -1);
 		frm.doc.bank_statement_to_date = today;
-
 		frm.trigger("bank_account");
 	},
 
@@ -103,7 +98,7 @@ frappe.ui.form.on("Bank Reconciliation Tool", {
 
 	make_reconciliation_tool(frm) {
 		frm.get_field("reconciliation_tool_cards").$wrapper.empty();
-		if (frm.doc.company && frm.doc.bank_account && frm.doc.bank_statement_to_date) {
+		if (frm.doc.bank_account && frm.doc.bank_statement_to_date) {
 			frm.trigger("get_cleared_balance").then(() => {
 				if (
 					frm.doc.bank_account &&
@@ -119,13 +114,12 @@ frappe.ui.form.on("Bank Reconciliation Tool", {
 	},
 
 	get_account_opening_balance(frm) {
-		if (frm.doc.company && frm.doc.bank_account && frm.doc.bank_statement_from_date) {
+		if (frm.doc.bank_account && frm.doc.bank_statement_from_date) {
 			frappe.call({
 				method: "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.get_account_balance",
 				args: {
 					bank_account: frm.doc.bank_account,
 					till_date: frappe.datetime.add_days(frm.doc.bank_statement_from_date, -1),
-					company: frm.doc.company,
 				},
 				callback: (response) => {
 					frm.set_value("account_opening_balance", response.message);
@@ -135,13 +129,12 @@ frappe.ui.form.on("Bank Reconciliation Tool", {
 	},
 
 	get_cleared_balance(frm) {
-		if (frm.doc.company && frm.doc.bank_account && frm.doc.bank_statement_to_date) {
+		if (frm.doc.bank_account && frm.doc.bank_statement_to_date) {
 			return frappe.call({
 				method: "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.get_account_balance",
 				args: {
 					bank_account: frm.doc.bank_account,
 					till_date: frm.doc.bank_statement_to_date,
-					company: frm.doc.company,
 				},
 				callback: (response) => {
 					frm.cleared_balance = response.message;

erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py

@@ -8,12 +8,10 @@ import frappe
 from frappe import _
 from frappe.model.document import Document
 from frappe.query_builder.custom import ConstantColumn
-from frappe.query_builder.functions import Sum
 from frappe.utils import cint, flt
 
 from erpnext import get_default_cost_center
 from erpnext.accounts.doctype.bank_transaction.bank_transaction import get_total_allocated_amount
-from erpnext.accounts.party import get_party_account
 from erpnext.accounts.report.bank_reconciliation_statement.bank_reconciliation_statement import (
 	get_amounts_not_reflected_in_system,
 	get_entries,
@@ -80,17 +78,10 @@ def get_bank_transactions(bank_account, from_date=None, to_date=None):
 
 
 @frappe.whitelist()
-def get_account_balance(bank_account, till_date, company):
+def get_account_balance(bank_account, till_date):
 	# returns account balance till the specified date
 	account = frappe.db.get_value("Bank Account", bank_account, "account")
-	filters = frappe._dict(
-		{
-			"account": account,
-			"report_date": till_date,
-			"include_pos_transactions": 1,
-			"company": company,
-		}
-	)
+	filters = frappe._dict({"account": account, "report_date": till_date, "include_pos_transactions": 1})
 	data = get_entries(filters)
 
 	balance_as_per_system = get_balance_on(filters["account"], filters["report_date"])
@@ -102,7 +93,11 @@ def get_account_balance(bank_account, till_date, company):
 
 	amounts_not_reflected_in_system = get_amounts_not_reflected_in_system(filters)
 
-	return flt(balance_as_per_system) - flt(total_debit) + flt(total_credit) + amounts_not_reflected_in_system
+	bank_bal = (
+		flt(balance_as_per_system) - flt(total_debit) + flt(total_credit) + amounts_not_reflected_in_system
+	)
+
+	return bank_bal
 
 
 @frappe.whitelist()
@@ -309,56 +304,54 @@ def create_payment_entry_bts(
 	bank_transaction = frappe.db.get_values(
 		"Bank Transaction",
 		bank_transaction_name,
-		fieldname=["name", "unallocated_amount", "deposit", "bank_account", "currency"],
+		fieldname=["name", "unallocated_amount", "deposit", "bank_account"],
 		as_dict=True,
 	)[0]
-
+	paid_amount = bank_transaction.unallocated_amount
 	payment_type = "Receive" if bank_transaction.deposit > 0.0 else "Pay"
 
-	bank_account = frappe.get_cached_value("Bank Account", bank_transaction.bank_account, "account")
-	company = frappe.get_cached_value("Account", bank_account, "company")
-	party_account = get_party_account(party_type, party, company)
+	company_account = frappe.get_value("Bank Account", bank_transaction.bank_account, "account")
+	company = frappe.get_value("Account", company_account, "company")
+	payment_entry_dict = {
+		"company": company,
+		"payment_type": payment_type,
+		"reference_no": reference_number,
+		"reference_date": reference_date,
+		"party_type": party_type,
+		"party": party,
+		"posting_date": posting_date,
+		"paid_amount": paid_amount,
+		"received_amount": paid_amount,
+	}
+	payment_entry = frappe.new_doc("Payment Entry")
 
-	bank_currency = bank_transaction.currency
-	party_currency = frappe.get_cached_value("Account", party_account, "account_currency")
+	payment_entry.update(payment_entry_dict)
 
-	exc_rate = get_exchange_rate(bank_currency, party_currency, posting_date)
+	if mode_of_payment:
+		payment_entry.mode_of_payment = mode_of_payment
+	if project:
+		payment_entry.project = project
+	if cost_center:
+		payment_entry.cost_center = cost_center
+	if payment_type == "Receive":
+		payment_entry.paid_to = company_account
+	else:
+		payment_entry.paid_from = company_account
 
-	amt_in_bank_acc_currency = bank_transaction.unallocated_amount
-	amount_in_party_currency = bank_transaction.unallocated_amount * exc_rate
-
-	pe = frappe.new_doc("Payment Entry")
-	pe.payment_type = payment_type
-	pe.company = company
-	pe.reference_no = reference_number
-	pe.reference_date = reference_date
-	pe.party_type = party_type
-	pe.party = party
-	pe.posting_date = posting_date
-	pe.paid_from = party_account if payment_type == "Receive" else bank_account
-	pe.paid_to = party_account if payment_type == "Pay" else bank_account
-	pe.paid_from_account_currency = party_currency if payment_type == "Receive" else bank_currency
-	pe.paid_to_account_currency = party_currency if payment_type == "Pay" else bank_currency
-	pe.paid_amount = amount_in_party_currency if payment_type == "Receive" else amt_in_bank_acc_currency
-	pe.received_amount = amount_in_party_currency if payment_type == "Pay" else amt_in_bank_acc_currency
-	pe.mode_of_payment = mode_of_payment
-	pe.project = project
-	pe.cost_center = cost_center
-
-	pe.validate()
+	payment_entry.validate()
 
 	if allow_edit:
-		return pe
+		return payment_entry
 
-	pe.insert()
-	pe.submit()
+	payment_entry.insert()
 
+	payment_entry.submit()
 	vouchers = json.dumps(
 		[
 			{
 				"payment_doctype": "Payment Entry",
-				"payment_name": pe.name,
-				"amount": amt_in_bank_acc_currency,
+				"payment_name": payment_entry.name,
+				"amount": paid_amount,
 			}
 		]
 	)
@@ -373,38 +366,11 @@ def auto_reconcile_vouchers(
 	filter_by_reference_date=None,
 	from_reference_date=None,
 	to_reference_date=None,
-):
-	bank_transactions = get_bank_transactions(bank_account)
-
-	if len(bank_transactions) > 10:
-		frappe.enqueue(
-			method="erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.start_auto_reconcile",
-			queue="long",
-			bank_transactions=bank_transactions,
-			from_date=from_date,
-			to_date=to_date,
-			filter_by_reference_date=filter_by_reference_date,
-			from_reference_date=from_reference_date,
-			to_reference_date=to_reference_date,
-		)
-		frappe.msgprint(_("Auto Reconciliation has started in the background"))
-	else:
-		start_auto_reconcile(
-			bank_transactions,
-			from_date,
-			to_date,
-			filter_by_reference_date,
-			from_reference_date,
-			to_reference_date,
-		)
-
-
-def start_auto_reconcile(
-	bank_transactions, from_date, to_date, filter_by_reference_date, from_reference_date, to_reference_date
 ):
 	frappe.flags.auto_reconcile_vouchers = True
-
 	reconciled, partially_reconciled = set(), set()
+
+	bank_transactions = get_bank_transactions(bank_account)
 	for transaction in bank_transactions:
 		linked_payments = get_linked_payments(
 			transaction.name,
@@ -442,6 +408,7 @@ def start_auto_reconcile(
 	frappe.msgprint(title=_("Auto Reconciliation"), msg=alert_message, indicator=indicator)
 
 	frappe.flags.auto_reconcile_vouchers = False
+	return reconciled, partially_reconciled
 
 
 def get_auto_reconcile_message(partially_reconciled, reconciled):
@@ -513,28 +480,17 @@ def get_linked_payments(
 def subtract_allocations(gl_account, vouchers):
 	"Look up & subtract any existing Bank Transaction allocations"
 	copied = []
-
-	voucher_docs = [(voucher.get("doctype"), voucher.get("name")) for voucher in vouchers]
-	voucher_allocated_amounts = get_total_allocated_amount(voucher_docs)
-
 	for voucher in vouchers:
-		if amount := get_allocated_amount(voucher_allocated_amounts, voucher, gl_account):
+		rows = get_total_allocated_amount(voucher.get("doctype"), voucher.get("name"))
+		filtered_row = list(filter(lambda row: row.get("gl_account") == gl_account, rows))
+
+		if amount := None if not filtered_row else filtered_row[0]["total"]:
 			voucher["paid_amount"] -= amount
 
 		copied.append(voucher)
 	return copied
 
 
-def get_allocated_amount(voucher_allocated_amounts, voucher, gl_account):
-	if not (voucher_details := voucher_allocated_amounts.get((voucher.get("doctype"), voucher.get("name")))):
-		return
-
-	if not (row := voucher_details.get(gl_account)):
-		return
-
-	return row.get("total")
-
-
 def check_matching(
 	bank_account,
 	company,
@@ -763,7 +719,7 @@ def get_pe_matching_query(
 			(ref_rank + amount_rank + party_rank + 1).as_("rank"),
 			ConstantColumn("Payment Entry").as_("doctype"),
 			pe.name,
-			pe.base_paid_amount_after_tax.as_("paid_amount"),
+			pe.paid_amount_after_tax.as_("paid_amount"),
 			pe.reference_no,
 			pe.reference_date,
 			pe.party,
@@ -804,20 +760,26 @@ def get_je_matching_query(
 	je = frappe.qb.DocType("Journal Entry")
 	jea = frappe.qb.DocType("Journal Entry Account")
 
+	ref_condition = je.cheque_no == transaction.reference_number
+	ref_rank = frappe.qb.terms.Case().when(ref_condition, 1).else_(0)
+
 	amount_field = f"{cr_or_dr}_in_account_currency"
+	amount_equality = getattr(jea, amount_field) == transaction.unallocated_amount
+	amount_rank = frappe.qb.terms.Case().when(amount_equality, 1).else_(0)
 
 	filter_by_date = je.posting_date.between(from_date, to_date)
 	if cint(filter_by_reference_date):
 		filter_by_date = je.cheque_date.between(from_reference_date, to_reference_date)
 
-	subquery = (
+	query = (
 		frappe.qb.from_(jea)
 		.join(je)
 		.on(jea.parent == je.name)
 		.select(
-			Sum(getattr(jea, amount_field)).as_("paid_amount"),
+			(ref_rank + amount_rank + 1).as_("rank"),
 			ConstantColumn("Journal Entry").as_("doctype"),
 			je.name,
+			getattr(jea, amount_field).as_("paid_amount"),
 			je.cheque_no.as_("reference_no"),
 			je.cheque_date.as_("reference_date"),
 			je.pay_to_recd_from.as_("party"),
@@ -829,26 +791,14 @@ def get_je_matching_query(
 		.where(je.voucher_type != "Opening Entry")
 		.where(je.clearance_date.isnull())
 		.where(jea.account == common_filters.bank_account)
+		.where(amount_equality if exact_match else getattr(jea, amount_field) > 0.0)
+		.where(je.docstatus == 1)
 		.where(filter_by_date)
-		.groupby(je.name)
 		.orderby(je.cheque_date if cint(filter_by_reference_date) else je.posting_date)
 	)
 
 	if frappe.flags.auto_reconcile_vouchers is True:
-		subquery = subquery.where(je.cheque_no == transaction.reference_number)
-
-	ref_rank = frappe.qb.terms.Case().when(subquery.reference_no == transaction.reference_number, 1).else_(0)
-	amount_equality = subquery.paid_amount == transaction.unallocated_amount
-	amount_rank = frappe.qb.terms.Case().when(amount_equality, 1).else_(0)
-
-	query = (
-		frappe.qb.from_(subquery)
-		.select(
-			"*",
-			(ref_rank + amount_rank + 1).as_("rank"),
-		)
-		.where(amount_equality if exact_match else subquery.paid_amount > 0.0)
-	)
+		query = query.where(ref_condition)
 
 	return query
 

erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py

@@ -277,7 +277,7 @@ def get_import_status(docname):
 
 @frappe.whitelist()
 def get_import_logs(docname: str):
-	frappe.has_permission("Bank Statement Import", throw=True)
+	frappe.has_permission("Bank Statement Import")
 
 	return frappe.get_all(
 		"Data Import Log",

erpnext/accounts/doctype/bank_transaction/auto_match_party.py

@@ -1,7 +1,6 @@
 import frappe
 from frappe.utils import flt
 from rapidfuzz import fuzz, process
-from rapidfuzz.utils import default_process
 
 
 class AutoMatchParty:
@@ -46,41 +45,45 @@ class AutoMatchbyAccountIBAN:
 		if not (self.bank_party_account_number or self.bank_party_iban):
 			return None
 
-		return self.match_account_in_party()
+		result = self.match_account_in_party()
+		return result
 
 	def match_account_in_party(self) -> tuple | None:
-		"""
-		Returns (Party Type, Party) if a matching account is found in Bank Account or Employee:
-		1. Get party from a matching (iban/account no) Bank Account
-		2. If not found, get party from Employee with matching bank account details (iban/account no)
-		"""
-		if not (self.bank_party_account_number or self.bank_party_iban):
-			# Nothing to match
-			return None
+		"""Check if there is a IBAN/Account No. match in Customer/Supplier/Employee"""
+		result = None
+		parties = get_parties_in_order(self.deposit)
+		or_filters = self.get_or_filters()
 
-		# Search for a matching Bank Account that has party set
-		party_result = frappe.db.get_all(
-			"Bank Account",
-			or_filters=self.get_or_filters(),
-			filters={"party_type": ("is", "set"), "party": ("is", "set")},
-			fields=["party", "party_type"],
-			limit_page_length=1,
-		)
-		if result := party_result[0] if party_result else None:
-			return (result["party_type"], result["party"])
+		for party in parties:
+			party_result = frappe.db.get_all(
+				"Bank Account", or_filters=or_filters, pluck="party", limit_page_length=1
+			)
 
-		# If no party is found, search in Employee (since it has bank account details)
-		if employee_result := frappe.db.get_all(
-			"Employee", or_filters=self.get_or_filters("Employee"), pluck="name", limit_page_length=1
-		):
-			return ("Employee", employee_result[0])
+			if party == "Employee" and not party_result:
+				# Search in Bank Accounts first for Employee, and then Employee record
+				if "bank_account_no" in or_filters:
+					or_filters["bank_ac_no"] = or_filters.pop("bank_account_no")
 
-	def get_or_filters(self, party: str | None = None) -> dict:
-		"""Return OR filters for Bank Account and IBAN"""
+				party_result = frappe.db.get_all(
+					party, or_filters=or_filters, pluck="name", limit_page_length=1
+				)
+
+				if "bank_ac_no" in or_filters:
+					or_filters["bank_account_no"] = or_filters.pop("bank_ac_no")
+
+			if party_result:
+				result = (
+					party,
+					party_result[0],
+				)
+				break
+
+		return result
+
+	def get_or_filters(self) -> dict:
 		or_filters = {}
 		if self.bank_party_account_number:
-			bank_ac_field = "bank_ac_no" if party == "Employee" else "bank_account_no"
-			or_filters[bank_ac_field] = self.bank_party_account_number
+			or_filters["bank_account_no"] = self.bank_party_account_number
 
 		if self.bank_party_iban:
 			or_filters["iban"] = self.bank_party_iban
@@ -100,7 +103,8 @@ class AutoMatchbyPartyNameDescription:
 		if not (self.bank_party_name or self.description):
 			return None
 
-		return self.match_party_name_desc_in_party()
+		result = self.match_party_name_desc_in_party()
+		return result
 
 	def match_party_name_desc_in_party(self) -> tuple | None:
 		"""Fuzzy search party name and/or description against parties in the system"""
@@ -109,8 +113,7 @@ class AutoMatchbyPartyNameDescription:
 
 		for party in parties:
 			filters = {"status": "Active"} if party == "Employee" else {"disabled": 0}
-			field = f"{party.lower()}_name"
-			names = frappe.get_all(party, filters=filters, fields=[f"{field} as party_name", "name"])
+			names = frappe.get_all(party, filters=filters, pluck=party.lower() + "_name")
 
 			for field in ["bank_party_name", "description"]:
 				if not self.get(field):
@@ -129,15 +132,16 @@ class AutoMatchbyPartyNameDescription:
 
 	def fuzzy_search_and_return_result(self, party, names, field) -> tuple | None:
 		skip = False
-		result = process.extract(
-			query=self.get(field),
-			choices={row.get("name"): row.get("party_name") for row in names},
-			scorer=fuzz.token_set_ratio,
-			processor=default_process,
-		)
+		result = process.extract(query=self.get(field), choices=names, scorer=fuzz.token_set_ratio)
 		party_name, skip = self.process_fuzzy_result(result)
 
-		return ((party, party_name), skip) if party_name else (None, skip)
+		if not party_name:
+			return None, skip
+
+		return (
+			party,
+			party_name,
+		), skip
 
 	def process_fuzzy_result(self, result: list | None):
 		"""
@@ -146,30 +150,30 @@ class AutoMatchbyPartyNameDescription:
 
 		Returns: Result, Skip (whether or not to discontinue matching)
 		"""
-		SCORE, PARTY_ID, CUTOFF = 1, 2, 80
+		PARTY, SCORE, CUTOFF = 0, 1, 80
 
 		if not result or not len(result):
 			return None, False
 
 		first_result = result[0]
 		if len(result) == 1:
-			return (first_result[PARTY_ID] if first_result[SCORE] > CUTOFF else None), True
+			return (first_result[PARTY] if first_result[SCORE] > CUTOFF else None), True
 
+		second_result = result[1]
 		if first_result[SCORE] > CUTOFF:
-			second_result = result[1]
 			# If multiple matches with the same score, return None but discontinue matching
 			# Matches were found but were too close to distinguish between
 			if first_result[SCORE] == second_result[SCORE]:
 				return None, True
 
-			return first_result[PARTY_ID], True
+			return first_result[PARTY], True
 		else:
 			return None, False
 
 
 def get_parties_in_order(deposit: float) -> list:
-	return (
-		["Customer", "Supplier", "Employee"]  # most -> least likely to pay us
-		if flt(deposit) > 0
-		else ["Supplier", "Employee", "Customer"]  # most -> least likely to receive from us
-	)
+	parties = ["Supplier", "Employee", "Customer"]  # most -> least likely to receive
+	if flt(deposit) > 0:
+		parties = ["Customer", "Supplier", "Employee"]  # most -> least likely to pay
+
+	return parties

erpnext/accounts/doctype/bank_transaction/bank_transaction.js

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

erpnext/accounts/doctype/bank_transaction/bank_transaction.json

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

erpnext/accounts/doctype/bank_transaction/bank_transaction.py

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

erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py

@@ -12,9 +12,6 @@ from erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool
 	get_linked_payments,
 	reconcile_vouchers,
 )
-from erpnext.accounts.doctype.mode_of_payment.test_mode_of_payment import (
-	set_default_account_for_mode_of_payment,
-)
 from erpnext.accounts.doctype.payment_entry.test_payment_entry import get_payment_entry
 from erpnext.accounts.doctype.pos_profile.test_pos_profile import make_pos_profile
 from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make_purchase_invoice
@@ -437,13 +434,15 @@ def add_vouchers(gl_account="_Test Bank - _TC"):
 	except frappe.DuplicateEntryError:
 		pass
 
-	mode_of_payment = frappe.get_doc({"doctype": "Mode of Payment", "name": "Wire Transfer"})
+	mode_of_payment = frappe.get_doc({"doctype": "Mode of Payment", "name": "Cash"})
 
-	set_default_account_for_mode_of_payment(mode_of_payment, "_Test Company", gl_account)
+	if not frappe.db.get_value("Mode of Payment Account", {"company": "_Test Company", "parent": "Cash"}):
+		mode_of_payment.append("accounts", {"company": "_Test Company", "default_account": gl_account})
+		mode_of_payment.save()
 
 	si = create_sales_invoice(customer="Fayva", qty=1, rate=109080, do_not_save=1)
 	si.is_pos = 1
-	si.append("payments", {"mode_of_payment": "Wire Transfer", "amount": 109080})
+	si.append("payments", {"mode_of_payment": "Cash", "account": gl_account, "amount": 109080})
 	si.insert()
 	si.submit()
 

erpnext/accounts/doctype/budget/budget.json

@@ -7,10 +7,10 @@
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
-  "naming_series",
   "budget_against",
   "company",
   "cost_center",
+  "naming_series",
   "project",
   "fiscal_year",
   "column_break_3",
@@ -195,19 +195,19 @@
   },
   {
    "fieldname": "naming_series",
-   "fieldtype": "Select",
+   "fieldtype": "Data",
+   "hidden": 1,
    "label": "Series",
    "no_copy": 1,
-   "options": "BUDGET-.YYYY.-",
    "print_hide": 1,
-   "reqd": 1,
+   "read_only": 1,
    "set_only_once": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2025-06-16 15:57:13.114981",
+ "modified": "2022-10-10 22:14:36.361509",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Budget",
@@ -235,4 +235,4 @@
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
-}
+}

erpnext/accounts/doctype/budget/budget.py

@@ -48,7 +48,7 @@ class Budget(Document):
 		cost_center: DF.Link | None
 		fiscal_year: DF.Link
 		monthly_distribution: DF.Link | None
-		naming_series: DF.Literal["BUDGET-.YYYY.-"]
+		naming_series: DF.Data | None
 		project: DF.Link | None
 	# end: auto-generated types
 
@@ -136,6 +136,9 @@ class Budget(Document):
 		):
 			self.applicable_on_booking_actual_expenses = 1
 
+	def before_naming(self):
+		self.naming_series = f"{{{frappe.scrub(self.budget_against)}}}./.{self.fiscal_year}/.###"
+
 
 def validate_expense_against_budget(args, expense_amount=0):
 	args = frappe._dict(args)
@@ -487,20 +490,13 @@ def get_actual_expense(args):
 def get_accumulated_monthly_budget(monthly_distribution, posting_date, fiscal_year, annual_budget):
 	distribution = {}
 	if monthly_distribution:
-		mdp = frappe.qb.DocType("Monthly Distribution Percentage")
-		md = frappe.qb.DocType("Monthly Distribution")
-
-		res = (
-			frappe.qb.from_(mdp)
-			.join(md)
-			.on(mdp.parent == md.name)
-			.select(mdp.month, mdp.percentage_allocation)
-			.where(md.fiscal_year == fiscal_year)
-			.where(md.name == monthly_distribution)
-			.run(as_dict=True)
-		)
-
-		for d in res:
+		for d in frappe.db.sql(
+			"""select mdp.month, mdp.percentage_allocation
+			from `tabMonthly Distribution Percentage` mdp, `tabMonthly Distribution` md
+			where mdp.parent=md.name and md.fiscal_year=%s""",
+			fiscal_year,
+			as_dict=1,
+		):
 			distribution.setdefault(d.month, d.percentage_allocation)
 
 	dt = frappe.get_cached_value("Fiscal Year", fiscal_year, "year_start_date")

erpnext/accounts/doctype/coupon_code/test_coupon_code.py

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

erpnext/accounts/doctype/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": "2023-06-15 15:46:53.865712",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Dunning",
@@ -454,4 +435,4 @@
  "states": [],
  "title_field": "customer_name",
  "track_changes": 1
-}
+}

erpnext/accounts/doctype/dunning/dunning.py

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

erpnext/accounts/doctype/dunning/test_dunning.py

@@ -1,9 +1,6 @@
 # Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-import json
-
 import frappe
-from frappe.model import mapper
 from frappe.tests.utils import FrappeTestCase
 from frappe.utils import add_days, nowdate, today
 
@@ -71,36 +68,6 @@ class TestDunning(FrappeTestCase):
 		dunning.reload()
 		self.assertEqual(dunning.status, "Resolved")
 
-	def test_fetch_overdue_payments(self):
-		"""
-		Create SI with overdue payment. Check if overdue payment is fetched in Dunning.
-		"""
-		si1 = create_sales_invoice_against_cost_center(
-			posting_date=add_days(today(), -1 * 6),
-			qty=1,
-			rate=100,
-		)
-
-		si2 = create_sales_invoice_against_cost_center(
-			posting_date=add_days(today(), -1 * 6),
-			qty=1,
-			rate=300,
-		)
-
-		dunning = create_dunning_from_sales_invoice(si1.name)
-		dunning.overdue_payments = []
-
-		method = "erpnext.accounts.doctype.sales_invoice.sales_invoice.create_dunning"
-		updated_dunning = mapper.map_docs(method, json.dumps([si1.name, si2.name]), dunning)
-
-		self.assertEqual(len(updated_dunning.overdue_payments), 2)
-
-		self.assertEqual(updated_dunning.overdue_payments[0].sales_invoice, si1.name)
-		self.assertEqual(updated_dunning.overdue_payments[0].outstanding, si1.outstanding_amount)
-
-		self.assertEqual(updated_dunning.overdue_payments[1].sales_invoice, si2.name)
-		self.assertEqual(updated_dunning.overdue_payments[1].outstanding, si2.outstanding_amount)
-
 	def test_dunning_and_payment_against_partially_due_invoice(self):
 		"""
 		Create SI with first installment overdue. Check impact of Dunning and Payment Entry.

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

@@ -188,7 +188,7 @@ class TestExchangeRateRevaluation(AccountsTestMixin, FrappeTestCase):
 
 		pe = get_payment_entry(si.doctype, si.name)
 		pe.paid_amount = 95
-		pe.source_exchange_rate = 84.2105
+		pe.source_exchange_rate = 84.211
 		pe.received_amount = 8000
 		pe.references = []
 		pe.save().submit()
@@ -229,7 +229,7 @@ class TestExchangeRateRevaluation(AccountsTestMixin, FrappeTestCase):
 		row = next(x for x in je.accounts if x.account == self.debtors_usd)
 		self.assertEqual(flt(row.credit_in_account_currency, precision), 5.0)  # in USD
 		row = next(x for x in je.accounts if x.account != self.debtors_usd)
-		self.assertEqual(flt(row.debit_in_account_currency, precision), 421.05)  # in INR
+		self.assertEqual(flt(row.debit_in_account_currency, precision), 421.06)  # in INR
 
 		# total_debit and total_credit will be 0.0, as JV is posting only to account currency fields
 		self.assertEqual(flt(je.total_debit, precision), 0.0)

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/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": [
   {
@@ -279,8 +267,7 @@
   {
    "fieldname": "transaction_exchange_rate",
    "fieldtype": "Float",
-   "label": "Transaction Exchange Rate",
-   "precision": "9"
+   "label": "Transaction Exchange Rate"
   },
   {
    "fieldname": "debit_in_transaction_currency",
@@ -298,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": "2025-02-21 14:36:49.431166",
+ "modified": "2024-07-02 14:31:51.496466",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "GL Entry",

erpnext/accounts/doctype/gl_entry/gl_entry.py

@@ -7,17 +7,13 @@ from frappe import _
 from frappe.model.document import Document
 from frappe.model.meta import get_field_precision
 from frappe.model.naming import set_name_from_naming_options
-from frappe.utils import create_batch, flt, fmt_money, now
+from frappe.utils import flt, fmt_money
 
 import erpnext
 from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import (
 	get_checks_for_pl_and_bs_accounts,
 )
-from erpnext.accounts.party import (
-	validate_account_party_type,
-	validate_party_frozen_disabled,
-	validate_party_gle_currency,
-)
+from erpnext.accounts.party import validate_party_frozen_disabled, validate_party_gle_currency
 from erpnext.accounts.utils import get_account_currency, get_fiscal_year
 from erpnext.exceptions import InvalidAccountCurrency
 
@@ -129,7 +125,7 @@ class GLEntry(Document):
 			if not self.get(k):
 				frappe.throw(_("{0} is required").format(_(self.meta.get_label(k))))
 
-		if not self.is_cancelled and not (self.party_type and self.party):
+		if not (self.party_type and self.party):
 			account_type = frappe.get_cached_value("Account", self.account, "account_type")
 			if account_type == "Receivable":
 				frappe.throw(
@@ -272,12 +268,8 @@ class GLEntry(Document):
 
 	def validate_party(self):
 		validate_party_frozen_disabled(self.party_type, self.party)
-		validate_account_party_type(self)
 
 	def validate_currency(self):
-		if self.is_cancelled:
-			return
-
 		company_currency = erpnext.get_company_currency(self.company)
 		account_currency = get_account_currency(self.account)
 
@@ -438,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():
@@ -451,15 +442,12 @@ def rename_gle_sle_docs():
 def rename_temporarily_named_docs(doctype):
 	"""Rename temporarily named docs using autoname options"""
 	docs_to_rename = frappe.get_all(doctype, {"to_rename": "1"}, order_by="creation", limit=50000)
-	autoname = frappe.get_meta(doctype).autoname
-
-	for batch in create_batch(docs_to_rename, 100):
-		for doc in batch:
-			oldname = doc.name
-			set_name_from_naming_options(autoname, doc)
-			newname = doc.name
-			frappe.db.sql(
-				f"UPDATE `tab{doctype}` SET name = %s, to_rename = 0, modified = %s where name = %s",
-				(newname, now(), oldname),
-			)
-		frappe.db.commit()
+	for doc in docs_to_rename:
+		oldname = doc.name
+		set_name_from_naming_options(frappe.get_meta(doctype).autoname, doc)
+		newname = doc.name
+		frappe.db.sql(
+			f"UPDATE `tab{doctype}` SET name = %s, to_rename = 0 where name = %s",
+			(newname, oldname),
+			auto_commit=True,
+		)

erpnext/accounts/doctype/gl_entry/test_gl_entry.py

@@ -79,65 +79,3 @@ class TestGLEntry(unittest.TestCase):
 			"SELECT current from tabSeries where name = %s", naming_series
 		)[0][0]
 		self.assertEqual(old_naming_series_current_value + 2, new_naming_series_current_value)
-
-	def test_validate_account_party_type(self):
-		jv = make_journal_entry(
-			"_Test Account Cost for Goods Sold - _TC",
-			"_Test Bank - _TC",
-			100,
-			"_Test Cost Center - _TC",
-			save=False,
-			submit=False,
-		)
-
-		for row in jv.accounts:
-			row.party_type = "Supplier"
-			break
-
-		jv.save()
-		try:
-			jv.submit()
-		except Exception as e:
-			self.assertEqual(
-				str(e),
-				"Party Type and Party can only be set for Receivable / Payable account_Test Account Cost for Goods Sold - _TC",
-			)
-
-		jv1 = make_journal_entry(
-			"_Test Account Cost for Goods Sold - _TC",
-			"_Test Bank - _TC",
-			100,
-			"_Test Cost Center - _TC",
-			save=False,
-			submit=False,
-		)
-
-		for row in jv.accounts:
-			row.party_type = "Customer"
-			break
-
-		jv1.save()
-		try:
-			jv1.submit()
-		except Exception as e:
-			self.assertEqual(
-				str(e),
-				"Party Type and Party can only be set for Receivable / Payable account_Test Account Cost for Goods Sold - _TC",
-			)
-
-	def test_validate_account_party_type_shareholder(self):
-		jv = make_journal_entry(
-			"Opening Balance Equity - _TC",
-			"Cash - _TC",
-			100,
-			"_Test Cost Center - _TC",
-			save=False,
-			submit=False,
-		)
-
-		for row in jv.accounts:
-			row.party_type = "Shareholder"
-			break
-
-		jv.save().submit()
-		self.assertEqual(1, jv.docstatus)

erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js

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

erpnext/accounts/doctype/journal_entry/journal_entry.js

@@ -35,7 +35,7 @@ frappe.ui.form.on("Journal Entry", {
 						to_date: moment(frm.doc.modified).format("YYYY-MM-DD"),
 						company: frm.doc.company,
 						finance_book: frm.doc.finance_book,
-						categorize_by: "",
+						group_by: "",
 						show_cancelled_entries: frm.doc.docstatus === 2,
 					};
 					frappe.set_route("query-report", "General Ledger");
@@ -430,6 +430,12 @@ frappe.ui.form.on("Journal Entry Account", {
 			});
 		}
 	},
+	cost_center: function (frm, dt, dn) {
+		// Don't reset for Gain/Loss type journals, as it will make Debit and Credit values '0'
+		if (frm.doc.voucher_type != "Exchange Gain Or Loss") {
+			erpnext.journal_entry.set_account_details(frm, dt, dn);
+		}
+	},
 
 	account: function (frm, dt, dn) {
 		erpnext.journal_entry.set_account_details(frm, dt, dn);

erpnext/accounts/doctype/journal_entry/journal_entry.py

@@ -127,6 +127,9 @@ class JournalEntry(AccountsController):
 		self.set_amounts_in_company_currency()
 		self.validate_debit_credit_amount()
 		self.set_total_debit_credit()
+		# Do not validate while importing via data import
+		if not frappe.flags.in_import:
+			self.validate_total_debit_and_credit()
 
 		if not frappe.flags.is_reverse_depr_entry:
 			self.validate_against_jv()
@@ -141,13 +144,13 @@ class JournalEntry(AccountsController):
 		self.validate_empty_accounts_table()
 		self.validate_inter_company_accounts()
 		self.validate_depr_entry_voucher_type()
-		self.validate_company_in_accounting_dimension()
 		self.validate_advance_accounts()
 
 		if self.docstatus == 0:
 			self.apply_tax_withholding()
 
-		self.title = self.get_title()
+		if not self.title:
+			self.title = self.get_title()
 
 	def validate_advance_accounts(self):
 		journal_accounts = set([x.account for x in self.accounts])
@@ -181,16 +184,10 @@ class JournalEntry(AccountsController):
 		else:
 			return self._cancel()
 
-	def before_submit(self):
-		# Do not validate while importing via data import
-		if not frappe.flags.in_import:
-			self.validate_total_debit_and_credit()
-
 	def on_submit(self):
 		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()
@@ -221,10 +218,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()
@@ -249,20 +244,11 @@ class JournalEntry(AccountsController):
 
 	def validate_inter_company_accounts(self):
 		if self.voucher_type == "Inter Company Journal Entry" and self.inter_company_journal_entry_reference:
-			doc = frappe.db.get_value(
-				"Journal Entry",
-				self.inter_company_journal_entry_reference,
-				["company", "total_debit", "total_credit"],
-				as_dict=True,
-			)
+			doc = frappe.get_doc("Journal Entry", self.inter_company_journal_entry_reference)
 			account_currency = frappe.get_cached_value("Company", self.company, "default_currency")
 			previous_account_currency = frappe.get_cached_value("Company", doc.company, "default_currency")
 			if account_currency == previous_account_currency:
-				credit_precision = self.precision("total_credit")
-				debit_precision = self.precision("total_debit")
-				if (flt(self.total_credit, credit_precision) != flt(doc.total_debit, debit_precision)) or (
-					flt(self.total_debit, debit_precision) != flt(doc.total_credit, credit_precision)
-				):
+				if self.total_credit != doc.total_debit or self.total_debit != doc.total_credit:
 					frappe.throw(_("Total Credit/ Debit Amount should be same as linked Journal Entry"))
 
 	def validate_depr_entry_voucher_type(self):
@@ -273,7 +259,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
@@ -584,22 +570,8 @@ class JournalEntry(AccountsController):
 		if customers:
 			from erpnext.selling.doctype.customer.customer import check_credit_limit
 
-			customer_details = frappe._dict(
-				frappe.db.get_all(
-					"Customer Credit Limit",
-					filters={
-						"parent": ["in", customers],
-						"parenttype": ["=", "Customer"],
-						"company": ["=", self.company],
-					},
-					fields=["parent", "bypass_credit_limit_check"],
-					as_list=True,
-				)
-			)
-
 			for customer in customers:
-				ignore_outstanding_sales_order = bool(customer_details.get(customer))
-				check_credit_limit(customer, self.company, ignore_outstanding_sales_order)
+				check_credit_limit(customer, self.company)
 
 	def validate_cheque_info(self):
 		if self.voucher_type in ["Bank Entry"]:
@@ -1082,15 +1054,14 @@ class JournalEntry(AccountsController):
 		gl_map = []
 
 		company_currency = erpnext.get_company_currency(self.company)
-		self.transaction_currency = company_currency
-		self.transaction_exchange_rate = 1
 		if self.multi_currency:
 			for row in self.get("accounts"):
 				if row.account_currency != company_currency:
-					# Journal assumes the first foreign currency as transaction currency
-					self.transaction_currency = row.account_currency
-					self.transaction_exchange_rate = row.exchange_rate
+					self.currency = row.account_currency
+					self.conversion_rate = row.exchange_rate
 					break
+		else:
+			self.currency = company_currency
 
 		for d in self.get("accounts"):
 			if d.debit or d.credit or (self.voucher_type == "Exchange Gain Or Loss"):
@@ -1115,18 +1086,6 @@ class JournalEntry(AccountsController):
 							"credit_in_account_currency": flt(
 								d.credit_in_account_currency, d.precision("credit_in_account_currency")
 							),
-							"transaction_currency": self.transaction_currency,
-							"transaction_exchange_rate": self.transaction_exchange_rate,
-							"debit_in_transaction_currency": flt(
-								d.debit_in_account_currency, d.precision("debit_in_account_currency")
-							)
-							if self.transaction_currency == d.account_currency
-							else flt(d.debit, d.precision("debit")) / self.transaction_exchange_rate,
-							"credit_in_transaction_currency": flt(
-								d.credit_in_account_currency, d.precision("credit_in_account_currency")
-							)
-							if self.transaction_currency == d.account_currency
-							else flt(d.credit, d.precision("credit")) / self.transaction_exchange_rate,
 							"against_voucher_type": d.reference_type,
 							"against_voucher": d.reference_name,
 							"remarks": remarks,
@@ -1709,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

@@ -146,9 +146,10 @@ class TestJournalEntry(unittest.TestCase):
 				"credit_in_account_currency": 0 if diff > 0 else abs(diff),
 			},
 		)
+		jv.insert()
 
 		if account_bal == stock_bal:
-			self.assertRaises(StockAccountInvalidTransaction, jv.save)
+			self.assertRaises(StockAccountInvalidTransaction, jv.submit)
 			frappe.db.rollback()
 		else:
 			jv.submit()
@@ -514,55 +515,6 @@ class TestJournalEntry(unittest.TestCase):
 				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})
@@ -575,7 +527,7 @@ class TestJournalEntry(unittest.TestCase):
 			order_by="account",
 		)
 		expected = [
-			{"account": "_Test Bank - _TC", "transaction_exchange_rate": 85.0},
+			{"account": "_Test Bank - _TC", "transaction_exchange_rate": 1.0},
 			{"account": "_Test Receivable USD - _TC", "transaction_exchange_rate": 85.0},
 		]
 		self.assertEqual(expected, actual)
@@ -591,14 +543,13 @@ def make_journal_entry(
 	save=True,
 	submit=False,
 	project=None,
-	company=None,
 ):
 	if not cost_center:
 		cost_center = "_Test Cost Center - _TC"
 
 	jv = frappe.new_doc("Journal Entry")
 	jv.posting_date = posting_date or nowdate()
-	jv.company = company or "_Test Company"
+	jv.company = "_Test Company"
 	jv.user_remark = "test"
 	jv.multi_currency = 1
 	jv.set(

erpnext/accounts/doctype/loyalty_program/loyalty_program.py

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