chore(release): Bumped to Version 14.1.0

# [14.1.0](https://github.com/frappe/erpnext/compare/v14.0.3...v14.1.0) (2022-09-06)

### Bug Fixes

* **Appointment:** create lead notes as child table ([00a73c7](00a73c7a57))
* fetch from parent not working for custom field ([76ae4d8](76ae4d87ca))
* force delete old report docs (backport [#32026](https://github.com/frappe/erpnext/issues/32026)) ([#32027](https://github.com/frappe/erpnext/issues/32027)) ([0e9a1fb](0e9a1fb40e))
* include payment against PO in AR/AP report ([4bbd0ec](4bbd0ec985))
* incorrect import parameter for cancel PDA ([f55881a](f55881aef8))
* key error on consolidated financial report ([4409f11](4409f11282))
* KSA VAT report multi currency amount issue ([b96526e](b96526eefd))
* Loan Interest accruals for 0 rated loans ([1b9082e](1b9082e07b))
* Naming series in Journal Entry Template ([5520c6b](5520c6b2f3))
* not able to make variant item ([f871dd4](f871dd4ef6))
* **pos:** error while consolidating pos invoices ([319ee41](319ee41403))
* remove spaces and order import ([055556b](055556b7f1))
* upgrade process to version-14 when currency opportunity wass not set ([4cb685a](4cb685a326))
* validate available qty for consumption in SCR ([26536da](26536da74b))

### Features

* better Item Price list view ([#31954](https://github.com/frappe/erpnext/issues/31954)) ([784fb47](784fb47197))
* tabbed view for Employee form ([#31940](https://github.com/frappe/erpnext/issues/31940)) ([#32095](https://github.com/frappe/erpnext/issues/32095)) ([3c688df](3c688dfa6d))
* two new filters for gross profit ([60fa421](60fa421409))

.github/helper/.flake8_strict

@@ -66,8 +66,7 @@ ignore =
     F841,
     E713,
     E712,
-    B023,
-    B028
+    B023
 
 
 max-line-length = 200

.github/helper/documentation.py

@@ -3,71 +3,52 @@ import requests
 from urllib.parse import urlparse
 
 
-WEBSITE_REPOS = [
+docs_repos = [
+	"frappe_docs",
+	"erpnext_documentation",
 	"erpnext_com",
 	"frappe_io",
 ]
 
-DOCUMENTATION_DOMAINS = [
-	"docs.erpnext.com",
-	"frappeframework.com",
-]
 
+def uri_validator(x):
+	result = urlparse(x)
+	return all([result.scheme, result.netloc, result.path])
 
-def is_valid_url(url: str) -> bool:
-	parts = urlparse(url)
-	return all((parts.scheme, parts.netloc, parts.path))
-
-
-def is_documentation_link(word: str) -> bool:
-	if not word.startswith("http") or not is_valid_url(word):
-		return False
-
-	parsed_url = urlparse(word)
-	if parsed_url.netloc in DOCUMENTATION_DOMAINS:
-		return True
-
-	if parsed_url.netloc == "github.com":
-		parts = parsed_url.path.split("/")
-		if len(parts) == 5 and parts[1] == "frappe" and parts[2] in WEBSITE_REPOS:
-			return True
-
-	return False
-
-
-def contains_documentation_link(body: str) -> bool:
-	return any(
-		is_documentation_link(word)
-		for line in body.splitlines()
-		for word in line.split()
-	)
-
-
-def check_pull_request(number: str) -> "tuple[int, str]":
-	response = requests.get(f"https://api.github.com/repos/frappe/erpnext/pulls/{number}")
-	if not response.ok:
-		return 1, "Pull Request Not Found! ⚠️"
-
-	payload = response.json()
-	title = (payload.get("title") or "").lower().strip()
-	head_sha = (payload.get("head") or {}).get("sha")
-	body = (payload.get("body") or "").lower()
-
-	if (
-		not title.startswith("feat")
-		or not head_sha
-		or "no-docs" in body
-		or "backport" in body
-	):
-		return 0, "Skipping documentation checks... 🏃"
-
-	if contains_documentation_link(body):
-		return 0, "Documentation Link Found. You're Awesome! 🎉"
-
-	return 1, "Documentation Link Not Found! ⚠️"
+def docs_link_exists(body):
+	for line in body.splitlines():
+		for word in line.split():
+			if word.startswith('http') and uri_validator(word):
+				parsed_url = urlparse(word)
+				if parsed_url.netloc == "github.com":
+					parts = parsed_url.path.split('/')
+					if len(parts) == 5 and parts[1] == "frappe" and parts[2] in docs_repos:
+						return True
+				elif parsed_url.netloc == "docs.erpnext.com":
+					return True
 
 
 if __name__ == "__main__":
-	exit_code, message = check_pull_request(sys.argv[1])
-	print(message)
-	sys.exit(exit_code)
+	pr = sys.argv[1]
+	response = requests.get("https://api.github.com/repos/frappe/erpnext/pulls/{}".format(pr))
+
+	if response.ok:
+		payload = response.json()
+		title = (payload.get("title") or "").lower().strip()
+		head_sha = (payload.get("head") or {}).get("sha")
+		body = (payload.get("body") or "").lower()
+
+		if (title.startswith("feat")
+			and head_sha
+			and "no-docs" not in body
+			and "backport" not in body
+		):
+			if docs_link_exists(body):
+				print("Documentation Link Found. You're Awesome! 🎉")
+
+			else:
+				print("Documentation Link Not Found! ⚠️")
+				sys.exit(1)
+
+		else:
+			print("Skipping documentation checks... 🏃")

.github/helper/install.sh

@@ -24,14 +24,15 @@ fi
 
 
 if [ "$DB" == "mariadb" ];then
-    mysql --host 127.0.0.1 --port 3306 -u root -proot -e "SET GLOBAL character_set_server = 'utf8mb4'"
-    mysql --host 127.0.0.1 --port 3306 -u root -proot -e "SET GLOBAL collation_server = 'utf8mb4_unicode_ci'"
+    mysql --host 127.0.0.1 --port 3306 -u root -e "SET GLOBAL character_set_server = 'utf8mb4'"
+    mysql --host 127.0.0.1 --port 3306 -u root -e "SET GLOBAL collation_server = 'utf8mb4_unicode_ci'"
 
-    mysql --host 127.0.0.1 --port 3306 -u root -proot -e "CREATE USER 'test_frappe'@'localhost' IDENTIFIED BY 'test_frappe'"
-    mysql --host 127.0.0.1 --port 3306 -u root -proot -e "CREATE DATABASE test_frappe"
-    mysql --host 127.0.0.1 --port 3306 -u root -proot -e "GRANT ALL PRIVILEGES ON \`test_frappe\`.* TO 'test_frappe'@'localhost'"
+    mysql --host 127.0.0.1 --port 3306 -u root -e "CREATE USER 'test_frappe'@'localhost' IDENTIFIED BY 'test_frappe'"
+    mysql --host 127.0.0.1 --port 3306 -u root -e "CREATE DATABASE test_frappe"
+    mysql --host 127.0.0.1 --port 3306 -u root -e "GRANT ALL PRIVILEGES ON \`test_frappe\`.* TO 'test_frappe'@'localhost'"
 
-    mysql --host 127.0.0.1 --port 3306 -u root -proot -e "FLUSH PRIVILEGES"
+    mysql --host 127.0.0.1 --port 3306 -u root -e "UPDATE mysql.user SET Password=PASSWORD('travis') WHERE User='root'"
+    mysql --host 127.0.0.1 --port 3306 -u root -e "FLUSH PRIVILEGES"
 fi
 
 if [ "$DB" == "postgres" ];then
@@ -41,17 +42,12 @@ fi
 
 
 install_whktml() {
-    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
+    wget -O /tmp/wkhtmltox.tar.xz https://github.com/frappe/wkhtmltopdf/raw/master/wkhtmltox-0.12.3_linux-generic-amd64.tar.xz
+    tar -xf /tmp/wkhtmltox.tar.xz -C /tmp
+    sudo mv /tmp/wkhtmltox/bin/wkhtmltopdf /usr/local/bin/wkhtmltopdf
+    sudo chmod o+x /usr/local/bin/wkhtmltopdf
 }
 install_whktml &
-wkpid=$!
-
 
 cd ~/frappe-bench || exit
 
@@ -65,8 +61,6 @@ bench get-app erpnext "${GITHUB_WORKSPACE}"
 
 if [ "$TYPE" == "server" ]; then bench setup requirements --dev; fi
 
-wait $wkpid
-
 bench start &> bench_run_logs.txt &
 CI=Yes bench build --app frappe &
 bench --site test_site reinstall --yes

.github/helper/site_config_mariadb.json

@@ -9,8 +9,8 @@
  "mail_password": "test",
  "admin_password": "admin",
  "root_login": "root",
- "root_password": "root",
+ "root_password": "travis",
  "host_name": "http://test_site:8000",
- "install_apps": ["payments", "erpnext"],
+ "install_apps": ["erpnext"],
  "throttle_user_limit": 100
 }

.github/workflows/initiate_release.yml

@@ -1,32 +0,0 @@
-# This workflow is agnostic to branches. Only maintain on develop branch.
-# To add/remove versions just modify the matrix.
-
-name: Create weekly release pull requests
-on:
-  schedule:
-    # 9:30 UTC => 3 PM IST Tuesday
-    - cron: "30 9 * * 2"
-  workflow_dispatch:
-
-jobs:
-  release:
-    name: Release
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        version: ["13", "14"]
-
-    steps:
-      - uses: octokit/request-action@v2.x
-        with:
-          route: POST /repos/{owner}/{repo}/pulls
-          owner: frappe
-          repo: erpnext
-          title: |-
-            "chore: release v${{ matrix.version }}"
-          body: "Automated weekly release."
-          base: version-${{ matrix.version }}
-          head: version-${{ matrix.version }}-hotfix
-        env:
-          GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}

.github/workflows/patch.yml

@@ -11,7 +11,7 @@ on:
   workflow_dispatch:
 
 concurrency:
-  group: patch-develop-${{ github.event_name }}-${{ github.event.number || github.event_name == 'workflow_dispatch' && github.run_id || '' }}
+  group: patch-develop-${{ github.event.number }}
   cancel-in-progress: true
 
 jobs:
@@ -25,7 +25,7 @@ jobs:
       mysql:
         image: mariadb:10.3
         env:
-          MARIADB_ROOT_PASSWORD: 'root'
+          MYSQL_ALLOW_EMPTY_PASSWORD: YES
         ports:
           - 3306:3306
         options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3

.github/workflows/release.yml

@@ -2,7 +2,7 @@ name: Generate Semantic Release
 on:
   push:
     branches:
-      - version-13
+      - version-14
 jobs:
   release:
     name: Release
@@ -13,10 +13,12 @@ jobs:
         with:
           fetch-depth: 0
           persist-credentials: false
+
       - name: Setup Node.js
         uses: actions/setup-node@v2
         with:
-          node-version: 18
+          node-version: 16
+
       - name: Setup dependencies
         run: |
           npm install @semantic-release/git @semantic-release/exec --no-save

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

@@ -16,18 +16,18 @@ on:
   workflow_dispatch:
     inputs:
       user:
-        description: 'Frappe Framework repository user (add your username for forks)'
+        description: 'user'
         required: true
         default: 'frappe'
         type: string
       branch:
-        description: 'Frappe Framework branch'
+        description: 'Branch name'
         default: 'develop'
         required: false
         type: string
 
 concurrency:
-  group: server-mariadb-develop-${{ github.event_name }}-${{ github.event.number || github.event_name == 'workflow_dispatch' && github.run_id || '' }}
+  group: server-mariadb-develop-${{ github.event.number }}
   cancel-in-progress: true
 
 jobs:
@@ -45,9 +45,9 @@ jobs:
 
     services:
       mysql:
-        image: mariadb:10.6
+        image: mariadb:10.3
         env:
-          MARIADB_ROOT_PASSWORD: 'root'
+          MYSQL_ALLOW_EMPTY_PASSWORD: YES
         ports:
           - 3306:3306
         options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
@@ -59,7 +59,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v2
         with:
-          python-version: '3.11'
+          python-version: '3.10'
 
       - name: Check for valid Python & Merge Conflicts
         run: |
@@ -120,7 +120,7 @@ jobs:
           FRAPPE_BRANCH: ${{ github.event.inputs.branch }}
 
       - name: Run Tests
-        run: 'cd ~/frappe-bench/ && bench --site test_site run-parallel-tests --app erpnext --with-coverage --total-builds 4 --build-number ${{ matrix.container }}'
+        run: cd ~/frappe-bench/ && bench --site test_site run-parallel-tests --app erpnext --use-orchestrator --with-coverage
         env:
           TYPE: server
           CI_BUILD_ID: ${{ github.run_id }}

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

@@ -9,7 +9,7 @@ on:
     types: [opened, labelled, synchronize, reopened]
 
 concurrency:
-  group: server-postgres-develop-${{ github.event_name }}-${{ github.event.number || github.event_name == 'workflow_dispatch' && github.run_id || '' }}
+  group: server-postgres-develop-${{ github.event.number }}
   cancel-in-progress: true
 
 jobs:

.mergify.yml

@@ -9,7 +9,6 @@ pull_request_rules:
           - author!=nabinhait
           - author!=ankush
           - author!=deepeshgarg007
-          - author!=frappe-pr-bot
           - author!=mergify[bot]
 
         - or:

.pre-commit-config.yaml

@@ -16,8 +16,8 @@ repos:
       - id: check-merge-conflict
       - id: check-ast
 
-  - repo: https://github.com/PyCQA/flake8
-    rev: 5.0.4
+  - repo: https://gitlab.com/pycqa/flake8
+    rev: 3.9.2
     hooks:
       - id: flake8
         additional_dependencies: [
@@ -32,8 +32,8 @@ repos:
       - id: black
         additional_dependencies: ['click==8.0.4']
 
-  - repo: https://github.com/PyCQA/isort
-    rev: 5.12.0
+  - repo: https://github.com/timothycrosley/isort
+    rev: 5.9.1
     hooks:
       - id: isort
         exclude: ".*setup.py$"

.releaserc

@@ -1,5 +1,5 @@
 {
-	"branches": ["version-13"],
+	"branches": ["version-14"],
 	"plugins": [
 		"@semantic-release/commit-analyzer", {
 			"preset": "angular",
@@ -10,7 +10,7 @@
 		"@semantic-release/release-notes-generator",
 		[
 			"@semantic-release/exec", {
-				"prepareCmd": 'sed -ir "s/[0-9]*\.[0-9]*\.[0-9]*/${nextRelease.version}/" erpnext/__init__.py'
+				"prepareCmd": 'sed -ir -E "s/\"[0-9]+\.[0-9]+\.[0-9]+\"/\"${nextRelease.version}\"/" erpnext/__init__.py'
 			}
 		],
 		[
@@ -21,4 +21,4 @@
 		],
 		"@semantic-release/github"
 	]
-}
+}

CODEOWNERS

@@ -4,26 +4,29 @@
 # the repo. Unless a later match takes precedence,
 
 erpnext/accounts/               @nextchamp-saqib @deepeshgarg007 @ruthra-kumar
-erpnext/assets/                 @anandbaburajan @deepeshgarg007
+erpnext/assets/                 @nextchamp-saqib @deepeshgarg007 @ruthra-kumar
 erpnext/loan_management/        @nextchamp-saqib @deepeshgarg007
 erpnext/regional                @nextchamp-saqib @deepeshgarg007 @ruthra-kumar
 erpnext/selling                 @nextchamp-saqib @deepeshgarg007 @ruthra-kumar
 erpnext/support/                @nextchamp-saqib @deepeshgarg007
 pos*                            @nextchamp-saqib
 
-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/buying/                 @marination @rohitwaghchaure @s-aga-r
+erpnext/e_commerce/             @marination
+erpnext/maintenance/            @marination @rohitwaghchaure @s-aga-r
+erpnext/manufacturing/          @marination @rohitwaghchaure @s-aga-r
+erpnext/portal/                 @marination
+erpnext/quality_management/     @marination @rohitwaghchaure @s-aga-r
+erpnext/shopping_cart/          @marination
+erpnext/stock/                  @marination @rohitwaghchaure @s-aga-r
 
-erpnext/crm/                    @NagariaHussain
-erpnext/education/              @rutwikhdev
+erpnext/crm/                    @NagariaHussain 
+erpnext/education/              @rutwikhdev 
 erpnext/projects/               @ruchamahabal
 
-erpnext/controllers/            @deepeshgarg007 @nextchamp-saqib @rohitwaghchaure
-erpnext/patches/                @deepeshgarg007 @nextchamp-saqib
+erpnext/controllers/            @deepeshgarg007 @nextchamp-saqib @rohitwaghchaure @marination
+erpnext/patches/                @deepeshgarg007 @nextchamp-saqib @marination
+erpnext/public/                 @nextchamp-saqib @marination
 
 .github/                        @ankush
-pyproject.toml                  @ankush
+pyproject.toml                  @gavindsouza @ankush

README.md

@@ -82,8 +82,6 @@ GNU/General Public License (see [license.txt](license.txt))
 
 The ERPNext code is licensed as GNU General Public License (v3) and the Documentation is licensed as Creative Commons (CC-BY-SA-3.0) and the copyright is owned by Frappe Technologies Pvt Ltd (Frappe) and Contributors.
 
-By contributing to ERPNext, you agree that your contributions will be licensed under its GNU General Public License (v3).
-
 ## Logo and Trademark Policy
 
 Please read our [Logo and Trademark Policy](TRADEMARK_POLICY.md).

erpnext/__init__.py

@@ -2,7 +2,7 @@ import inspect
 
 import frappe
 
-__version__ = "14.0.0-dev"
+__version__ = "14.1.0"
 
 
 def get_default_company(user=None):

erpnext/accounts/dashboard_chart_source/account_balance_timeline/account_balance_timeline.py

@@ -76,7 +76,7 @@ def get(
 
 def build_result(account, dates, gl_entries):
 	result = [[getdate(date), 0.0] for date in dates]
-	root_type = frappe.get_cached_value("Account", account, "root_type")
+	root_type = frappe.db.get_value("Account", account, "root_type")
 
 	# start with the first date
 	date_index = 0

erpnext/accounts/deferred_revenue.py

@@ -378,7 +378,7 @@ def book_deferred_income_or_expense(doc, deferred_process, posting_date=None):
 			return
 
 		# check if books nor frozen till endate:
-		if accounts_frozen_upto and getdate(end_date) <= getdate(accounts_frozen_upto):
+		if accounts_frozen_upto and (end_date) <= getdate(accounts_frozen_upto):
 			end_date = get_last_day(add_days(accounts_frozen_upto, 1))
 
 		if via_journal_entry:

erpnext/accounts/doctype/account/account.py

@@ -37,7 +37,7 @@ class Account(NestedSet):
 	def autoname(self):
 		from erpnext.accounts.utils import get_autoname_with_number
 
-		self.name = get_autoname_with_number(self.account_number, self.account_name, self.company)
+		self.name = get_autoname_with_number(self.account_number, self.account_name, None, self.company)
 
 	def validate(self):
 		from erpnext.accounts.utils import validate_field_number
@@ -58,7 +58,7 @@ class Account(NestedSet):
 	def validate_parent(self):
 		"""Fetch Parent Details and validate parent account"""
 		if self.parent_account:
-			par = frappe.get_cached_value(
+			par = frappe.db.get_value(
 				"Account", self.parent_account, ["name", "is_group", "company"], as_dict=1
 			)
 			if not par:
@@ -82,7 +82,7 @@ class Account(NestedSet):
 
 	def set_root_and_report_type(self):
 		if self.parent_account:
-			par = frappe.get_cached_value(
+			par = frappe.db.get_value(
 				"Account", self.parent_account, ["report_type", "root_type"], as_dict=1
 			)
 
@@ -92,7 +92,7 @@ class Account(NestedSet):
 				self.root_type = par.root_type
 
 		if self.is_group:
-			db_value = self.get_doc_before_save()
+			db_value = frappe.db.get_value("Account", self.name, ["report_type", "root_type"], as_dict=1)
 			if db_value:
 				if self.report_type != db_value.report_type:
 					frappe.db.sql(
@@ -111,13 +111,13 @@ class Account(NestedSet):
 			)
 
 	def validate_root_details(self):
-		doc_before_save = self.get_doc_before_save()
-
-		if doc_before_save and not doc_before_save.parent_account:
-			throw(_("Root cannot be edited."), RootNotEditable)
+		# does not exists parent
+		if frappe.db.exists("Account", self.name):
+			if not frappe.db.get_value("Account", self.name, "parent_account"):
+				throw(_("Root cannot be edited."), RootNotEditable)
 
 		if not self.parent_account and not self.is_group:
-			throw(_("The root account {0} must be a group").format(frappe.bold(self.name)))
+			frappe.throw(_("The root account {0} must be a group").format(frappe.bold(self.name)))
 
 	def validate_root_company_and_sync_account_to_children(self):
 		# ignore validation while creating new compnay or while syncing to child companies
@@ -127,9 +127,7 @@ class Account(NestedSet):
 			return
 		ancestors = get_root_company(self.company)
 		if ancestors:
-			if frappe.get_cached_value(
-				"Company", self.company, "allow_account_creation_against_child_company"
-			):
+			if frappe.get_value("Company", self.company, "allow_account_creation_against_child_company"):
 				return
 			if not frappe.db.get_value(
 				"Account", {"account_name": self.account_name, "company": ancestors[0]}, "name"
@@ -140,7 +138,7 @@ class Account(NestedSet):
 			if not descendants:
 				return
 			parent_acc_name_map = {}
-			parent_acc_name, parent_acc_number = frappe.get_cached_value(
+			parent_acc_name, parent_acc_number = frappe.db.get_value(
 				"Account", self.parent_account, ["account_name", "account_number"]
 			)
 			filters = {
@@ -161,28 +159,27 @@ class Account(NestedSet):
 			self.create_account_for_child_company(parent_acc_name_map, descendants, parent_acc_name)
 
 	def validate_group_or_ledger(self):
-		doc_before_save = self.get_doc_before_save()
-		if not doc_before_save or cint(doc_before_save.is_group) == cint(self.is_group):
+		if self.get("__islocal"):
 			return
 
-		if self.check_gle_exists():
-			throw(_("Account with existing transaction cannot be converted to ledger"))
-		elif self.is_group:
-			if self.account_type and not self.flags.exclude_account_type_check:
-				throw(_("Cannot covert to Group because Account Type is selected."))
-		elif self.check_if_child_exists():
-			throw(_("Account with child nodes cannot be set as ledger"))
+		existing_is_group = frappe.db.get_value("Account", self.name, "is_group")
+		if cint(self.is_group) != cint(existing_is_group):
+			if self.check_gle_exists():
+				throw(_("Account with existing transaction cannot be converted to ledger"))
+			elif self.is_group:
+				if self.account_type and not self.flags.exclude_account_type_check:
+					throw(_("Cannot covert to Group because Account Type is selected."))
+			elif self.check_if_child_exists():
+				throw(_("Account with child nodes cannot be set as ledger"))
 
 	def validate_frozen_accounts_modifier(self):
-		doc_before_save = self.get_doc_before_save()
-		if not doc_before_save or doc_before_save.freeze_account == self.freeze_account:
-			return
-
-		frozen_accounts_modifier = frappe.get_cached_value(
-			"Accounts Settings", "Accounts Settings", "frozen_accounts_modifier"
-		)
-		if not frozen_accounts_modifier or frozen_accounts_modifier not in frappe.get_roles():
-			throw(_("You are not authorized to set Frozen value"))
+		old_value = frappe.db.get_value("Account", self.name, "freeze_account")
+		if old_value and old_value != self.freeze_account:
+			frozen_accounts_modifier = frappe.db.get_value(
+				"Accounts Settings", None, "frozen_accounts_modifier"
+			)
+			if not frozen_accounts_modifier or frozen_accounts_modifier not in frappe.get_roles():
+				throw(_("You are not authorized to set Frozen value"))
 
 	def validate_balance_must_be_debit_or_credit(self):
 		from erpnext.accounts.utils import get_balance_on
@@ -226,9 +223,9 @@ class Account(NestedSet):
 				)
 
 			# validate if parent of child company account to be added is a group
-			if frappe.get_cached_value(
-				"Account", self.parent_account, "is_group"
-			) and not frappe.get_cached_value("Account", parent_acc_name_map[company], "is_group"):
+			if frappe.db.get_value("Account", self.parent_account, "is_group") and not frappe.db.get_value(
+				"Account", parent_acc_name_map[company], "is_group"
+			):
 				msg = _(
 					"While creating account for Child Company {0}, parent account {1} found as a ledger account."
 				).format(company_bold, parent_acc_name_bold)
@@ -380,15 +377,17 @@ def validate_account_number(name, account_number, company):
 
 @frappe.whitelist()
 def update_account_number(name, account_name, account_number=None, from_descendant=False):
-	account = frappe.get_cached_doc("Account", name)
+	account = frappe.db.get_value("Account", name, "company", as_dict=True)
 	if not account:
 		return
 
-	old_acc_name, old_acc_number = account.account_name, account.account_number
+	old_acc_name, old_acc_number = frappe.db.get_value(
+		"Account", name, ["account_name", "account_number"]
+	)
 
 	# check if account exists in parent company
 	ancestors = get_ancestors_of("Company", account.company)
-	allow_independent_account_creation = frappe.get_cached_value(
+	allow_independent_account_creation = frappe.get_value(
 		"Company", account.company, "allow_account_creation_against_child_company"
 	)
 
@@ -436,24 +435,22 @@ def update_account_number(name, account_name, account_number=None, from_descenda
 @frappe.whitelist()
 def merge_account(old, new, is_group, root_type, company):
 	# Validate properties before merging
-	new_account = frappe.get_cached_doc("Account", new)
-
-	if not new_account:
+	if not frappe.db.exists("Account", new):
 		throw(_("Account {0} does not exist").format(new))
 
-	if (new_account.is_group, new_account.root_type, new_account.company) != (
-		cint(is_group),
-		root_type,
-		company,
-	):
+	val = list(frappe.db.get_value("Account", new, ["is_group", "root_type", "company"]))
+
+	if val != [cint(is_group), root_type, company]:
 		throw(
 			_(
 				"""Merging is only possible if following properties are same in both records. Is Group, Root Type, Company"""
 			)
 		)
 
-	if is_group and new_account.parent_account == old:
-		new_account.db_set("parent_account", frappe.get_cached_value("Account", old, "parent_account"))
+	if is_group and frappe.db.get_value("Account", new, "parent_account") == old:
+		frappe.db.set_value(
+			"Account", new, "parent_account", frappe.db.get_value("Account", old, "parent_account")
+		)
 
 	frappe.rename_doc("Account", old, new, merge=1, force=1)
 

erpnext/accounts/doctype/account/account_tree.js

@@ -56,41 +56,36 @@ frappe.treeview_settings["Account"] = {
 			accounts = nodes;
 		}
 
-		frappe.db.get_single_value("Accounts Settings", "show_balance_in_coa").then((value) => {
-			if(value) {
+		const get_balances = frappe.call({
+			method: 'erpnext.accounts.utils.get_account_balances',
+			args: {
+				accounts: accounts,
+				company: cur_tree.args.company
+			},
+		});
 
-				const get_balances = frappe.call({
-					method: 'erpnext.accounts.utils.get_account_balances',
-					args: {
-						accounts: accounts,
-						company: cur_tree.args.company
-					},
-				});
+		get_balances.then(r => {
+			if (!r.message || r.message.length == 0) return;
 
-				get_balances.then(r => {
-					if (!r.message || r.message.length == 0) return;
+			for (let account of r.message) {
 
-					for (let account of r.message) {
+				const node = cur_tree.nodes && cur_tree.nodes[account.value];
+				if (!node || node.is_root) continue;
 
-						const node = cur_tree.nodes && cur_tree.nodes[account.value];
-						if (!node || node.is_root) continue;
+				// show Dr if positive since balance is calculated as debit - credit else show Cr
+				const balance = account.balance_in_account_currency || account.balance;
+				const dr_or_cr = balance > 0 ? "Dr": "Cr";
+				const format = (value, currency) => format_currency(Math.abs(value), currency);
 
-						// show Dr if positive since balance is calculated as debit - credit else show Cr
-						const balance = account.balance_in_account_currency || account.balance;
-						const dr_or_cr = balance > 0 ? "Dr": "Cr";
-						const format = (value, currency) => format_currency(Math.abs(value), currency);
-
-						if (account.balance!==undefined) {
-							node.parent && node.parent.find('.balance-area').remove();
-							$('<span class="balance-area pull-right">'
-							  + (account.balance_in_account_currency ?
-							     (format(account.balance_in_account_currency, account.account_currency) + " / ") : "")
-							  + format(account.balance, account.company_currency)
-							  + " " + dr_or_cr
-							  + '</span>').insertBefore(node.$ul);
-						}
-					}
-				});
+				if (account.balance!==undefined) {
+					node.parent && node.parent.find('.balance-area').remove();
+					$('<span class="balance-area pull-right">'
+						+ (account.balance_in_account_currency ?
+							(format(account.balance_in_account_currency, account.account_currency) + " / ") : "")
+						+ format(account.balance, account.company_currency)
+						+ " " + dr_or_cr
+						+ '</span>').insertBefore(node.$ul);
+				}
 			}
 		});
 	},

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

@@ -53,7 +53,7 @@ def create_charts(
 							"account_number": account_number,
 							"account_type": child.get("account_type"),
 							"account_currency": child.get("account_currency")
-							or frappe.get_cached_value("Company", company, "default_currency"),
+							or frappe.db.get_value("Company", company, "default_currency"),
 							"tax_rate": child.get("tax_rate"),
 						}
 					)
@@ -148,7 +148,7 @@ def get_charts_for_country(country, with_standard=False):
 			) or frappe.local.flags.allow_unverified_charts:
 				charts.append(content["name"])
 
-	country_code = frappe.get_cached_value("Country", country, "code")
+	country_code = frappe.db.get_value("Country", country, "code")
 	if country_code:
 		folders = ("verified",)
 		if frappe.local.flags.allow_unverified_charts:

erpnext/accounts/doctype/account/chart_of_accounts/unverified/at_austria_chart_template.json

@@ -2,438 +2,397 @@
     "country_code": "at",
     "name": "Austria - Chart of Accounts",
     "tree": {
-        "Klasse 0 Aktiva: Anlageverm\u00f6gen": {
-				"0100 Konzessionen ": {"account_type": "Fixed Asset"},
-				"0110 Patentrechte und Lizenzen ": {"account_type": "Fixed Asset"},
-				"0120 Datenverarbeitungsprogramme ": {"account_type": "Fixed Asset"},
-				"0130 Marken, Warenzeichen und Musterschutzrechte, sonstige Urheberrechte ": {"account_type": "Fixed Asset"},
-				"0140 Pacht- und Mietrechte ": {"account_type": "Fixed Asset"},
-				"0150 Bezugs- und ähnliche Rechte ": {"account_type": "Fixed Asset"},
-				"0160 Geschäfts-/Firmenwert ": {"account_type": "Fixed Asset"},
-				"0170 Umgründungsmehrwert ": {"account_type": "Fixed Asset"},
-				"0180 Geleistete Anzahlungen auf immaterielle Vermögensgegenstände": {"account_type": "Fixed Asset"},
-				"0190 Kumulierte Abschreibungen zu immateriellen Vermögensgegenständen ": {"account_type": "Fixed Asset"},
-				"0200 Unbebaute Grundstücke, soweit nicht landwirtschaftlich genutzt ": {"account_type": "Fixed Asset"},
-				"0210 Bebaute Grundstücke (Grundwert) ": {"account_type": "Fixed Asset"},
-				"0220 Landwirtschaftlich genutzte Grundstücke ": {"account_type": "Fixed Asset"},
-				"0230 Grundstücksgleiche Rechte ": {"account_type": "Fixed Asset"},
-				"0300 Betriebs- und Geschäftsgebäude auf eigenem Grund ": {"account_type": "Fixed Asset"},
-				"0310 Wohn- und Sozialgebäude auf eigenem Grund ": {"account_type": "Fixed Asset"},
-				"0320 Betriebs- und Geschäftsgebäude auf fremdem Grund ": {"account_type": "Fixed Asset"},
-				"0330 Wohn- und Sozialgebäude auf fremdem Grund ": {"account_type": "Fixed Asset"},
-				"0340 Grundstückseinrichtungen auf eigenem Grund ": {"account_type": "Fixed Asset"},
-				"0350 Grundstückseinrichtungen auf fremdem Grund ": {"account_type": "Fixed Asset"},
-				"0360 Bauliche Investitionen in fremden (gepachteten) Betriebs- und Geschäftsgebäuden": {"account_type": "Fixed Asset"},
-				"0370 Bauliche Investitionen in fremden (gepachteten) Wohn- und Sozialgebäuden": {"account_type": "Fixed Asset"},
-				"0390 Kumulierte Abschreibungen zu Grundstücken ": {"account_type": "Fixed Asset"},
-				"0400 Maschinen und Geräte ": {"account_type": "Fixed Asset"},				
-				"0500 Maschinenwerkzeuge ": {"account_type": "Fixed Asset"},
-				"0510 Allgemeine Werkzeuge und Handwerkzeuge ": {"account_type": "Fixed Asset"},
-				"0520 Prototypen, Formen, Modelle ": {"account_type": "Fixed Asset"},
-				"0530 Andere Erzeugungshilfsmittel (auch Softwarewerkzeuge)": {"account_type": "Fixed Asset"},
-				"0540 Hebezeuge und Montageanlagen ": {"account_type": "Fixed Asset"},
-				"0550 Geringwertige Vermögensgegenstände, soweit im Erzeugungsprozess ": {"account_type": "Fixed Asset"},
-				"0560 Festwerte technische Anlagen und Maschinen ": {"account_type": "Fixed Asset"},
-				"0590 Kumulierte Abschreibungen zu technischen Anlagen und Maschinen ": {"account_type": "Fixed Asset"},
-				"0600 Betriebs- und Geschäftsausstattung, soweit nicht gesondert angeführt ": {"account_type": "Fixed Asset"},
-				"0610 Andere Anlagen, soweit nicht gesondert angeführt ": {"account_type": "Fixed Asset"},
-				"0620 Büromaschinen, EDV-Anlagen ": {"account_type": "Fixed Asset"},
-				"0630 PKW und Kombis ": {"account_type": "Fixed Asset"},
-				"0640 LKW ": {"account_type": "Fixed Asset"},
-				"0650 Andere Beförderungsmittel ": {"account_type": "Fixed Asset"},
-				"0660 Gebinde ": {"account_type": "Fixed Asset"},
-				"0670 Geringwertige Vermögensgegenstände, soweit nicht im Erzeugungssprozess verwendet": {"account_type": "Fixed Asset"},
-				"0680 Festwerte außer technische Anlagen und Maschinen ": {"account_type": "Fixed Asset"},
-				"0690 Kumulierte Abschreibungen zu anderen Anlagen, Betriebs- und Geschäftsausstattung": {"account_type": "Fixed Asset"},
-				"0700 Geleistete Anzahlungen auf Sachanlagen ": {"account_type": "Fixed Asset"},
-				"0710 Anlagen in Bau ": {"account_type": "Fixed Asset"},
-				"0790 Kumulierte Abschreibungen zu geleisteten Anzahlungen auf Sachanlagen ": {"account_type": "Fixed Asset"},
-				"0800 Anteile an verbundenen Unternehmen ": {"account_type": "Fixed Asset"},
-				"0810 Beteiligungen an Gemeinschaftsunternehmen ": {"account_type": "Fixed Asset"},
-				"0820 Beteiligungen an angeschlossenen (assoziierten) Unternehmen ": {"account_type": "Fixed Asset"},
-				"0830 Eigene Anteile, Anteile an herrschenden oder mit Mehrheit beteiligten ": {"account_type": "Fixed Asset"},
-				"0840 Sonstige Beteiligungen ": {"account_type": "Fixed Asset"},
-				"0850 Ausleihungen an verbundene Unternehmen ": {"account_type": "Fixed Asset"},
-				"0860 Ausleihungen an Unternehmen mit Beteiligungsverhältnis": {"account_type": "Fixed Asset"},
-				"0870 Ausleihungen an Gesellschafter ": {"account_type": "Fixed Asset"},
-				"0880 Sonstige Ausleihungen ": {"account_type": "Fixed Asset"},
-				"0890 Anteile an Kapitalgesellschaften ohne Beteiligungscharakter ": {"account_type": "Fixed Asset"},
-				"0900 Anteile an Personengesellschaften ohne Beteiligungscharakter ": {"account_type": "Fixed Asset"},
-				"0910 Genossenschaftsanteile ohne Beteiligungscharakter ": {"account_type": "Fixed Asset"},
-				"0920 Anteile an Investmentfonds ": {"account_type": "Fixed Asset"},
-				"0930 Festverzinsliche Wertpapiere des Anlagevermögens ": {"account_type": "Fixed Asset"},
-				"0980 Geleistete Anzahlungen auf Finanzanlagen ": {"account_type": "Fixed Asset"},
-				"0990 Kumulierte Abschreibungen zu Finanzanlagen ": {"account_type": "Fixed Asset"},
-            "root_type": "Asset"
-        },    
-        "Klasse 1 Aktiva: Vorr\u00e4te": {
-            "1000 Bezugsverrechnung": {"account_type": "Stock"},
-            "1100 Rohstoffe": {"account_type": "Stock"},
-            "1200 Bezogene Teile": {"account_type": "Stock"},
-            "1300 Hilfsstoffe": {"account_type": "Stock"},
-            "1350 Betriebsstoffe": {"account_type": "Stock"},
-            "1360 Vorrat Energietraeger": {"account_type": "Stock"},            
-            "1400 Unfertige Erzeugnisse": {"account_type": "Stock"},
-            "1500 Fertige Erzeugnisse": {"account_type": "Stock"},
-            "1600 Handelswarenvorrat": {"account_type": "Stock Received But Not Billed"},
-            "1700 Noch nicht abrechenbare Leistungen": {"account_type": "Stock"},
-            "1900 Wertberichtigungen": {"account_type": "Stock"},
-            "1800 Geleistete Anzahlungen": {"account_type": "Stock"},
-            "1900 Wertberichtigungen": {"account_type": "Stock"},
-            "root_type": "Asset"
-        },    
-        "Klasse 3 Passiva: Verbindlichkeiten": {
-            "3000 Allgemeine Verbindlichkeiten (Schuld)": {"account_type": "Payable"},
-            "3010 R\u00fcckstellungen f\u00fcr Pensionen": {"account_type": "Payable"},
-            "3020 Steuerr\u00fcckstellungen": {"account_type": "Tax"},
-            "3041 Sonstige R\u00fcckstellungen": {"account_type": "Payable"},            
-            "3110 Verbindlichkeiten gegen\u00fcber Bank": {"account_type": "Payable"},
-            "3150 Verbindlichkeiten Darlehen": {"account_type": "Payable"},
-            "3185 Verbindlichkeiten Kreditkarte": {"account_type": "Payable"},            
-            "3380 Verbindlichkeiten aus der Annahme gezogener Wechsel u. d. Ausstellungen eigener Wechsel": {
-                "account_type": "Payable"
-            },
-            "3400 Verbindlichkeiten gegen\u00fc. verb. Untern., Verbindl. gegen\u00fc. Untern., mit denen eine Beteiligungsverh\u00e4lnis besteht": {},
-            "3460 Verbindlichkeiten gegenueber Gesellschaftern": {"account_type": "Payable"},
-            "3470 Einlagen stiller Gesellschafter": {"account_type": "Payable"},
-            "3585 Verbindlichkeiten Lohnsteuer": {"account_type": "Tax"},             
-            "3590 Verbindlichkeiten Kommunalabgaben": {"account_type": "Tax"},  
-            "3595 Verbindlichkeiten Dienstgeberbeitrag": {"account_type": "Tax"},                       
-            "3600 Verbindlichkeiten Sozialversicherung": {"account_type": "Payable"},
-            "3640 Verbindlichkeiten Loehne und Gehaelter": {"account_type": "Payable"},            
-            "3700 Sonstige Verbindlichkeiten": {"account_type": "Payable"},
-            "3900 Passive Rechnungsabgrenzungsposten": {"account_type": "Payable"},
-            "3100 Anleihen (einschlie\u00dflich konvertibler)": {"account_type": "Payable"},
-            "3200 Erhaltene Anzahlungen auf Bestellungen": {"account_type": "Payable"},
-            "3040 R\u00fcckstellungen f\u00fcr Abfertigung": {"account_type": "Payable"},
-
-            "3530 USt. \u00a719 (reverse charge)": {
+        "Summe Abschreibungen und Aufwendungen": {
+            "7010 bis 7080 Abschreibungen auf das Anlageverm\u00f6gen (ausgenommen Finanzanlagen)": {},
+            "7100 bis 7190 Sonstige Steuern": {
                 "account_type": "Tax"
             },
-            "3500 Verbindlichkeiten aus Umsatzsteuer": {"account_type": "Tax"},
-            "3580 Umsatzsteuer Zahllast": {
-                "account_type": "Tax"
-            },
-            "3510 Umsatzsteuer Inland 20%": {
-                "account_type": "Tax"
-            },
-            "3515 Umsatzsteuer Inland 10%": {
-                "account_type": "Tax"
-            },            
-            "3520 Umsatzsteuer aus i.g. Erwerb 20%": {
-                "account_type": "Tax"
-            },
-            "3525 Umsatzsteuer aus i.g. Erwerb 10%": {
-                "account_type": "Tax"
-            },            
-            "3560 Umsatzsteuer-Evidenzkonto f\u00fcr erhaltene Anzahlungen auf Bestellungen": {},
-            "3360 Verbindlichkeiten aus Lieferungen u. Leistungen EU": {
-                "account_type": "Payable"
-            },
-            "3000 Verbindlichkeiten aus Lieferungen u. Leistungen Inland": {
-                "account_type": "Payable"
-            },
-            "3370 Verbindlichkeiten aus Lieferungen u. Leistungen sonst. Ausland": {
-                "account_type": "Payable"
-            },
-            "3400 Verbindlichkeiten gegen\u00fcber verbundenen Unternehmen": {},
-            "3570 Verrechnung Finanzamt": {
-                "account_type": "Tax"
-            },
-            "root_type": "Liability"
-        },      
-        "Klasse 2 Aktiva: Umlaufverm\u00f6gen, Rechnungsabgrenzungen": {
-            "2030 Forderungen aus Lieferungen und Leistungen Inland (0% USt, umsatzsteuerfrei)": {
-                "account_type": "Receivable"
-            },
-            "2010 Forderungen aus Lieferungen und Leistungen Inland (10% USt, umsatzsteuerfrei)": {
-                "account_type": "Receivable"
-            },
-            "2000 Forderungen aus Lieferungen und Leistungen Inland (20% USt, umsatzsteuerfrei)": {
-                "account_type": "Receivable"
-            },
-            "2040 Forderungen aus Lieferungen und Leistungen Inland (sonstiger USt-Satz)": {
-                "account_type": "Receivable"
-            },                                    
-            "2100 Forderungen aus Lieferungen und Leistungen EU": {
-                "account_type": "Receivable"
-            },
-            "2150 Forderungen aus Lieferungen und Leistungen Ausland (Nicht-EU)": {
-                "account_type": "Receivable"
-            },
-            "2200 Forderungen gegen\u00fcber verbundenen Unternehmen": {
-                "account_type": "Receivable"
-            },
-            "2250 Forderungen gegen\u00fcber Unternehmen, mit denen ein Beteiligungsverh\u00e4ltnis besteht": {
-                "account_type": "Receivable"
-            },
-            "2300 Sonstige Forderungen und Verm\u00f6gensgegenst\u00e4nde": {
-                "account_type": "Receivable"
-            },
-            "2630 Sonstige Wertpapiere": {
-                "account_type": "Stock"
-            },
-            "2750 Kassenbest\u00e4nde in Fremdw\u00e4hrung": {
-                "account_type": "Cash"
-            },
-            "2900 Aktive Rechnungsabrenzungsposten": {
-                "account_type": "Receivable"
-            },
-            "2600 Anteile an verbundenen Unternehmen": {
-                "account_type": "Equity"
-            },
-            "2680 Besitzwechsel ohne Forderungen": {
-                "account_type": "Receivable"
-            },
-            "2950 Aktiviertes Disagio": {
-                "account_type": "Receivable"
-            },
-            "2610 Eigene Anteile und Wertpapiere an mit Mehrheit beteiligten Unternehmen": {
-                "account_type": "Receivable"
-            },
-            "2570 Einfuhrumsatzsteuer (bezahlt)": {"account_type": "Tax"},
-            
-            "2460 Eingeforderte aber noch nicht eingezahlte Einlagen": {
-                "account_type": "Receivable"
-            },
-            "2180 Einzelwertberichtigungen zu Forderungen aus Lief. und Leist. Ausland": {
-                "account_type": "Receivable"
-            },
-            "2130 Einzelwertberichtigungen zu Forderungen aus Lief. und Leist. EU": {
-                "account_type": "Receivable"
-            },
-            "2080 Einzelwertberichtigungen zu Forderungen aus Lief. und Leist. Inland ": {
-                "account_type": "Receivable"
-            },
-            "2270 Einzelwertberichtigungen zu Forderungen gegen\u00fcber Unternehmen mit denen ein Beteiligungsverh\u00e4ltnis besteht": {
-                "account_type": "Receivable"
-            },
-            "2230 Einzelwertberichtigungen zu Forderungen gegen\u00fcber verbundenen Unternehmen": {
-                "account_type": "Receivable"
-            },
-            "2470 Einzelwertberichtigungen zu sonstigen Forderungen und Verm\u00f6gensgegenst\u00e4nden": {
-                "account_type": "Receivable"
-            },
-            "2700 Kassenbestand": {
-                "account_type": "Cash"
-            },
-            "2190 Pauschalwertberichtigungen zu Forderungen aus Lief. und Leist. sonstiges Ausland": {
-                "account_type": "Receivable"
-            },
-            "2130 Pauschalwertberichtigungen zu Forderungen aus Lief. und Leist. EU": {
-                "account_type": "Receivable"
-            },
-            "2100 Pauschalwertberichtigungen zu Forderungen aus Lief. und Leist. Inland ": {
-                "account_type": "Receivable"
-            },
-            "2280 Pauschalwertberichtigungen zu Forderungen gegen\u00fcber Unternehmen mit denen ein Beteiligungsverh\u00e4ltnis besteht": {
-                "account_type": "Receivable"
-            },
-            "2240 Pauschalwertberichtigungen zu Forderungen gegen\u00fcber verbundenen Unternehmen": {
-                "account_type": "Receivable"
-            },
-            "2480 Pauschalwertberichtigungen zu sonstigen Forderungen und Verm\u00f6gensgegenst\u00e4nden": {
-                "account_type": "Receivable"
-            },
-            "2740 Postwertzeichen": {
-                "account_type": "Cash"
-            },
-            "2780 Schecks in Euro": {
-                "account_type": "Cash"
-            },
-            "2800 Guthaben bei Bank": {
-                "account_type": "Bank"
-            },  
-            "2801 Guthaben bei Bank - Sparkonto": {
-                "account_type": "Bank"
-            },                      
-            "2810 Guthaben bei Paypal": {
-                "account_type": "Bank"
-            },
-            "2930 Mietvorauszahlungen": {
-                "account_type": "Receivable"
-            },
-            "2980 Abgrenzung latenter Steuern": {
-                "account_type": "Receivable"
-            },
-            "2500 Vorsteuer": {
-                "account_type": "Receivable"
-            },
-            "2510 Vorsteuer Inland 10%": {
-                "account_type": "Tax"
-            },
-            "2895 Schwebende Geldbewegugen": {
-                "account_type": "Bank"
-            },            
-            "2513 Vorsteuer Inland 5%": {
-                "account_type": "Tax"
-            },
-            "2515 Vorsteuer Inland 20%": {
-                "account_type": "Tax"
-            },                        
-            "2520 Vorsteuer aus innergemeinschaftlichem Erwerb 10%": {
-                "account_type": "Tax"
-            },
-            "2525 Vorsteuer aus innergemeinschaftlichem Erwerb 20%": {
-                "account_type": "Tax"
-            },            
-            "2530 Vorsteuer \u00a719/Art 19 ( reverse charge ) ": {
-                "account_type": "Tax"
-            },
-            "2690 Wertberichtigungen zu Wertpapieren und Anteilen": {
-                "account_type": "Receivable"
-            },
-            "root_type": "Asset"
+            "7200 bis 7290 Instandhaltung u. Reinigung durh Dritte, Entsorgung, Beleuchtung": {},
+            "7300 bis 7310 Transporte durch Dritte": {},
+            "7320 bis 7330 Kfz - Aufwand": {},
+            "7340 bis 7350 Reise- und Fahraufwand": {},
+            "7360 bis 7370 Tag- und N\u00e4chtigungsgelder": {},
+            "7380 bis 7390 Nachrichtenaufwand": {},
+            "7400 bis 7430 Miet- und Pachtaufwand": {},
+            "7440 bis 7470 Leasingaufwand": {},
+            "7480 bis 7490 Lizenzaufwand": {},
+            "7500 bis 7530 Aufwand f\u00fcr beigestelltes Personal": {},
+            "7540 bis 7570 Provisionen an Dritte": {},
+            "7580 bis 7590 Aufsichtsratsverg\u00fctungen": {},
+            "7610 bis 7620 Druckerzeugnisse und Vervielf\u00e4ltigungen": {},
+            "7650 bis 7680 Werbung und Repr\u00e4sentationen": {},
+            "7700 bis 7740 Versicherungen": {},
+            "7750 bis 7760 Beratungs- und Pr\u00fcfungsaufwand": {},
+            "7800 bis 7810 Schadensf\u00e4lle": {},
+            "7840 bis 7880 Verschiedene betriebliche Aufwendungen": {},
+            "7910 bis 7950 Aufwandsstellenrechung der Hersteller": {},
+            "Abschreibungen auf aktivierte Aufwendungen f\u00fcr das Ingangs. u. Erweitern des Betriebes": {},
+            "Abschreibungen vom Umlaufverm\u00f6gen, soweit diese die im Unternehmen \u00fcblichen Abschreibungen \u00fcbersteigen": {},
+            "Aufwandsstellenrechnung": {},
+            "Aus- und Fortbildung": {},
+            "Buchwert abgegangener Anlagen, ausgenommen Finanzanlagen": {},
+            "B\u00fcromaterial und Drucksorten": {},
+            "Fachliteratur und Zeitungen ": {},
+            "Herstellungskosten der zur Erzielung der Umsatzerl\u00f6se erbrachten Leistungen": {},
+            "Mitgliedsbeitr\u00e4ge": {},
+            "Skontoertr\u00e4ge auf sonstige betriebliche Aufwendungen": {},
+            "Sonstige betrieblichen Aufwendungen": {},
+            "Spenden und Trinkgelder": {},
+            "Spesen des Geldverkehrs": {},
+            "Verluste aus dem Abgang vom Anlageverm\u00f6gen, ausgenommen Finanzanlagen": {},
+            "Vertriebskosten": {},
+            "Verwaltungskosten": {},
+            "root_type": "Expense"
         },
-          "Klasse 4: Betriebliche Erträge": {
-            "4000 Erlöse 20 %": {"account_type": "Income Account"},          
-            "4020 Erl\u00f6se 0 % steuerbefreit": {"account_type": "Income Account"},            
-            "4010 Erl\u00f6se 10 %": {"account_type": "Income Account"},
-            "4030 Erl\u00f6se 13 %": {"account_type": "Income Account"},            
-            "4040 Erl\u00f6se 0 % innergemeinschaftliche Lieferungen": {"account_type": "Income Account"},      
-            "4400 Erl\u00f6sreduktion 0 % steuerbefreit": {"account_type": "Expense Account"},            
-            "4410 Erl\u00f6sreduktion 10 %": {"account_type": "Expense Account"},
-            "4420 Erl\u00f6sreduktion 20 %": {"account_type": "Expense Account"},
-            "4430 Erl\u00f6sreduktion 13 %": {"account_type": "Expense Account"},            
-            "4440 Erl\u00f6sreduktion 0 % innergemeinschaftliche Lieferungen": {"account_type": "Expense Account"}, 
-            "4500 Ver\u00e4nderungen des Bestandes an fertigen und unfertigen Erzeugn. sowie an noch nicht abrechenbaren Leistungen": {"account_type": "Income Account"},
-            "4580 Aktivierte Eigenleistungen": {"account_type": "Income Account"},
-            "4600 Erl\u00f6se aus dem Abgang vom Anlageverm\u00f6gen, ausgen. Finanzanlagen": {"account_type": "Income Account"},
-            "4630 Ertr\u00e4ge aus dem Abgang vom Anlageverm\u00f6gen, ausgen. Finanzanlagen": {"account_type": "Income Account"},
-            "4660 Ertr\u00e4ge aus der Zuschreibung zum Anlageverm\u00f6gen, ausgen. Finanzanlagen": {"account_type": "Income Account"},
-            "4700 Ertr\u00e4ge aus der Aufl\u00f6sung von R\u00fcckstellungen": {"account_type": "Income Account"},
-            "4800 \u00dcbrige betriebliche Ertr\u00e4ge": {"account_type": "Income Account"},
+        "Summe Betriebliche Ertr\u00e4ge": {
+            "4400 bis 4490 Erl\u00f6sschm\u00e4lerungen": {},
+            "4500 bis 4570 Ver\u00e4nderungen des Bestandes an fertigen und unfertigen Erzeugn. sowie an noch nicht abrechenbaren Leistungen": {},
+            "4580 bis 4590 andere aktivierte Eigenleistungen": {},
+            "4600 bis 4620 Erl\u00f6se aus dem Abgang vom Anlageverm\u00f6gen, ausgen. Finanzanlagen": {},
+            "4630 bis 4650 Ertr\u00e4ge aus dem Abgang vom Anlageverm\u00f6gen, ausgen. Finanzanlagen": {},
+            "4660 bis 4670 Ertr\u00e4ge aus der Zuschreibung zum Anlageverm\u00f6gen, ausgen. Finanzanlagen": {},
+            "4700 bis 4790 Ertr\u00e4ge aus der Aufl\u00f6sung von R\u00fcckstellungen": {},
+            "4800 bis 4990 \u00dcbrige betriebliche Ertr\u00e4ge": {},
+            "Erl\u00f6se 0 % Ausfuhrlieferungen/Drittl\u00e4nder": {},
+            "Erl\u00f6se 10 %": {},
+            "Erl\u00f6se 20 %": {},
+            "Erl\u00f6se aus im Inland stpfl. EG Lieferungen 10 % USt": {},
+            "Erl\u00f6se aus im Inland stpfl. EG Lieferungen 20 % USt": {},
+            "Erl\u00f6se i.g. Lieferungen (stfr)": {},
             "root_type": "Income"
-        },        
-        "Klasse 5: Aufwand f\u00fcr Material und Leistungen": {
-            "5000 Einkauf Partnerleistungen": {"account_type": "Cost of Goods Sold"},        
-            "5100 Verbrauch an Rohstoffen": {"account_type": "Cost of Goods Sold"},
-            "5200 Verbrauch von bezogenen Fertig- und Einzelteilen": {"account_type": "Cost of Goods Sold"},
-            "5300 Verbrauch von Hilfsstoffen": {"account_type": "Cost of Goods Sold"},
-            "5340 Verbrauch Verpackungsmaterial": {"account_type": "Cost of Goods Sold"},
-            "5470 Verbrauch von Kleinmaterial": {"account_type": "Cost of Goods Sold"},
-            "5450 Verbrauch von Reinigungsmaterial": {"account_type": "Cost of Goods Sold"},                                  
-            "5400 Verbrauch von Betriebsstoffen": {"account_type": "Cost of Goods Sold"},
-            "5500 Verbrauch von Werkzeugen und anderen Erzeugungshilfsmittel": {"account_type": "Cost of Goods Sold"},
-            "5600 Verbrauch von Brenn- und Treibstoffen, Energie und Wasser": {"account_type": "Cost of Goods Sold"},
-            "5700 Bearbeitung durch Dritte": {"account_type": "Cost of Goods Sold"},
-            "5900 Aufwandsstellenrechnung Material": {"account_type": "Cost of Goods Sold"},
-            "5820 Skontoertr\u00e4ge (20% USt.)": {"account_type": "Income Account"},
-            "5810 Skontoertr\u00e4ge (10% USt.)": {"account_type": "Income Account"},
-            "5010 Handelswareneinkauf 10 %": {"account_type": "Cost of Goods Sold"},
-            "5020 Handelswareneinkauf 20 %": {"account_type": "Cost of Goods Sold"},
-            "5040 Handelswareneinkauf innergemeinschaftlicher Erwerb 10 % VSt/10 % USt": {"account_type": "Cost of Goods Sold"},
-            "5050 Handelswareneinkauf innergemeinschaftlicher Erwerb 20 % VSt/20 % USt": {"account_type": "Cost of Goods Sold"},
-            "5070 Handelswareneinkauf innergemeinschaftlicher Erwerb ohne Vorsteuerabzug und 10 % USt": {"account_type": "Cost of Goods Sold"},
-            "5080 Handelswareneinkauf innergemeinschaftlicher Erwerb ohne Vorsteuerabzug und 20 % USt": {"account_type": "Cost of Goods Sold"},
-            "root_type": "Expense"
         },
-        "Klasse 6: Personalaufwand": {
-            "6000 L\u00f6hne": {"account_type": "Payable"},
-            "6200 Geh\u00e4lter": {"account_type": "Payable"},
-            "6400 Aufwendungen f\u00fcr Abfertigungen": {"account_type": "Payable"},
-            "6450 Aufwendungen f\u00fcr Altersversorgung": {"account_type": "Payable"},
-            "6500 Gesetzlicher Sozialaufwand Arbeiter": {"account_type": "Payable"},
-            "6560 Gesetzlicher Sozialaufwand Angestellte": {"account_type": "Payable"},
-            "6600 Lohnabh\u00e4ngige Abgaben und Pflichtbeitr\u00e4gte": {"account_type": "Payable"},
-            "6660 Gehaltsabh\u00e4ngige Abgaben und Pflichtbeitr\u00e4gte": {"account_type": "Payable"},
-            "6700 Sonstige Sozialaufwendungen": {"account_type": "Payable"},
-            "6900 Aufwandsstellenrechnung Personal": {"account_type": "Payable"},
-            "root_type": "Expense"
-        },       
-         "Klasse 7: Abschreibungen und sonstige betriebliche Aufwendungen": {
-            "7010 Abschreibungen auf das Anlageverm\u00f6gen (ausgenommen Finanzanlagen)": {"account_type": "Depreciation"},
-            "7100 Sonstige Steuern und Geb\u00fchren": {"account_type": "Tax"},
-            "7200 Instandhaltung u. Reinigung durch Dritte, Entsorgung, Energie": {"account_type": "Expense Account"},
-            "7300 Transporte durch Dritte": {"account_type": "Expense Account"},
-            "7310 Fahrrad - Aufwand": {"account_type": "Expense Account"},
-            "7320 Kfz - Aufwand": {"account_type": "Expense Account"},
-            "7330 LKW - Aufwand": {"account_type": "Expense Account"},
-            "7340 Lastenrad - Aufwand": {"account_type": "Expense Account"},            
-            "7350 Reise- und Fahraufwand": {"account_type": "Expense Account"},
-            "7360 Tag- und N\u00e4chtigungsgelder": {"account_type": "Expense Account"},
-            "7380 Nachrichtenaufwand": {"account_type": "Expense Account"},
-            "7400 Miet- und Pachtaufwand": {"account_type": "Expense Account"},
-            "7440 Leasingaufwand": {"account_type": "Expense Account"},
-            "7480 Lizenzaufwand": {"account_type": "Expense Account"},
-            "7500 Aufwand f\u00fcr beigestelltes Personal": {"account_type": "Expense Account"},
-            "7540 Provisionen an Dritte": {"account_type": "Expense Account"},
-            "7580 Aufsichtsratsverg\u00fctungen": {"account_type": "Expense Account"},
-            "7610 Druckerzeugnisse und Vervielf\u00e4ltigungen": {"account_type": "Expense Account"},
-            "7650 Werbung und Repr\u00e4sentationen": {"account_type": "Expense Account"},
-            "7700 Versicherungen": {"account_type": "Expense Account"},
-            "7750 Beratungs- und Pr\u00fcfungsaufwand": {"account_type": "Expense Account"},
-            "7800 Forderungsverluste und Schadensf\u00e4lle": {"account_type": "Expense Account"},
-            "7840 Verschiedene betriebliche Aufwendungen": {"account_type": "Expense Account"},
-            "7910 Aufwandsstellenrechung der Hersteller": {"account_type": "Expense Account"},
-            "7060 Sofortabschreibungen geringwertig": {"account_type": "Expense Account"},
-            "7070 Abschreibungen vom Umlaufverm\u00f6gen, soweit diese die im Unternehmen \u00fcblichen Abschreibungen \u00fcbersteigen": {"account_type": "Depreciation"},
-            "7900 Aufwandsstellenrechnung": {"account_type": "Expense Account"},
-            "7770 Aus- und Fortbildung": {"account_type": "Expense Account"},
-            "7820 Buchwert abgegangener Anlagen, ausgenommen Finanzanlagen": {"account_type": "Expense Account"},
-            "7600 B\u00fcromaterial und Drucksorten": {"account_type": "Expense Account"},
-            "7630 Fachliteratur und Zeitungen ": {"account_type": "Expense Account"},
-            "7960 Herstellungskosten der zur Erzielung der Umsatzerl\u00f6se erbrachten Leistungen": {"account_type": "Expense Account"},
-            "7780 Mitgliedsbeitr\u00e4ge": {"account_type": "Expense Account"},
-            "7880 Skontoertr\u00e4ge auf sonstige betriebliche Aufwendungen": {"account_type": "Expense Account"},
-            "7990 Sonstige betrieblichen Aufwendungen": {"account_type": "Expense Account"},
-            "7680 Spenden und Trinkgelder": {"account_type": "Expense Account"},
-            "7790 Spesen des Geldverkehrs": {"account_type": "Expense Account"},
-            "7830 Verluste aus dem Abgang vom Anlageverm\u00f6gen, ausgenommen Finanzanlagen": {"account_type": "Expense Account"},
-            "7970 Vertriebskosten": {"account_type": "Expense Account"},
-            "7980 Verwaltungskosten": {"account_type": "Expense Account"},
-            "root_type": "Expense"
-        },
-         "Klasse 8: Finanz- und ausserordentliche Ertr\u00e4ge und Aufwendungen": {
-            "8000 Ertr\u00e4ge aus Beteiligungen": {"account_type": "Income Account"},
-            "8050 Ertr\u00e4ge aus anderen Wertpapieren und Ausleihungen des Finanzanlageverm\u00f6gens": {"account_type": "Income Account"},
-            "8100 Zinsen aus Bankguthaben": {"account_type": "Income Account"},
-            "8110 Zinsen aus gewaehrten Darlehen": {"account_type": "Income Account"},
-            "8130 Verzugszinsenertraege": {"account_type": "Income Account"},
-            "8220 Aufwendungen aus Beteiligungen": {"account_type": "Expense Account"},
-            "8260 Aufwendungen aus sonst. Fiananzanlagen und aus Wertpapieren des Umlaufverm\u00f6gens": {},
-            "8280 Zinsen und \u00e4hnliche Aufwendungem": {"account_type": "Expense Account"},
-            "8400 Au\u00dferordentliche Ertr\u00e4ge": {"account_type": "Income Account"},
-            "8450 Au\u00dferordentliche Aufwendungen": {"account_type": "Expense Account"},
-            "8500 Steuern vom Einkommen und vom Ertrag": {
-                "account_type": "Tax"
-            },
-            "8600 Aufl\u00f6sung unversteuerten R\u00fccklagen": {"account_type": "Income Account"},
-            "8700 Aufl\u00f6sung von Kapitalr\u00fccklagen": {"account_type": "Income Account"},
-            "8750 Aufl\u00f6sung von Gewinnr\u00fccklagen": {"account_type": "Income Account"},
-            "8800 Zuweisung zu unversteuerten R\u00fccklagen": {"account_type": "Expense Account"},
-            "8900 Zuweisung zu Gewinnr\u00fccklagen": {"account_type": "Expense Account"},
-            "8100 Buchwert abgegangener Beteiligungen": {"account_type": "Expense Account"},
-            "8130 Buchwert abgegangener Wertpapiere des Umlaufverm\u00f6gens": {"account_type": "Expense Account"},
-            "8120 Buchwert abgegangener sonstiger Finanzanlagen": {"account_type": "Expense Account"},
-            "8990 Gewinnabfuhr bzw. Verlust\u00fcberrechnung aus Ergebnisabf\u00fchrungsvertr\u00e4gen": {"account_type": "Expense Account"},
-            "8350 nicht ausgenutzte Lieferantenskonti": {"account_type": "Expense Account"},
-            "root_type": "Income"
-        },       
-        "Klasse 9 Passiva: Eigenkapital, R\u00fccklagen, stille Einlagen, Abschlusskonten": {
-            "9000 Gezeichnetes bzw. gewidmetes Kapital": {
+        "Summe Eigenkapital R\u00fccklagen Abschlusskonten": {
+            "9000 bis 9180 Gezeichnetes bzw. gewidmetes Kapital": {
                 "account_type": "Equity"
             },
-            "9200 Kapitalr\u00fccklagen": {
+            "9200 bis 9290 Kapitalr\u00fccklagen": {
                 "account_type": "Equity"
             },
-            "9300 Gewinnr\u00fccklagen": {
+            "9300 bis 9380 Gewinnr\u00fccklagen": {
                 "account_type": "Equity"
             },
-            "9400 Bewertungsreserven uns sonst. unversteuerte R\u00fccklagen": {
+            "9400 bis 9590 Bewertungsreserven uns sonst. unversteuerte R\u00fccklagen": {
                 "account_type": "Equity"
             },
-            "9600 Private Entnahmen": {"account_type": "Equity"},
-            "9610 Privatsteuern": {"account_type": "Equity"},
-            "9700 Einlagen stiller Gesellschafter ": {"account_type": "Equity"},
-            "9900 Evidenzkonto": {"account_type": "Equity"},
-            "9800 Er\u00f6ffnungsbilanzkonto (EBK)": {"account_type": "Equity"},
-            "9880 Jahresergebnis laut Gewinn- und Verlustrechnung (G+V)": {"account_type": "Equity"},
-            "9850 Schlussbilanzkonto (SBK)": {"account_type": "Round Off"},
-            "9190 nicht eingeforderte ausstehende Einlagen und berechtigte Entnahmen von Gesellschaftern": {
+            "9600 bis 9690 Privat und Verrechnungskonten bei Einzelunternehmen und Personengesellschaften": {},
+            "9700 bis 9790 Einlagen stiller Gesellschafter ": {},
+            "9900 bis 9999 Evidenzkonten": {},
+            "Bilanzgewinn (-verlust )": {
+                "account_type": "Equity"
+            },
+            "Er\u00f6ffnungsbilanz": {},
+            "Gewinn- und Verlustrechnung": {},
+            "Schlussbilanz": {},
+            "nicht eingeforderte ausstehende Einlagen": {
                 "account_type": "Equity"
             },
             "root_type": "Equity"
+        },
+        "Summe Finanzertr\u00e4ge und Aufwendungen": {
+            "8000 bis 8040 Ertr\u00e4ge aus Beteiligungen": {},
+            "8050 bis 8090 Ertr\u00e4ge aus anderen Wertpapieren und Ausleihungen des Finanzanlageverm\u00f6gens": {},
+            "8100 bis 8130 Sonstige Zinsen und \u00e4hnliche Ertr\u00e4ge": {},
+            "8220 bis 8250 Aufwendungen aus Beteiligungen": {},
+            "8260 bis 8270 Aufwendungen aus sonst. Fiananzanlagen und aus Wertpapieren des Umlaufverm\u00f6gens": {},
+            "8280 bis 8340 Zinsen und \u00e4hnliche Aufwendungem": {},
+            "8400 bis 8440 Au\u00dferordentliche Ertr\u00e4ge": {},
+            "8450 bis 8490 Au\u00dferordentliche Aufwendungen": {},
+            "8500 bis 8590 Steuern vom Einkommen und vom Ertrag": {
+                "account_type": "Tax"
+            },
+            "8600 bis 8690 Aufl\u00f6sung unversteuerten R\u00fccklagen": {},
+            "8700 bis 8740 Aufl\u00f6sung von Kapitalr\u00fccklagen": {},
+            "8750 bis 8790 Aufl\u00f6sung von Gewinnr\u00fccklagen": {},
+            "8800 bis 8890 Zuweisung von unversteuerten R\u00fccklagen": {},
+            "Buchwert abgegangener Beteiligungen": {},
+            "Buchwert abgegangener Wertpapiere des Umlaufverm\u00f6gens": {},
+            "Buchwert abgegangener sonstiger Finanzanlagen": {},
+            "Erl\u00f6se aus dem Abgang von Beteiligungen": {},
+            "Erl\u00f6se aus dem Abgang von Wertpapieren des Umlaufverm\u00f6gens": {},
+            "Erl\u00f6se aus dem Abgang von sonstigen Finanzanlagen": {},
+            "Ertr\u00e4ge aus dem Abgang von und der Zuschreibung zu Finanzanlagen": {},
+            "Ertr\u00e4ge aus dem Abgang von und der Zuschreibung zu Wertpapieren des Umlaufverm\u00f6gens": {},
+            "Gewinabfuhr bzw. Verlust\u00fcberrechnung aus Ergebnisabf\u00fchrungsvertr\u00e4gen": {},
+            "nicht ausgenutzte Lieferantenskonti": {},
+            "root_type": "Income"
+        },
+        "Summe Fremdkapital": {
+            "3020 bis 3030 Steuerr\u00fcckstellungen": {},
+            "3040 bis 3090 Sonstige R\u00fcckstellungen": {},
+            "3110 bis 3170 Verbindlichkeiten gegen\u00fcber Kredidinstituten": {},
+            "3180 bis 3190 Verbindlichkeiten gegen\u00fcber Finanzinstituten": {},
+            "3380 bis 3390 Verbindlichkeiten aus der Annahme gezogener Wechsel u. d. Ausstellungen eigener Wechsel": {
+                "account_type": "Payable"
+            },
+            "3400 bis 3470 Verbindlichkeiten gegen\u00fc. verb. Untern., Verbindl. gegen\u00fc. Untern., mit denen eine Beteiligungsverh\u00e4lnis besteht": {},
+            "3600 bis 3690 Verbindlichkeiten im Rahmen der sozialen Sicherheit": {},
+            "3700 bis 3890 \u00dcbrige sonstige Verbindlichkeiten": {},
+            "3900 bis 3990 Passive Rechnungsabgrenzungsposten": {},
+            "Anleihen (einschlie\u00dflich konvertibler)": {},
+            "Erhaltene Anzahlungenauf Bestellungen": {},
+            "R\u00fcckstellungen f\u00fcr Abfertigung": {},
+            "R\u00fcckstellungen f\u00fcr Pensionen": {},
+            "USt. \u00a719 /art (reverse charge)": {
+                "account_type": "Tax"
+            },
+            "Umsatzsteuer": {},
+            "Umsatzsteuer Zahllast": {
+                "account_type": "Tax"
+            },
+            "Umsatzsteuer aus i.g. Erwerb 10%": {
+                "account_type": "Tax"
+            },
+            "Umsatzsteuer aus i.g. Erwerb 20%": {
+                "account_type": "Tax"
+            },
+            "Umsatzsteuer aus i.g. Lieferungen 10%": {
+                "account_type": "Tax"
+            },
+            "Umsatzsteuer aus i.g. Lieferungen 20%": {
+                "account_type": "Tax"
+            },
+            "Umsatzsteuer-Evidenzkonto f\u00fcr erhaltene Anzahlungen auf Bestellungen": {},
+            "Verbindlichkeiten aus Lieferungen u. Leistungen EU": {
+                "account_type": "Payable"
+            },
+            "Verbindlichkeiten aus Lieferungen u. Leistungen Inland": {
+                "account_type": "Payable"
+            },
+            "Verbindlichkeiten aus Lieferungen u. Leistungen sonst. Ausland": {
+                "account_type": "Payable"
+            },
+            "Verbindlichkeiten gegen\u00fcber Gesellschaften": {},
+            "Verrechnung Finanzamt": {
+                "account_type": "Tax"
+            },
+            "root_type": "Liability"
+        },
+        "Summe Kontoklasse 0 Anlageverm\u00f6gen": {
+            "44 bis 49 Sonstige Maschinen und maschinelle Anlagen": {},
+            "920 bis 930 Festverzinsliche Wertpapiere des Anlageverm\u00f6gens": {},
+            "940 bis 970 Sonstige Finanzanlagen, Wertrechte": {},
+            "Allgemeine Werkzeuge und Handwerkzeuge": {},
+            "Andere Bef\u00f6rderungsmittel": {},
+            "Andere Betriebs- und Gesch\u00e4ftsausstattung": {},
+            "Andere Erzeugungshilfsmittel": {},
+            "Anlagen im Bau": {},
+            "Anteile an Investmentfonds": {},
+            "Anteile an Kapitalgesellschaften ohne Beteiligungscharakter": {},
+            "Anteile an Personengesellschaften ohne Beteiligungscharakter": {},
+            "Anteile an verbundenen Unternehmen": {},
+            "Antriebsmaschinen": {},
+            "Aufwendungen f\u00fcs das Ingangssetzen u. Erweitern eines Betriebes": {},
+            "Ausleihungen an  verbundene Unternehmen": {},
+            "Ausleihungen an  verbundene Unternehmen, mit denen ein Beteiligungsverh\u00e4lnis besteht": {},
+            "Bauliche Investitionen in fremden (gepachteten) Betriebs- und Gesch\u00e4ftsgeb\u00e4uden": {},
+            "Bauliche Investitionen in fremden (gepachteten) Wohn- und Sozialgeb\u00e4uden": {},
+            "Bebaute Grundst\u00fccke (Grundwert)": {},
+            "Beheizungs- und Beleuchtungsanlagen": {},
+            "Beteiligungen an Gemeinschaftunternehmen": {},
+            "Beteiligungen an angeschlossenen (assoziierten) Unternehmen": {},
+            "Betriebs- und Gesch\u00e4ftsgeb\u00e4ude auf eigenem Grund": {},
+            "Betriebs- und Gesch\u00e4ftsgeb\u00e4ude auf fremdem Grund": {},
+            "B\u00fcromaschinen, EDV - Anlagen": {},
+            "Datenverarbeitungsprogramme": {},
+            "Energieversorgungsanlagen": {},
+            "Fertigungsmaschinen": {},
+            "Gebinde": {},
+            "Geleistete Anzahlungen": {},
+            "Genossenschaften ohne Beteiligungscharakter": {},
+            "Geringwertige Verm\u00f6gensgegenst\u00e4nde, soweit im Erzeugerprozess verwendet": {},
+            "Geringwertige Verm\u00f6gensgegenst\u00e4nde, soweit nicht im Erzeugungsprozess verwendet": {},
+            "Gesch\u00e4fts(Firmen)wert": {},
+            "Grundst\u00fcckseinrichtunten auf eigenem Grund": {},
+            "Grundst\u00fcckseinrichtunten auf fremdem Grund": {},
+            "Grundst\u00fccksgleiche Rechte": {},
+            "Hebezeuge und Montageanlagen": {},
+            "Konzessionen": {},
+            "Kumulierte Abschreibungen": {},
+            "LKW": {},
+            "Marken, Warenzeichen und Musterschutzrechte": {},
+            "Maschinenwerkzeuge": {},
+            "Nachrichten- und Kontrollanlagen": {},
+            "PKW": {},
+            "Pacht- und Mietrechte": {},
+            "Patentrechte und Lizenzen": {},
+            "Sonstige Ausleihungen": {},
+            "Sonstige Beteiligungen": {},
+            "Transportanlagen": {},
+            "Unbebaute Grundst\u00fccke": {},
+            "Vorrichtungen, Formen und Modelle": {},
+            "Wohn- und Sozialgeb\u00e4ude auf eigenem Grund": {},
+            "Wohn- und Sozialgeb\u00e4ude auf fremdem Grund": {},
+            "root_type": "Asset"
+        },
+        "Summe Personalaufwand": {
+            "6000 bis 6190 L\u00f6hne": {},
+            "6200 bis 6390 Geh\u00e4lter": {},
+            "6400 bis 6440 Aufwendungen f\u00fcr Abfertigungen": {},
+            "6450 bis 6490 Aufwendungen f\u00fcr Altersversorgung": {},
+            "6500 bis 6550 Gesetzlicher Sozialaufwand Arbeiter": {},
+            "6560 bis 6590 Gesetzlicher Sozialaufwand Angestellte": {},
+            "6600 bis 6650 Lohnabh\u00e4ngige Abgaben und Pflichtbeitr\u00e4gte": {},
+            "6660 bis 6690 Gehaltsabh\u00e4ngige Abgaben und Pflichtbeitr\u00e4gte": {},
+            "6700 bis 6890 Sonstige Sozialaufwendungen": {},
+            "Aufwandsstellenrechnung": {},
+            "root_type": "Expense"
+        },
+        "Summe Umlaufverm\u00f6gen": {
+            "2000 bis 2007 Forderungen aus Lief. und Leist. Inland": {
+                "account_type": "Receivable"
+            },
+            "2100 bis 2120 Forderungen aus Lief. und Leist. EU": {
+                "account_type": "Receivable"
+            },
+            "2150 bis 2170 Forderungen aus Lief. und Leist. Ausland": {
+                "account_type": "Receivable"
+            },
+            "2200 bis 2220 Forderungen gegen\u00fcber verbundenen Unternehmen": {
+                "account_type": "Receivable"
+            },
+            "2250 bis 2270 Forderungen gegen\u00fcber Unternehmen, mit denen ein Beteiligungsverh\u00e4ltnis besteht": {
+                "account_type": "Receivable"
+            },
+            "2300 bis 2460 Sonstige Forderungen und Verm\u00f6gensgegenst\u00e4nde": {
+                "account_type": "Receivable"
+            },
+            "2630 bis 2670 Sonstige Wertpapiere": {
+                "account_type": "Receivable"
+            },
+            "2750 bis 2770 Kassenbest\u00e4nde in Fremdw\u00e4hrung": {
+                "account_type": "Receivable"
+            },
+            "Aktive Rechnungsabrenzungsposten": {
+                "account_type": "Receivable"
+            },
+            "Anteile an verbundenen Unternehmen": {
+                "account_type": "Receivable"
+            },
+            "Bank / Guthaben bei Kreditinstituten": {
+                "account_type": "Receivable"
+            },
+            "Besitzwechsel ...": {
+                "account_type": "Receivable"
+            },
+            "Disagio": {
+                "account_type": "Receivable"
+            },
+            "Eigene Anteile (Wertpapiere)": {
+                "account_type": "Receivable"
+            },
+            "Einfuhrumsatzsteuer (bezahlt)": {},
+            "Eingeforderte aber noch nicht eingezahlte Einlagen": {
+                "account_type": "Receivable"
+            },
+            "Einzelwertberichtigungen zu Forderungen aus Lief. und Leist. Ausland": {
+                "account_type": "Receivable"
+            },
+            "Einzelwertberichtigungen zu Forderungen aus Lief. und Leist. EU": {
+                "account_type": "Receivable"
+            },
+            "Einzelwertberichtigungen zu Forderungen aus Lief. und Leist. Inland ": {
+                "account_type": "Receivable"
+            },
+            "Einzelwertberichtigungen zu Forderungen gegen\u00fcber Unternehmen mit denen ein Beteiligungsverh\u00e4ltnis besteht": {
+                "account_type": "Receivable"
+            },
+            "Einzelwertberichtigungen zu Forderungen gegen\u00fcber verbundenen Unternehmen": {
+                "account_type": "Receivable"
+            },
+            "Einzelwertberichtigungen zu sonstigen Forderungen und Verm\u00f6gensgegenst\u00e4nden": {
+                "account_type": "Receivable"
+            },
+            "Kassenbestand": {
+                "account_type": "Receivable"
+            },
+            "Pauschalwertberichtigungen zu Forderungen aus Lief. und Leist. Ausland": {
+                "account_type": "Receivable"
+            },
+            "Pauschalwertberichtigungen zu Forderungen aus Lief. und Leist. EU": {
+                "account_type": "Receivable"
+            },
+            "Pauschalwertberichtigungen zu Forderungen aus Lief. und Leist. Inland ": {
+                "account_type": "Receivable"
+            },
+            "Pauschalwertberichtigungen zu Forderungen gegen\u00fcber Unternehmen mit denen ein Beteiligungsverh\u00e4ltnis besteht": {
+                "account_type": "Receivable"
+            },
+            "Pauschalwertberichtigungen zu Forderungen gegen\u00fcber verbundenen Unternehmen": {
+                "account_type": "Receivable"
+            },
+            "Pauschalwertberichtigungen zu sonstigen Forderungen und Verm\u00f6gensgegenst\u00e4nden": {
+                "account_type": "Receivable"
+            },
+            "Postwertzeichen": {
+                "account_type": "Receivable"
+            },
+            "Schecks in Inlandsw\u00e4hrung": {
+                "account_type": "Receivable"
+            },
+            "Sonstige Anteile": {
+                "account_type": "Receivable"
+            },
+            "Stempelmarken": {
+                "account_type": "Receivable"
+            },
+            "Steuerabgrenzung": {
+                "account_type": "Receivable"
+            },
+            "Unterschiedsbetrag gem. Abschnitt XII Pensionskassengesetz": {
+                "account_type": "Receivable"
+            },
+            "Unterschiedsbetrag zur gebotenen Pensionsr\u00fcckstellung": {
+                "account_type": "Receivable"
+            },
+            "Vorsteuer": {
+                "account_type": "Receivable"
+            },
+            "Vorsteuer aus ig. Erwerb 10%": {
+                "account_type": "Tax"
+            },
+            "Vorsteuer aus ig. Erwerb 20%": {
+                "account_type": "Tax"
+            },
+            "Vorsteuer \u00a719/Art 19 ( reverse charge ) ": {
+                "account_type": "Tax"
+            },
+            "Wertberichtigungen": {
+                "account_type": "Receivable"
+            },
+            "root_type": "Asset"
+        },
+        "Summe Vorr\u00e4te": {
+            "1000 bis 1090 Bezugsverrechnung": {},
+            "1100 bis 1190 Rohstoffe": {},
+            "1200 bis 1290 Bezogene Teile": {},
+            "1300 bis 1340 Hilfsstoffe": {},
+            "1350 bis 1390 Betriebsstoffe": {},
+            "1400 bis 1490 Unfertige Erzeugniss": {},
+            "1500 bis 1590 Fertige Erzeugniss": {},
+            "1600 bis 1690 Waren": {},
+            "1700 bis 1790 Noch nicht abgerechenbare Leistungen": {},
+            "1900 bis 1990 Wertberichtigungen": {},
+            "geleistete Anzahlungen": {},
+            "root_type": "Asset"
+        },
+        "Summe Wareneinsatz": {
+            "5100 bis 5190 Verbrauch an Rohstoffen": {},
+            "5200 bis 5290 Verbrauch von bezogenen Fertig- und Einzelteilen": {},
+            "5300 bis 5390 Verbrauch von Hilfsstoffen": {},
+            "5400 bis 5490 Verbrauch von Betriebsstoffen": {},
+            "5500 bis 5590 Verbrauch von Werkzeugen und anderen Erzeugungshilfsmittel": {},
+            "5600 bis 5690 Verbrauch von Brenn- und Treibstoffen, Energie und Wasser": {},
+            "5700 bis 5790 Sonstige bezogene Herstellungsleistungen": {},
+            "Aufwandsstellenrechnung": {},
+            "Skontoertr\u00e4ge auf Materialaufwand": {},
+            "Skontoertr\u00e4ge auf sonstige bezogene Herstellungsleistungen": {},
+            "Wareneinkauf 10 %": {},
+            "Wareneinkauf 20 %": {},
+            "Wareneinkauf igErwerb 10 % VSt/10 % USt": {},
+            "Wareneinkauf igErwerb 20 % VSt/20 % USt": {},
+            "Wareneinkauf igErwerb ohne Vorsteuerabzug und 10 % USt": {},
+            "Wareneinkauf igErwerb ohne Vorsteuerabzug und 20 % USt": {},
+            "root_type": "Expense"
         }
-     }   
-  }
+    }
+}

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

@@ -1,38 +1,38 @@
 {
-	"country_code": "de",
-	"name": "SKR03 mit Kontonummern",
-	"tree": {
-		"Aktiva": {
-			"is_group": 1,
+    "country_code": "de",
+    "name": "SKR03 mit Kontonummern",
+    "tree": {
+        "Aktiva": {
+            "is_group": 1,
 			"root_type": "Asset",
-			"A - Anlagevermögen": {
-				"is_group": 1,
-				"EDV-Software": {
-					"account_number": "0027",
-					"account_type": "Fixed Asset"
-				},
-				"Geschäftsausstattung": {
-					"account_number": "0410",
-					"account_type": "Fixed Asset"
-				},
-				"Büroeinrichtung": {
-					"account_number": "0420",
-					"account_type": "Fixed Asset"
-				},
-				"Darlehen": {
-					"account_number": "0565"
-				},
-				"Maschinen": {
-					"account_number": "0210",
-					"account_type": "Fixed Asset"
-				},
-				"Betriebsausstattung": {
-					"account_number": "0400",
-					"account_type": "Fixed Asset"
-				},
-				"Ladeneinrichtung": {
-					"account_number": "0430",
-					"account_type": "Fixed Asset"
+            "A - Anlagevermögen": {
+                "is_group": 1,
+                "EDV-Software": {
+                    "account_number": "0027",
+                    "account_type": "Fixed Asset"
+                },
+                "Gesch\u00e4ftsausstattung": {
+                    "account_number": "0410",
+                    "account_type": "Fixed Asset"
+                },
+                "B\u00fcroeinrichtung": {
+                    "account_number": "0420",
+                    "account_type": "Fixed Asset"
+                },
+                "Darlehen": {
+                    "account_number": "0565"
+                },
+                "Maschinen": {
+                    "account_number": "0210",
+                    "account_type": "Fixed Asset"
+                },
+                "Betriebsausstattung": {
+                    "account_number": "0400",
+                    "account_type": "Fixed Asset"
+                },
+                "Ladeneinrichtung": {
+                    "account_number": "0430",
+                    "account_type": "Fixed Asset"
 				},
 				"Accumulated Depreciation": {
 					"account_type": "Accumulated Depreciation"
@@ -60,46 +60,36 @@
 					"Durchlaufende Posten": {
 						"account_number": "1590"
 					},
-					"Verrechnungskonto Gewinnermittlung § 4 Abs. 3 EStG, nicht ergebniswirksam": {
+					"Gewinnermittlung \u00a74/3 nicht Ergebniswirksam": {
 						"account_number": "1371"
 					},
 					"Abziehbare Vorsteuer": {
+						"account_type": "Tax",
 						"is_group": 1,
-						"Abziehbare Vorsteuer 7 %": {
-							"account_number": "1571",
-							"account_type": "Tax",
-							"tax_rate": 7.0
+						"Abziehbare Vorsteuer 7%": {
+							"account_number": "1571"
 						},
-						"Abziehbare Vorsteuer 19 %": {
-							"account_number": "1576",
-							"account_type": "Tax",
-							"tax_rate": 19.0
+						"Abziehbare Vorsteuer 19%": {
+							"account_number": "1576"
 						},
-						"Abziehbare Vorsteuer nach § 13b UStG 19 %": {
-							"account_number": "1577",
-							"account_type": "Tax",
-							"tax_rate": 19.0
+						"Abziehbare Vorsteuer nach \u00a713b UStG 19%": {
+							"account_number": "1577"
+						},
+						"Leistungen \u00a713b UStG 19% Vorsteuer, 19% Umsatzsteuer": {
+							"account_number": "3120"
 						}
 					}
 				},
 				"III. Wertpapiere": {
-					"is_group": 1,
-					"Anteile an verbundenen Unternehmen (Umlaufvermögen)": {
-						"account_number": "1340"
-					},
-					"Anteile an herrschender oder mit Mehrheit beteiligter Gesellschaft": {
-						"account_number": "1344"
-					},
-					"Sonstige Wertpapiere": {
-						"account_number": "1348"
-					}
+					"is_group": 1
 				},
 				"IV. Kassenbestand, Bundesbankguthaben, Guthaben bei Kreditinstituten und Schecks.": {
 					"is_group": 1,
 					"Kasse": {
-						"is_group": 1,
 						"account_type": "Cash",
+						"is_group": 1,
 						"Kasse": {
+							"is_group": 1,
 							"account_number": "1000",
 							"account_type": "Cash"
 						}
@@ -121,21 +111,21 @@
 			"C - Rechnungsabgrenzungsposten": {
 				"is_group": 1,
 				"Aktive Rechnungsabgrenzung": {
-					"account_number": "0980"
+                    "account_number": "0980"
 				}
 			},
 			"D - Aktive latente Steuern": {
 				"is_group": 1,
 				"Aktive latente Steuern": {
-					"account_number": "0983"
+                    "account_number": "0983"
 				}
 			},
 			"E - Aktiver Unterschiedsbetrag aus der Vermögensverrechnung": {
 				"is_group": 1
 			}
-		},
-		"Passiva": {
-			"is_group": 1,
+        },
+        "Passiva": {
+            "is_group": 1,
 			"root_type": "Liability",
 			"A. Eigenkapital": {
 				"is_group": 1,
@@ -210,32 +200,26 @@
 					},
 					"Umsatzsteuer": {
 						"is_group": 1,
-						"Umsatzsteuer 7 %": {
-							"account_number": "1771",
-							"account_type": "Tax",
-							"tax_rate": 7.0
+						"account_type": "Tax",
+						"Umsatzsteuer 7%": {
+							"account_number": "1771"
 						},
-						"Umsatzsteuer 19 %": {
-							"account_number": "1776",
-							"account_type": "Tax",
-							"tax_rate": 19.0
+						"Umsatzsteuer 19%": {
+							"account_number": "1776"
 						},
 						"Umsatzsteuer-Vorauszahlung": {
-							"account_number": "1780",
-							"account_type": "Tax"
+							"account_number": "1780"
 						},
 						"Umsatzsteuer-Vorauszahlung 1/11": {
 							"account_number": "1781"
 						},
-						"Umsatzsteuer nach § 13b UStG 19 %": {
-							"account_number": "1787",
-							"account_type": "Tax",
-							"tax_rate": 19.0
+						"Umsatzsteuer \u00a7 13b UStG 19%": {
+							"account_number": "1787"
 						},
 						"Umsatzsteuer Vorjahr": {
 							"account_number": "1790"
 						},
-						"Umsatzsteuer frühere Jahre": {
+						"Umsatzsteuer fr\u00fchere Jahre": {
 							"account_number": "1791"
 						}
 					}
@@ -250,56 +234,44 @@
 			"E. Passive latente Steuern": {
 				"is_group": 1
 			}
-		},
-		"Erlöse u. Erträge 2/8": {
-			"is_group": 1,
-			"root_type": "Income",
-			"Erlöskonten 8": {
+        },
+        "Erl\u00f6se u. Ertr\u00e4ge 2/8": {
+            "is_group": 1,
+            "root_type": "Income",
+            "Erl\u00f6skonten 8": {
 				"is_group": 1,
-				"Erlöse": {
-					"account_number": "8200",
-					"account_type": "Income Account"
-				},
-				"Erlöse USt. 19 %": {
-					"account_number": "8400",
-					"account_type": "Income Account"
-				},
-				"Erlöse USt. 7 %": {
-					"account_number": "8300",
-					"account_type": "Income Account"
-				}
-			},
-			"Ertragskonten 2": {
-				"is_group": 1,
-				"sonstige Zinsen und ähnliche Erträge": {
-					"account_number": "2650",
-					"account_type": "Income Account"
-				},
-				"Außerordentliche Erträge": {
-					"account_number": "2500",
-					"account_type": "Income Account"
-				},
-				"Sonstige Erträge": {
-					"account_number": "2700",
-					"account_type": "Income Account"
-				}
-			}
-		},
-		"Aufwendungen 2/4": {
-			"is_group": 1,
+				"Erl\u00f6se": {
+                    "account_number": "8200",
+                    "account_type": "Income Account"
+                },
+                "Erl\u00f6se USt. 19%": {
+                    "account_number": "8400",
+                    "account_type": "Income Account"
+                },
+                "Erl\u00f6se USt. 7%": {
+                    "account_number": "8300",
+                    "account_type": "Income Account"
+                }
+            },
+            "Ertragskonten 2": {
+                "is_group": 1,
+                "sonstige Zinsen und \u00e4hnliche Ertr\u00e4ge": {
+                    "account_number": "2650",
+                    "account_type": "Income Account"
+                },
+                "Au\u00dferordentliche Ertr\u00e4ge": {
+                    "account_number": "2500",
+                    "account_type": "Income Account"
+                },
+                "Sonstige Ertr\u00e4ge": {
+                    "account_number": "2700",
+                    "account_type": "Income Account"
+                }
+            }
+        },
+        "Aufwendungen 2/4": {
+            "is_group": 1,
 			"root_type": "Expense",
-			"Fremdleistungen": {
-				"account_number": "3100",
-				"account_type": "Expense Account"
-			},
-			"Fremdleistungen ohne Vorsteuer": {
-				"account_number": "3109",
-				"account_type": "Expense Account"
-			},
-			"Bauleistungen eines im Inland ansässigen Unternehmers 19 % Vorsteuer und 19 % Umsatzsteuer": {
-				"account_number": "3120",
-				"account_type": "Expense Account"
-			},
 			"Wareneingang": {
 				"account_number": "3200"
 			},
@@ -326,234 +298,234 @@
 			"Gegenkonto 4996-4998": {
 				"account_number": "4999"
 			},
-			"Abschreibungen": {
-				"is_group": 1,
+            "Abschreibungen": {
+                "is_group": 1,
 				"Abschreibungen auf Sachanlagen (ohne AfA auf Kfz und Gebäude)": {
-					"account_number": "4830",
-					"account_type": "Accumulated Depreciation"
+                    "account_number": "4830",
+                    "account_type": "Accumulated Depreciation"
 				},
 				"Abschreibungen auf Gebäude": {
-					"account_number": "4831",
-					"account_type": "Depreciation"
+                    "account_number": "4831",
+                    "account_type": "Depreciation"
 				},
 				"Abschreibungen auf Kfz": {
-					"account_number": "4832",
-					"account_type": "Depreciation"
+                    "account_number": "4832",
+                    "account_type": "Depreciation"
 				},
 				"Sofortabschreibung GWG": {
-					"account_number": "4855",
-					"account_type": "Expense Account"
+                    "account_number": "4855",
+                    "account_type": "Expense Account"
 				}
-			},
-			"Kfz-Kosten": {
-				"is_group": 1,
-				"Kfz-Steuer": {
-					"account_number": "4510",
-					"account_type": "Expense Account"
-				},
-				"Kfz-Versicherungen": {
-					"account_number": "4520",
-					"account_type": "Expense Account"
-				},
-				"laufende Kfz-Betriebskosten": {
-					"account_number": "4530",
-					"account_type": "Expense Account"
-				},
-				"Kfz-Reparaturen": {
-					"account_number": "4540",
-					"account_type": "Expense Account"
-				},
-				"Fremdfahrzeuge": {
-					"account_number": "4570",
-					"account_type": "Expense Account"
-				},
-				"sonstige Kfz-Kosten": {
-					"account_number": "4580",
-					"account_type": "Expense Account"
-				}
-			},
-			"Personalkosten": {
-				"is_group": 1,
-				"Gehälter": {
-					"account_number": "4120",
-					"account_type": "Expense Account"
-				},
-				"gesetzliche soziale Aufwendungen": {
-					"account_number": "4130",
-					"account_type": "Expense Account"
-				},
-				"Aufwendungen für Altersvorsorge": {
-					"account_number": "4165",
-					"account_type": "Expense Account"
-				},
-				"Vermögenswirksame Leistungen": {
-					"account_number": "4170",
-					"account_type": "Expense Account"
-				},
-				"Aushilfslöhne": {
-					"account_number": "4190",
-					"account_type": "Expense Account"
-				}
-			},
-			"Raumkosten": {
-				"is_group": 1,
-				"Miete und Nebenkosten": {
-					"account_number": "4210",
-					"account_type": "Expense Account"
-				},
-				"Gas, Wasser, Strom (Verwaltung, Vertrieb)": {
-					"account_number": "4240",
-					"account_type": "Expense Account"
-				},
-				"Reinigung": {
-					"account_number": "4250",
-					"account_type": "Expense Account"
-				}
-			},
-			"Reparatur/Instandhaltung": {
-				"is_group": 1,
-				"Reparaturen und Instandhaltungen von anderen Anlagen und Betriebs- und Geschäftsausstattung": {
-					"account_number": "4805",
-					"account_type": "Expense Account"
-				}
-			},
-			"Versicherungsbeiträge": {
-				"is_group": 1,
-				"Versicherungen": {
-					"account_number": "4360",
-					"account_type": "Expense Account"
-				},
-				"Beiträge": {
-					"account_number": "4380",
-					"account_type": "Expense Account"
-				},
-				"sonstige Ausgaben": {
-					"account_number": "4390",
-					"account_type": "Expense Account"
-				},
-				"steuerlich abzugsfähige Verspätungszuschläge und Zwangsgelder": {
-					"account_number": "4396",
-					"account_type": "Expense Account"
-				}
-			},
-			"Werbe-/Reisekosten": {
-				"is_group": 1,
-				"Werbekosten": {
-					"account_number": "4610",
-					"account_type": "Expense Account"
-				},
-				"Aufmerksamkeiten": {
-					"account_number": "4653",
-					"account_type": "Expense Account"
-				},
-				"nicht abzugsfähige Betriebsausg. aus Werbe-, Repräs.- u. Reisekosten": {
-					"account_number": "4665",
-					"account_type": "Expense Account"
-				},
-				"Reisekosten Unternehmer": {
-					"account_number": "4670",
-					"account_type": "Expense Account"
-				}
-			},
-			"verschiedene Kosten": {
-				"is_group": 1,
-				"Porto": {
-					"account_number": "4910",
-					"account_type": "Expense Account"
-				},
-				"Telekom": {
-					"account_number": "4920",
-					"account_type": "Expense Account"
-				},
-				"Mobilfunk D2": {
-					"account_number": "4921",
-					"account_type": "Expense Account"
-				},
-				"Internet": {
-					"account_number": "4922",
-					"account_type": "Expense Account"
-				},
-				"Bürobedarf": {
-					"account_number": "4930",
-					"account_type": "Expense Account"
-				},
-				"Zeitschriften, Bücher": {
-					"account_number": "4940",
-					"account_type": "Expense Account"
-				},
-				"Fortbildungskosten": {
-					"account_number": "4945",
-					"account_type": "Expense Account"
-				},
-				"Buchführungskosten": {
-					"account_number": "4955",
-					"account_type": "Expense Account"
-				},
-				"Abschluß- u. Prüfungskosten": {
-					"account_number": "4957",
-					"account_type": "Expense Account"
-				},
-				"Nebenkosten des Geldverkehrs": {
-					"account_number": "4970",
-					"account_type": "Expense Account"
-				},
-				"Werkzeuge und Kleingeräte": {
-					"account_number": "4985",
-					"account_type": "Expense Account"
-				}
-			},
-			"Zinsaufwendungen": {
-				"is_group": 1,
-				"Zinsaufwendungen für kurzfristige Verbindlichkeiten": {
-					"account_number": "2110",
-					"account_type": "Expense Account"
-				},
-				"Zinsaufwendungen für KFZ Finanzierung": {
-					"account_number": "2121",
-					"account_type": "Expense Account"
-				}
-			}
-		},
-		"Anfangsbestand 9": {
-			"is_group": 1,
-			"root_type": "Equity",
-			"Saldenvortragskonten": {
-				"is_group": 1,
-				"Saldenvortrag Sachkonten": {
-					"account_number": "9000"
-				},
-				"Saldenvorträge Debitoren": {
-					"account_number": "9008"
-				},
-				"Saldenvorträge Kreditoren": {
-					"account_number": "9009"
-				}
-			}
-		},
-		"Privatkonten 1": {
-			"is_group": 1,
-			"root_type": "Equity",
-			"Privatentnahmen/-einlagen": {
-				"is_group": 1,
-				"Privatentnahme allgemein": {
-					"account_number": "1800"
-				},
-				"Privatsteuern": {
-					"account_number": "1810"
-				},
-				"Sonderausgaben beschränkt abzugsfähig": {
-					"account_number": "1820"
-				},
-				"Sonderausgaben unbeschränkt abzugsfähig": {
-					"account_number": "1830"
-				},
-				"Außergewöhnliche Belastungen": {
-					"account_number": "1850"
-				},
-				"Privateinlagen": {
-					"account_number": "1890"
-				}
-			}
-		}
-	}
+            },
+            "Kfz-Kosten": {
+                "is_group": 1,
+                "Kfz-Steuer": {
+                    "account_number": "4510",
+                    "account_type": "Expense Account"
+                },
+                "Kfz-Versicherungen": {
+                    "account_number": "4520",
+                    "account_type": "Expense Account"
+                },
+                "laufende Kfz-Betriebskosten": {
+                    "account_number": "4530",
+                    "account_type": "Expense Account"
+                },
+                "Kfz-Reparaturen": {
+                    "account_number": "4540",
+                    "account_type": "Expense Account"
+                },
+                "Fremdfahrzeuge": {
+                    "account_number": "4570",
+                    "account_type": "Expense Account"
+                },
+                "sonstige Kfz-Kosten": {
+                    "account_number": "4580",
+                    "account_type": "Expense Account"
+                }
+            },
+            "Personalkosten": {
+                "is_group": 1,
+                "Geh\u00e4lter": {
+                    "account_number": "4120",
+                    "account_type": "Expense Account"
+                },
+                "gesetzliche soziale Aufwendungen": {
+                    "account_number": "4130",
+                    "account_type": "Expense Account"
+                },
+                "Aufwendungen f\u00fcr Altersvorsorge": {
+                    "account_number": "4165",
+                    "account_type": "Expense Account"
+                },
+                "Verm\u00f6genswirksame Leistungen": {
+                    "account_number": "4170",
+                    "account_type": "Expense Account"
+                },
+                "Aushilfsl\u00f6hne": {
+                    "account_number": "4190",
+                    "account_type": "Expense Account"
+                }
+            },
+            "Raumkosten": {
+                "is_group": 1,
+                "Miete und Nebenkosten": {
+                    "account_number": "4210",
+                    "account_type": "Expense Account"
+                },
+                "Gas, Wasser, Strom (Verwaltung, Vertrieb)": {
+                    "account_number": "4240",
+                    "account_type": "Expense Account"
+                },
+                "Reinigung": {
+                    "account_number": "4250",
+                    "account_type": "Expense Account"
+                }
+            },
+            "Reparatur/Instandhaltung": {
+                "is_group": 1,
+                "Reparatur u. Instandh. von Anlagen/Maschinen u. Betriebs- u. Gesch\u00e4ftsausst.": {
+                    "account_number": "4805",
+                    "account_type": "Expense Account"
+                }
+            },
+            "Versicherungsbeitr\u00e4ge": {
+                "is_group": 1,
+                "Versicherungen": {
+                    "account_number": "4360",
+                    "account_type": "Expense Account"
+                },
+                "Beitr\u00e4ge": {
+                    "account_number": "4380",
+                    "account_type": "Expense Account"
+                },
+                "sonstige Ausgaben": {
+                    "account_number": "4390",
+                    "account_type": "Expense Account"
+                },
+                "steuerlich abzugsf\u00e4hige Versp\u00e4tungszuschl\u00e4ge und Zwangsgelder": {
+                    "account_number": "4396",
+                    "account_type": "Expense Account"
+                }
+            },
+            "Werbe-/Reisekosten": {
+                "is_group": 1,
+                "Werbekosten": {
+                    "account_number": "4610",
+                    "account_type": "Expense Account"
+                },
+                "Aufmerksamkeiten": {
+                    "account_number": "4653",
+                    "account_type": "Expense Account"
+                },
+                "nicht abzugsf\u00e4hige Betriebsausg. aus Werbe-, Repr\u00e4s.- u. Reisekosten": {
+                    "account_number": "4665",
+                    "account_type": "Expense Account"
+                },
+                "Reisekosten Unternehmer": {
+                    "account_number": "4670",
+                    "account_type": "Expense Account"
+                }
+            },
+            "verschiedene Kosten": {
+                "is_group": 1,
+                "Porto": {
+                    "account_number": "4910",
+                    "account_type": "Expense Account"
+                },
+                "Telekom": {
+                    "account_number": "4920",
+                    "account_type": "Expense Account"
+                },
+                "Mobilfunk D2": {
+                    "account_number": "4921",
+                    "account_type": "Expense Account"
+                },
+                "Internet": {
+                    "account_number": "4922",
+                    "account_type": "Expense Account"
+                },
+                "B\u00fcrobedarf": {
+                    "account_number": "4930",
+                    "account_type": "Expense Account"
+                },
+                "Zeitschriften, B\u00fccher": {
+                    "account_number": "4940",
+                    "account_type": "Expense Account"
+                },
+                "Fortbildungskosten": {
+                    "account_number": "4945",
+                    "account_type": "Expense Account"
+                },
+                "Buchf\u00fchrungskosten": {
+                    "account_number": "4955",
+                    "account_type": "Expense Account"
+                },
+                "Abschlu\u00df- u. Pr\u00fcfungskosten": {
+                    "account_number": "4957",
+                    "account_type": "Expense Account"
+                },
+                "Nebenkosten des Geldverkehrs": {
+                    "account_number": "4970",
+                    "account_type": "Expense Account"
+                },
+                "Werkzeuge und Kleinger\u00e4te": {
+                    "account_number": "4985",
+                    "account_type": "Expense Account"
+                }
+            },
+            "Zinsaufwendungen": {
+                "is_group": 1,
+                "Zinsaufwendungen f\u00fcr kurzfristige Verbindlichkeiten": {
+                    "account_number": "2110",
+                    "account_type": "Expense Account"
+                },
+                "Zinsaufwendungen f\u00fcr KFZ Finanzierung": {
+                    "account_number": "2121",
+                    "account_type": "Expense Account"
+                }
+            }
+        },
+        "Anfangsbestand 9": {
+            "is_group": 1,
+            "root_type": "Equity",
+            "Saldenvortragskonten": {
+                "is_group": 1,
+                "Saldenvortrag Sachkonten": {
+                    "account_number": "9000"
+                },
+                "Saldenvortr\u00e4ge Debitoren": {
+                    "account_number": "9008"
+                },
+                "Saldenvortr\u00e4ge Kreditoren": {
+                    "account_number": "9009"
+                }
+            }
+        },
+        "Privatkonten 1": {
+            "is_group": 1,
+            "root_type": "Equity",
+            "Privatentnahmen/-einlagen": {
+                "is_group": 1,
+                "Privatentnahme allgemein": {
+                    "account_number": "1800"
+                },
+                "Privatsteuern": {
+                    "account_number": "1810"
+                },
+                "Sonderausgaben beschr\u00e4nkt abzugsf\u00e4hig": {
+                    "account_number": "1820"
+                },
+                "Sonderausgaben unbeschr\u00e4nkt abzugsf\u00e4hig": {
+                    "account_number": "1830"
+                },
+                "Au\u00dfergew\u00f6hnliche Belastungen": {
+                    "account_number": "1850"
+                },
+                "Privateinlagen": {
+                    "account_number": "1890"
+                }
+            }
+        }
+    }
 }

erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.js

@@ -3,6 +3,10 @@
 
 frappe.ui.form.on('Accounting Dimension Filter', {
 	refresh: function(frm, cdt, cdn) {
+		if (frm.doc.accounting_dimension) {
+			frm.set_df_property('dimensions', 'label', frm.doc.accounting_dimension, cdn, 'dimension_value');
+		}
+
 		let help_content =
 			`<table class="table table-bordered" style="background-color: var(--scrollbar-track-color);">
 				<tr><td>
@@ -64,7 +68,6 @@ frappe.ui.form.on('Accounting Dimension Filter', {
 		frm.clear_table("dimensions");
 		let row = frm.add_child("dimensions");
 		row.accounting_dimension = frm.doc.accounting_dimension;
-		frm.fields_dict["dimensions"].grid.update_docfield_property("dimension_value", "label", frm.doc.accounting_dimension);
 		frm.refresh_field("dimensions");
 		frm.trigger('setup_filters');
 	},

erpnext/accounts/doctype/accounts_settings/accounts_settings.json

@@ -56,9 +56,7 @@
   "acc_frozen_upto",
   "column_break_25",
   "frozen_accounts_modifier",
-  "report_settings_sb",
-  "tab_break_dpet",
-  "show_balance_in_coa"
+  "report_settings_sb"
  ],
  "fields": [
   {
@@ -93,7 +91,7 @@
   },
   {
    "default": "0",
-   "description": "Enabling ensure each Purchase Invoice has a unique value in Supplier Invoice No. field",
+   "description": "Enabling ensure each Sales Invoice has a unique value in Supplier Invoice No. field",
    "fieldname": "check_supplier_invoice_uniqueness",
    "fieldtype": "Check",
    "label": "Check Supplier Invoice Number Uniqueness"
@@ -349,17 +347,6 @@
    "fieldname": "allow_multi_currency_invoices_against_single_party_account",
    "fieldtype": "Check",
    "label": "Allow multi-currency invoices against single party account "
-  },
-  {
-   "fieldname": "tab_break_dpet",
-   "fieldtype": "Tab Break",
-   "label": "Chart Of Accounts"
-  },
-  {
-   "default": "1",
-   "fieldname": "show_balance_in_coa",
-   "fieldtype": "Check",
-   "label": "Show Balances in Chart Of Accounts"
   }
  ],
  "icon": "icon-cog",
@@ -367,7 +354,7 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2023-01-02 12:07:42.434214",
+ "modified": "2022-07-11 13:37:50.605141",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Accounts Settings",

erpnext/accounts/doctype/bank_account/bank_account.py

@@ -77,6 +77,6 @@ def get_party_bank_account(party_type, party):
 
 @frappe.whitelist()
 def get_bank_account_details(bank_account):
-	return frappe.get_cached_value(
+	return frappe.db.get_value(
 		"Bank Account", bank_account, ["account", "bank", "bank_account_no"], as_dict=1
 	)

erpnext/accounts/doctype/bank_clearance/bank_clearance.js

@@ -4,23 +4,6 @@
 frappe.ui.form.on("Bank Clearance", {
 	setup: function(frm) {
 		frm.add_fetch("account", "account_currency", "account_currency");
-
-		frm.set_query("account", function() {
-			return {
-				"filters": {
-					"account_type": ["in",["Bank","Cash"]],
-					"is_group": 0,
-				}
-			};
-		});
-
-		frm.set_query("bank_account", function () {
-			return {
-				filters: {
-					'is_company_account': 1
-				},
-			};
-		});
 	},
 
 	onload: function(frm) {
@@ -29,7 +12,14 @@ frappe.ui.form.on("Bank Clearance", {
 			locals[":Company"][frappe.defaults.get_user_default("Company")]["default_bank_account"]: "";
 		frm.set_value("account", default_bank_account);
 
-
+		frm.set_query("account", function() {
+			return {
+				"filters": {
+					"account_type": ["in",["Bank","Cash"]],
+					"is_group": 0
+				}
+			};
+		});
 
 		frm.set_value("from_date", frappe.datetime.month_start());
 		frm.set_value("to_date", frappe.datetime.month_end());
@@ -37,11 +27,6 @@ frappe.ui.form.on("Bank Clearance", {
 
 	refresh: function(frm) {
 		frm.disable_save();
-		frm.add_custom_button(__('Get Payment Entries'), () =>
-			frm.trigger("get_payment_entries")
-		);
-
-		frm.change_custom_button_type('Get Payment Entries', null, 'primary');
 	},
 
 	update_clearance_date: function(frm) {
@@ -51,30 +36,22 @@ frappe.ui.form.on("Bank Clearance", {
 			callback: function(r, rt) {
 				frm.refresh_field("payment_entries");
 				frm.refresh_fields();
-
-				if (!frm.doc.payment_entries.length) {
-					frm.change_custom_button_type('Get Payment Entries', null, 'primary');
-					frm.change_custom_button_type('Update Clearance Date', null, 'default');
-				}
 			}
 		});
 	},
-
 	get_payment_entries: function(frm) {
 		return frappe.call({
 			method: "get_payment_entries",
 			doc: frm.doc,
 			callback: function(r, rt) {
 				frm.refresh_field("payment_entries");
+				frm.refresh_fields();
 
-				if (frm.doc.payment_entries.length) {
-					frm.add_custom_button(__('Update Clearance Date'), () =>
-						frm.trigger("update_clearance_date")
-					);
-
-					frm.change_custom_button_type('Get Payment Entries', null, 'default');
-					frm.change_custom_button_type('Update Clearance Date', null, 'primary');
-				}
+				$(frm.fields_dict.payment_entries.wrapper).find("[data-fieldname=amount]").each(function(i,v){
+					if (i !=0){
+						$(v).addClass("text-right")
+					}
+				})
 			}
 		});
 	}

erpnext/accounts/doctype/bank_clearance/bank_clearance.json

@@ -1,5 +1,4 @@
 {
- "actions": [],
  "allow_copy": 1,
  "creation": "2013-01-10 16:34:05",
  "doctype": "DocType",
@@ -14,8 +13,11 @@
   "bank_account",
   "include_reconciled_entries",
   "include_pos_transactions",
+  "get_payment_entries",
   "section_break_10",
-  "payment_entries"
+  "payment_entries",
+  "update_clearance_date",
+  "total_amount"
  ],
  "fields": [
   {
@@ -74,6 +76,11 @@
    "fieldtype": "Check",
    "label": "Include POS Transactions"
   },
+  {
+   "fieldname": "get_payment_entries",
+   "fieldtype": "Button",
+   "label": "Get Payment Entries"
+  },
   {
    "fieldname": "section_break_10",
    "fieldtype": "Section Break"
@@ -84,14 +91,25 @@
    "fieldtype": "Table",
    "label": "Payment Entries",
    "options": "Bank Clearance Detail"
+  },
+  {
+   "fieldname": "update_clearance_date",
+   "fieldtype": "Button",
+   "label": "Update Clearance Date"
+  },
+  {
+   "fieldname": "total_amount",
+   "fieldtype": "Currency",
+   "label": "Total Amount",
+   "options": "account_currency",
+   "read_only": 1
   }
  ],
  "hide_toolbar": 1,
  "icon": "fa fa-check",
  "idx": 1,
  "issingle": 1,
- "links": [],
- "modified": "2022-11-28 17:24:13.008692",
+ "modified": "2020-04-06 16:12:06.628008",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Bank Clearance",
@@ -108,6 +126,5 @@
  "quick_entry": 1,
  "read_only": 1,
  "sort_field": "modified",
- "sort_order": "ASC",
- "states": []
+ "sort_order": "ASC"
 }

erpnext/accounts/doctype/bank_clearance/bank_clearance.py

@@ -99,7 +99,7 @@ class BankClearance(Document):
 			.where(loan_disbursement.clearance_date.isnull())
 			.where(loan_disbursement.disbursement_account.isin([self.bank_account, self.account]))
 			.orderby(loan_disbursement.disbursement_date)
-			.orderby(loan_disbursement.name, order=frappe.qb.desc)
+			.orderby(loan_disbursement.name, frappe.qb.desc)
 		).run(as_dict=1)
 
 		loan_repayment = frappe.qb.DocType("Loan Repayment")
@@ -126,9 +126,7 @@ class BankClearance(Document):
 		if frappe.db.has_column("Loan Repayment", "repay_from_salary"):
 			query = query.where((loan_repayment.repay_from_salary == 0))
 
-		query = query.orderby(loan_repayment.posting_date).orderby(
-			loan_repayment.name, order=frappe.qb.desc
-		)
+		query = query.orderby(loan_repayment.posting_date).orderby(loan_repayment.name, frappe.qb.desc)
 
 		loan_repayments = query.run(as_dict=True)
 
@@ -179,6 +177,7 @@ class BankClearance(Document):
 		)
 
 		self.set("payment_entries", [])
+		self.total_amount = 0.0
 		default_currency = erpnext.get_default_currency()
 
 		for d in entries:
@@ -197,6 +196,7 @@ class BankClearance(Document):
 			d.pop("debit")
 			d.pop("account_currency")
 			row.update(d)
+			self.total_amount += flt(amount)
 
 	@frappe.whitelist()
 	def update_clearance_date(self):

erpnext/accounts/doctype/bank_guarantee/bank_guarantee.js

@@ -43,13 +43,20 @@ frappe.ui.form.on('Bank Guarantee', {
 
 	reference_docname: function(frm) {
 		if (frm.doc.reference_docname && frm.doc.reference_doctype) {
+			let fields_to_fetch = ["grand_total"];
 			let party_field = frm.doc.reference_doctype == "Sales Order" ? "customer" : "supplier";
 
+			if (frm.doc.reference_doctype == "Sales Order") {
+				fields_to_fetch.push("project");
+			}
+
+			fields_to_fetch.push(party_field);
 			frappe.call({
-				method: "erpnext.accounts.doctype.bank_guarantee.bank_guarantee.get_voucher_details",
+				method: "erpnext.accounts.doctype.bank_guarantee.bank_guarantee.get_vouchar_detials",
 				args: {
-					"bank_guarantee_type": frm.doc.bg_type,
-					"reference_name": frm.doc.reference_docname
+					"column_list": fields_to_fetch,
+					"doctype": frm.doc.reference_doctype,
+					"docname": frm.doc.reference_docname
 				},
 				callback: function(r) {
 					if (r.message) {

erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py

@@ -2,8 +2,11 @@
 # For license information, please see license.txt
 
 
+import json
+
 import frappe
 from frappe import _
+from frappe.desk.search import sanitize_searchfield
 from frappe.model.document import Document
 
 
@@ -22,18 +25,14 @@ class BankGuarantee(Document):
 
 
 @frappe.whitelist()
-def get_voucher_details(bank_guarantee_type: str, reference_name: str):
-	if not isinstance(reference_name, str):
-		raise TypeError("reference_name must be a string")
-
-	fields_to_fetch = ["grand_total"]
-
-	if bank_guarantee_type == "Receiving":
-		doctype = "Sales Order"
-		fields_to_fetch.append("customer")
-		fields_to_fetch.append("project")
-	else:
-		doctype = "Purchase Order"
-		fields_to_fetch.append("supplier")
-
-	return frappe.db.get_value(doctype, reference_name, fields_to_fetch, as_dict=True)
+def get_vouchar_detials(column_list, doctype, docname):
+	column_list = json.loads(column_list)
+	for col in column_list:
+		sanitize_searchfield(col)
+	return frappe.db.sql(
+		""" select {columns} from `tab{doctype}` where name=%s""".format(
+			columns=", ".join(column_list), doctype=doctype
+		),
+		docname,
+		as_dict=1,
+	)[0]

erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js

@@ -12,31 +12,19 @@ frappe.ui.form.on("Bank Reconciliation Tool", {
 				},
 			};
 		});
-		let no_bank_transactions_text =
-			`<div class="text-muted text-center">${__("No Matching Bank Transactions Found")}</div>`
-		set_field_options("no_bank_transactions", no_bank_transactions_text);
 	},
 
 	onload: function (frm) {
 		frm.trigger('bank_account');
 	},
 
-	filter_by_reference_date: function (frm) {
-		if (frm.doc.filter_by_reference_date) {
-			frm.set_value("bank_statement_from_date", "");
-			frm.set_value("bank_statement_to_date", "");
-		} else {
-			frm.set_value("from_reference_date", "");
-			frm.set_value("to_reference_date", "");
-		}
-	},
-
 	refresh: function (frm) {
 		frappe.require("bank-reconciliation-tool.bundle.js", () =>
 			frm.trigger("make_reconciliation_tool")
 		);
-
-		frm.add_custom_button(__("Upload Bank Statement"), () =>
+		frm.upload_statement_button = frm.page.set_secondary_action(
+			__("Upload Bank Statement"),
+			() =>
 				frappe.call({
 					method:
 						"erpnext.accounts.doctype.bank_statement_import.bank_statement_import.upload_bank_statement",
@@ -58,20 +46,6 @@ frappe.ui.form.on("Bank Reconciliation Tool", {
 					},
 				})
 		);
-
-		frm.add_custom_button(__('Auto Reconcile'), function() {
-			frappe.call({
-				method: "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.auto_reconcile_vouchers",
-				args: {
-					bank_account: frm.doc.bank_account,
-					from_date: frm.doc.bank_statement_from_date,
-					to_date: frm.doc.bank_statement_to_date,
-					filter_by_reference_date: frm.doc.filter_by_reference_date,
-					from_reference_date: frm.doc.from_reference_date,
-					to_reference_date: frm.doc.to_reference_date,
-				},
-			})
-		});
 	},
 
 	after_save: function (frm) {
@@ -183,9 +157,6 @@ frappe.ui.form.on("Bank Reconciliation Tool", {
 					).$wrapper,
 					bank_statement_from_date: frm.doc.bank_statement_from_date,
 					bank_statement_to_date: frm.doc.bank_statement_to_date,
-					filter_by_reference_date: frm.doc.filter_by_reference_date,
-					from_reference_date: frm.doc.from_reference_date,
-					to_reference_date: frm.doc.to_reference_date,
 					bank_statement_closing_balance:
 						frm.doc.bank_statement_closing_balance,
 					cards_manager: frm.cards_manager,

erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.json

@@ -10,9 +10,6 @@
   "column_break_1",
   "bank_statement_from_date",
   "bank_statement_to_date",
-  "from_reference_date",
-  "to_reference_date",
-  "filter_by_reference_date",
   "column_break_2",
   "account_opening_balance",
   "bank_statement_closing_balance",
@@ -39,13 +36,13 @@
    "fieldtype": "Column Break"
   },
   {
-   "depends_on": "eval: doc.bank_account && !doc.filter_by_reference_date",
+   "depends_on": "eval: doc.bank_account",
    "fieldname": "bank_statement_from_date",
    "fieldtype": "Date",
    "label": "From Date"
   },
   {
-   "depends_on": "eval: doc.bank_account && !doc.filter_by_reference_date",
+   "depends_on": "eval: doc.bank_statement_from_date",
    "fieldname": "bank_statement_to_date",
    "fieldtype": "Date",
    "label": "To Date"
@@ -86,31 +83,13 @@
    "fieldname": "no_bank_transactions",
    "fieldtype": "HTML",
    "options": "<div class=\"text-muted text-center\">No Matching Bank Transactions Found</div>"
-  },
-  {
-   "depends_on": "eval:doc.filter_by_reference_date",
-   "fieldname": "from_reference_date",
-   "fieldtype": "Date",
-   "label": "From Reference Date"
-  },
-  {
-   "depends_on": "eval:doc.filter_by_reference_date",
-   "fieldname": "to_reference_date",
-   "fieldtype": "Date",
-   "label": "To Reference Date"
-  },
-  {
-   "default": "0",
-   "fieldname": "filter_by_reference_date",
-   "fieldtype": "Check",
-   "label": "Filter by Reference Date"
   }
  ],
  "hide_toolbar": 1,
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2023-01-13 13:00:02.022919",
+ "modified": "2021-04-21 11:13:49.831769",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Bank Reconciliation Tool",
@@ -129,6 +108,5 @@
  ],
  "quick_entry": 1,
  "sort_field": "modified",
- "sort_order": "DESC",
- "states": []
+ "sort_order": "DESC"
 }

erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py

@@ -8,7 +8,7 @@ import frappe
 from frappe import _
 from frappe.model.document import Document
 from frappe.query_builder.custom import ConstantColumn
-from frappe.utils import cint, flt
+from frappe.utils import flt
 
 from erpnext.accounts.doctype.bank_transaction.bank_transaction import get_paid_amount
 from erpnext.accounts.report.bank_reconciliation_statement.bank_reconciliation_statement import (
@@ -50,7 +50,6 @@ def get_bank_transactions(bank_account, from_date=None, to_date=None):
 			"party",
 		],
 		filters=filters,
-		order_by="date",
 	)
 	return transactions
 
@@ -58,7 +57,7 @@ def get_bank_transactions(bank_account, from_date=None, to_date=None):
 @frappe.whitelist()
 def get_account_balance(bank_account, till_date):
 	# returns account balance till the specified date
-	account = frappe.get_cached_value("Bank Account", bank_account, "account")
+	account = frappe.db.get_value("Bank Account", bank_account, "account")
 	filters = frappe._dict(
 		{"account": account, "report_date": till_date, "include_pos_transactions": 1}
 	)
@@ -131,10 +130,8 @@ def create_journal_entry_bts(
 		fieldname=["name", "deposit", "withdrawal", "bank_account"],
 		as_dict=True,
 	)[0]
-	company_account = frappe.get_cached_value(
-		"Bank Account", bank_transaction.bank_account, "account"
-	)
-	account_type = frappe.get_cached_value("Account", second_account, "account_type")
+	company_account = frappe.get_value("Bank Account", bank_transaction.bank_account, "account")
+	account_type = frappe.db.get_value("Account", second_account, "account_type")
 	if account_type in ["Receivable", "Payable"]:
 		if not (party_type and party):
 			frappe.throw(
@@ -167,7 +164,7 @@ def create_journal_entry_bts(
 		}
 	)
 
-	company = frappe.get_cached_value("Account", company_account, "company")
+	company = frappe.get_value("Account", company_account, "company")
 
 	journal_entry_dict = {
 		"voucher_type": entry_type,
@@ -222,10 +219,8 @@ def create_payment_entry_bts(
 	paid_amount = bank_transaction.unallocated_amount
 	payment_type = "Receive" if bank_transaction.deposit > 0 else "Pay"
 
-	company_account = frappe.get_cached_value(
-		"Bank Account", bank_transaction.bank_account, "account"
-	)
-	company = frappe.get_cached_value("Account", company_account, "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,
@@ -266,86 +261,12 @@ def create_payment_entry_bts(
 	return reconcile_vouchers(bank_transaction.name, vouchers)
 
 
-@frappe.whitelist()
-def auto_reconcile_vouchers(
-	bank_account,
-	from_date=None,
-	to_date=None,
-	filter_by_reference_date=None,
-	from_reference_date=None,
-	to_reference_date=None,
-):
-	frappe.flags.auto_reconcile_vouchers = True
-	document_types = ["payment_entry", "journal_entry"]
-	bank_transactions = get_bank_transactions(bank_account)
-	matched_transaction = []
-	for transaction in bank_transactions:
-		linked_payments = get_linked_payments(
-			transaction.name,
-			document_types,
-			from_date,
-			to_date,
-			filter_by_reference_date,
-			from_reference_date,
-			to_reference_date,
-		)
-		vouchers = []
-		for r in linked_payments:
-			vouchers.append(
-				{
-					"payment_doctype": r[1],
-					"payment_name": r[2],
-					"amount": r[4],
-				}
-			)
-		transaction = frappe.get_doc("Bank Transaction", transaction.name)
-		account = frappe.db.get_value("Bank Account", transaction.bank_account, "account")
-		matched_trans = 0
-		for voucher in vouchers:
-			gl_entry = frappe.db.get_value(
-				"GL Entry",
-				dict(
-					account=account, voucher_type=voucher["payment_doctype"], voucher_no=voucher["payment_name"]
-				),
-				["credit", "debit"],
-				as_dict=1,
-			)
-			gl_amount, transaction_amount = (
-				(gl_entry.credit, transaction.deposit)
-				if gl_entry.credit > 0
-				else (gl_entry.debit, transaction.withdrawal)
-			)
-			allocated_amount = gl_amount if gl_amount >= transaction_amount else transaction_amount
-			transaction.append(
-				"payment_entries",
-				{
-					"payment_document": voucher["payment_doctype"],
-					"payment_entry": voucher["payment_name"],
-					"allocated_amount": allocated_amount,
-				},
-			)
-			matched_transaction.append(str(transaction.name))
-		transaction.save()
-		transaction.update_allocations()
-	matched_transaction_len = len(set(matched_transaction))
-	if matched_transaction_len == 0:
-		frappe.msgprint(_("No matching references found for auto reconciliation"))
-	elif matched_transaction_len == 1:
-		frappe.msgprint(_("{0} transaction is reconcilied").format(matched_transaction_len))
-	else:
-		frappe.msgprint(_("{0} transactions are reconcilied").format(matched_transaction_len))
-
-	frappe.flags.auto_reconcile_vouchers = False
-
-	return frappe.get_doc("Bank Transaction", transaction.name)
-
-
 @frappe.whitelist()
 def reconcile_vouchers(bank_transaction_name, vouchers):
 	# updated clear date of all the vouchers based on the bank transaction
 	vouchers = json.loads(vouchers)
 	transaction = frappe.get_doc("Bank Transaction", bank_transaction_name)
-	company_account = frappe.get_cached_value("Bank Account", transaction.bank_account, "account")
+	company_account = frappe.db.get_value("Bank Account", transaction.bank_account, "account")
 
 	if transaction.unallocated_amount == 0:
 		frappe.throw(_("This bank transaction is already fully reconciled"))
@@ -369,7 +290,7 @@ def reconcile_vouchers(bank_transaction_name, vouchers):
 				"The sum total of amounts of all selected vouchers should be less than the unallocated amount of the bank transaction"
 			)
 		)
-	account = frappe.get_cached_value("Bank Account", transaction.bank_account, "account")
+	account = frappe.db.get_value("Bank Account", transaction.bank_account, "account")
 
 	for voucher in vouchers:
 		gl_entry = frappe.db.get_value(
@@ -377,7 +298,7 @@ def reconcile_vouchers(bank_transaction_name, vouchers):
 			dict(
 				account=account, voucher_type=voucher["payment_doctype"], voucher_no=voucher["payment_name"]
 			),
-			["credit_in_account_currency as credit", "debit_in_account_currency as debit"],
+			["credit", "debit"],
 			as_dict=1,
 		)
 		gl_amount, transaction_amount = (
@@ -402,58 +323,20 @@ def reconcile_vouchers(bank_transaction_name, vouchers):
 
 
 @frappe.whitelist()
-def get_linked_payments(
-	bank_transaction_name,
-	document_types=None,
-	from_date=None,
-	to_date=None,
-	filter_by_reference_date=None,
-	from_reference_date=None,
-	to_reference_date=None,
-):
+def get_linked_payments(bank_transaction_name, document_types=None):
 	# get all matching payments for a bank transaction
 	transaction = frappe.get_doc("Bank Transaction", bank_transaction_name)
 	bank_account = frappe.db.get_values(
 		"Bank Account", transaction.bank_account, ["account", "company"], as_dict=True
 	)[0]
 	(account, company) = (bank_account.account, bank_account.company)
-	matching = check_matching(
-		account,
-		company,
-		transaction,
-		document_types,
-		from_date,
-		to_date,
-		filter_by_reference_date,
-		from_reference_date,
-		to_reference_date,
-	)
+	matching = check_matching(account, company, transaction, document_types)
 	return matching
 
 
-def check_matching(
-	bank_account,
-	company,
-	transaction,
-	document_types,
-	from_date,
-	to_date,
-	filter_by_reference_date,
-	from_reference_date,
-	to_reference_date,
-):
+def check_matching(bank_account, company, transaction, document_types):
 	# combine all types of vouchers
-	subquery = get_queries(
-		bank_account,
-		company,
-		transaction,
-		document_types,
-		from_date,
-		to_date,
-		filter_by_reference_date,
-		from_reference_date,
-		to_reference_date,
-	)
+	subquery = get_queries(bank_account, company, transaction, document_types)
 	filters = {
 		"amount": transaction.unallocated_amount,
 		"payment_type": "Receive" if transaction.deposit > 0 else "Pay",
@@ -474,20 +357,11 @@ def check_matching(
 				filters,
 			)
 		)
+
 	return sorted(matching_vouchers, key=lambda x: x[0], reverse=True) if matching_vouchers else []
 
 
-def get_queries(
-	bank_account,
-	company,
-	transaction,
-	document_types,
-	from_date,
-	to_date,
-	filter_by_reference_date,
-	from_reference_date,
-	to_reference_date,
-):
+def get_queries(bank_account, company, transaction, document_types):
 	# get queries to get matching vouchers
 	amount_condition = "=" if "exact_match" in document_types else "<="
 	account_from_to = "paid_to" if transaction.deposit > 0 else "paid_from"
@@ -503,11 +377,6 @@ def get_queries(
 				document_types,
 				amount_condition,
 				account_from_to,
-				from_date,
-				to_date,
-				filter_by_reference_date,
-				from_reference_date,
-				to_reference_date,
 			)
 			or []
 		)
@@ -516,42 +385,15 @@ def get_queries(
 
 
 def get_matching_queries(
-	bank_account,
-	company,
-	transaction,
-	document_types,
-	amount_condition,
-	account_from_to,
-	from_date,
-	to_date,
-	filter_by_reference_date,
-	from_reference_date,
-	to_reference_date,
+	bank_account, company, transaction, document_types, amount_condition, account_from_to
 ):
 	queries = []
 	if "payment_entry" in document_types:
-		pe_amount_matching = get_pe_matching_query(
-			amount_condition,
-			account_from_to,
-			transaction,
-			from_date,
-			to_date,
-			filter_by_reference_date,
-			from_reference_date,
-			to_reference_date,
-		)
+		pe_amount_matching = get_pe_matching_query(amount_condition, account_from_to, transaction)
 		queries.extend([pe_amount_matching])
 
 	if "journal_entry" in document_types:
-		je_amount_matching = get_je_matching_query(
-			amount_condition,
-			transaction,
-			from_date,
-			to_date,
-			filter_by_reference_date,
-			from_reference_date,
-			to_reference_date,
-		)
+		je_amount_matching = get_je_matching_query(amount_condition, transaction)
 		queries.extend([je_amount_matching])
 
 	if transaction.deposit > 0 and "sales_invoice" in document_types:
@@ -658,81 +500,47 @@ def get_lr_matching_query(bank_account, amount_condition, filters):
 	return vouchers
 
 
-def get_pe_matching_query(
-	amount_condition,
-	account_from_to,
-	transaction,
-	from_date,
-	to_date,
-	filter_by_reference_date,
-	from_reference_date,
-	to_reference_date,
-):
+def get_pe_matching_query(amount_condition, account_from_to, transaction):
 	# get matching payment entries query
 	if transaction.deposit > 0:
 		currency_field = "paid_to_account_currency as currency"
 	else:
 		currency_field = "paid_from_account_currency as currency"
-	filter_by_date = f"AND posting_date between '{from_date}' and '{to_date}'"
-	order_by = " posting_date"
-	filter_by_reference_no = ""
-	if cint(filter_by_reference_date):
-		filter_by_date = f"AND reference_date between '{from_reference_date}' and '{to_reference_date}'"
-		order_by = " reference_date"
-	if frappe.flags.auto_reconcile_vouchers == True:
-		filter_by_reference_no = f"AND reference_no = '{transaction.reference_number}'"
 	return f"""
-		SELECT
-			(CASE WHEN reference_no=%(reference_no)s THEN 1 ELSE 0 END
-			+ CASE WHEN (party_type = %(party_type)s AND party = %(party)s ) THEN 1 ELSE 0  END
-			+ 1 ) AS rank,
-			'Payment Entry' as doctype,
-			name,
-			paid_amount,
-			reference_no,
-			reference_date,
-			party,
-			party_type,
-			posting_date,
-			{currency_field}
-		FROM
-			`tabPayment Entry`
-		WHERE
-			paid_amount {amount_condition} %(amount)s
-			AND docstatus = 1
-			AND payment_type IN (%(payment_type)s, 'Internal Transfer')
-			AND ifnull(clearance_date, '') = ""
-			AND {account_from_to} = %(bank_account)s
-			{filter_by_date}
-			{filter_by_reference_no}
-		order by{order_by}
-
+	SELECT
+		(CASE WHEN reference_no=%(reference_no)s THEN 1 ELSE 0 END
+		+ CASE WHEN (party_type = %(party_type)s AND party = %(party)s ) THEN 1 ELSE 0  END
+		+ 1 ) AS rank,
+		'Payment Entry' as doctype,
+		name,
+		paid_amount,
+		reference_no,
+		reference_date,
+		party,
+		party_type,
+		posting_date,
+		{currency_field}
+	FROM
+		`tabPayment Entry`
+	WHERE
+		paid_amount {amount_condition} %(amount)s
+		AND docstatus = 1
+		AND payment_type IN (%(payment_type)s, 'Internal Transfer')
+		AND ifnull(clearance_date, '') = ""
+		AND {account_from_to} = %(bank_account)s
 	"""
 
 
-def get_je_matching_query(
-	amount_condition,
-	transaction,
-	from_date,
-	to_date,
-	filter_by_reference_date,
-	from_reference_date,
-	to_reference_date,
-):
+def get_je_matching_query(amount_condition, transaction):
 	# get matching journal entry query
+
 	# We have mapping at the bank level
 	# So one bank could have both types of bank accounts like asset and liability
 	# So cr_or_dr should be judged only on basis of withdrawal and deposit and not account type
 	cr_or_dr = "credit" if transaction.withdrawal > 0 else "debit"
-	filter_by_date = f"AND je.posting_date between '{from_date}' and '{to_date}'"
-	order_by = " je.posting_date"
-	filter_by_reference_no = ""
-	if cint(filter_by_reference_date):
-		filter_by_date = f"AND je.cheque_date between '{from_reference_date}' and '{to_reference_date}'"
-		order_by = " je.cheque_date"
-	if frappe.flags.auto_reconcile_vouchers == True:
-		filter_by_reference_no = f"AND je.cheque_no = '{transaction.reference_number}'"
+
 	return f"""
+
 		SELECT
 			(CASE WHEN je.cheque_no=%(reference_no)s THEN 1 ELSE 0 END
 			+ 1) AS rank ,
@@ -756,9 +564,6 @@ def get_je_matching_query(
 			AND jea.account = %(bank_account)s
 			AND jea.{cr_or_dr}_in_account_currency {amount_condition} %(amount)s
 			AND je.docstatus = 1
-			{filter_by_date}
-			{filter_by_reference_no}
-			order by {order_by}
 	"""
 
 

erpnext/accounts/doctype/bank_statement_import/bank_statement_import.js

@@ -100,7 +100,7 @@ frappe.ui.form.on("Bank Statement Import", {
 
 		if (frm.doc.status.includes("Success")) {
 			frm.add_custom_button(
-				__("Go to {0} List", [__(frm.doc.reference_doctype)]),
+				__("Go to {0} List", [frm.doc.reference_doctype]),
 				() => frappe.set_route("List", frm.doc.reference_doctype)
 			);
 		}
@@ -141,7 +141,7 @@ frappe.ui.form.on("Bank Statement Import", {
 	},
 
 	show_import_status(frm) {
-		let import_log = JSON.parse(frm.doc.statement_import_log || "[]");
+		let import_log = JSON.parse(frm.doc.import_log || "[]");
 		let successful_records = import_log.filter((log) => log.success);
 		let failed_records = import_log.filter((log) => !log.success);
 		if (successful_records.length === 0) return;
@@ -309,7 +309,7 @@ frappe.ui.form.on("Bank Statement Import", {
 	// method: 'frappe.core.doctype.data_import.data_import.get_preview_from_template',
 
 	show_import_preview(frm, preview_data) {
-		let import_log = JSON.parse(frm.doc.statement_import_log || "[]");
+		let import_log = JSON.parse(frm.doc.import_log || "[]");
 
 		if (
 			frm.import_preview &&
@@ -439,7 +439,7 @@ frappe.ui.form.on("Bank Statement Import", {
 	},
 
 	show_import_log(frm) {
-		let import_log = JSON.parse(frm.doc.statement_import_log || "[]");
+		let import_log = JSON.parse(frm.doc.import_log || "[]");
 		let logs = import_log;
 		frm.toggle_display("import_log", false);
 		frm.toggle_display("import_log_section", logs.length > 0);

erpnext/accounts/doctype/bank_statement_import/bank_statement_import.json

@@ -24,7 +24,7 @@
   "section_import_preview",
   "import_preview",
   "import_log_section",
-  "statement_import_log",
+  "import_log",
   "show_failed_logs",
   "import_log_preview",
   "reference_doctype",
@@ -90,6 +90,12 @@
    "options": "JSON",
    "read_only": 1
   },
+  {
+   "fieldname": "import_log",
+   "fieldtype": "Code",
+   "label": "Import Log",
+   "options": "JSON"
+  },
   {
    "fieldname": "import_log_section",
    "fieldtype": "Section Break",
@@ -192,17 +198,11 @@
   {
    "fieldname": "column_break_4",
    "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "statement_import_log",
-   "fieldtype": "Code",
-   "label": "Statement Import Log",
-   "options": "JSON"
   }
  ],
  "hide_toolbar": 1,
  "links": [],
- "modified": "2022-09-07 11:11:40.293317",
+ "modified": "2021-05-12 14:17:37.777246",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Bank Statement Import",

erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py

@@ -53,13 +53,15 @@ class BankStatementImport(DataImport):
 		if "Bank Account" not in json.dumps(preview["columns"]):
 			frappe.throw(_("Please add the Bank Account column"))
 
-		from frappe.utils.background_jobs import is_job_queued
+		from frappe.core.page.background_jobs.background_jobs import get_info
 		from frappe.utils.scheduler import is_scheduler_inactive
 
 		if is_scheduler_inactive() and not frappe.flags.in_test:
 			frappe.throw(_("Scheduler is inactive. Cannot import data."), title=_("Scheduler Inactive"))
 
-		if not is_job_queued(self.name):
+		enqueued_jobs = [d.get("job_name") for d in get_info()]
+
+		if self.name not in enqueued_jobs:
 			enqueue(
 				start_import,
 				queue="default",

erpnext/accounts/doctype/bank_transaction/bank_transaction.py

@@ -137,7 +137,7 @@ def get_paid_amount(payment_entry, currency, bank_account):
 				)
 			elif doc.payment_type == "Pay":
 				paid_amount_field = (
-					"paid_amount" if doc.paid_from_account_currency == currency else "base_paid_amount"
+					"paid_amount" if doc.paid_to_account_currency == currency else "base_paid_amount"
 				)
 
 		return frappe.db.get_value(

erpnext/accounts/doctype/bank_transaction/bank_transaction_upload.py

@@ -74,7 +74,7 @@ def get_header_mapping(columns, bank_account):
 
 
 def get_bank_mapping(bank_account):
-	bank_name = frappe.get_cached_value("Bank Account", bank_account, "bank")
+	bank_name = frappe.db.get_value("Bank Account", bank_account, "bank")
 	bank = frappe.get_doc("Bank", bank_name)
 
 	mapping = {row.file_field: row.bank_transaction_field for row in bank.bank_transaction_mapping}

erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py

@@ -5,7 +5,6 @@ import json
 import unittest
 
 import frappe
-from frappe import utils
 from frappe.tests.utils import FrappeTestCase
 
 from erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool import (
@@ -41,12 +40,7 @@ class TestBankTransaction(FrappeTestCase):
 			"Bank Transaction",
 			dict(description="Re 95282925234 FE/000002917 AT171513000281183046 Conrad Electronic"),
 		)
-		linked_payments = get_linked_payments(
-			bank_transaction.name,
-			["payment_entry", "exact_match"],
-			from_date=bank_transaction.date,
-			to_date=utils.today(),
-		)
+		linked_payments = get_linked_payments(bank_transaction.name, ["payment_entry", "exact_match"])
 		self.assertTrue(linked_payments[0][6] == "Conrad Electronic")
 
 	# This test validates a simple reconciliation leading to the clearance of the bank transaction and the payment
@@ -87,12 +81,7 @@ class TestBankTransaction(FrappeTestCase):
 			"Bank Transaction",
 			dict(description="Auszahlung Karte MC/000002916 AUTOMAT 698769 K002 27.10. 14:07"),
 		)
-		linked_payments = get_linked_payments(
-			bank_transaction.name,
-			["payment_entry", "exact_match"],
-			from_date=bank_transaction.date,
-			to_date=utils.today(),
-		)
+		linked_payments = get_linked_payments(bank_transaction.name, ["payment_entry", "exact_match"])
 		self.assertTrue(linked_payments[0][3])
 
 	# Check error if already reconciled

erpnext/accounts/doctype/budget/budget.json

@@ -1,7 +1,6 @@
 {
  "actions": [],
  "allow_import": 1,
- "autoname": "naming_series:",
  "creation": "2016-05-16 11:42:29.632528",
  "doctype": "DocType",
  "editable_grid": 1,
@@ -10,7 +9,6 @@
   "budget_against",
   "company",
   "cost_center",
-  "naming_series",
   "project",
   "fiscal_year",
   "column_break_3",
@@ -192,26 +190,15 @@
    "label": "Budget Accounts",
    "options": "Budget Account",
    "reqd": 1
-  },
-  {
-   "fieldname": "naming_series",
-   "fieldtype": "Data",
-   "hidden": 1,
-   "label": "Series",
-   "no_copy": 1,
-   "print_hide": 1,
-   "read_only": 1,
-   "set_only_once": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2022-10-10 22:14:36.361509",
+ "modified": "2020-10-06 15:13:54.055854",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Budget",
- "naming_rule": "By \"Naming Series\" field",
  "owner": "Administrator",
  "permissions": [
   {
@@ -233,6 +220,5 @@
  ],
  "sort_field": "modified",
  "sort_order": "DESC",
- "states": [],
  "track_changes": 1
 }

erpnext/accounts/doctype/budget/budget.py

@@ -5,6 +5,7 @@
 import frappe
 from frappe import _
 from frappe.model.document import Document
+from frappe.model.naming import make_autoname
 from frappe.utils import add_months, flt, fmt_money, get_last_day, getdate
 
 from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import (
@@ -22,6 +23,11 @@ class DuplicateBudgetError(frappe.ValidationError):
 
 
 class Budget(Document):
+	def autoname(self):
+		self.name = make_autoname(
+			self.get(frappe.scrub(self.budget_against)) + "/" + self.fiscal_year + "/.###"
+		)
+
 	def validate(self):
 		if not self.get(frappe.scrub(self.budget_against)):
 			frappe.throw(_("{0} is mandatory").format(self.budget_against))
@@ -59,7 +65,7 @@ class Budget(Document):
 		account_list = []
 		for d in self.get("accounts"):
 			if d.account:
-				account_details = frappe.get_cached_value(
+				account_details = frappe.db.get_value(
 					"Account", d.account, ["is_group", "company", "report_type"], as_dict=1
 				)
 
@@ -103,11 +109,8 @@ 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):
+def validate_expense_against_budget(args):
 	args = frappe._dict(args)
 
 	if args.get("company") and not args.fiscal_year:
@@ -175,20 +178,15 @@ def validate_expense_against_budget(args, expense_amount=0):
 			)  # nosec
 
 			if budget_records:
-				validate_budget_records(args, budget_records, expense_amount)
+				validate_budget_records(args, budget_records)
 
 
-def validate_budget_records(args, budget_records, expense_amount):
+def validate_budget_records(args, budget_records):
 	for budget in budget_records:
 		if flt(budget.budget_amount):
-			amount = expense_amount or get_amount(args, budget)
+			amount = get_amount(args, budget)
 			yearly_action, monthly_action = get_actions(args, budget)
 
-			if yearly_action in ("Stop", "Warn"):
-				compare_expense_with_budget(
-					args, flt(budget.budget_amount), _("Annual"), yearly_action, budget.budget_against, amount
-				)
-
 			if monthly_action in ["Stop", "Warn"]:
 				budget_amount = get_accumulated_monthly_budget(
 					budget.monthly_distribution, args.posting_date, args.fiscal_year, budget.budget_amount
@@ -200,28 +198,28 @@ def validate_budget_records(args, budget_records, expense_amount):
 					args, budget_amount, _("Accumulated Monthly"), monthly_action, budget.budget_against, amount
 				)
 
+			if (
+				yearly_action in ("Stop", "Warn")
+				and monthly_action != "Stop"
+				and yearly_action != monthly_action
+			):
+				compare_expense_with_budget(
+					args, flt(budget.budget_amount), _("Annual"), yearly_action, budget.budget_against, amount
+				)
+
 
 def compare_expense_with_budget(args, budget_amount, action_for, action, budget_against, amount=0):
-	actual_expense = get_actual_expense(args)
-	total_expense = actual_expense + amount
-
-	if total_expense > budget_amount:
-		if actual_expense > budget_amount:
-			error_tense = _("is already")
-			diff = actual_expense - budget_amount
-		else:
-			error_tense = _("will be")
-			diff = total_expense - budget_amount
-
+	actual_expense = amount or get_actual_expense(args)
+	if actual_expense > budget_amount:
+		diff = actual_expense - budget_amount
 		currency = frappe.get_cached_value("Company", args.company, "default_currency")
 
-		msg = _("{0} Budget for Account {1} against {2} {3} is {4}. It {5} exceed by {6}").format(
+		msg = _("{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5}").format(
 			_(action_for),
 			frappe.bold(args.account),
-			frappe.unscrub(args.budget_against_field),
+			args.budget_against_field,
 			frappe.bold(budget_against),
 			frappe.bold(fmt_money(budget_amount, currency=currency)),
-			error_tense,
 			frappe.bold(fmt_money(diff, currency=currency)),
 		)
 
@@ -232,9 +230,9 @@ def compare_expense_with_budget(args, budget_amount, action_for, action, budget_
 			action = "Warn"
 
 		if action == "Stop":
-			frappe.throw(msg, BudgetError, title=_("Budget Exceeded"))
+			frappe.throw(msg, BudgetError)
 		else:
-			frappe.msgprint(msg, indicator="orange", title=_("Budget Exceeded"))
+			frappe.msgprint(msg, indicator="orange")
 
 
 def get_actions(args, budget):
@@ -311,7 +309,7 @@ def get_other_condition(args, budget, for_doc):
 
 	if args.get("fiscal_year"):
 		date_field = "schedule_date" if for_doc == "Material Request" else "transaction_date"
-		start_date, end_date = frappe.get_cached_value(
+		start_date, end_date = frappe.db.get_value(
 			"Fiscal Year", args.get("fiscal_year"), ["year_start_date", "year_end_date"]
 		)
 
@@ -356,9 +354,7 @@ def get_actual_expense(args):
 			"""
 		select sum(gle.debit) - sum(gle.credit)
 		from `tabGL Entry` gle
-		where
-			is_cancelled = 0
-			and gle.account=%(account)s
+		where gle.account=%(account)s
 			{condition1}
 			and gle.fiscal_year=%(fiscal_year)s
 			and gle.company=%(company)s
@@ -386,7 +382,7 @@ def get_accumulated_monthly_budget(monthly_distribution, posting_date, fiscal_ye
 		):
 			distribution.setdefault(d.month, d.percentage_allocation)
 
-	dt = frappe.get_cached_value("Fiscal Year", fiscal_year, "year_start_date")
+	dt = frappe.db.get_value("Fiscal Year", fiscal_year, "year_start_date")
 	accumulated_percentage = 0.0
 
 	while dt <= getdate(posting_date):

erpnext/accounts/doctype/budget/test_budget.py

@@ -334,39 +334,6 @@ class TestBudget(unittest.TestCase):
 		budget.cancel()
 		jv.cancel()
 
-	def test_monthly_budget_against_main_cost_center(self):
-		from erpnext.accounts.doctype.cost_center.test_cost_center import create_cost_center
-		from erpnext.accounts.doctype.cost_center_allocation.test_cost_center_allocation import (
-			create_cost_center_allocation,
-		)
-
-		cost_centers = [
-			"Main Budget Cost Center 1",
-			"Sub Budget Cost Center 1",
-			"Sub Budget Cost Center 2",
-		]
-
-		for cc in cost_centers:
-			create_cost_center(cost_center_name=cc, company="_Test Company")
-
-		create_cost_center_allocation(
-			"_Test Company",
-			"Main Budget Cost Center 1 - _TC",
-			{"Sub Budget Cost Center 1 - _TC": 60, "Sub Budget Cost Center 2 - _TC": 40},
-		)
-
-		make_budget(budget_against="Cost Center", cost_center="Main Budget Cost Center 1 - _TC")
-
-		jv = make_journal_entry(
-			"_Test Account Cost for Goods Sold - _TC",
-			"_Test Bank - _TC",
-			400000,
-			"Main Budget Cost Center 1 - _TC",
-			posting_date=nowdate(),
-		)
-
-		self.assertRaises(BudgetError, jv.submit)
-
 
 def set_total_expense_zero(posting_date, budget_against_field=None, budget_against_CC=None):
 	if budget_against_field == "project":

erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py

@@ -45,14 +45,14 @@ def validate_columns(data):
 
 @frappe.whitelist()
 def validate_company(company):
-	parent_company, allow_account_creation_against_child_company = frappe.get_cached_value(
-		"Company", company, ["parent_company", "allow_account_creation_against_child_company"]
+	parent_company, allow_account_creation_against_child_company = frappe.db.get_value(
+		"Company", {"name": company}, ["parent_company", "allow_account_creation_against_child_company"]
 	)
 
 	if parent_company and (not allow_account_creation_against_child_company):
 		msg = _("{} is a child company.").format(frappe.bold(company)) + " "
 		msg += _("Please import accounts against parent company or enable {} in company master.").format(
-			frappe.bold(_("Allow Account Creation Against Child Company"))
+			frappe.bold("Allow Account Creation Against Child Company")
 		)
 		frappe.throw(msg, title=_("Wrong Company"))
 
@@ -485,10 +485,6 @@ def set_default_accounts(company):
 			"default_payable_account": frappe.db.get_value(
 				"Account", {"company": company.name, "account_type": "Payable", "is_group": 0}
 			),
-			"default_provisional_account": frappe.db.get_value(
-				"Account",
-				{"company": company.name, "account_type": "Service Received But Not Billed", "is_group": 0},
-			),
 		}
 	)
 

erpnext/accounts/doctype/cost_center/cost_center.py

@@ -16,7 +16,7 @@ class CostCenter(NestedSet):
 		from erpnext.accounts.utils import get_autoname_with_number
 
 		self.name = get_autoname_with_number(
-			self.cost_center_number, self.cost_center_name, self.company
+			self.cost_center_number, self.cost_center_name, None, self.company
 		)
 
 	def validate(self):

erpnext/accounts/doctype/cost_center_allocation/cost_center_allocation.py

@@ -28,14 +28,9 @@ class InvalidDateError(frappe.ValidationError):
 
 
 class CostCenterAllocation(Document):
-	def __init__(self, *args, **kwargs):
-		super(CostCenterAllocation, self).__init__(*args, **kwargs)
-		self._skip_from_date_validation = False
-
 	def validate(self):
 		self.validate_total_allocation_percentage()
-		if not self._skip_from_date_validation:
-			self.validate_from_date_based_on_existing_gle()
+		self.validate_from_date_based_on_existing_gle()
 		self.validate_backdated_allocation()
 		self.validate_main_cost_center()
 		self.validate_child_cost_centers()

erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.json

@@ -6,7 +6,6 @@
  "engine": "InnoDB",
  "field_order": [
   "api_details_section",
-  "disabled",
   "service_provider",
   "api_endpoint",
   "url",
@@ -78,18 +77,12 @@
    "label": "Service Provider",
    "options": "frankfurter.app\nexchangerate.host\nCustom",
    "reqd": 1
-  },
-  {
-   "default": "0",
-   "fieldname": "disabled",
-   "fieldtype": "Check",
-   "label": "Disabled"
   }
  ],
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2023-01-09 12:19:03.955906",
+ "modified": "2022-01-10 15:51:14.521174",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Currency Exchange Settings",

erpnext/accounts/doctype/dunning/dunning.py

@@ -19,7 +19,7 @@ class Dunning(AccountsController):
 		self.validate_overdue_days()
 		self.validate_amount()
 		if not self.income_account:
-			self.income_account = frappe.get_cached_value("Company", self.company, "default_income_account")
+			self.income_account = frappe.db.get_value("Company", self.company, "default_income_account")
 
 	def validate_overdue_days(self):
 		self.overdue_days = (getdate(self.posting_date) - getdate(self.due_date)).days or 0
@@ -40,7 +40,7 @@ class Dunning(AccountsController):
 
 	def on_cancel(self):
 		if self.dunning_amount:
-			self.ignore_linked_doctypes = ("GL Entry", "Stock Ledger Entry", "Payment Ledger Entry")
+			self.ignore_linked_doctypes = ("GL Entry", "Stock Ledger Entry")
 			make_reverse_gl_entries(voucher_type=self.doctype, voucher_no=self.name)
 
 	def make_gl_entries(self):

erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js

@@ -26,7 +26,7 @@ frappe.ui.form.on('Exchange Rate Revaluation', {
 				doc: frm.doc,
 				callback: function(r) {
 					if (r.message) {
-						frm.add_custom_button(__('Journal Entries'), function() {
+						frm.add_custom_button(__('Journal Entry'), function() {
 							return frm.events.make_jv(frm);
 						}, __('Create'));
 					}
@@ -35,11 +35,10 @@ frappe.ui.form.on('Exchange Rate Revaluation', {
 		}
 	},
 
-	get_entries: function(frm, account) {
+	get_entries: function(frm) {
 		frappe.call({
 			method: "get_accounts_data",
 			doc: cur_frm.doc,
-			account: account,
 			callback: function(r){
 				frappe.model.clear_table(frm.doc, "accounts");
 				if(r.message) {
@@ -58,6 +57,7 @@ frappe.ui.form.on('Exchange Rate Revaluation', {
 
 		let total_gain_loss = 0;
 		frm.doc.accounts.forEach((d) => {
+			d.gain_loss = flt(d.new_balance_in_base_currency, precision("new_balance_in_base_currency", d)) - flt(d.balance_in_base_currency, precision("balance_in_base_currency", d));
 			total_gain_loss += flt(d.gain_loss, precision("gain_loss", d));
 		});
 
@@ -66,19 +66,13 @@ frappe.ui.form.on('Exchange Rate Revaluation', {
 	},
 
 	make_jv : function(frm) {
-		let revaluation_journal = null;
-		let zero_balance_journal = null;
 		frappe.call({
-			method: "make_jv_entries",
+			method: "make_jv_entry",
 			doc: frm.doc,
-			freeze: true,
-			freeze_message: "Making Journal Entries...",
 			callback: function(r){
 				if (r.message) {
-					let response = r.message;
-					if(response['revaluation_jv'] || response['zero_balance_jv']) {
-						frappe.msgprint(__("Journals have been created"));
-					}
+					var doc = frappe.model.sync(r.message)[0];
+					frappe.set_route("Form", doc.doctype, doc.name);
 				}
 			}
 		});

erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.json

@@ -1,160 +1,389 @@
 {
- "actions": [],
- "allow_import": 1,
- "autoname": "ACC-ERR-.YYYY.-.#####",
- "creation": "2018-04-13 18:25:55.943587",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "posting_date",
-  "column_break_2",
-  "company",
-  "section_break_4",
-  "get_entries",
-  "accounts",
-  "section_break_6",
-  "gain_loss_unbooked",
-  "gain_loss_booked",
-  "column_break_10",
-  "total_gain_loss",
-  "amended_from"
- ],
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 0, 
+ "autoname": "ACC-ERR-.YYYY.-.#####", 
+ "beta": 0, 
+ "creation": "2018-04-13 18:25:55.943587", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
-   "default": "Today",
-   "fieldname": "posting_date",
-   "fieldtype": "Date",
-   "in_list_view": 1,
-   "label": "Posting Date",
-   "reqd": 1
-  },
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "Today", 
+   "fieldname": "posting_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Posting Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
   {
-   "fieldname": "column_break_2",
-   "fieldtype": "Column Break"
-  },
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
   {
-   "fieldname": "company",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Company",
-   "options": "Company",
-   "reqd": 1
-  },
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
   {
-   "fieldname": "section_break_4",
-   "fieldtype": "Section Break"
-  },
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_4", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
   {
-   "fieldname": "get_entries",
-   "fieldtype": "Button",
-   "label": "Get Entries"
-  },
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "get_entries", 
+   "fieldtype": "Button", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Get Entries", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
   {
-   "fieldname": "accounts",
-   "fieldtype": "Table",
-   "label": "Exchange Rate Revaluation Account",
-   "no_copy": 1,
-   "options": "Exchange Rate Revaluation Account",
-   "reqd": 1
-  },
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "accounts", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Exchange Rate Revaluation Account", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Exchange Rate Revaluation Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
   {
-   "fieldname": "section_break_6",
-   "fieldtype": "Section Break"
-  },
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_6", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
   {
-   "fieldname": "amended_from",
-   "fieldtype": "Link",
-   "label": "Amended From",
-   "no_copy": 1,
-   "options": "Exchange Rate Revaluation",
-   "print_hide": 1,
-   "read_only": 1
-  },
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "total_gain_loss", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Total Gain/Loss", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
   {
-   "fieldname": "gain_loss_unbooked",
-   "fieldtype": "Currency",
-   "label": "Gain/Loss from Revaluation",
-   "options": "Company:company:default_currency",
-   "read_only": 1
-  },
-  {
-   "description": "Gain/Loss accumulated in foreign currency account. Accounts with '0' balance in either Base or Account currency",
-   "fieldname": "gain_loss_booked",
-   "fieldtype": "Currency",
-   "label": "Gain/Loss already booked",
-   "options": "Company:company:default_currency",
-   "read_only": 1
-  },
-  {
-   "fieldname": "total_gain_loss",
-   "fieldtype": "Currency",
-   "label": "Total Gain/Loss",
-   "options": "Company:company:default_currency",
-   "read_only": 1
-  },
-  {
-   "fieldname": "column_break_10",
-   "fieldtype": "Column Break"
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Exchange Rate Revaluation", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
   }
- ],
- "is_submittable": 1,
- "links": [],
- "modified": "2022-12-29 19:38:24.416529",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Exchange Rate Revaluation",
- "naming_rule": "Expression (old style)",
- "owner": "Administrator",
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-08-21 16:15:34.660715", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Exchange Rate Revaluation", 
+ "name_case": "", 
+ "owner": "Administrator", 
  "permissions": [
   {
-   "amend": 1,
-   "cancel": 1,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "System Manager",
-   "share": 1,
-   "submit": 1,
+   "amend": 1, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
    "write": 1
-  },
+  }, 
   {
-   "amend": 1,
-   "cancel": 1,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Accounts Manager",
-   "share": 1,
-   "submit": 1,
+   "amend": 1, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
    "write": 1
-  },
+  }, 
   {
-   "amend": 1,
-   "cancel": 1,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Accounts User",
-   "share": 1,
-   "submit": 1,
+   "amend": 1, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
    "write": 1
   }
- ],
- "sort_field": "modified",
- "sort_order": "DESC",
- "states": [],
- "track_changes": 1
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0, 
+ "track_views": 0
 }

erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py

@@ -3,12 +3,10 @@
 
 
 import frappe
-from frappe import _, qb
+from frappe import _
 from frappe.model.document import Document
 from frappe.model.meta import get_field_precision
-from frappe.query_builder import Criterion, Order
-from frappe.query_builder.functions import NullIf, Sum
-from frappe.utils import flt, get_link_to_form
+from frappe.utils import flt
 
 import erpnext
 from erpnext.accounts.doctype.journal_entry.journal_entry import get_balance_on
@@ -21,25 +19,11 @@ class ExchangeRateRevaluation(Document):
 
 	def set_total_gain_loss(self):
 		total_gain_loss = 0
-
-		gain_loss_booked = 0
-		gain_loss_unbooked = 0
-
 		for d in self.accounts:
-			if not d.zero_balance:
-				d.gain_loss = flt(
-					d.new_balance_in_base_currency, d.precision("new_balance_in_base_currency")
-				) - flt(d.balance_in_base_currency, d.precision("balance_in_base_currency"))
-
-			if d.zero_balance:
-				gain_loss_booked += flt(d.gain_loss, d.precision("gain_loss"))
-			else:
-				gain_loss_unbooked += flt(d.gain_loss, d.precision("gain_loss"))
-
+			d.gain_loss = flt(
+				d.new_balance_in_base_currency, d.precision("new_balance_in_base_currency")
+			) - flt(d.balance_in_base_currency, d.precision("balance_in_base_currency"))
 			total_gain_loss += flt(d.gain_loss, d.precision("gain_loss"))
-
-		self.gain_loss_booked = gain_loss_booked
-		self.gain_loss_unbooked = gain_loss_unbooked
 		self.total_gain_loss = flt(total_gain_loss, self.precision("total_gain_loss"))
 
 	def validate_mandatory(self):
@@ -51,206 +35,98 @@ class ExchangeRateRevaluation(Document):
 
 	@frappe.whitelist()
 	def check_journal_entry_condition(self):
-		exchange_gain_loss_account = self.get_for_unrealized_gain_loss_account()
-
-		jea = qb.DocType("Journal Entry Account")
-		journals = (
-			qb.from_(jea)
-			.select(jea.parent)
-			.distinct()
-			.where(
-				(jea.reference_type == "Exchange Rate Revaluation")
-				& (jea.reference_name == self.name)
-				& (jea.docstatus == 1)
-			)
-			.run()
+		total_debit = frappe.db.get_value(
+			"Journal Entry Account",
+			{"reference_type": "Exchange Rate Revaluation", "reference_name": self.name, "docstatus": 1},
+			"sum(debit) as sum",
 		)
 
-		if journals:
-			gle = qb.DocType("GL Entry")
-			total_amt = (
-				qb.from_(gle)
-				.select((Sum(gle.credit) - Sum(gle.debit)).as_("total_amount"))
-				.where(
-					(gle.voucher_type == "Journal Entry")
-					& (gle.voucher_no.isin(journals))
-					& (gle.account == exchange_gain_loss_account)
-					& (gle.is_cancelled == 0)
-				)
-				.run()
-			)
+		total_amt = 0
+		for d in self.accounts:
+			total_amt = total_amt + d.new_balance_in_base_currency
 
-			if total_amt and total_amt[0][0] != self.total_gain_loss:
-				return True
-			else:
-				return False
+		if total_amt != total_debit:
+			return True
 
-		return True
+		return False
 
 	@frappe.whitelist()
-	def get_accounts_data(self):
-		self.validate_mandatory()
-		account_details = self.get_account_balance_from_gle(
-			company=self.company, posting_date=self.posting_date, account=None, party_type=None, party=None
-		)
-		accounts_with_new_balance = self.calculate_new_account_balance(
-			self.company, self.posting_date, account_details
-		)
-
-		if not accounts_with_new_balance:
-			self.throw_invalid_response_message(account_details)
-
-		return accounts_with_new_balance
-
-	@staticmethod
-	def get_account_balance_from_gle(company, posting_date, account, party_type, party):
-		account_details = []
-
-		if company and posting_date:
-			company_currency = erpnext.get_company_currency(company)
-
-			acc = qb.DocType("Account")
-			if account:
-				accounts = [account]
-			else:
-				res = (
-					qb.from_(acc)
-					.select(acc.name)
-					.where(
-						(acc.is_group == 0)
-						& (acc.report_type == "Balance Sheet")
-						& (acc.root_type.isin(["Asset", "Liability", "Equity"]))
-						& (acc.account_type != "Stock")
-						& (acc.company == company)
-						& (acc.account_currency != company_currency)
-					)
-					.orderby(acc.name)
-					.run(as_list=True)
-				)
-				accounts = [x[0] for x in res]
-
-			if accounts:
-				having_clause = (qb.Field("balance") != qb.Field("balance_in_account_currency")) & (
-					(qb.Field("balance_in_account_currency") != 0) | (qb.Field("balance") != 0)
-				)
-
-				gle = qb.DocType("GL Entry")
-
-				# conditions
-				conditions = []
-				conditions.append(gle.account.isin(accounts))
-				conditions.append(gle.posting_date.lte(posting_date))
-				conditions.append(gle.is_cancelled == 0)
-
-				if party_type:
-					conditions.append(gle.party_type == party_type)
-				if party:
-					conditions.append(gle.party == party)
-
-				account_details = (
-					qb.from_(gle)
-					.select(
-						gle.account,
-						gle.party_type,
-						gle.party,
-						gle.account_currency,
-						(Sum(gle.debit_in_account_currency) - Sum(gle.credit_in_account_currency)).as_(
-							"balance_in_account_currency"
-						),
-						(Sum(gle.debit) - Sum(gle.credit)).as_("balance"),
-						(Sum(gle.debit) - Sum(gle.credit) == 0)
-						^ (Sum(gle.debit_in_account_currency) - Sum(gle.credit_in_account_currency) == 0).as_(
-							"zero_balance"
-						),
-					)
-					.where(Criterion.all(conditions))
-					.groupby(gle.account, NullIf(gle.party_type, ""), NullIf(gle.party, ""))
-					.having(having_clause)
-					.orderby(gle.account)
-					.run(as_dict=True)
-				)
-
-		return account_details
-
-	@staticmethod
-	def calculate_new_account_balance(company, posting_date, account_details):
+	def get_accounts_data(self, account=None):
 		accounts = []
-		company_currency = erpnext.get_company_currency(company)
+		self.validate_mandatory()
+		company_currency = erpnext.get_company_currency(self.company)
 		precision = get_field_precision(
 			frappe.get_meta("Exchange Rate Revaluation Account").get_field("new_balance_in_base_currency"),
 			company_currency,
 		)
 
-		if account_details:
-			# Handle Accounts with balance in both Account/Base Currency
-			for d in [x for x in account_details if not x.zero_balance]:
-				current_exchange_rate = (
-					d.balance / d.balance_in_account_currency if d.balance_in_account_currency else 0
+		account_details = self.get_accounts_from_gle()
+		for d in account_details:
+			current_exchange_rate = (
+				d.balance / d.balance_in_account_currency if d.balance_in_account_currency else 0
+			)
+			new_exchange_rate = get_exchange_rate(d.account_currency, company_currency, self.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)
+			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,
+						"current_exchange_rate": current_exchange_rate,
+						"new_exchange_rate": new_exchange_rate,
+						"new_balance_in_base_currency": new_balance_in_base_currency,
+					}
 				)
-				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)
-				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]:
-
-				# TODO: Set new balance in Base/Account currency
-				if d.balance > 0:
-					current_exchange_rate = new_exchange_rate = 0
-
-					new_balance_in_account_currency = 0  # this will be '0'
-					new_balance_in_base_currency = 0  # this will be '0'
-					gain_loss = flt(new_balance_in_base_currency, precision) - flt(d.balance, precision)
-				else:
-					new_exchange_rate = 0
-					new_balance_in_base_currency = 0
-					new_balance_in_account_currency = 0
-
-					current_exchange_rate = calculate_exchange_rate_using_last_gle(
-						company, d.account, d.party_type, d.party
-					)
-
-					gain_loss = new_balance_in_account_currency - (
-						current_exchange_rate * d.balance_in_account_currency
-					)
-
-				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,
-						}
-					)
+		if not accounts:
+			self.throw_invalid_response_message(account_details)
 
 		return accounts
 
+	def get_accounts_from_gle(self):
+		company_currency = erpnext.get_company_currency(self.company)
+		accounts = frappe.db.sql_list(
+			"""
+			select name
+			from tabAccount
+			where is_group = 0
+				and report_type = 'Balance Sheet'
+				and root_type in ('Asset', 'Liability', 'Equity')
+				and account_type != 'Stock'
+				and company=%s
+				and account_currency != %s
+			order by name""",
+			(self.company, company_currency),
+		)
+
+		account_details = []
+		if accounts:
+			account_details = frappe.db.sql(
+				"""
+				select
+					account, party_type, party, account_currency,
+					sum(debit_in_account_currency) - sum(credit_in_account_currency) as balance_in_account_currency,
+					sum(debit) - sum(credit) as balance
+				from `tabGL Entry`
+				where account in (%s)
+				and posting_date <= %s
+				and is_cancelled = 0
+				group by account, NULLIF(party_type,''), NULLIF(party,'')
+				having sum(debit) != sum(credit)
+				order by account
+			"""
+				% (", ".join(["%s"] * len(accounts)), "%s"),
+				tuple(accounts + [self.posting_date]),
+				as_dict=1,
+			)
+
+		return account_details
+
 	def throw_invalid_response_message(self, account_details):
 		if account_details:
 			message = _("No outstanding invoices require exchange rate revaluation")
@@ -258,7 +134,11 @@ class ExchangeRateRevaluation(Document):
 			message = _("No outstanding invoices found")
 		frappe.msgprint(message)
 
-	def get_for_unrealized_gain_loss_account(self):
+	@frappe.whitelist()
+	def make_jv_entry(self):
+		if self.total_gain_loss == 0:
+			return
+
 		unrealized_exchange_gain_loss_account = frappe.get_cached_value(
 			"Company", self.company, "unrealized_exchange_gain_loss_account"
 		)
@@ -266,130 +146,6 @@ class ExchangeRateRevaluation(Document):
 			frappe.throw(
 				_("Please set Unrealized Exchange Gain/Loss Account in Company {0}").format(self.company)
 			)
-		return unrealized_exchange_gain_loss_account
-
-	@frappe.whitelist()
-	def make_jv_entries(self):
-		zero_balance_jv = self.make_jv_for_zero_balance()
-		if zero_balance_jv:
-			frappe.msgprint(
-				f"Zero Balance Journal: {get_link_to_form('Journal Entry', zero_balance_jv.name)}"
-			)
-
-		revaluation_jv = self.make_jv_for_revaluation()
-		if revaluation_jv:
-			frappe.msgprint(
-				f"Revaluation Journal: {get_link_to_form('Journal Entry', revaluation_jv.name)}"
-			)
-
-		return {
-			"revaluation_jv": revaluation_jv.name if revaluation_jv else None,
-			"zero_balance_jv": zero_balance_jv.name if zero_balance_jv else None,
-		}
-
-	def make_jv_for_zero_balance(self):
-		if self.gain_loss_booked == 0:
-			return
-
-		accounts = [x for x in self.accounts if x.zero_balance]
-
-		if not accounts:
-			return
-
-		unrealized_exchange_gain_loss_account = self.get_for_unrealized_gain_loss_account()
-
-		journal_entry = frappe.new_doc("Journal Entry")
-		journal_entry.voucher_type = "Exchange Gain Or Loss"
-		journal_entry.company = self.company
-		journal_entry.posting_date = self.posting_date
-		journal_entry.multi_currency = 1
-
-		journal_entry_accounts = []
-		for d in accounts:
-			journal_account = frappe._dict(
-				{
-					"account": d.get("account"),
-					"party_type": d.get("party_type"),
-					"party": d.get("party"),
-					"account_currency": d.get("account_currency"),
-					"balance": flt(
-						d.get("balance_in_account_currency"), d.precision("balance_in_account_currency")
-					),
-					"exchange_rate": 0,
-					"cost_center": erpnext.get_default_cost_center(self.company),
-					"reference_type": "Exchange Rate Revaluation",
-					"reference_name": self.name,
-				}
-			)
-
-			# Account Currency has balance
-			if d.get("balance_in_account_currency") and not d.get("new_balance_in_account_currency"):
-				dr_or_cr = (
-					"credit_in_account_currency"
-					if d.get("balance_in_account_currency") > 0
-					else "debit_in_account_currency"
-				)
-				reverse_dr_or_cr = (
-					"debit_in_account_currency"
-					if dr_or_cr == "credit_in_account_currency"
-					else "credit_in_account_currency"
-				)
-				journal_account.update(
-					{
-						dr_or_cr: flt(
-							abs(d.get("balance_in_account_currency")), d.precision("balance_in_account_currency")
-						),
-						reverse_dr_or_cr: 0,
-						"debit": 0,
-						"credit": 0,
-					}
-				)
-			elif d.get("balance_in_base_currency") and not d.get("new_balance_in_base_currency"):
-				# Base currency has balance
-				dr_or_cr = "credit" if d.get("balance_in_base_currency") > 0 else "debit"
-				reverse_dr_or_cr = "debit" if dr_or_cr == "credit" else "credit"
-				journal_account.update(
-					{
-						dr_or_cr: flt(
-							abs(d.get("balance_in_base_currency")), d.precision("balance_in_base_currency")
-						),
-						reverse_dr_or_cr: 0,
-						"debit_in_account_currency": 0,
-						"credit_in_account_currency": 0,
-					}
-				)
-
-			journal_entry_accounts.append(journal_account)
-
-		journal_entry_accounts.append(
-			{
-				"account": unrealized_exchange_gain_loss_account,
-				"balance": get_balance_on(unrealized_exchange_gain_loss_account),
-				"debit": abs(self.gain_loss_booked) if self.gain_loss_booked < 0 else 0,
-				"credit": abs(self.gain_loss_booked) if self.gain_loss_booked > 0 else 0,
-				"debit_in_account_currency": abs(self.gain_loss_booked) if self.gain_loss_booked < 0 else 0,
-				"credit_in_account_currency": self.gain_loss_booked if self.gain_loss_booked > 0 else 0,
-				"cost_center": erpnext.get_default_cost_center(self.company),
-				"exchange_rate": 1,
-				"reference_type": "Exchange Rate Revaluation",
-				"reference_name": self.name,
-			}
-		)
-
-		journal_entry.set("accounts", journal_entry_accounts)
-		journal_entry.set_total_debit_credit()
-		journal_entry.save()
-		return journal_entry
-
-	def make_jv_for_revaluation(self):
-		if self.gain_loss_unbooked == 0:
-			return
-
-		accounts = [x for x in self.accounts if not x.zero_balance]
-		if not accounts:
-			return
-
-		unrealized_exchange_gain_loss_account = self.get_for_unrealized_gain_loss_account()
 
 		journal_entry = frappe.new_doc("Journal Entry")
 		journal_entry.voucher_type = "Exchange Rate Revaluation"
@@ -398,7 +154,7 @@ class ExchangeRateRevaluation(Document):
 		journal_entry.multi_currency = 1
 
 		journal_entry_accounts = []
-		for d in accounts:
+		for d in self.accounts:
 			dr_or_cr = (
 				"debit_in_account_currency"
 				if d.get("balance_in_account_currency") > 0
@@ -423,7 +179,6 @@ class ExchangeRateRevaluation(Document):
 					dr_or_cr: flt(
 						abs(d.get("balance_in_account_currency")), d.precision("balance_in_account_currency")
 					),
-					"cost_center": erpnext.get_default_cost_center(self.company),
 					"exchange_rate": flt(d.get("new_exchange_rate"), d.precision("new_exchange_rate")),
 					"reference_type": "Exchange Rate Revaluation",
 					"reference_name": self.name,
@@ -441,7 +196,6 @@ class ExchangeRateRevaluation(Document):
 					reverse_dr_or_cr: flt(
 						abs(d.get("balance_in_account_currency")), d.precision("balance_in_account_currency")
 					),
-					"cost_center": erpnext.get_default_cost_center(self.company),
 					"exchange_rate": flt(d.get("current_exchange_rate"), d.precision("current_exchange_rate")),
 					"reference_type": "Exchange Rate Revaluation",
 					"reference_name": self.name,
@@ -452,11 +206,8 @@ class ExchangeRateRevaluation(Document):
 			{
 				"account": unrealized_exchange_gain_loss_account,
 				"balance": get_balance_on(unrealized_exchange_gain_loss_account),
-				"debit_in_account_currency": abs(self.gain_loss_unbooked)
-				if self.gain_loss_unbooked < 0
-				else 0,
-				"credit_in_account_currency": self.gain_loss_unbooked if self.gain_loss_unbooked > 0 else 0,
-				"cost_center": erpnext.get_default_cost_center(self.company),
+				"debit_in_account_currency": abs(self.total_gain_loss) if self.total_gain_loss < 0 else 0,
+				"credit_in_account_currency": self.total_gain_loss if self.total_gain_loss > 0 else 0,
 				"exchange_rate": 1,
 				"reference_type": "Exchange Rate Revaluation",
 				"reference_name": self.name,
@@ -466,91 +217,38 @@ class ExchangeRateRevaluation(Document):
 		journal_entry.set("accounts", journal_entry_accounts)
 		journal_entry.set_amounts_in_company_currency()
 		journal_entry.set_total_debit_credit()
-		journal_entry.save()
-		return journal_entry
-
-
-def calculate_exchange_rate_using_last_gle(company, account, party_type, party):
-	"""
-	Use last GL entry to calculate exchange rate
-	"""
-	last_exchange_rate = None
-	if company and account:
-		gl = qb.DocType("GL Entry")
-
-		# build conditions
-		conditions = []
-		conditions.append(gl.company == company)
-		conditions.append(gl.account == account)
-		conditions.append(gl.is_cancelled == 0)
-		if party_type:
-			conditions.append(gl.party_type == party_type)
-		if party:
-			conditions.append(gl.party == party)
-
-		voucher_type, voucher_no = (
-			qb.from_(gl)
-			.select(gl.voucher_type, gl.voucher_no)
-			.where(Criterion.all(conditions))
-			.orderby(gl.posting_date, order=Order.desc)
-			.limit(1)
-			.run()[0]
-		)
-
-		last_exchange_rate = (
-			qb.from_(gl)
-			.select((gl.debit - gl.credit) / (gl.debit_in_account_currency - gl.credit_in_account_currency))
-			.where(
-				(gl.voucher_type == voucher_type) & (gl.voucher_no == voucher_no) & (gl.account == account)
-			)
-			.orderby(gl.posting_date, order=Order.desc)
-			.limit(1)
-			.run()[0][0]
-		)
-
-	return last_exchange_rate
+		return journal_entry.as_dict()
 
 
 @frappe.whitelist()
-def get_account_details(company, posting_date, account, party_type=None, party=None):
-	if not (company and posting_date):
-		frappe.throw(_("Company and Posting Date is mandatory"))
-
-	account_currency, account_type = frappe.get_cached_value(
+def get_account_details(account, company, posting_date, party_type=None, party=None):
+	account_currency, account_type = frappe.db.get_value(
 		"Account", account, ["account_currency", "account_type"]
 	)
-
 	if account_type in ["Receivable", "Payable"] and not (party_type and party):
 		frappe.throw(_("Party Type and Party is mandatory for {0} account").format(account_type))
 
 	account_details = {}
 	company_currency = erpnext.get_company_currency(company)
-
-	account_details = {
-		"account_currency": account_currency,
-	}
-	account_balance = ExchangeRateRevaluation.get_account_balance_from_gle(
-		company=company, posting_date=posting_date, account=account, party_type=party_type, party=party
+	balance = get_balance_on(
+		account, date=posting_date, party_type=party_type, party=party, in_account_currency=False
 	)
-
-	if account_balance and (
-		account_balance[0].balance or account_balance[0].balance_in_account_currency
-	):
-		account_with_new_balance = ExchangeRateRevaluation.calculate_new_account_balance(
-			company, posting_date, account_balance
+	if balance:
+		balance_in_account_currency = get_balance_on(
+			account, date=posting_date, party_type=party_type, party=party
 		)
-		row = account_with_new_balance[0]
-		account_details.update(
-			{
-				"balance_in_base_currency": row["balance_in_base_currency"],
-				"balance_in_account_currency": row["balance_in_account_currency"],
-				"current_exchange_rate": row["current_exchange_rate"],
-				"new_exchange_rate": row["new_exchange_rate"],
-				"new_balance_in_base_currency": row["new_balance_in_base_currency"],
-				"new_balance_in_account_currency": row["new_balance_in_account_currency"],
-				"zero_balance": row["zero_balance"],
-				"gain_loss": row["gain_loss"],
-			}
+		current_exchange_rate = (
+			balance / balance_in_account_currency if balance_in_account_currency else 0
 		)
+		new_exchange_rate = get_exchange_rate(account_currency, company_currency, posting_date)
+		new_balance_in_base_currency = balance_in_account_currency * new_exchange_rate
+		account_details = {
+			"account_currency": account_currency,
+			"balance_in_base_currency": balance,
+			"balance_in_account_currency": balance_in_account_currency,
+			"current_exchange_rate": current_exchange_rate,
+			"new_exchange_rate": new_exchange_rate,
+			"new_balance_in_base_currency": new_balance_in_base_currency,
+		}
 
 	return account_details

erpnext/accounts/doctype/exchange_rate_revaluation_account/exchange_rate_revaluation_account.json

@@ -1,161 +1,475 @@
 {
- "actions": [],
+ "allow_copy": 0,
+ "allow_events_in_timeline": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "beta": 0,
  "creation": "2018-04-13 18:30:06.110433",
+ "custom": 0,
+ "docstatus": 0,
  "doctype": "DocType",
+ "document_type": "",
  "editable_grid": 1,
  "engine": "InnoDB",
- "field_order": [
-  "account",
-  "party_type",
-  "party",
-  "column_break_2",
-  "account_currency",
-  "account_balances",
-  "balance_in_account_currency",
-  "column_break_46yz",
-  "new_balance_in_account_currency",
-  "balances",
-  "current_exchange_rate",
-  "column_break_xown",
-  "new_exchange_rate",
-  "column_break_9",
-  "balance_in_base_currency",
-  "column_break_ukce",
-  "new_balance_in_base_currency",
-  "section_break_ngrs",
-  "gain_loss",
-  "zero_balance"
- ],
  "fields": [
   {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "account",
    "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
    "in_list_view": 1,
+   "in_standard_filter": 0,
    "label": "Account",
+   "length": 0,
+   "no_copy": 0,
    "options": "Account",
-   "reqd": 1
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
   },
   {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "party_type",
    "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
    "label": "Party Type",
-   "options": "DocType"
+   "length": 0,
+   "no_copy": 0,
+   "options": "DocType",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
   },
   {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "party",
    "fieldtype": "Dynamic Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
    "label": "Party",
-   "options": "party_type"
+   "length": 0,
+   "no_copy": 0,
+   "options": "party_type",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
   },
   {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "column_break_2",
-   "fieldtype": "Column Break"
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
   },
   {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "account_currency",
    "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
    "label": "Account Currency",
+   "length": 0,
+   "no_copy": 0,
    "options": "Currency",
-   "read_only": 1
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
   },
   {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "balance_in_account_currency",
    "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
    "label": "Balance In Account Currency",
+   "length": 0,
+   "no_copy": 0,
    "options": "account_currency",
-   "read_only": 1
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
   },
   {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "balances",
-   "fieldtype": "Section Break"
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
   },
   {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "current_exchange_rate",
    "fieldtype": "Float",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
    "label": "Current Exchange Rate",
-   "read_only": 1
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
   },
   {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "balance_in_base_currency",
    "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
    "in_list_view": 1,
+   "in_standard_filter": 0,
    "label": "Balance In Base Currency",
-   "options": "Company:company:default_currency",
-   "read_only": 1
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
   },
   {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "column_break_9",
-   "fieldtype": "Section Break"
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
   },
   {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "new_exchange_rate",
    "fieldtype": "Float",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
    "in_list_view": 1,
+   "in_standard_filter": 0,
    "label": "New Exchange Rate",
-   "reqd": 1
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
   },
   {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "new_balance_in_base_currency",
    "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
    "in_list_view": 1,
+   "in_standard_filter": 0,
    "label": "New Balance In Base Currency",
-   "options": "Company:company:default_currency",
-   "read_only": 1
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
   },
   {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "gain_loss",
    "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
    "in_list_view": 1,
+   "in_standard_filter": 0,
    "label": "Gain/Loss",
-   "options": "Company:company:default_currency",
-   "read_only": 1
-  },
-  {
-   "default": "0",
-   "description": "This Account has '0' balance in either Base Currency or Account Currency",
-   "fieldname": "zero_balance",
-   "fieldtype": "Check",
-   "label": "Zero Balance"
-  },
-  {
-   "fieldname": "new_balance_in_account_currency",
-   "fieldtype": "Currency",
-   "label": "New Balance In Account Currency",
-   "options": "account_currency",
-   "read_only": 1
-  },
-  {
-   "fieldname": "account_balances",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "column_break_46yz",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "column_break_xown",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "column_break_ukce",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "section_break_ngrs",
-   "fieldtype": "Section Break"
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
   }
  ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 0,
+ "issingle": 0,
  "istable": 1,
- "links": [],
- "modified": "2022-12-29 19:38:52.915295",
+ "max_attachments": 0,
+ "modified": "2019-06-26 18:57:51.762345",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Exchange Rate Revaluation Account",
+ "name_case": "",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "show_name_in_global_search": 0,
  "sort_field": "modified",
  "sort_order": "DESC",
- "states": [],
- "track_changes": 1
+ "track_changes": 1,
+ "track_seen": 0,
+ "track_views": 0
 }

erpnext/accounts/doctype/fiscal_year/fiscal_year.py

@@ -9,6 +9,10 @@ from frappe.model.document import Document
 from frappe.utils import add_days, add_years, cstr, getdate
 
 
+class FiscalYearIncorrectDate(frappe.ValidationError):
+	pass
+
+
 class FiscalYear(Document):
 	@frappe.whitelist()
 	def set_as_default(self):
@@ -49,18 +53,23 @@ class FiscalYear(Document):
 					)
 
 	def validate_dates(self):
-		self.validate_from_to_dates("year_start_date", "year_end_date")
 		if self.is_short_year:
 			# Fiscal Year can be shorter than one year, in some jurisdictions
 			# under certain circumstances. For example, in the USA and Germany.
 			return
 
+		if getdate(self.year_start_date) > getdate(self.year_end_date):
+			frappe.throw(
+				_("Fiscal Year Start Date should be one year earlier than Fiscal Year End Date"),
+				FiscalYearIncorrectDate,
+			)
+
 		date = getdate(self.year_start_date) + relativedelta(years=1) - relativedelta(days=1)
 
 		if getdate(self.year_end_date) != date:
 			frappe.throw(
 				_("Fiscal Year End Date should be one year after Fiscal Year Start Date"),
-				frappe.exceptions.InvalidDates,
+				FiscalYearIncorrectDate,
 			)
 
 	def on_update(self):
@@ -160,6 +169,5 @@ def auto_create_fiscal_year():
 
 
 def get_from_and_to_date(fiscal_year):
-	fields = ["year_start_date", "year_end_date"]
-	cached_results = frappe.get_cached_value("Fiscal Year", fiscal_year, fields, as_dict=1)
-	return dict(from_date=cached_results.year_start_date, to_date=cached_results.year_end_date)
+	fields = ["year_start_date as from_date", "year_end_date as to_date"]
+	return frappe.db.get_value("Fiscal Year", fiscal_year, fields, as_dict=1)

erpnext/accounts/doctype/fiscal_year/test_fiscal_year.py

@@ -7,6 +7,8 @@ import unittest
 import frappe
 from frappe.utils import now_datetime
 
+from erpnext.accounts.doctype.fiscal_year.fiscal_year import FiscalYearIncorrectDate
+
 test_ignore = ["Company"]
 
 
@@ -24,7 +26,7 @@ class TestFiscalYear(unittest.TestCase):
 			}
 		)
 
-		self.assertRaises(frappe.exceptions.InvalidDates, fy.insert)
+		self.assertRaises(FiscalYearIncorrectDate, fy.insert)
 
 
 def test_record_generator():
@@ -33,8 +35,8 @@ def test_record_generator():
 			"doctype": "Fiscal Year",
 			"year": "_Test Short Fiscal Year 2011",
 			"is_short_year": 1,
-			"year_start_date": "2011-04-01",
-			"year_end_date": "2011-12-31",
+			"year_end_date": "2011-04-01",
+			"year_start_date": "2011-12-31",
 		}
 	]
 

erpnext/accounts/doctype/gl_entry/gl_entry.py

@@ -58,7 +58,7 @@ class GLEntry(Document):
 			validate_balance_type(self.account, adv_adj)
 			validate_frozen_account(self.account, adv_adj)
 
-			if frappe.get_cached_value("Account", self.account, "account_type") not in [
+			if frappe.db.get_value("Account", self.account, "account_type") not in [
 				"Receivable",
 				"Payable",
 			]:
@@ -95,15 +95,7 @@ class GLEntry(Document):
 				)
 
 		# Zero value transaction is not allowed
-		if not (
-			flt(self.debit, self.precision("debit"))
-			or flt(self.credit, self.precision("credit"))
-			or (
-				self.voucher_type == "Journal Entry"
-				and frappe.get_cached_value("Journal Entry", self.voucher_no, "voucher_type")
-				== "Exchange Gain Or Loss"
-			)
-		):
+		if not (flt(self.debit, self.precision("debit")) or flt(self.credit, self.precision("credit"))):
 			frappe.throw(
 				_("{0} {1}: Either debit or credit amount is required for {2}").format(
 					self.voucher_type, self.voucher_no, self.account
@@ -128,7 +120,7 @@ class GLEntry(Document):
 			frappe.throw(msg, title=_("Missing Cost Center"))
 
 	def validate_dimensions_for_pl_and_bs(self):
-		account_type = frappe.get_cached_value("Account", self.account, "report_type")
+		account_type = frappe.db.get_value("Account", self.account, "report_type")
 
 		for dimension in get_checks_for_pl_and_bs_accounts():
 			if (
@@ -196,7 +188,7 @@ class GLEntry(Document):
 	def check_pl_account(self):
 		if (
 			self.is_opening == "Yes"
-			and frappe.get_cached_value("Account", self.account, "report_type") == "Profit and Loss"
+			and frappe.db.get_value("Account", self.account, "report_type") == "Profit and Loss"
 			and not self.is_cancelled
 		):
 			frappe.throw(
@@ -289,7 +281,7 @@ class GLEntry(Document):
 
 def validate_balance_type(account, adv_adj=False):
 	if not adv_adj and account:
-		balance_must_be = frappe.get_cached_value("Account", account, "balance_must_be")
+		balance_must_be = frappe.db.get_value("Account", account, "balance_must_be")
 		if balance_must_be:
 			balance = frappe.db.sql(
 				"""select sum(debit) - sum(credit)

erpnext/accounts/doctype/item_tax_template/item_tax_template.py

@@ -21,7 +21,7 @@ class ItemTaxTemplate(Document):
 		check_list = []
 		for d in self.get("taxes"):
 			if d.tax_type:
-				account_type = frappe.get_cached_value("Account", d.tax_type, "account_type")
+				account_type = frappe.db.get_value("Account", d.tax_type, "account_type")
 
 				if account_type not in [
 					"Tax",

erpnext/accounts/doctype/journal_entry/journal_entry.js

@@ -8,7 +8,7 @@ frappe.provide("erpnext.journal_entry");
 frappe.ui.form.on("Journal Entry", {
 	setup: function(frm) {
 		frm.add_fetch("bank_account", "account", "account");
-		frm.ignore_doctypes_on_cancel_all = ['Sales Invoice', 'Purchase Invoice', 'Journal Entry'];
+		frm.ignore_doctypes_on_cancel_all = ['Sales Invoice', 'Purchase Invoice'];
 	},
 
 	refresh: function(frm) {
@@ -173,8 +173,8 @@ frappe.ui.form.on("Journal Entry", {
 var update_jv_details = function(doc, r) {
 	$.each(r, function(i, d) {
 		var row = frappe.model.add_child(doc, "Journal Entry Account", "accounts");
-		frappe.model.set_value(row.doctype, row.name, "account", d.account)
-		frappe.model.set_value(row.doctype, row.name, "balance", d.balance)
+		row.account = d.account;
+		row.balance = d.balance;
 	});
 	refresh_field("accounts");
 }
@@ -253,6 +253,9 @@ erpnext.accounts.JournalEntry = class JournalEntry extends frappe.ui.form.Contro
 				var party_account_field = jvd.reference_type==="Sales Invoice" ? "debit_to": "credit_to";
 				out.filters.push([jvd.reference_type, party_account_field, "=", jvd.account]);
 
+				if (in_list(['Debit Note', 'Credit Note'], doc.voucher_type)) {
+					out.filters.push([jvd.reference_type, "is_return", "=", 1]);
+				}
 			}
 
 			if(in_list(["Sales Order", "Purchase Order"], jvd.reference_type)) {
@@ -309,7 +312,8 @@ erpnext.accounts.JournalEntry = class JournalEntry extends frappe.ui.form.Contro
 		}
 	}
 
-	get_outstanding(doctype, docname, company, child) {
+	get_outstanding(doctype, docname, company, child, due_date) {
+		var me = this;
 		var args = {
 			"doctype": doctype,
 			"docname": docname,

erpnext/accounts/doctype/journal_entry/journal_entry.json

@@ -88,7 +88,7 @@
    "label": "Entry Type",
    "oldfieldname": "voucher_type",
    "oldfieldtype": "Select",
-   "options": "Journal Entry\nInter Company Journal Entry\nBank Entry\nCash Entry\nCredit Card Entry\nDebit Note\nCredit Note\nContra Entry\nExcise Entry\nWrite Off Entry\nOpening Entry\nDepreciation Entry\nExchange Rate Revaluation\nExchange Gain Or Loss\nDeferred Revenue\nDeferred Expense",
+   "options": "Journal Entry\nInter Company Journal Entry\nBank Entry\nCash Entry\nCredit Card Entry\nDebit Note\nCredit Note\nContra Entry\nExcise Entry\nWrite Off Entry\nOpening Entry\nDepreciation Entry\nExchange Rate Revaluation\nDeferred Revenue\nDeferred Expense",
    "reqd": 1,
    "search_index": 1
   },
@@ -137,7 +137,8 @@
    "fieldname": "finance_book",
    "fieldtype": "Link",
    "label": "Finance Book",
-   "options": "Finance Book"
+   "options": "Finance Book",
+   "read_only": 1
   },
   {
    "fieldname": "2_add_edit_gl_entries",
@@ -538,7 +539,7 @@
  "idx": 176,
  "is_submittable": 1,
  "links": [],
- "modified": "2023-01-17 12:53:53.280620",
+ "modified": "2022-06-23 22:01:32.348337",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Journal Entry",

erpnext/accounts/doctype/journal_entry/journal_entry.py

@@ -6,7 +6,7 @@ import json
 
 import frappe
 from frappe import _, msgprint, scrub
-from frappe.utils import cstr, flt, fmt_money, formatdate, get_link_to_form, nowdate
+from frappe.utils import cint, cstr, flt, fmt_money, formatdate, get_link_to_form, nowdate
 
 import erpnext
 from erpnext.accounts.deferred_revenue import get_deferred_booking_accounts
@@ -23,9 +23,6 @@ from erpnext.accounts.utils import (
 	get_stock_accounts,
 	get_stock_and_account_balance,
 )
-from erpnext.assets.doctype.asset_depreciation_schedule.asset_depreciation_schedule import (
-	get_depr_schedule,
-)
 from erpnext.controllers.accounts_controller import AccountsController
 
 
@@ -37,6 +34,9 @@ class JournalEntry(AccountsController):
 	def __init__(self, *args, **kwargs):
 		super(JournalEntry, self).__init__(*args, **kwargs)
 
+	def get_feed(self):
+		return self.voucher_type
+
 	def validate(self):
 		if self.voucher_type == "Opening Entry":
 			self.is_opening = "Yes"
@@ -81,7 +81,6 @@ class JournalEntry(AccountsController):
 		self.check_credit_limit()
 		self.make_gl_entries()
 		self.update_advance_paid()
-		self.update_asset_value()
 		self.update_inter_company_jv()
 		self.update_invoice_discounting()
 
@@ -185,9 +184,7 @@ class JournalEntry(AccountsController):
 			}
 		)
 
-		tax_withholding_details, advance_taxes, voucher_wise_amount = get_party_tax_withholding_details(
-			inv, self.tax_withholding_category
-		)
+		tax_withholding_details = get_party_tax_withholding_details(inv, self.tax_withholding_category)
 
 		if not tax_withholding_details:
 			return
@@ -226,34 +223,6 @@ class JournalEntry(AccountsController):
 		for d in to_remove:
 			self.remove(d)
 
-	def update_asset_value(self):
-		if self.voucher_type != "Depreciation Entry":
-			return
-
-		processed_assets = []
-
-		for d in self.get("accounts"):
-			if (
-				d.reference_type == "Asset" and d.reference_name and d.reference_name not in processed_assets
-			):
-				processed_assets.append(d.reference_name)
-
-				asset = frappe.db.get_value(
-					"Asset", d.reference_name, ["calculate_depreciation", "value_after_depreciation"], as_dict=1
-				)
-
-				if asset.calculate_depreciation:
-					continue
-
-				depr_value = d.debit or d.credit
-
-				frappe.db.set_value(
-					"Asset",
-					d.reference_name,
-					"value_after_depreciation",
-					asset.value_after_depreciation - depr_value,
-				)
-
 	def update_inter_company_jv(self):
 		if (
 			self.voucher_type == "Inter Company Journal Entry"
@@ -312,48 +281,19 @@ class JournalEntry(AccountsController):
 				d.db_update()
 
 	def unlink_asset_reference(self):
-		if self.voucher_type != "Depreciation Entry":
-			return
-
-		processed_assets = []
-
 		for d in self.get("accounts"):
-			if (
-				d.reference_type == "Asset" and d.reference_name and d.reference_name not in processed_assets
-			):
-				processed_assets.append(d.reference_name)
-
+			if d.reference_type == "Asset" and d.reference_name:
 				asset = frappe.get_doc("Asset", d.reference_name)
+				for s in asset.get("schedules"):
+					if s.journal_entry == self.name:
+						s.db_set("journal_entry", None)
 
-				if asset.calculate_depreciation:
-					je_found = False
+						idx = cint(s.finance_book_id) or 1
+						finance_books = asset.get("finance_books")[idx - 1]
+						finance_books.value_after_depreciation += s.depreciation_amount
+						finance_books.db_update()
 
-					for row in asset.get("finance_books"):
-						if je_found:
-							break
-
-						depr_schedule = get_depr_schedule(asset.name, "Active", row.finance_book)
-
-						for s in depr_schedule or []:
-							if s.journal_entry == self.name:
-								s.db_set("journal_entry", None)
-
-								row.value_after_depreciation += s.depreciation_amount
-								row.db_update()
-
-								asset.set_status()
-
-								je_found = True
-								break
-				else:
-					depr_value = d.debit or d.credit
-
-					frappe.db.set_value(
-						"Asset",
-						d.reference_name,
-						"value_after_depreciation",
-						asset.value_after_depreciation + depr_value,
-					)
+						asset.set_status()
 
 	def unlink_inter_company_jv(self):
 		if (
@@ -377,7 +317,7 @@ class JournalEntry(AccountsController):
 
 	def validate_party(self):
 		for d in self.get("accounts"):
-			account_type = frappe.get_cached_value("Account", d.account, "account_type")
+			account_type = frappe.db.get_value("Account", d.account, "account_type")
 			if account_type in ["Receivable", "Payable"]:
 				if not (d.party_type and d.party):
 					frappe.throw(
@@ -440,7 +380,7 @@ class JournalEntry(AccountsController):
 	def validate_against_jv(self):
 		for d in self.get("accounts"):
 			if d.reference_type == "Journal Entry":
-				account_root_type = frappe.get_cached_value("Account", d.account, "root_type")
+				account_root_type = frappe.db.get_value("Account", d.account, "root_type")
 				if account_root_type == "Asset" and flt(d.debit) > 0:
 					frappe.throw(
 						_(
@@ -650,30 +590,28 @@ class JournalEntry(AccountsController):
 				d.against_account = frappe.db.get_value(d.reference_type, d.reference_name, field)
 		else:
 			for d in self.get("accounts"):
-				if flt(d.debit) > 0:
+				if flt(d.debit > 0):
 					accounts_debited.append(d.party or d.account)
 				if flt(d.credit) > 0:
 					accounts_credited.append(d.party or d.account)
 
 			for d in self.get("accounts"):
-				if flt(d.debit) > 0:
+				if flt(d.debit > 0):
 					d.against_account = ", ".join(list(set(accounts_credited)))
-				if flt(d.credit) > 0:
+				if flt(d.credit > 0):
 					d.against_account = ", ".join(list(set(accounts_debited)))
 
 	def validate_debit_credit_amount(self):
-		if not (self.voucher_type == "Exchange Gain Or Loss" and self.multi_currency):
-			for d in self.get("accounts"):
-				if not flt(d.debit) and not flt(d.credit):
-					frappe.throw(_("Row {0}: Both Debit and Credit values cannot be zero").format(d.idx))
+		for d in self.get("accounts"):
+			if not flt(d.debit) and not flt(d.credit):
+				frappe.throw(_("Row {0}: Both Debit and Credit values cannot be zero").format(d.idx))
 
 	def validate_total_debit_and_credit(self):
 		self.set_total_debit_credit()
-		if not (self.voucher_type == "Exchange Gain Or Loss" and self.multi_currency):
-			if self.difference:
-				frappe.throw(
-					_("Total Debit must be equal to Total Credit. The difference is {0}").format(self.difference)
-				)
+		if self.difference:
+			frappe.throw(
+				_("Total Debit must be equal to Total Credit. The difference is {0}").format(self.difference)
+			)
 
 	def set_total_debit_credit(self):
 		self.total_debit, self.total_credit, self.difference = 0, 0, 0
@@ -691,7 +629,7 @@ class JournalEntry(AccountsController):
 	def validate_multi_currency(self):
 		alternate_currency = []
 		for d in self.get("accounts"):
-			account = frappe.get_cached_value(
+			account = frappe.db.get_value(
 				"Account", d.account, ["account_currency", "account_type"], as_dict=1
 			)
 			if account:
@@ -711,17 +649,16 @@ class JournalEntry(AccountsController):
 		self.set_exchange_rate()
 
 	def set_amounts_in_company_currency(self):
-		if not (self.voucher_type == "Exchange Gain Or Loss" and self.multi_currency):
-			for d in self.get("accounts"):
-				d.debit_in_account_currency = flt(
-					d.debit_in_account_currency, d.precision("debit_in_account_currency")
-				)
-				d.credit_in_account_currency = flt(
-					d.credit_in_account_currency, d.precision("credit_in_account_currency")
-				)
+		for d in self.get("accounts"):
+			d.debit_in_account_currency = flt(
+				d.debit_in_account_currency, d.precision("debit_in_account_currency")
+			)
+			d.credit_in_account_currency = flt(
+				d.credit_in_account_currency, d.precision("credit_in_account_currency")
+			)
 
-				d.debit = flt(d.debit_in_account_currency * flt(d.exchange_rate), d.precision("debit"))
-				d.credit = flt(d.credit_in_account_currency * flt(d.exchange_rate), d.precision("credit"))
+			d.debit = flt(d.debit_in_account_currency * flt(d.exchange_rate), d.precision("debit"))
+			d.credit = flt(d.credit_in_account_currency * flt(d.exchange_rate), d.precision("credit"))
 
 	def set_exchange_rate(self):
 		for d in self.get("accounts"):
@@ -820,10 +757,10 @@ class JournalEntry(AccountsController):
 					pay_to_recd_from = d.party
 
 				if pay_to_recd_from and pay_to_recd_from == d.party:
-					party_amount += flt(d.debit_in_account_currency) or flt(d.credit_in_account_currency)
+					party_amount += d.debit_in_account_currency or d.credit_in_account_currency
 					party_account_currency = d.account_currency
 
-			elif frappe.get_cached_value("Account", d.account, "account_type") in ["Bank", "Cash"]:
+			elif frappe.db.get_value("Account", d.account, "account_type") in ["Bank", "Cash"]:
 				bank_amount += d.debit_in_account_currency or d.credit_in_account_currency
 				bank_account_currency = d.account_currency
 
@@ -850,7 +787,7 @@ class JournalEntry(AccountsController):
 	def build_gl_map(self):
 		gl_map = []
 		for d in self.get("accounts"):
-			if d.debit or d.credit or (self.voucher_type == "Exchange Gain Or Loss"):
+			if d.debit or d.credit:
 				r = [d.user_remark, self.remark]
 				r = [x for x in r if x]
 				remarks = "\n".join(r)
@@ -898,7 +835,7 @@ class JournalEntry(AccountsController):
 			make_gl_entries(gl_map, cancel=cancel, adv_adj=adv_adj, update_outstanding=update_outstanding)
 
 	@frappe.whitelist()
-	def get_balance(self, difference_account=None):
+	def get_balance(self):
 		if not self.get("accounts"):
 			msgprint(_("'Entries' cannot be empty"), raise_exception=True)
 		else:
@@ -913,13 +850,7 @@ class JournalEntry(AccountsController):
 						blank_row = d
 
 				if not blank_row:
-					blank_row = self.append(
-						"accounts",
-						{
-							"account": difference_account,
-							"cost_center": erpnext.get_default_cost_center(self.company),
-						},
-					)
+					blank_row = self.append("accounts", {})
 
 				blank_row.exchange_rate = 1
 				if diff > 0:
@@ -1054,7 +985,7 @@ def get_default_bank_cash_account(company, account_type=None, mode_of_payment=No
 					account = account_list[0].name
 
 	if account:
-		account_details = frappe.get_cached_value(
+		account_details = frappe.db.get_value(
 			"Account", account, ["account_currency", "account_type"], as_dict=1
 		)
 
@@ -1183,7 +1114,7 @@ def get_payment_entry(ref_doc, args):
 			"party_type": args.get("party_type"),
 			"party": ref_doc.get(args.get("party_type").lower()),
 			"cost_center": cost_center,
-			"account_type": frappe.get_cached_value("Account", args.get("party_account"), "account_type"),
+			"account_type": frappe.db.get_value("Account", args.get("party_account"), "account_type"),
 			"account_currency": args.get("party_account_currency")
 			or get_account_currency(args.get("party_account")),
 			"balance": get_balance_on(args.get("party_account")),
@@ -1277,7 +1208,6 @@ def get_outstanding(args):
 		args = json.loads(args)
 
 	company_currency = erpnext.get_company_currency(args.get("company"))
-	due_date = None
 
 	if args.get("doctype") == "Journal Entry":
 		condition = " and party=%(party)s" if args.get("party") else ""
@@ -1302,12 +1232,10 @@ def get_outstanding(args):
 		invoice = frappe.db.get_value(
 			args["doctype"],
 			args["docname"],
-			["outstanding_amount", "conversion_rate", scrub(party_type), "due_date"],
+			["outstanding_amount", "conversion_rate", scrub(party_type)],
 			as_dict=1,
 		)
 
-		due_date = invoice.get("due_date")
-
 		exchange_rate = (
 			invoice.conversion_rate if (args.get("account_currency") != company_currency) else 1
 		)
@@ -1330,7 +1258,6 @@ def get_outstanding(args):
 			"exchange_rate": exchange_rate,
 			"party_type": party_type,
 			"party": invoice.get(scrub(party_type)),
-			"reference_due_date": due_date,
 		}
 
 
@@ -1350,7 +1277,7 @@ def get_party_account_and_balance(company, party_type, party, cost_center=None):
 		"account": account,
 		"balance": account_balance,
 		"party_balance": party_balance,
-		"account_currency": frappe.get_cached_value("Account", account, "account_currency"),
+		"account_currency": frappe.db.get_value("Account", account, "account_currency"),
 	}
 
 
@@ -1363,7 +1290,7 @@ def get_account_balance_and_party_type(
 		frappe.msgprint(_("No Permission"), raise_exception=1)
 
 	company_currency = erpnext.get_company_currency(company)
-	account_details = frappe.get_cached_value(
+	account_details = frappe.db.get_value(
 		"Account", account, ["account_type", "account_currency"], as_dict=1
 	)
 
@@ -1416,7 +1343,7 @@ def get_exchange_rate(
 ):
 	from erpnext.setup.utils import get_exchange_rate
 
-	account_details = frappe.get_cached_value(
+	account_details = frappe.db.get_value(
 		"Account", account, ["account_type", "root_type", "account_currency", "company"], as_dict=1
 	)
 

erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json

@@ -202,7 +202,6 @@
    "fieldname": "reference_type",
    "fieldtype": "Select",
    "label": "Reference Type",
-   "no_copy": 1,
    "options": "\nSales Invoice\nPurchase Invoice\nJournal Entry\nSales Order\nPurchase Order\nExpense Claim\nAsset\nLoan\nPayroll Entry\nEmployee Advance\nExchange Rate Revaluation\nInvoice Discounting\nFees\nFull and Final Statement"
   },
   {
@@ -210,15 +209,13 @@
    "fieldtype": "Dynamic Link",
    "in_list_view": 1,
    "label": "Reference Name",
-   "no_copy": 1,
    "options": "reference_type"
   },
   {
    "depends_on": "eval:doc.reference_type&&!in_list(doc.reference_type, ['Expense Claim', 'Asset', 'Employee Loan', 'Employee Advance'])",
    "fieldname": "reference_due_date",
-   "fieldtype": "Date",
-   "label": "Reference Due Date",
-   "no_copy": 1
+   "fieldtype": "Select",
+   "label": "Reference Due Date"
   },
   {
    "fieldname": "project",
@@ -277,22 +274,19 @@
    "fieldname": "reference_detail_no",
    "fieldtype": "Data",
    "hidden": 1,
-   "label": "Reference Detail No",
-   "no_copy": 1
+   "label": "Reference Detail No"
   }
  ],
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2022-10-26 20:03:10.906259",
+ "modified": "2021-08-30 21:27:32.200299",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Journal Entry Account",
- "naming_rule": "Random",
  "owner": "Administrator",
  "permissions": [],
  "sort_field": "modified",
  "sort_order": "DESC",
- "states": [],
  "track_changes": 1
 }

erpnext/accounts/doctype/journal_entry_template/journal_entry_template.js

@@ -45,6 +45,21 @@ frappe.ui.form.on("Journal Entry Template", {
 
 		frm.trigger("clear_child");
 		switch(frm.doc.voucher_type){
+			case "Opening Entry":
+				frm.set_value("is_opening", "Yes");
+				frappe.call({
+					type:"GET",
+					method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_opening_accounts",
+					args: {
+						"company": frm.doc.company
+					},
+					callback: function(r) {
+						if(r.message) {
+							add_accounts(frm.doc, r.message);
+						}
+					}
+				});
+				break;
 			case "Bank Entry":
 			case "Cash Entry":
 				frappe.call({

erpnext/accounts/doctype/ledger_merge/ledger_merge.py

@@ -4,20 +4,22 @@
 import frappe
 from frappe import _
 from frappe.model.document import Document
-from frappe.utils.background_jobs import is_job_queued
 
 from erpnext.accounts.doctype.account.account import merge_account
 
 
 class LedgerMerge(Document):
 	def start_merge(self):
+		from frappe.core.page.background_jobs.background_jobs import get_info
 		from frappe.utils.background_jobs import enqueue
 		from frappe.utils.scheduler import is_scheduler_inactive
 
 		if is_scheduler_inactive() and not frappe.flags.in_test:
 			frappe.throw(_("Scheduler is inactive. Cannot merge accounts."), title=_("Scheduler Inactive"))
 
-		if not is_job_queued(self.name):
+		enqueued_jobs = [d.get("job_name") for d in get_info()]
+
+		if self.name not in enqueued_jobs:
 			enqueue(
 				start_merge,
 				queue="default",

erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py

@@ -25,7 +25,7 @@ class ModeofPayment(Document):
 	def validate_accounts(self):
 		for entry in self.accounts:
 			"""Error when Company of Ledger account doesn't match with Company Selected"""
-			if frappe.get_cached_value("Account", entry.default_account, "company") != entry.company:
+			if frappe.db.get_value("Account", entry.default_account, "company") != entry.company:
 				frappe.throw(
 					_("Account {0} does not match with Company {1} in Mode of Account: {2}").format(
 						entry.default_account, entry.company, self.name

erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js

@@ -20,14 +20,15 @@ frappe.ui.form.on('Opening Invoice Creation Tool', {
 				frm.dashboard.reset();
 				frm.doc.import_in_progress = true;
 			}
+			if (data.user != frappe.session.user) return;
 			if (data.count == data.total) {
-				setTimeout(() => {
+				setTimeout((title) => {
 					frm.doc.import_in_progress = false;
 					frm.clear_table("invoices");
 					frm.refresh_fields();
 					frm.page.clear_indicator();
-					frm.dashboard.hide_progress();
-					frappe.msgprint(__("Opening {0} Invoices created", [frm.doc.invoice_type]));
+					frm.dashboard.hide_progress(title);
+					frappe.msgprint(__("Opening {0} Invoice created", [frm.doc.invoice_type]));
 				}, 1500, data.title);
 				return;
 			}
@@ -50,6 +51,13 @@ frappe.ui.form.on('Opening Invoice Creation Tool', {
 				method: "make_invoices",
 				freeze: 1,
 				freeze_message: __("Creating {0} Invoice", [frm.doc.invoice_type]),
+				callback: function(r) {
+					if (r.message.length == 1) {
+						frappe.msgprint(__("{0} Invoice created successfully.", [frm.doc.invoice_type]));
+					} else if (r.message.length < 50) {
+						frappe.msgprint(__("{0} Invoices created successfully.", [frm.doc.invoice_type]));
+					}
+				}
 			});
 		});
 

erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py

@@ -6,7 +6,7 @@ import frappe
 from frappe import _, scrub
 from frappe.model.document import Document
 from frappe.utils import flt, nowdate
-from frappe.utils.background_jobs import enqueue, is_job_queued
+from frappe.utils.background_jobs import enqueue
 
 from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import (
 	get_accounting_dimensions,
@@ -207,12 +207,14 @@ class OpeningInvoiceCreationTool(Document):
 		if len(invoices) < 50:
 			return start_import(invoices)
 		else:
+			from frappe.core.page.background_jobs.background_jobs import get_info
 			from frappe.utils.scheduler import is_scheduler_inactive
 
 			if is_scheduler_inactive() and not frappe.flags.in_test:
 				frappe.throw(_("Scheduler is inactive. Cannot import data."), title=_("Scheduler Inactive"))
 
-			if not is_job_queued(self.name):
+			enqueued_jobs = [d.get("job_name") for d in get_info()]
+			if self.name not in enqueued_jobs:
 				enqueue(
 					start_import,
 					queue="default",
@@ -255,15 +257,17 @@ def start_import(invoices):
 
 
 def publish(index, total, doctype):
+	if total < 50:
+		return
 	frappe.publish_realtime(
 		"opening_invoice_creation_progress",
 		dict(
 			title=_("Opening Invoice Creation In Progress"),
 			message=_("Creating {} out of {} {}").format(index + 1, total, doctype),
+			user=frappe.session.user,
 			count=index + 1,
 			total=total,
 		),
-		user=frappe.session.user,
 	)
 
 

erpnext/accounts/doctype/payment_entry/payment_entry.js

@@ -1091,7 +1091,7 @@ frappe.ui.form.on('Payment Entry', {
 
 			$.each(tax_fields, function(i, fieldname) { tax[fieldname] = 0.0; });
 
-			frm.doc.paid_amount_after_tax = frm.doc.base_paid_amount;
+			frm.doc.paid_amount_after_tax = frm.doc.paid_amount;
 		});
 	},
 
@@ -1182,7 +1182,7 @@ frappe.ui.form.on('Payment Entry', {
 			}
 
 			cumulated_tax_fraction += tax.tax_fraction_for_current_item;
-			frm.doc.paid_amount_after_tax = flt(frm.doc.base_paid_amount/(1+cumulated_tax_fraction))
+			frm.doc.paid_amount_after_tax = flt(frm.doc.paid_amount/(1+cumulated_tax_fraction))
 		});
 	},
 
@@ -1214,7 +1214,6 @@ frappe.ui.form.on('Payment Entry', {
 		frm.doc.total_taxes_and_charges = 0.0;
 		frm.doc.base_total_taxes_and_charges = 0.0;
 
-		let company_currency = frappe.get_doc(":Company", frm.doc.company).default_currency;
 		let actual_tax_dict = {};
 
 		// maintain actual tax rate based on idx
@@ -1235,8 +1234,8 @@ frappe.ui.form.on('Payment Entry', {
 				}
 			}
 
-			// tax accounts are only in company currency
-			tax.base_tax_amount = current_tax_amount;
+			tax.tax_amount = current_tax_amount;
+			tax.base_tax_amount = tax.tax_amount * frm.doc.source_exchange_rate;
 			current_tax_amount *= (tax.add_deduct_tax == "Deduct") ? -1.0 : 1.0;
 
 			if(i==0) {
@@ -1245,29 +1244,9 @@ frappe.ui.form.on('Payment Entry', {
 				tax.total = flt(frm.doc["taxes"][i-1].total + current_tax_amount, precision("total", tax));
 			}
 
-			// tac accounts are only in company currency
-			tax.base_total = tax.total
-
-			// calculate total taxes and base total taxes
-			if(frm.doc.payment_type == "Pay") {
-				// tax accounts only have company currency
-				if(tax.currency != frm.doc.paid_to_account_currency) {
-					//total_taxes_and_charges has the target currency. so using target conversion rate
-					frm.doc.total_taxes_and_charges += flt(current_tax_amount / frm.doc.target_exchange_rate);
-
-				} else {
-					frm.doc.total_taxes_and_charges += current_tax_amount;
-				}
-			} else if(frm.doc.payment_type == "Receive") {
-				if(tax.currency != frm.doc.paid_from_account_currency) {
-					//total_taxes_and_charges has the target currency. so using source conversion rate
-					frm.doc.total_taxes_and_charges += flt(current_tax_amount / frm.doc.source_exchange_rate);
-				} else {
-					frm.doc.total_taxes_and_charges += current_tax_amount;
-				}
-			}
-
-			frm.doc.base_total_taxes_and_charges += tax.base_tax_amount;
+			tax.base_total = tax.total * frm.doc.source_exchange_rate;
+			frm.doc.total_taxes_and_charges += current_tax_amount;
+			frm.doc.base_total_taxes_and_charges += current_tax_amount * frm.doc.source_exchange_rate;
 
 			frm.refresh_field('taxes');
 			frm.refresh_field('total_taxes_and_charges');

erpnext/accounts/doctype/payment_entry/payment_entry.json

@@ -239,7 +239,7 @@
    "depends_on": "paid_from",
    "fieldname": "paid_from_account_currency",
    "fieldtype": "Link",
-   "label": "Account Currency (From)",
+   "label": "Account Currency",
    "options": "Currency",
    "print_hide": 1,
    "read_only": 1,
@@ -249,7 +249,7 @@
    "depends_on": "paid_from",
    "fieldname": "paid_from_account_balance",
    "fieldtype": "Currency",
-   "label": "Account Balance (From)",
+   "label": "Account Balance",
    "options": "paid_from_account_currency",
    "print_hide": 1,
    "read_only": 1
@@ -272,7 +272,7 @@
    "depends_on": "paid_to",
    "fieldname": "paid_to_account_currency",
    "fieldtype": "Link",
-   "label": "Account Currency (To)",
+   "label": "Account Currency",
    "options": "Currency",
    "print_hide": 1,
    "read_only": 1,
@@ -282,7 +282,7 @@
    "depends_on": "paid_to",
    "fieldname": "paid_to_account_balance",
    "fieldtype": "Currency",
-   "label": "Account Balance (To)",
+   "label": "Account Balance",
    "options": "paid_to_account_currency",
    "print_hide": 1,
    "read_only": 1
@@ -304,8 +304,7 @@
   {
    "fieldname": "source_exchange_rate",
    "fieldtype": "Float",
-   "label": "Source Exchange Rate",
-   "precision": "9",
+   "label": "Exchange Rate",
    "print_hide": 1,
    "reqd": 1
   },
@@ -334,8 +333,7 @@
   {
    "fieldname": "target_exchange_rate",
    "fieldtype": "Float",
-   "label": "Target Exchange Rate",
-   "precision": "9",
+   "label": "Exchange Rate",
    "print_hide": 1,
    "reqd": 1
   },
@@ -633,14 +631,14 @@
    "depends_on": "eval:doc.party_type == 'Supplier'",
    "fieldname": "purchase_taxes_and_charges_template",
    "fieldtype": "Link",
-   "label": "Purchase Taxes and Charges Template",
+   "label": "Taxes and Charges Template",
    "options": "Purchase Taxes and Charges Template"
   },
   {
    "depends_on": "eval: doc.party_type == 'Customer'",
    "fieldname": "sales_taxes_and_charges_template",
    "fieldtype": "Link",
-   "label": "Sales Taxes and Charges Template",
+   "label": "Taxes and Charges Template",
    "options": "Sales Taxes and Charges Template"
   },
   {
@@ -733,7 +731,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2023-02-14 04:52:30.478523",
+ "modified": "2022-02-23 20:08:39.559814",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Entry",

erpnext/accounts/doctype/payment_entry/payment_entry.py

@@ -62,6 +62,7 @@ class PaymentEntry(AccountsController):
 		self.set_missing_values()
 		self.validate_payment_type()
 		self.validate_party_details()
+		self.validate_bank_accounts()
 		self.set_exchange_rate()
 		self.validate_mandatory()
 		self.validate_reference_documents()
@@ -242,12 +243,29 @@ class PaymentEntry(AccountsController):
 			if not frappe.db.exists(self.party_type, self.party):
 				frappe.throw(_("Invalid {0}: {1}").format(self.party_type, self.party))
 
+			if self.party_account and self.party_type in ("Customer", "Supplier"):
+				self.validate_account_type(
+					self.party_account, [erpnext.get_party_account_type(self.party_type)]
+				)
+
+	def validate_bank_accounts(self):
+		if self.payment_type in ("Pay", "Internal Transfer"):
+			self.validate_account_type(self.paid_from, ["Bank", "Cash"])
+
+		if self.payment_type in ("Receive", "Internal Transfer"):
+			self.validate_account_type(self.paid_to, ["Bank", "Cash"])
+
+	def validate_account_type(self, account, account_types):
+		account_type = frappe.db.get_value("Account", account, "account_type")
+		# if account_type not in account_types:
+		# 	frappe.throw(_("Account Type for {0} must be {1}").format(account, comma_or(account_types)))
+
 	def set_exchange_rate(self, ref_doc=None):
 		self.set_source_exchange_rate(ref_doc)
 		self.set_target_exchange_rate(ref_doc)
 
 	def set_source_exchange_rate(self, ref_doc=None):
-		if self.paid_from:
+		if self.paid_from and not self.source_exchange_rate:
 			if self.paid_from_account_currency == self.company_currency:
 				self.source_exchange_rate = 1
 			else:
@@ -622,7 +640,7 @@ class PaymentEntry(AccountsController):
 				self.payment_type == "Receive"
 				and self.base_total_allocated_amount < self.base_received_amount + total_deductions
 				and self.total_allocated_amount
-				< flt(self.paid_amount) + (total_deductions / self.source_exchange_rate)
+				< self.paid_amount + (total_deductions / self.source_exchange_rate)
 			):
 				self.unallocated_amount = (
 					self.base_received_amount + total_deductions - self.base_total_allocated_amount
@@ -632,7 +650,7 @@ class PaymentEntry(AccountsController):
 				self.payment_type == "Pay"
 				and self.base_total_allocated_amount < (self.base_paid_amount - total_deductions)
 				and self.total_allocated_amount
-				< flt(self.received_amount) + (total_deductions / self.target_exchange_rate)
+				< self.received_amount + (total_deductions / self.target_exchange_rate)
 			):
 				self.unallocated_amount = (
 					self.base_paid_amount - (total_deductions + self.base_total_allocated_amount)
@@ -684,34 +702,35 @@ class PaymentEntry(AccountsController):
 		)
 
 	def validate_payment_against_negative_invoice(self):
-		if (self.payment_type != "Pay" or self.party_type != "Customer") and (
-			self.payment_type != "Receive" or self.party_type != "Supplier"
+		if (self.payment_type == "Pay" and self.party_type == "Customer") or (
+			self.payment_type == "Receive" and self.party_type == "Supplier"
 		):
-			return
 
-		total_negative_outstanding = sum(
-			abs(flt(d.outstanding_amount)) for d in self.get("references") if flt(d.outstanding_amount) < 0
-		)
-
-		paid_amount = self.paid_amount if self.payment_type == "Receive" else self.received_amount
-		additional_charges = sum(flt(d.amount) for d in self.deductions)
-
-		if not total_negative_outstanding:
-			if self.party_type == "Customer":
-				msg = _("Cannot pay to Customer without any negative outstanding invoice")
-			else:
-				msg = _("Cannot receive from Supplier without any negative outstanding invoice")
-
-			frappe.throw(msg, InvalidPaymentEntry)
-
-		elif paid_amount - additional_charges > total_negative_outstanding:
-			frappe.throw(
-				_("Paid Amount cannot be greater than total negative outstanding amount {0}").format(
-					total_negative_outstanding
-				),
-				InvalidPaymentEntry,
+			total_negative_outstanding = sum(
+				abs(flt(d.outstanding_amount)) for d in self.get("references") if flt(d.outstanding_amount) < 0
 			)
 
+			paid_amount = self.paid_amount if self.payment_type == "Receive" else self.received_amount
+			additional_charges = sum([flt(d.amount) for d in self.deductions])
+
+			if not total_negative_outstanding:
+				frappe.throw(
+					_("Cannot {0} {1} {2} without any negative outstanding invoice").format(
+						_(self.payment_type),
+						(_("to") if self.party_type == "Customer" else _("from")),
+						self.party_type,
+					),
+					InvalidPaymentEntry,
+				)
+
+			elif paid_amount - additional_charges > total_negative_outstanding:
+				frappe.throw(
+					_("Paid Amount cannot be greater than total negative outstanding amount {0}").format(
+						total_negative_outstanding
+					),
+					InvalidPaymentEntry,
+				)
+
 	def set_title(self):
 		if frappe.flags.in_import and self.title:
 			# do not set title dynamically if title exists during data import.
@@ -724,7 +743,7 @@ class PaymentEntry(AccountsController):
 
 	def validate_transaction_reference(self):
 		bank_account = self.paid_to if self.payment_type == "Receive" else self.paid_from
-		bank_account_type = frappe.get_cached_value("Account", bank_account, "account_type")
+		bank_account_type = frappe.db.get_value("Account", bank_account, "account_type")
 
 		if bank_account_type == "Bank":
 			if not self.reference_no or not self.reference_date:
@@ -921,13 +940,6 @@ class PaymentEntry(AccountsController):
 			)
 
 			if not d.included_in_paid_amount:
-				if get_account_currency(payment_account) != self.company_currency:
-					if self.payment_type == "Receive":
-						exchange_rate = self.target_exchange_rate
-					elif self.payment_type in ["Pay", "Internal Transfer"]:
-						exchange_rate = self.source_exchange_rate
-					base_tax_amount = flt((tax_amount / exchange_rate), self.precision("paid_amount"))
-
 				gl_entries.append(
 					self.get_gl_dict(
 						{
@@ -976,9 +988,7 @@ class PaymentEntry(AccountsController):
 		if self.payment_type in ("Receive", "Pay") and self.party:
 			for d in self.get("references"):
 				if d.allocated_amount and d.reference_doctype in frappe.get_hooks("advance_payment_doctypes"):
-					frappe.get_doc(
-						d.reference_doctype, d.reference_name, for_update=True
-					).set_total_advance_paid()
+					frappe.get_doc(d.reference_doctype, d.reference_name).set_total_advance_paid()
 
 	def on_recurring(self, reference_doc, auto_repeat_doc):
 		self.reference_no = reference_doc.name
@@ -1023,7 +1033,7 @@ class PaymentEntry(AccountsController):
 			for fieldname in tax_fields:
 				tax.set(fieldname, 0.0)
 
-		self.paid_amount_after_tax = self.base_paid_amount
+		self.paid_amount_after_tax = self.paid_amount
 
 	def determine_exclusive_rate(self):
 		if not any(cint(tax.included_in_paid_amount) for tax in self.get("taxes")):
@@ -1042,7 +1052,7 @@ class PaymentEntry(AccountsController):
 
 			cumulated_tax_fraction += tax.tax_fraction_for_current_item
 
-		self.paid_amount_after_tax = flt(self.base_paid_amount / (1 + cumulated_tax_fraction))
+		self.paid_amount_after_tax = flt(self.paid_amount / (1 + cumulated_tax_fraction))
 
 	def calculate_taxes(self):
 		self.total_taxes_and_charges = 0.0
@@ -1065,7 +1075,7 @@ class PaymentEntry(AccountsController):
 					current_tax_amount += actual_tax_dict[tax.idx]
 
 			tax.tax_amount = current_tax_amount
-			tax.base_tax_amount = current_tax_amount
+			tax.base_tax_amount = tax.tax_amount * self.source_exchange_rate
 
 			if tax.add_deduct_tax == "Deduct":
 				current_tax_amount *= -1.0
@@ -1079,20 +1089,14 @@ class PaymentEntry(AccountsController):
 					self.get("taxes")[i - 1].total + current_tax_amount, self.precision("total", tax)
 				)
 
-			tax.base_total = tax.total
+			tax.base_total = tax.total * self.source_exchange_rate
 
 			if self.payment_type == "Pay":
-				if tax.currency != self.paid_to_account_currency:
-					self.total_taxes_and_charges += flt(current_tax_amount / self.target_exchange_rate)
-				else:
-					self.total_taxes_and_charges += current_tax_amount
-			elif self.payment_type == "Receive":
-				if tax.currency != self.paid_from_account_currency:
-					self.total_taxes_and_charges += flt(current_tax_amount / self.source_exchange_rate)
-				else:
-					self.total_taxes_and_charges += current_tax_amount
-
-			self.base_total_taxes_and_charges += tax.base_tax_amount
+				self.base_total_taxes_and_charges += flt(current_tax_amount / self.source_exchange_rate)
+				self.total_taxes_and_charges += flt(current_tax_amount / self.target_exchange_rate)
+			else:
+				self.base_total_taxes_and_charges += flt(current_tax_amount / self.target_exchange_rate)
+				self.total_taxes_and_charges += flt(current_tax_amount / self.source_exchange_rate)
 
 		if self.get("taxes"):
 			self.paid_amount_after_tax = self.get("taxes")[-1].base_total
@@ -1187,7 +1191,6 @@ def get_outstanding_reference_documents(args):
 
 	ple = qb.DocType("Payment Ledger Entry")
 	common_filter = []
-	accounting_dimensions_filter = []
 	posting_and_due_date = []
 
 	# confirm that Supplier is not blocked
@@ -1217,7 +1220,7 @@ def get_outstanding_reference_documents(args):
 	# Add cost center condition
 	if args.get("cost_center"):
 		condition += " and cost_center='%s'" % args.get("cost_center")
-		accounting_dimensions_filter.append(ple.cost_center == args.get("cost_center"))
+		common_filter.append(ple.cost_center == args.get("cost_center"))
 
 	date_fields_dict = {
 		"posting_date": ["from_posting_date", "to_posting_date"],
@@ -1243,7 +1246,6 @@ def get_outstanding_reference_documents(args):
 		posting_date=posting_and_due_date,
 		min_outstanding=args.get("outstanding_amt_greater_than"),
 		max_outstanding=args.get("outstanding_amt_less_than"),
-		accounting_dimensions=accounting_dimensions_filter,
 	)
 
 	outstanding_invoices = split_invoices_based_on_payment_terms(outstanding_invoices)
@@ -1304,7 +1306,7 @@ def split_invoices_based_on_payment_terms(outstanding_invoices):
 				d.voucher_type, d.voucher_no, "payment_terms_template"
 			)
 			if payment_term_template:
-				allocate_payment_based_on_payment_terms = frappe.get_cached_value(
+				allocate_payment_based_on_payment_terms = frappe.db.get_value(
 					"Payment Terms Template", payment_term_template, "allocate_payment_based_on_payment_terms"
 				)
 				if allocate_payment_based_on_payment_terms:
@@ -1536,7 +1538,7 @@ def get_account_details(account, date, cost_center=None):
 		{
 			"account_currency": get_account_currency(account),
 			"account_balance": account_balance,
-			"account_type": frappe.get_cached_value("Account", account, "account_type"),
+			"account_type": frappe.db.get_value("Account", account, "account_type"),
 		}
 	)
 
@@ -1640,7 +1642,7 @@ def get_payment_entry(
 ):
 	reference_doc = None
 	doc = frappe.get_doc(dt, dn)
-	if dt in ("Sales Order", "Purchase Order") and flt(doc.per_billed, 2) >= 99.99:
+	if dt in ("Sales Order", "Purchase Order") and flt(doc.per_billed, 2) > 0:
 		frappe.throw(_("Can only make payment against unbilled {0}").format(dt))
 
 	if not party_type:
@@ -1705,9 +1707,9 @@ def get_payment_entry(
 	if doc.doctype == "Purchase Invoice" and doc.invoice_is_blocked():
 		frappe.msgprint(_("{0} is on hold till {1}").format(doc.name, doc.release_date))
 	else:
-		if doc.doctype in ("Sales Invoice", "Purchase Invoice") and frappe.get_cached_value(
+		if doc.doctype in ("Sales Invoice", "Purchase Invoice") and frappe.get_value(
 			"Payment Terms Template",
-			doc.payment_terms_template,
+			{"name": doc.payment_terms_template},
 			"allocate_payment_based_on_payment_terms",
 		):
 
@@ -1758,8 +1760,6 @@ def get_payment_entry(
 	pe.setup_party_account_field()
 	pe.set_missing_values()
 
-	update_accounting_dimensions(pe, doc)
-
 	if party_account and bank:
 		pe.set_exchange_rate(ref_doc=reference_doc)
 		pe.set_amounts()
@@ -1777,18 +1777,6 @@ def get_payment_entry(
 	return pe
 
 
-def update_accounting_dimensions(pe, doc):
-	"""
-	Updates accounting dimensions in Payment Entry based on the accounting dimensions in the reference document
-	"""
-	from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import (
-		get_accounting_dimensions,
-	)
-
-	for dimension in get_accounting_dimensions():
-		pe.set(dimension, doc.get(dimension))
-
-
 def get_bank_cash_account(doc, bank_account):
 	bank = get_default_bank_cash_account(
 		doc.company, "Bank", mode_of_payment=doc.get("mode_of_payment"), account=bank_account

erpnext/accounts/doctype/payment_entry/test_payment_entry.py

@@ -4,7 +4,6 @@
 import unittest
 
 import frappe
-from frappe import qb
 from frappe.tests.utils import FrappeTestCase
 from frappe.utils import flt, nowdate
 
@@ -723,46 +722,6 @@ class TestPaymentEntry(FrappeTestCase):
 			flt(payment_entry.total_taxes_and_charges, 2), flt(10 / payment_entry.target_exchange_rate, 2)
 		)
 
-	def test_gl_of_multi_currency_payment_with_taxes(self):
-		payment_entry = create_payment_entry(
-			party="_Test Supplier USD", paid_to="_Test Payable USD - _TC", save=True
-		)
-		payment_entry.append(
-			"taxes",
-			{
-				"account_head": "_Test Account Service Tax - _TC",
-				"charge_type": "Actual",
-				"tax_amount": 100,
-				"add_deduct_tax": "Add",
-				"description": "Test",
-			},
-		)
-		payment_entry.target_exchange_rate = 80
-		payment_entry.received_amount = 12.5
-		payment_entry = payment_entry.submit()
-		gle = qb.DocType("GL Entry")
-		gl_entries = (
-			qb.from_(gle)
-			.select(
-				gle.account,
-				gle.debit,
-				gle.credit,
-				gle.debit_in_account_currency,
-				gle.credit_in_account_currency,
-			)
-			.orderby(gle.account)
-			.where(gle.voucher_no == payment_entry.name)
-			.run()
-		)
-
-		expected_gl_entries = (
-			("_Test Account Service Tax - _TC", 100.0, 0.0, 100.0, 0.0),
-			("_Test Bank - _TC", 0.0, 1100.0, 0.0, 1100.0),
-			("_Test Payable USD - _TC", 1000.0, 0.0, 12.5, 0),
-		)
-
-		self.assertEqual(gl_entries, expected_gl_entries)
-
 	def test_payment_entry_against_onhold_purchase_invoice(self):
 		pi = make_purchase_invoice()
 

erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json

@@ -25,8 +25,7 @@
    "in_list_view": 1,
    "label": "Type",
    "options": "DocType",
-   "reqd": 1,
-   "search_index": 1
+   "reqd": 1
   },
   {
    "columns": 2,
@@ -36,8 +35,7 @@
    "in_list_view": 1,
    "label": "Name",
    "options": "reference_doctype",
-   "reqd": 1,
-   "search_index": 1
+   "reqd": 1
   },
   {
    "fieldname": "due_date",
@@ -106,7 +104,7 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2022-12-12 12:31:44.919895",
+ "modified": "2021-09-26 17:06:55.597389",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Entry Reference",
@@ -115,6 +113,5 @@
  "quick_entry": 1,
  "sort_field": "modified",
  "sort_order": "DESC",
- "states": [],
  "track_changes": 1
 }

erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.js

@@ -3,7 +3,6 @@
 
 frappe.ui.form.on('Payment Gateway Account', {
 	refresh(frm) {
-		erpnext.utils.check_payments_app();
 		if(!frm.doc.__islocal) {
 			frm.set_df_property('payment_gateway', 'read_only', 1);
 		}

erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.py

@@ -11,7 +11,7 @@ class PaymentGatewayAccount(Document):
 		self.name = self.payment_gateway + " - " + self.currency
 
 	def validate(self):
-		self.currency = frappe.get_cached_value("Account", self.payment_account, "account_currency")
+		self.currency = frappe.db.get_value("Account", self.payment_account, "account_currency")
 
 		self.update_default_payment_gateway()
 		self.set_as_default_if_not_set()

erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py

@@ -97,7 +97,7 @@ class PaymentLedgerEntry(Document):
 						)
 
 	def validate_dimensions_for_pl_and_bs(self):
-		account_type = frappe.get_cached_value("Account", self.account, "report_type")
+		account_type = frappe.db.get_value("Account", self.account, "report_type")
 
 		for dimension in get_checks_for_pl_and_bs_accounts():
 			if (

erpnext/accounts/doctype/payment_ledger_entry/test_payment_ledger_entry.py

@@ -3,13 +3,12 @@
 
 import frappe
 from frappe import qb
-from frappe.tests.utils import FrappeTestCase, change_settings
+from frappe.tests.utils import FrappeTestCase
 from frappe.utils import nowdate
 
 from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry
 from erpnext.accounts.doctype.payment_entry.test_payment_entry import create_payment_entry
 from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
-from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
 from erpnext.stock.doctype.item.test_item import create_item
 
 
@@ -128,25 +127,6 @@ class TestPaymentLedgerEntry(FrappeTestCase):
 		payment.posting_date = posting_date
 		return payment
 
-	def create_sales_order(
-		self, qty=1, rate=100, posting_date=nowdate(), do_not_save=False, do_not_submit=False
-	):
-		so = make_sales_order(
-			company=self.company,
-			transaction_date=posting_date,
-			customer=self.customer,
-			item_code=self.item,
-			cost_center=self.cost_center,
-			warehouse=self.warehouse,
-			debit_to=self.debit_to,
-			currency="INR",
-			qty=qty,
-			rate=100,
-			do_not_save=do_not_save,
-			do_not_submit=do_not_submit,
-		)
-		return so
-
 	def clear_old_entries(self):
 		doctype_list = [
 			"GL Entry",
@@ -426,89 +406,3 @@ class TestPaymentLedgerEntry(FrappeTestCase):
 		]
 		self.assertEqual(pl_entries_for_crnote[0], expected_values[0])
 		self.assertEqual(pl_entries_for_crnote[1], expected_values[1])
-
-	@change_settings(
-		"Accounts Settings",
-		{"unlink_payment_on_cancellation_of_invoice": 1, "delete_linked_ledger_entries": 1},
-	)
-	def test_multi_payment_unlink_on_invoice_cancellation(self):
-		transaction_date = nowdate()
-		amount = 100
-		si = self.create_sales_invoice(qty=1, rate=amount, posting_date=transaction_date)
-
-		for amt in [40, 40, 20]:
-			# payment 1
-			pe = get_payment_entry(si.doctype, si.name)
-			pe.paid_amount = amt
-			pe.get("references")[0].allocated_amount = amt
-			pe = pe.save().submit()
-
-		si.reload()
-		si.cancel()
-
-		entries = frappe.db.get_list(
-			"Payment Ledger Entry",
-			filters={"against_voucher_type": si.doctype, "against_voucher_no": si.name, "delinked": 0},
-		)
-		self.assertEqual(entries, [])
-
-		# with references removed, deletion should be possible
-		si.delete()
-		self.assertRaises(frappe.DoesNotExistError, frappe.get_doc, si.doctype, si.name)
-
-	@change_settings(
-		"Accounts Settings",
-		{"unlink_payment_on_cancellation_of_invoice": 1, "delete_linked_ledger_entries": 1},
-	)
-	def test_multi_je_unlink_on_invoice_cancellation(self):
-		transaction_date = nowdate()
-		amount = 100
-		si = self.create_sales_invoice(qty=1, rate=amount, posting_date=transaction_date)
-
-		# multiple JE's against invoice
-		for amt in [40, 40, 20]:
-			je1 = self.create_journal_entry(
-				self.income_account, self.debit_to, amt, posting_date=transaction_date
-			)
-			je1.get("accounts")[1].party_type = "Customer"
-			je1.get("accounts")[1].party = self.customer
-			je1.get("accounts")[1].reference_type = si.doctype
-			je1.get("accounts")[1].reference_name = si.name
-			je1 = je1.save().submit()
-
-		si.reload()
-		si.cancel()
-
-		entries = frappe.db.get_list(
-			"Payment Ledger Entry",
-			filters={"against_voucher_type": si.doctype, "against_voucher_no": si.name, "delinked": 0},
-		)
-		self.assertEqual(entries, [])
-
-		# with references removed, deletion should be possible
-		si.delete()
-		self.assertRaises(frappe.DoesNotExistError, frappe.get_doc, si.doctype, si.name)
-
-	@change_settings(
-		"Accounts Settings",
-		{"unlink_payment_on_cancellation_of_invoice": 1, "delete_linked_ledger_entries": 1},
-	)
-	def test_advance_payment_unlink_on_order_cancellation(self):
-		transaction_date = nowdate()
-		amount = 100
-		so = self.create_sales_order(qty=1, rate=amount, posting_date=transaction_date).save().submit()
-
-		pe = get_payment_entry(so.doctype, so.name).save().submit()
-
-		so.reload()
-		so.cancel()
-
-		entries = frappe.db.get_list(
-			"Payment Ledger Entry",
-			filters={"against_voucher_type": so.doctype, "against_voucher_no": so.name, "delinked": 0},
-		)
-		self.assertEqual(entries, [])
-
-		# with references removed, deletion should be possible
-		so.delete()
-		self.assertRaises(frappe.DoesNotExistError, frappe.get_doc, so.doctype, so.name)

erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js

@@ -170,7 +170,7 @@ erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationCo
 	}
 
 	reconcile() {
-		var show_dialog = this.frm.doc.allocation.filter(d => d.difference_amount);
+		var show_dialog = this.frm.doc.allocation.filter(d => d.difference_amount && !d.difference_account);
 
 		if (show_dialog && show_dialog.length) {
 
@@ -179,12 +179,8 @@ erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationCo
 				title: __("Select Difference Account"),
 				fields: [
 					{
-						fieldname: "allocation",
-						fieldtype: "Table",
-						label: __("Allocation"),
-						data: this.data,
-						in_place_edit: true,
-						cannot_add_rows: true,
+						fieldname: "allocation", fieldtype: "Table", label: __("Allocation"),
+						data: this.data, in_place_edit: true,
 						get_data: () => {
 							return this.data;
 						},
@@ -222,10 +218,6 @@ erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationCo
 							read_only: 1
 						}]
 					},
-					{
-						fieldtype: 'HTML',
-						options: "<b> New Journal Entry will be posted for the difference amount </b>"
-					}
 				],
 				primary_action: () => {
 					const args = dialog.get_values()["allocation"];
@@ -242,7 +234,7 @@ erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationCo
 			});
 
 			this.frm.doc.allocation.forEach(d => {
-				if (d.difference_amount) {
+				if (d.difference_amount && !d.difference_account) {
 					dialog.fields_dict.allocation.df.data.push({
 						'docname': d.name,
 						'reference_name': d.reference_name,

erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py

@@ -22,7 +22,6 @@ class PaymentReconciliation(Document):
 	def __init__(self, *args, **kwargs):
 		super(PaymentReconciliation, self).__init__(*args, **kwargs)
 		self.common_filter_conditions = []
-		self.accounting_dimension_filter_conditions = []
 		self.ple_posting_date_filter = []
 
 	@frappe.whitelist()
@@ -69,10 +68,6 @@ class PaymentReconciliation(Document):
 
 	def get_jv_entries(self):
 		condition = self.get_conditions()
-
-		if self.get("cost_center"):
-			condition += f" and t2.cost_center = '{self.cost_center}' "
-
 		dr_or_cr = (
 			"credit_in_account_currency"
 			if erpnext.get_party_account_type(self.party_type) == "Receivable"
@@ -83,13 +78,12 @@ class PaymentReconciliation(Document):
 			"t2.against_account like %(bank_cash_account)s" if self.bank_cash_account else "1=1"
 		)
 
-		# nosemgrep
 		journal_entries = frappe.db.sql(
 			"""
 			select
 				"Journal Entry" as reference_type, t1.name as reference_name,
 				t1.posting_date, t1.remark as remarks, t2.name as reference_row,
-				{dr_or_cr} as amount, t2.is_advance, t2.exchange_rate,
+				{dr_or_cr} as amount, t2.is_advance,
 				t2.account_currency as currency
 			from
 				`tabJournal Entry` t1, `tabJournal Entry Account` t2
@@ -198,7 +192,6 @@ class PaymentReconciliation(Document):
 			posting_date=self.ple_posting_date_filter,
 			min_outstanding=self.minimum_invoice_amount if self.minimum_invoice_amount else None,
 			max_outstanding=self.maximum_invoice_amount if self.maximum_invoice_amount else None,
-			accounting_dimensions=self.accounting_dimension_filter_conditions,
 		)
 
 		if self.invoice_limit:
@@ -219,26 +212,9 @@ class PaymentReconciliation(Document):
 			inv.currency = entry.get("currency")
 			inv.outstanding_amount = flt(entry.get("outstanding_amount"))
 
-	def get_difference_amount(self, payment_entry, invoice, allocated_amount):
-		difference_amount = 0
-		if invoice.get("exchange_rate") and payment_entry.get("exchange_rate", 1) != invoice.get(
-			"exchange_rate", 1
-		):
-			allocated_amount_in_ref_rate = payment_entry.get("exchange_rate", 1) * allocated_amount
-			allocated_amount_in_inv_rate = invoice.get("exchange_rate", 1) * allocated_amount
-			difference_amount = allocated_amount_in_ref_rate - allocated_amount_in_inv_rate
-
-		return difference_amount
-
 	@frappe.whitelist()
 	def allocate_entries(self, args):
 		self.validate_entries()
-
-		invoice_exchange_map = self.get_invoice_exchange_map(args.get("invoices"), args.get("payments"))
-		default_exchange_gain_loss_account = frappe.get_cached_value(
-			"Company", self.company, "exchange_gain_loss_account"
-		)
-
 		entries = []
 		for pay in args.get("payments"):
 			pay.update({"unreconciled_amount": pay.get("amount")})
@@ -251,22 +227,12 @@ class PaymentReconciliation(Document):
 					res = self.get_allocated_entry(pay, inv, pay["amount"])
 					inv["outstanding_amount"] = flt(inv.get("outstanding_amount")) - flt(pay.get("amount"))
 					pay["amount"] = 0
-
-				inv["exchange_rate"] = invoice_exchange_map.get(inv.get("invoice_number"))
-				if pay.get("reference_type") in ["Sales Invoice", "Purchase Invoice"]:
-					pay["exchange_rate"] = invoice_exchange_map.get(pay.get("reference_name"))
-
-				res.difference_amount = self.get_difference_amount(pay, inv, res["allocated_amount"])
-				res.difference_account = default_exchange_gain_loss_account
-				res.exchange_rate = inv.get("exchange_rate")
-
 				if pay.get("amount") == 0:
 					entries.append(res)
 					break
 				elif inv.get("outstanding_amount") == 0:
 					entries.append(res)
 					continue
-
 			else:
 				break
 
@@ -288,7 +254,6 @@ class PaymentReconciliation(Document):
 				"amount": pay.get("amount"),
 				"allocated_amount": allocated_amount,
 				"difference_amount": pay.get("difference_amount"),
-				"currency": inv.get("currency"),
 			}
 		)
 
@@ -311,11 +276,7 @@ class PaymentReconciliation(Document):
 				else:
 					reconciled_entry = entry_list
 
-				payment_details = self.get_payment_details(row, dr_or_cr)
-				reconciled_entry.append(payment_details)
-
-				if payment_details.difference_amount:
-					self.make_difference_entry(payment_details)
+				reconciled_entry.append(self.get_payment_details(row, dr_or_cr))
 
 		if entry_list:
 			reconcile_against_document(entry_list)
@@ -326,56 +287,6 @@ class PaymentReconciliation(Document):
 		msgprint(_("Successfully Reconciled"))
 		self.get_unreconciled_entries()
 
-	def make_difference_entry(self, row):
-		journal_entry = frappe.new_doc("Journal Entry")
-		journal_entry.voucher_type = "Exchange Gain Or Loss"
-		journal_entry.company = self.company
-		journal_entry.posting_date = nowdate()
-		journal_entry.multi_currency = 1
-
-		party_account_currency = frappe.get_cached_value(
-			"Account", self.receivable_payable_account, "account_currency"
-		)
-		difference_account_currency = frappe.get_cached_value(
-			"Account", row.difference_account, "account_currency"
-		)
-
-		# Account Currency has balance
-		dr_or_cr = "debit" if self.party_type == "Customer" else "credit"
-		reverse_dr_or_cr = "debit" if dr_or_cr == "credit" else "credit"
-
-		journal_account = frappe._dict(
-			{
-				"account": self.receivable_payable_account,
-				"party_type": self.party_type,
-				"party": self.party,
-				"account_currency": party_account_currency,
-				"exchange_rate": 0,
-				"cost_center": erpnext.get_default_cost_center(self.company),
-				"reference_type": row.against_voucher_type,
-				"reference_name": row.against_voucher,
-				dr_or_cr: flt(row.difference_amount),
-				dr_or_cr + "_in_account_currency": 0,
-			}
-		)
-
-		journal_entry.append("accounts", journal_account)
-
-		journal_account = frappe._dict(
-			{
-				"account": row.difference_account,
-				"account_currency": difference_account_currency,
-				"exchange_rate": 1,
-				"cost_center": erpnext.get_default_cost_center(self.company),
-				reverse_dr_or_cr + "_in_account_currency": flt(row.difference_amount),
-			}
-		)
-
-		journal_entry.append("accounts", journal_account)
-
-		journal_entry.save()
-		journal_entry.submit()
-
 	def get_payment_details(self, row, dr_or_cr):
 		return frappe._dict(
 			{
@@ -385,7 +296,6 @@ class PaymentReconciliation(Document):
 				"against_voucher_type": row.get("invoice_type"),
 				"against_voucher": row.get("invoice_number"),
 				"account": self.receivable_payable_account,
-				"exchange_rate": row.get("exchange_rate"),
 				"party_type": self.party_type,
 				"party": self.party,
 				"is_advance": row.get("is_advance"),
@@ -410,49 +320,6 @@ class PaymentReconciliation(Document):
 		if not self.get("payments"):
 			frappe.throw(_("No records found in the Payments table"))
 
-	def get_invoice_exchange_map(self, invoices, payments):
-		sales_invoices = [
-			d.get("invoice_number") for d in invoices if d.get("invoice_type") == "Sales Invoice"
-		]
-
-		sales_invoices.extend(
-			[d.get("reference_name") for d in payments if d.get("reference_type") == "Sales Invoice"]
-		)
-		purchase_invoices = [
-			d.get("invoice_number") for d in invoices if d.get("invoice_type") == "Purchase Invoice"
-		]
-		purchase_invoices.extend(
-			[d.get("reference_name") for d in payments if d.get("reference_type") == "Purchase Invoice"]
-		)
-
-		invoice_exchange_map = frappe._dict()
-
-		if sales_invoices:
-			sales_invoice_map = frappe._dict(
-				frappe.db.get_all(
-					"Sales Invoice",
-					filters={"name": ("in", sales_invoices)},
-					fields=["name", "conversion_rate"],
-					as_list=1,
-				)
-			)
-
-			invoice_exchange_map.update(sales_invoice_map)
-
-		if purchase_invoices:
-			purchase_invoice_map = frappe._dict(
-				frappe.db.get_all(
-					"Purchase Invoice",
-					filters={"name": ("in", purchase_invoices)},
-					fields=["name", "conversion_rate"],
-					as_list=1,
-				)
-			)
-
-			invoice_exchange_map.update(purchase_invoice_map)
-
-		return invoice_exchange_map
-
 	def validate_allocation(self):
 		unreconciled_invoices = frappe._dict()
 
@@ -486,14 +353,13 @@ class PaymentReconciliation(Document):
 
 	def build_qb_filter_conditions(self, get_invoices=False, get_return_invoices=False):
 		self.common_filter_conditions.clear()
-		self.accounting_dimension_filter_conditions.clear()
 		self.ple_posting_date_filter.clear()
 		ple = qb.DocType("Payment Ledger Entry")
 
 		self.common_filter_conditions.append(ple.company == self.company)
 
 		if self.get("cost_center") and (get_invoices or get_return_invoices):
-			self.accounting_dimension_filter_conditions.append(ple.cost_center == self.cost_center)
+			self.common_filter_conditions.append(ple.cost_center == self.cost_center)
 
 		if get_invoices:
 			if self.from_invoice_date:

erpnext/accounts/doctype/payment_reconciliation/test_payment_reconciliation.py

@@ -6,10 +6,8 @@ import unittest
 import frappe
 from frappe import qb
 from frappe.tests.utils import FrappeTestCase
-from frappe.utils import add_days, flt, nowdate
+from frappe.utils import add_days, nowdate
 
-from erpnext import get_default_cost_center
-from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry
 from erpnext.accounts.doctype.payment_entry.test_payment_entry import create_payment_entry
 from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
 from erpnext.accounts.party import get_party_account
@@ -22,7 +20,6 @@ class TestPaymentReconciliation(FrappeTestCase):
 		self.create_item()
 		self.create_customer()
 		self.create_account()
-		self.create_cost_center()
 		self.clear_old_entries()
 
 	def tearDown(self):
@@ -75,11 +72,33 @@ class TestPaymentReconciliation(FrappeTestCase):
 		self.item = item if isinstance(item, str) else item.item_code
 
 	def create_customer(self):
-		self.customer = make_customer("_Test PR Customer")
-		self.customer2 = make_customer("_Test PR Customer 2")
-		self.customer3 = make_customer("_Test PR Customer 3", "EUR")
-		self.customer4 = make_customer("_Test PR Customer 4", "EUR")
-		self.customer5 = make_customer("_Test PR Customer 5", "EUR")
+		if frappe.db.exists("Customer", "_Test PR Customer"):
+			self.customer = "_Test PR Customer"
+		else:
+			customer = frappe.new_doc("Customer")
+			customer.customer_name = "_Test PR Customer"
+			customer.type = "Individual"
+			customer.save()
+			self.customer = customer.name
+
+		if frappe.db.exists("Customer", "_Test PR Customer 2"):
+			self.customer2 = "_Test PR Customer 2"
+		else:
+			customer = frappe.new_doc("Customer")
+			customer.customer_name = "_Test PR Customer 2"
+			customer.type = "Individual"
+			customer.save()
+			self.customer2 = customer.name
+
+		if frappe.db.exists("Customer", "_Test PR Customer 3"):
+			self.customer3 = "_Test PR Customer 3"
+		else:
+			customer = frappe.new_doc("Customer")
+			customer.customer_name = "_Test PR Customer 3"
+			customer.type = "Individual"
+			customer.default_currency = "EUR"
+			customer.save()
+			self.customer3 = customer.name
 
 	def create_account(self):
 		account_name = "Debtors EUR"
@@ -197,22 +216,6 @@ class TestPaymentReconciliation(FrappeTestCase):
 		)
 		return je
 
-	def create_cost_center(self):
-		# Setup cost center
-		cc_name = "Sub"
-
-		self.main_cc = frappe.get_doc("Cost Center", get_default_cost_center(self.company))
-
-		cc_exists = frappe.db.get_list("Cost Center", filters={"cost_center_name": cc_name})
-		if cc_exists:
-			self.sub_cc = frappe.get_doc("Cost Center", cc_exists[0].name)
-		else:
-			sub_cc = frappe.new_doc("Cost Center")
-			sub_cc.cost_center_name = "Sub"
-			sub_cc.parent_cost_center = self.main_cc.parent_cost_center
-			sub_cc.company = self.main_cc.company
-			self.sub_cc = sub_cc.save()
-
 	def test_filter_min_max(self):
 		# check filter condition minimum and maximum amount
 		self.create_sales_invoice(qty=1, rate=300)
@@ -473,11 +476,6 @@ class TestPaymentReconciliation(FrappeTestCase):
 		invoices = [x.as_dict() for x in pr.get("invoices")]
 		payments = [x.as_dict() for x in pr.get("payments")]
 		pr.allocate_entries(frappe._dict({"invoices": invoices, "payments": payments}))
-
-		# Cr Note and Invoice are of the same currency. There shouldn't any difference amount.
-		for row in pr.allocation:
-			self.assertEqual(flt(row.get("difference_amount")), 0.0)
-
 		pr.reconcile()
 
 		pr.get_unreconciled_entries()
@@ -511,11 +509,6 @@ class TestPaymentReconciliation(FrappeTestCase):
 		payments = [x.as_dict() for x in pr.get("payments")]
 		pr.allocate_entries(frappe._dict({"invoices": invoices, "payments": payments}))
 		pr.allocation[0].allocated_amount = allocated_amount
-
-		# Cr Note and Invoice are of the same currency. There shouldn't any difference amount.
-		for row in pr.allocation:
-			self.assertEqual(flt(row.get("difference_amount")), 0.0)
-
 		pr.reconcile()
 
 		# assert outstanding
@@ -585,255 +578,3 @@ class TestPaymentReconciliation(FrappeTestCase):
 		self.assertEqual(len(pr.payments), 1)
 		self.assertEqual(pr.payments[0].amount, amount)
 		self.assertEqual(pr.payments[0].currency, "EUR")
-
-	def test_difference_amount_via_journal_entry(self):
-		# Make Sale Invoice
-		si = self.create_sales_invoice(
-			qty=1, rate=100, posting_date=nowdate(), do_not_save=True, do_not_submit=True
-		)
-		si.customer = self.customer4
-		si.currency = "EUR"
-		si.conversion_rate = 85
-		si.debit_to = self.debtors_eur
-		si.save().submit()
-
-		# Make payment using Journal Entry
-		je1 = self.create_journal_entry("HDFC - _PR", self.debtors_eur, 100, nowdate())
-		je1.multi_currency = 1
-		je1.accounts[0].exchange_rate = 1
-		je1.accounts[0].credit_in_account_currency = 0
-		je1.accounts[0].credit = 0
-		je1.accounts[0].debit_in_account_currency = 8000
-		je1.accounts[0].debit = 8000
-		je1.accounts[1].party_type = "Customer"
-		je1.accounts[1].party = self.customer4
-		je1.accounts[1].exchange_rate = 80
-		je1.accounts[1].credit_in_account_currency = 100
-		je1.accounts[1].credit = 8000
-		je1.accounts[1].debit_in_account_currency = 0
-		je1.accounts[1].debit = 0
-		je1.save()
-		je1.submit()
-
-		je2 = self.create_journal_entry("HDFC - _PR", self.debtors_eur, 200, nowdate())
-		je2.multi_currency = 1
-		je2.accounts[0].exchange_rate = 1
-		je2.accounts[0].credit_in_account_currency = 0
-		je2.accounts[0].credit = 0
-		je2.accounts[0].debit_in_account_currency = 16000
-		je2.accounts[0].debit = 16000
-		je2.accounts[1].party_type = "Customer"
-		je2.accounts[1].party = self.customer4
-		je2.accounts[1].exchange_rate = 80
-		je2.accounts[1].credit_in_account_currency = 200
-		je1.accounts[1].credit = 16000
-		je1.accounts[1].debit_in_account_currency = 0
-		je1.accounts[1].debit = 0
-		je2.save()
-		je2.submit()
-
-		pr = self.create_payment_reconciliation()
-		pr.party = self.customer4
-		pr.receivable_payable_account = self.debtors_eur
-		pr.get_unreconciled_entries()
-
-		self.assertEqual(len(pr.invoices), 1)
-		self.assertEqual(len(pr.payments), 2)
-
-		# Test exact payment allocation
-		invoices = [x.as_dict() for x in pr.invoices]
-		payments = [pr.payments[0].as_dict()]
-		pr.allocate_entries(frappe._dict({"invoices": invoices, "payments": payments}))
-
-		self.assertEqual(pr.allocation[0].allocated_amount, 100)
-		self.assertEqual(pr.allocation[0].difference_amount, -500)
-
-		# Test partial payment allocation (with excess payment entry)
-		pr.set("allocation", [])
-		pr.get_unreconciled_entries()
-		invoices = [x.as_dict() for x in pr.invoices]
-		payments = [pr.payments[1].as_dict()]
-		pr.allocate_entries(frappe._dict({"invoices": invoices, "payments": payments}))
-		pr.allocation[0].difference_account = "Exchange Gain/Loss - _PR"
-
-		self.assertEqual(pr.allocation[0].allocated_amount, 100)
-		self.assertEqual(pr.allocation[0].difference_amount, -500)
-
-		# Check if difference journal entry gets generated for difference amount after reconciliation
-		pr.reconcile()
-		total_debit_amount = frappe.db.get_all(
-			"Journal Entry Account",
-			{"account": self.debtors_eur, "docstatus": 1, "reference_name": si.name},
-			"sum(debit) as amount",
-			group_by="reference_name",
-		)[0].amount
-
-		self.assertEqual(flt(total_debit_amount, 2), -500)
-
-	def test_difference_amount_via_payment_entry(self):
-		# Make Sale Invoice
-		si = self.create_sales_invoice(
-			qty=1, rate=100, posting_date=nowdate(), do_not_save=True, do_not_submit=True
-		)
-		si.customer = self.customer5
-		si.currency = "EUR"
-		si.conversion_rate = 85
-		si.debit_to = self.debtors_eur
-		si.save().submit()
-
-		# Make payment using Payment Entry
-		pe1 = create_payment_entry(
-			company=self.company,
-			payment_type="Receive",
-			party_type="Customer",
-			party=self.customer5,
-			paid_from=self.debtors_eur,
-			paid_to=self.bank,
-			paid_amount=100,
-		)
-
-		pe1.source_exchange_rate = 80
-		pe1.received_amount = 8000
-		pe1.save()
-		pe1.submit()
-
-		pe2 = create_payment_entry(
-			company=self.company,
-			payment_type="Receive",
-			party_type="Customer",
-			party=self.customer5,
-			paid_from=self.debtors_eur,
-			paid_to=self.bank,
-			paid_amount=200,
-		)
-
-		pe2.source_exchange_rate = 80
-		pe2.received_amount = 16000
-		pe2.save()
-		pe2.submit()
-
-		pr = self.create_payment_reconciliation()
-		pr.party = self.customer5
-		pr.receivable_payable_account = self.debtors_eur
-		pr.get_unreconciled_entries()
-
-		self.assertEqual(len(pr.invoices), 1)
-		self.assertEqual(len(pr.payments), 2)
-
-		invoices = [x.as_dict() for x in pr.invoices]
-		payments = [pr.payments[0].as_dict()]
-		pr.allocate_entries(frappe._dict({"invoices": invoices, "payments": payments}))
-
-		self.assertEqual(pr.allocation[0].allocated_amount, 100)
-		self.assertEqual(pr.allocation[0].difference_amount, -500)
-
-		pr.set("allocation", [])
-		pr.get_unreconciled_entries()
-		invoices = [x.as_dict() for x in pr.invoices]
-		payments = [pr.payments[1].as_dict()]
-		pr.allocate_entries(frappe._dict({"invoices": invoices, "payments": payments}))
-
-		self.assertEqual(pr.allocation[0].allocated_amount, 100)
-		self.assertEqual(pr.allocation[0].difference_amount, -500)
-
-	def test_differing_cost_center_on_invoice_and_payment(self):
-		"""
-		Cost Center filter should not affect outstanding amount calculation
-		"""
-
-		si = self.create_sales_invoice(qty=1, rate=100, do_not_submit=True)
-		si.cost_center = self.main_cc.name
-		si.submit()
-		pr = get_payment_entry(si.doctype, si.name)
-		pr.cost_center = self.sub_cc.name
-		pr = pr.save().submit()
-
-		pr = self.create_payment_reconciliation()
-		pr.cost_center = self.main_cc.name
-
-		pr.get_unreconciled_entries()
-
-		# check PR tool output
-		self.assertEqual(len(pr.get("invoices")), 0)
-		self.assertEqual(len(pr.get("payments")), 0)
-
-	def test_cost_center_filter_on_vouchers(self):
-		"""
-		Test Cost Center filter is applied on Invoices, Payment Entries and Journals
-		"""
-		transaction_date = nowdate()
-		rate = 100
-
-		# 'Main - PR' Cost Center
-		si1 = self.create_sales_invoice(
-			qty=1, rate=rate, posting_date=transaction_date, do_not_submit=True
-		)
-		si1.cost_center = self.main_cc.name
-		si1.submit()
-
-		pe1 = self.create_payment_entry(posting_date=transaction_date, amount=rate)
-		pe1.cost_center = self.main_cc.name
-		pe1 = pe1.save().submit()
-
-		je1 = self.create_journal_entry(self.bank, self.debit_to, 100, transaction_date)
-		je1.accounts[0].cost_center = self.main_cc.name
-		je1.accounts[1].cost_center = self.main_cc.name
-		je1.accounts[1].party_type = "Customer"
-		je1.accounts[1].party = self.customer
-		je1 = je1.save().submit()
-
-		# 'Sub - PR' Cost Center
-		si2 = self.create_sales_invoice(
-			qty=1, rate=rate, posting_date=transaction_date, do_not_submit=True
-		)
-		si2.cost_center = self.sub_cc.name
-		si2.submit()
-
-		pe2 = self.create_payment_entry(posting_date=transaction_date, amount=rate)
-		pe2.cost_center = self.sub_cc.name
-		pe2 = pe2.save().submit()
-
-		je2 = self.create_journal_entry(self.bank, self.debit_to, 100, transaction_date)
-		je2.accounts[0].cost_center = self.sub_cc.name
-		je2.accounts[1].cost_center = self.sub_cc.name
-		je2.accounts[1].party_type = "Customer"
-		je2.accounts[1].party = self.customer
-		je2 = je2.save().submit()
-
-		pr = self.create_payment_reconciliation()
-		pr.cost_center = self.main_cc.name
-
-		pr.get_unreconciled_entries()
-
-		# check PR tool output
-		self.assertEqual(len(pr.get("invoices")), 1)
-		self.assertEqual(pr.get("invoices")[0].get("invoice_number"), si1.name)
-		self.assertEqual(len(pr.get("payments")), 2)
-		payment_vouchers = [x.get("reference_name") for x in pr.get("payments")]
-		self.assertCountEqual(payment_vouchers, [pe1.name, je1.name])
-
-		# Change cost center
-		pr.cost_center = self.sub_cc.name
-
-		pr.get_unreconciled_entries()
-
-		# check PR tool output
-		self.assertEqual(len(pr.get("invoices")), 1)
-		self.assertEqual(pr.get("invoices")[0].get("invoice_number"), si2.name)
-		self.assertEqual(len(pr.get("payments")), 2)
-		payment_vouchers = [x.get("reference_name") for x in pr.get("payments")]
-		self.assertCountEqual(payment_vouchers, [je2.name, pe2.name])
-
-
-def make_customer(customer_name, currency=None):
-	if not frappe.db.exists("Customer", customer_name):
-		customer = frappe.new_doc("Customer")
-		customer.customer_name = customer_name
-		customer.type = "Individual"
-
-		if currency:
-			customer.default_currency = currency
-		customer.save()
-		return customer.name
-	else:
-		return customer_name

erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json

@@ -20,9 +20,7 @@
   "section_break_5",
   "difference_amount",
   "column_break_7",
-  "difference_account",
-  "exchange_rate",
-  "currency"
+  "difference_account"
  ],
  "fields": [
   {
@@ -39,7 +37,7 @@
    "fieldtype": "Currency",
    "in_list_view": 1,
    "label": "Allocated Amount",
-   "options": "currency",
+   "options": "Currency",
    "reqd": 1
   },
   {
@@ -114,7 +112,7 @@
    "fieldtype": "Currency",
    "hidden": 1,
    "label": "Unreconciled Amount",
-   "options": "currency",
+   "options": "Currency",
    "read_only": 1
   },
   {
@@ -122,7 +120,7 @@
    "fieldtype": "Currency",
    "hidden": 1,
    "label": "Amount",
-   "options": "currency",
+   "options": "Currency",
    "read_only": 1
   },
   {
@@ -131,24 +129,11 @@
    "hidden": 1,
    "label": "Reference Row",
    "read_only": 1
-  },
-  {
-   "fieldname": "currency",
-   "fieldtype": "Link",
-   "hidden": 1,
-   "label": "Currency",
-   "options": "Currency"
-  },
-  {
-   "fieldname": "exchange_rate",
-   "fieldtype": "Float",
-   "label": "Exchange Rate",
-   "read_only": 1
   }
  ],
  "istable": 1,
  "links": [],
- "modified": "2022-12-24 21:01:14.882747",
+ "modified": "2021-10-06 11:48:59.616562",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Reconciliation Allocation",
@@ -156,6 +141,5 @@
  "permissions": [],
  "sort_field": "modified",
  "sort_order": "DESC",
- "states": [],
  "track_changes": 1
 }

erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json

@@ -11,8 +11,7 @@
   "col_break1",
   "amount",
   "outstanding_amount",
-  "currency",
-  "exchange_rate"
+  "currency"
  ],
  "fields": [
   {
@@ -63,17 +62,11 @@
    "hidden": 1,
    "label": "Currency",
    "options": "Currency"
-  },
-  {
-   "fieldname": "exchange_rate",
-   "fieldtype": "Float",
-   "hidden": 1,
-   "label": "Exchange Rate"
   }
  ],
  "istable": 1,
  "links": [],
- "modified": "2022-11-08 18:18:02.502149",
+ "modified": "2021-08-24 22:42:40.923179",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Reconciliation Invoice",
@@ -82,6 +75,5 @@
  "quick_entry": 1,
  "sort_field": "modified",
  "sort_order": "DESC",
- "states": [],
  "track_changes": 1
 }

erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json

@@ -15,8 +15,7 @@
   "difference_amount",
   "sec_break1",
   "remark",
-  "currency",
-  "exchange_rate"
+  "currency"
  ],
  "fields": [
   {
@@ -92,17 +91,11 @@
    "label": "Difference Amount",
    "options": "currency",
    "read_only": 1
-  },
-  {
-   "fieldname": "exchange_rate",
-   "fieldtype": "Float",
-   "hidden": 1,
-   "label": "Exchange Rate"
   }
  ],
  "istable": 1,
  "links": [],
- "modified": "2022-11-08 18:18:36.268760",
+ "modified": "2021-08-30 10:51:48.140062",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Reconciliation Payment",
@@ -110,6 +103,5 @@
  "permissions": [],
  "quick_entry": 1,
  "sort_field": "modified",
- "sort_order": "DESC",
- "states": []
+ "sort_order": "DESC"
 }

erpnext/accounts/doctype/payment_request/payment_request.js

@@ -42,7 +42,7 @@ frappe.ui.form.on("Payment Request", "refresh", function(frm) {
 		});
 	}
 
-	if((!frm.doc.payment_gateway_account || frm.doc.payment_request_type == "Outward") && frm.doc.status == "Initiated") {
+	if(!frm.doc.payment_gateway_account && frm.doc.status == "Initiated") {
 		frm.add_custom_button(__('Create Payment Entry'), function(){
 			frappe.call({
 				method: "erpnext.accounts.doctype.payment_request.payment_request.make_payment_entry",

erpnext/accounts/doctype/payment_request/payment_request.json

@@ -32,10 +32,6 @@
   "iban",
   "branch_code",
   "swift_number",
-  "accounting_dimensions_section",
-  "cost_center",
-  "dimension_col_break",
-  "project",
   "recipient_and_message",
   "print_format",
   "email_to",
@@ -190,10 +186,8 @@
   {
    "fetch_from": "bank_account.bank",
    "fieldname": "bank",
-   "fieldtype": "Link",
-   "label": "Bank",
-   "options": "Bank",
-   "read_only": 1
+   "fieldtype": "Read Only",
+   "label": "Bank"
   },
   {
    "fetch_from": "bank_account.bank_account_no",
@@ -366,39 +360,16 @@
    "label": "Payment Channel",
    "options": "\nEmail\nPhone",
    "read_only": 1
-  },
-  {
-   "collapsible": 1,
-   "fieldname": "accounting_dimensions_section",
-   "fieldtype": "Section Break",
-   "label": "Accounting Dimensions"
-  },
-  {
-   "fieldname": "cost_center",
-   "fieldtype": "Link",
-   "label": "Cost Center",
-   "options": "Cost Center"
-  },
-  {
-   "fieldname": "dimension_col_break",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "project",
-   "fieldtype": "Link",
-   "label": "Project",
-   "options": "Project"
   }
  ],
  "in_create": 1,
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2022-12-21 16:56:40.115737",
+ "modified": "2020-09-18 12:24:14.178853",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Request",
- "naming_rule": "By \"Naming Series\" field",
  "owner": "Administrator",
  "permissions": [
   {
@@ -430,6 +401,5 @@
   }
  ],
  "sort_field": "modified",
- "sort_order": "DESC",
- "states": []
+ "sort_order": "DESC"
 }

erpnext/accounts/doctype/payment_request/payment_request.py

@@ -9,10 +9,8 @@ from frappe import _
 from frappe.model.document import Document
 from frappe.utils import flt, get_url, nowdate
 from frappe.utils.background_jobs import enqueue
+from payments.utils import get_payment_gateway_controller
 
-from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import (
-	get_accounting_dimensions,
-)
 from erpnext.accounts.doctype.payment_entry.payment_entry import (
 	get_company_defaults,
 	get_payment_entry,
@@ -21,14 +19,6 @@ from erpnext.accounts.doctype.subscription_plan.subscription_plan import get_pla
 from erpnext.accounts.party import get_party_account, get_party_bank_account
 from erpnext.accounts.utils import get_account_currency
 from erpnext.erpnext_integrations.stripe_integration import create_stripe_subscription
-from erpnext.utilities import payment_app_import_guard
-
-
-def _get_payment_gateway_controller(*args, **kwargs):
-	with payment_app_import_guard():
-		from payments.utils import get_payment_gateway_controller
-
-	return get_payment_gateway_controller(*args, **kwargs)
 
 
 class PaymentRequest(Document):
@@ -45,24 +35,25 @@ class PaymentRequest(Document):
 			frappe.throw(_("To create a Payment Request reference document is required"))
 
 	def validate_payment_request_amount(self):
-		existing_payment_request_amount = flt(
-			get_existing_payment_request_amount(self.reference_doctype, self.reference_name)
+		existing_payment_request_amount = get_existing_payment_request_amount(
+			self.reference_doctype, self.reference_name
 		)
 
-		ref_doc = frappe.get_doc(self.reference_doctype, self.reference_name)
-		if not hasattr(ref_doc, "order_type") or getattr(ref_doc, "order_type") != "Shopping Cart":
-			ref_amount = get_amount(ref_doc, self.payment_account)
+		if existing_payment_request_amount:
+			ref_doc = frappe.get_doc(self.reference_doctype, self.reference_name)
+			if hasattr(ref_doc, "order_type") and getattr(ref_doc, "order_type") != "Shopping Cart":
+				ref_amount = get_amount(ref_doc, self.payment_account)
 
-			if existing_payment_request_amount + flt(self.grand_total) > ref_amount:
-				frappe.throw(
-					_("Total Payment Request amount cannot be greater than {0} amount").format(
-						self.reference_doctype
+				if existing_payment_request_amount + flt(self.grand_total) > ref_amount:
+					frappe.throw(
+						_("Total Payment Request amount cannot be greater than {0} amount").format(
+							self.reference_doctype
+						)
 					)
-				)
 
 	def validate_currency(self):
 		ref_doc = frappe.get_doc(self.reference_doctype, self.reference_name)
-		if self.payment_account and ref_doc.currency != frappe.get_cached_value(
+		if self.payment_account and ref_doc.currency != frappe.db.get_value(
 			"Account", self.payment_account, "account_currency"
 		):
 			frappe.throw(_("Transaction currency must be same as Payment Gateway currency"))
@@ -116,7 +107,7 @@ class PaymentRequest(Document):
 			self.request_phone_payment()
 
 	def request_phone_payment(self):
-		controller = _get_payment_gateway_controller(self.payment_gateway)
+		controller = get_payment_gateway_controller(self.payment_gateway)
 		request_amount = self.get_request_amount()
 
 		payment_record = dict(
@@ -165,7 +156,7 @@ class PaymentRequest(Document):
 
 	def payment_gateway_validation(self):
 		try:
-			controller = _get_payment_gateway_controller(self.payment_gateway)
+			controller = get_payment_gateway_controller(self.payment_gateway)
 			if hasattr(controller, "on_payment_request_submission"):
 				return controller.on_payment_request_submission(self)
 			else:
@@ -198,7 +189,7 @@ class PaymentRequest(Document):
 			)
 			data.update({"company": frappe.defaults.get_defaults().company})
 
-		controller = _get_payment_gateway_controller(self.payment_gateway)
+		controller = get_payment_gateway_controller(self.payment_gateway)
 		controller.validate_transaction_currency(self.currency)
 
 		if hasattr(controller, "validate_minimum_transaction_amount"):
@@ -263,7 +254,6 @@ class PaymentRequest(Document):
 
 		payment_entry.update(
 			{
-				"mode_of_payment": self.mode_of_payment,
 				"reference_no": self.name,
 				"reference_date": nowdate(),
 				"remarks": "Payment Entry against {0} {1} via Payment Request {2}".format(
@@ -272,17 +262,6 @@ class PaymentRequest(Document):
 			}
 		)
 
-		# Update dimensions
-		payment_entry.update(
-			{
-				"cost_center": self.get("cost_center"),
-				"project": self.get("project"),
-			}
-		)
-
-		for dimension in get_accounting_dimensions():
-			payment_entry.update({dimension: self.get(dimension)})
-
 		if payment_entry.difference_amount:
 			company_details = get_company_defaults(ref_doc.company)
 
@@ -424,22 +403,25 @@ def make_payment_request(**args):
 		else ""
 	)
 
-	draft_payment_request = frappe.db.get_value(
-		"Payment Request",
-		{"reference_doctype": args.dt, "reference_name": args.dn, "docstatus": 0},
-	)
-
-	existing_payment_request_amount = get_existing_payment_request_amount(args.dt, args.dn)
-
-	if existing_payment_request_amount:
-		grand_total -= existing_payment_request_amount
-
-	if draft_payment_request:
-		frappe.db.set_value(
-			"Payment Request", draft_payment_request, "grand_total", grand_total, update_modified=False
+	existing_payment_request = None
+	if args.order_type == "Shopping Cart":
+		existing_payment_request = frappe.db.get_value(
+			"Payment Request",
+			{"reference_doctype": args.dt, "reference_name": args.dn, "docstatus": ("!=", 2)},
 		)
-		pr = frappe.get_doc("Payment Request", draft_payment_request)
+
+	if existing_payment_request:
+		frappe.db.set_value(
+			"Payment Request", existing_payment_request, "grand_total", grand_total, update_modified=False
+		)
+		pr = frappe.get_doc("Payment Request", existing_payment_request)
 	else:
+		if args.order_type != "Shopping Cart":
+			existing_payment_request_amount = get_existing_payment_request_amount(args.dt, args.dn)
+
+			if existing_payment_request_amount:
+				grand_total -= existing_payment_request_amount
+
 		pr = frappe.new_doc("Payment Request")
 		pr.update(
 			{
@@ -462,17 +444,6 @@ def make_payment_request(**args):
 			}
 		)
 
-		# Update dimensions
-		pr.update(
-			{
-				"cost_center": ref_doc.get("cost_center"),
-				"project": ref_doc.get("project"),
-			}
-		)
-
-		for dimension in get_accounting_dimensions():
-			pr.update({dimension: ref_doc.get(dimension)})
-
 		if args.order_type == "Shopping Cart" or args.mute_email:
 			pr.flags.mute_email = True
 

erpnext/accounts/doctype/payment_schedule/payment_schedule.json

@@ -39,7 +39,6 @@
   {
    "columns": 2,
    "fetch_from": "payment_term.description",
-   "fetch_if_empty": 1,
    "fieldname": "description",
    "fieldtype": "Small Text",
    "in_list_view": 1,
@@ -160,7 +159,7 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2022-09-16 13:57:06.382859",
+ "modified": "2021-04-28 05:41:35.084233",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Schedule",
@@ -169,6 +168,5 @@
  "quick_entry": 1,
  "sort_field": "modified",
  "sort_order": "DESC",
- "states": [],
  "track_changes": 1
 }

erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py

@@ -43,7 +43,7 @@ class PeriodClosingVoucher(AccountsController):
 			make_reverse_gl_entries(voucher_type="Period Closing Voucher", voucher_no=self.name)
 
 	def validate_account_head(self):
-		closing_account_type = frappe.get_cached_value("Account", self.closing_account_head, "root_type")
+		closing_account_type = frappe.db.get_value("Account", self.closing_account_head, "root_type")
 
 		if closing_account_type not in ["Liability", "Equity"]:
 			frappe.throw(

erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.js

@@ -25,7 +25,7 @@ frappe.ui.form.on('POS Closing Entry', {
 
 		frappe.realtime.on('closing_process_complete', async function(data) {
 			await frm.reload_doc();
-			if (frm.doc.status == 'Failed' && frm.doc.error_message) {
+			if (frm.doc.status == 'Failed' && frm.doc.error_message && data.user == frappe.session.user) {
 				frappe.msgprint({
 					title: __('POS Closing Failed'),
 					message: frm.doc.error_message,

erpnext/accounts/doctype/pos_invoice/pos_invoice.js

@@ -5,8 +5,6 @@
 frappe.provide("erpnext.accounts");
 
 erpnext.selling.POSInvoiceController = class POSInvoiceController extends erpnext.selling.SellingController {
-	settings = {};
-
 	setup(doc) {
 		this.setup_posting_date_time_check();
 		super.setup(doc);
@@ -14,37 +12,21 @@ erpnext.selling.POSInvoiceController = class POSInvoiceController extends erpnex
 
 	company() {
 		erpnext.accounts.dimensions.update_dimension(this.frm, this.frm.doctype);
-		this.frm.set_value("set_warehouse", "");
-		this.frm.set_value("taxes_and_charges", "");
 	}
 
 	onload(doc) {
 		super.onload();
 		this.frm.ignore_doctypes_on_cancel_all = ['POS Invoice Merge Log', 'POS Closing Entry'];
-
 		if(doc.__islocal && doc.is_pos && frappe.get_route_str() !== 'point-of-sale') {
 			this.frm.script_manager.trigger("is_pos");
 			this.frm.refresh_fields();
 		}
 
-		this.frm.set_query("set_warehouse", function(doc) {
-			return {
-				filters: {
-					company: doc.company ? doc.company : '',
-				}
-			}
-		});
-
 		erpnext.accounts.dimensions.setup_dimension_filters(this.frm, this.frm.doctype);
 	}
 
-	onload_post_render(frm) {
-		this.pos_profile(frm);
-	}
-
 	refresh(doc) {
 		super.refresh();
-
 		if (doc.docstatus == 1 && !doc.is_return) {
 			this.frm.add_custom_button(__('Return'), this.make_sales_return, __('Create'));
 			this.frm.page.set_inner_btn_group_as_primary(__('Create'));
@@ -54,18 +36,6 @@ erpnext.selling.POSInvoiceController = class POSInvoiceController extends erpnex
 			this.frm.return_print_format = "Sales Invoice Return";
 			this.frm.set_value('consolidated_invoice', '');
 		}
-
-		this.frm.set_query("customer", (function () {
-			const customer_groups = this.settings?.customer_groups;
-
-			if (!customer_groups?.length) return {};
-
-			return {
-				filters: {
-					customer_group: ["in", customer_groups],
-				}
-			}
-		}).bind(this));
 	}
 
 	is_pos() {
@@ -118,25 +88,6 @@ erpnext.selling.POSInvoiceController = class POSInvoiceController extends erpnex
 			});
 	}
 
-	pos_profile(frm) {
-		if (!frm.pos_profile || frm.pos_profile == '') {
-			this.update_customer_groups_settings([]);
-			return;
-		}
-
-		frappe.call({
-			method: "erpnext.selling.page.point_of_sale.point_of_sale.get_pos_profile_data",
-			args: { "pos_profile": frm.pos_profile },
-			callback: ({ message: profile }) => {
-				this.update_customer_groups_settings(profile?.customer_groups);
-			},
-		});
-	}
-
-	update_customer_groups_settings(customer_groups) {
-		this.settings.customer_groups = customer_groups?.map((group) => group.name)
-	}
-
 	amount(){
 		this.write_off_outstanding_amount_automatically()
 	}

erpnext/accounts/doctype/pos_invoice/pos_invoice.json

@@ -343,8 +343,7 @@
    "no_copy": 1,
    "options": "POS Invoice",
    "print_hide": 1,
-   "read_only": 1,
-   "search_index": 1
+   "read_only": 1
   },
   {
    "default": "0",
@@ -1554,7 +1553,7 @@
  "icon": "fa fa-file-text",
  "is_submittable": 1,
  "links": [],
- "modified": "2022-09-30 03:49:50.455199",
+ "modified": "2022-03-22 13:00:24.166684",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "POS Invoice",

erpnext/accounts/doctype/pos_invoice/pos_invoice.py

@@ -239,14 +239,14 @@ class POSInvoice(SalesInvoice):
 					frappe.bold(d.warehouse),
 					frappe.bold(d.qty),
 				)
-				if is_stock_item and flt(available_stock) <= 0:
+				if flt(available_stock) <= 0:
 					frappe.throw(
 						_("Row #{}: Item Code: {} is not available under warehouse {}.").format(
 							d.idx, item_code, warehouse
 						),
 						title=_("Item Unavailable"),
 					)
-				elif is_stock_item and flt(available_stock) < flt(d.qty):
+				elif flt(available_stock) < flt(d.qty):
 					frappe.throw(
 						_(
 							"Row #{}: Stock quantity not enough for Item Code: {} under warehouse {}. Available quantity {}."
@@ -335,8 +335,7 @@ class POSInvoice(SalesInvoice):
 		if (
 			self.change_amount
 			and self.account_for_change_amount
-			and frappe.get_cached_value("Account", self.account_for_change_amount, "company")
-			!= self.company
+			and frappe.db.get_value("Account", self.account_for_change_amount, "company") != self.company
 		):
 			frappe.throw(
 				_("The selected change account {} doesn't belongs to Company {}.").format(
@@ -487,7 +486,7 @@ class POSInvoice(SalesInvoice):
 				customer_price_list, customer_group, customer_currency = frappe.db.get_value(
 					"Customer", self.customer, ["default_price_list", "customer_group", "default_currency"]
 				)
-				customer_group_price_list = frappe.get_cached_value(
+				customer_group_price_list = frappe.db.get_value(
 					"Customer Group", customer_group, "default_price_list"
 				)
 				selling_price_list = (
@@ -533,8 +532,8 @@ class POSInvoice(SalesInvoice):
 
 		if not self.debit_to:
 			self.debit_to = get_party_account("Customer", self.customer, self.company)
-			self.party_account_currency = frappe.get_cached_value(
-				"Account", self.debit_to, "account_currency"
+			self.party_account_currency = frappe.db.get_value(
+				"Account", self.debit_to, "account_currency", cache=True
 			)
 		if not self.due_date and self.customer:
 			self.due_date = get_due_date(self.posting_date, "Customer", self.customer, self.company)
@@ -633,12 +632,11 @@ def get_stock_availability(item_code, warehouse):
 		pos_sales_qty = get_pos_reserved_qty(item_code, warehouse)
 		return bin_qty - pos_sales_qty, is_stock_item
 	else:
-		is_stock_item = True
+		is_stock_item = False
 		if frappe.db.exists("Product Bundle", item_code):
 			return get_bundle_availability(item_code, warehouse), is_stock_item
 		else:
-			is_stock_item = False
-			# Is a service item or non_stock item
+			# Is a service item
 			return 0, is_stock_item
 
 
@@ -652,9 +650,7 @@ def get_bundle_availability(bundle_item_code, warehouse):
 		available_qty = item_bin_qty - item_pos_reserved_qty
 
 		max_available_bundles = available_qty / item.qty
-		if bundle_bin_qty > max_available_bundles and frappe.get_value(
-			"Item", item.item_code, "is_stock_item"
-		):
+		if bundle_bin_qty > max_available_bundles:
 			bundle_bin_qty = max_available_bundles
 
 	pos_sales_qty = get_pos_reserved_qty(bundle_item_code, warehouse)
@@ -675,7 +671,7 @@ def get_bin_qty(item_code, warehouse):
 
 def get_pos_reserved_qty(item_code, warehouse):
 	reserved_qty = frappe.db.sql(
-		"""select sum(p_item.stock_qty) as qty
+		"""select sum(p_item.qty) as qty
 		from `tabPOS Invoice` p, `tabPOS Invoice Item` p_item
 		where p.name = p_item.parent
 		and ifnull(p.consolidated_invoice, '') = ''

erpnext/accounts/doctype/pos_invoice/test_pos_invoice.py

@@ -495,67 +495,6 @@ class TestPOSInvoice(unittest.TestCase):
 
 		self.assertRaises(frappe.ValidationError, pos.submit)
 
-	def test_value_error_on_serial_no_validation(self):
-		from erpnext.stock.doctype.stock_entry.test_stock_entry import make_serialized_item
-
-		se = make_serialized_item(
-			company="_Test Company",
-			target_warehouse="Stores - _TC",
-			cost_center="Main - _TC",
-			expense_account="Cost of Goods Sold - _TC",
-		)
-		serial_nos = se.get("items")[0].serial_no
-
-		# make a pos invoice
-		pos = create_pos_invoice(
-			company="_Test Company",
-			debit_to="Debtors - _TC",
-			account_for_change_amount="Cash - _TC",
-			warehouse="Stores - _TC",
-			income_account="Sales - _TC",
-			expense_account="Cost of Goods Sold - _TC",
-			cost_center="Main - _TC",
-			item=se.get("items")[0].item_code,
-			rate=1000,
-			qty=1,
-			do_not_save=1,
-		)
-		pos.get("items")[0].has_serial_no = 1
-		pos.get("items")[0].serial_no = serial_nos.split("\n")[0]
-		pos.set("payments", [])
-		pos.append(
-			"payments", {"mode_of_payment": "Cash", "account": "Cash - _TC", "amount": 1000, "default": 1}
-		)
-		pos = pos.save().submit()
-
-		# make a return
-		pos_return = make_sales_return(pos.name)
-		pos_return.paid_amount = pos_return.grand_total
-		pos_return.save()
-		pos_return.submit()
-
-		# set docstatus to 2 for pos to trigger this issue
-		frappe.db.set_value("POS Invoice", pos.name, "docstatus", 2)
-
-		pos2 = create_pos_invoice(
-			company="_Test Company",
-			debit_to="Debtors - _TC",
-			account_for_change_amount="Cash - _TC",
-			warehouse="Stores - _TC",
-			income_account="Sales - _TC",
-			expense_account="Cost of Goods Sold - _TC",
-			cost_center="Main - _TC",
-			item=se.get("items")[0].item_code,
-			rate=1000,
-			qty=1,
-			do_not_save=1,
-		)
-
-		pos2.get("items")[0].has_serial_no = 1
-		pos2.get("items")[0].serial_no = serial_nos.split("\n")[0]
-		# Value error should not be triggered on validation
-		pos2.save()
-
 	def test_loyalty_points(self):
 		from erpnext.accounts.doctype.loyalty_program.loyalty_program import (
 			get_loyalty_program_details_with_points,

erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json

@@ -8,7 +8,6 @@
  "engine": "InnoDB",
  "field_order": [
   "barcode",
-  "has_item_scanned",
   "item_code",
   "col_break1",
   "item_name",
@@ -809,19 +808,11 @@
    "fieldtype": "Check",
    "label": "Grant Commission",
    "read_only": 1
-  },
-  {
-   "default": "0",
-   "depends_on": "barcode",
-   "fieldname": "has_item_scanned",
-   "fieldtype": "Check",
-   "label": "Has Item Scanned",
-   "read_only": 1
   }
  ],
  "istable": 1,
  "links": [],
- "modified": "2022-11-02 12:52:39.125295",
+ "modified": "2021-10-05 12:23:47.506290",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "POS Invoice Item",
@@ -829,6 +820,5 @@
  "owner": "Administrator",
  "permissions": [],
  "sort_field": "modified",
- "sort_order": "DESC",
- "states": []
+ "sort_order": "DESC"
 }

erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py

@@ -6,10 +6,11 @@ import json
 
 import frappe
 from frappe import _
+from frappe.core.page.background_jobs.background_jobs import get_info
 from frappe.model.document import Document
 from frappe.model.mapper import map_child_doc, map_doc
 from frappe.utils import cint, flt, get_time, getdate, nowdate, nowtime
-from frappe.utils.background_jobs import enqueue, is_job_queued
+from frappe.utils.background_jobs import enqueue
 from frappe.utils.scheduler import is_scheduler_inactive
 
 
@@ -430,7 +431,7 @@ def create_merge_logs(invoice_by_customer, closing_entry=None):
 
 	finally:
 		frappe.db.commit()
-		frappe.publish_realtime("closing_process_complete", user=frappe.session.user)
+		frappe.publish_realtime("closing_process_complete", {"user": frappe.session.user})
 
 
 def cancel_merge_logs(merge_logs, closing_entry=None):
@@ -457,7 +458,7 @@ def cancel_merge_logs(merge_logs, closing_entry=None):
 
 	finally:
 		frappe.db.commit()
-		frappe.publish_realtime("closing_process_complete", user=frappe.session.user)
+		frappe.publish_realtime("closing_process_complete", {"user": frappe.session.user})
 
 
 def enqueue_job(job, **kwargs):
@@ -466,7 +467,7 @@ def enqueue_job(job, **kwargs):
 	closing_entry = kwargs.get("closing_entry") or {}
 
 	job_name = closing_entry.get("name")
-	if not is_job_queued(job_name):
+	if not job_already_enqueued(job_name):
 		enqueue(
 			job,
 			**kwargs,
@@ -490,6 +491,12 @@ def check_scheduler_status():
 		frappe.throw(_("Scheduler is inactive. Cannot enqueue job."), title=_("Scheduler Inactive"))
 
 
+def job_already_enqueued(job_name):
+	enqueued_jobs = [d.get("job_name") for d in get_info()]
+	if job_name in enqueued_jobs:
+		return True
+
+
 def safe_load_json(message):
 	try:
 		json_message = json.loads(message).get("message")

erpnext/accounts/doctype/pricing_rule/pricing_rule.json

@@ -52,10 +52,7 @@
   "free_item_rate",
   "column_break_42",
   "free_item_uom",
-  "round_free_qty",
   "is_recursive",
-  "recurse_for",
-  "apply_recursion_over",
   "section_break_23",
   "valid_from",
   "valid_upto",
@@ -179,7 +176,7 @@
   },
   {
    "collapsible": 1,
-   "depends_on": "eval:doc.apply_on != 'Transaction' && !doc.mixed_conditions",
+   "depends_on": "eval:doc.apply_on != 'Transaction'",
    "fieldname": "section_break_18",
    "fieldtype": "Section Break",
    "label": "Discount on Other Item"
@@ -300,12 +297,12 @@
   {
    "fieldname": "min_qty",
    "fieldtype": "Float",
-   "label": "Min Qty (As Per Stock UOM)"
+   "label": "Min Qty"
   },
   {
    "fieldname": "max_qty",
    "fieldtype": "Float",
-   "label": "Max Qty (As Per Stock UOM)"
+   "label": "Max Qty"
   },
   {
    "fieldname": "column_break_21",
@@ -472,7 +469,7 @@
    "description": "If rate is zero them item will be treated as \"Free Item\"",
    "fieldname": "free_item_rate",
    "fieldtype": "Currency",
-   "label": "Free Item Rate"
+   "label": "Rate"
   },
   {
    "collapsible": 1,
@@ -484,7 +481,7 @@
    "description": "System will notify to increase or decrease quantity or amount ",
    "fieldname": "threshold_percentage",
    "fieldtype": "Percent",
-   "label": "Threshold for Suggestion (In Percentage)"
+   "label": "Threshold for Suggestion"
   },
   {
    "description": "Higher the number, higher the priority",
@@ -581,38 +578,15 @@
    "fieldtype": "Select",
    "label": "Naming Series",
    "options": "PRLE-.####"
-  },
-  {
-   "default": "0",
-   "fieldname": "round_free_qty",
-   "fieldtype": "Check",
-   "label": "Round Free Qty"
-  },
-  {
-   "depends_on": "is_recursive",
-   "description": "Give free item for every N quantity",
-   "fieldname": "recurse_for",
-   "fieldtype": "Float",
-   "label": "Recurse Every (As Per Transaction UOM)",
-   "mandatory_depends_on": "is_recursive"
-  },
-  {
-   "default": "0",
-   "depends_on": "is_recursive",
-   "description": "Qty for which recursion isn't applicable.",
-   "fieldname": "apply_recursion_over",
-   "fieldtype": "Float",
-   "label": "Apply Recursion Over (As Per Transaction UOM)"
   }
  ],
  "icon": "fa fa-gift",
  "idx": 1,
  "links": [],
- "modified": "2023-02-14 04:53:34.887358",
+ "modified": "2021-08-06 15:10:04.219321",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Pricing Rule",
- "naming_rule": "By \"Naming Series\" field",
  "owner": "Administrator",
  "permissions": [
   {
@@ -668,6 +642,5 @@
  "show_name_in_global_search": 1,
  "sort_field": "modified",
  "sort_order": "DESC",
- "states": [],
  "title_field": "title"
-}
+}

erpnext/accounts/doctype/pricing_rule/pricing_rule.py

@@ -10,7 +10,7 @@ import re
 import frappe
 from frappe import _, throw
 from frappe.model.document import Document
-from frappe.utils import cint, flt
+from frappe.utils import cint, flt, getdate
 
 apply_on_dict = {"Item Code": "items", "Item Group": "item_groups", "Brand": "brands"}
 
@@ -24,7 +24,6 @@ class PricingRule(Document):
 		self.validate_applicable_for_selling_or_buying()
 		self.validate_min_max_amt()
 		self.validate_min_max_qty()
-		self.validate_recursion()
 		self.cleanup_fields_value()
 		self.validate_rate_or_discount()
 		self.validate_max_discount()
@@ -110,18 +109,6 @@ class PricingRule(Document):
 		if self.min_amt and self.max_amt and flt(self.min_amt) > flt(self.max_amt):
 			throw(_("Min Amt can not be greater than Max Amt"))
 
-	def validate_recursion(self):
-		if self.price_or_product_discount != "Product":
-			return
-		if self.free_item or self.same_item:
-			if flt(self.recurse_for) <= 0:
-				self.recurse_for = 1
-		if self.is_recursive:
-			if flt(self.apply_recursion_over) > flt(self.min_qty):
-				throw(_("Min Qty should be greater than Recurse Over Qty"))
-			if flt(self.apply_recursion_over) < 0:
-				throw(_("Recurse Over Qty cannot be less than 0"))
-
 	def cleanup_fields_value(self):
 		for logic_field in ["apply_on", "applicable_for", "rate_or_discount"]:
 			fieldname = frappe.scrub(self.get(logic_field) or "")
@@ -184,7 +171,8 @@ class PricingRule(Document):
 		if self.is_cumulative and not (self.valid_from and self.valid_upto):
 			frappe.throw(_("Valid from and valid upto fields are mandatory for the cumulative"))
 
-		self.validate_from_to_dates("valid_from", "valid_upto")
+		if self.valid_from and self.valid_upto and getdate(self.valid_from) > getdate(self.valid_upto):
+			frappe.throw(_("Valid from date must be less than valid upto date"))
 
 	def validate_condition(self):
 		if (
@@ -255,7 +243,7 @@ def apply_pricing_rule(args, doc=None):
 	for item in item_list:
 		args_copy = copy.deepcopy(args)
 		args_copy.update(item)
-		data = get_pricing_rule_for_item(args_copy, doc=doc)
+		data = get_pricing_rule_for_item(args_copy, item.get("price_list_rate"), doc=doc)
 		out.append(data)
 
 		if (
@@ -280,19 +268,7 @@ def get_serial_no_for_item(args):
 	return item_details
 
 
-def update_pricing_rule_uom(pricing_rule, args):
-	child_doc = {"Item Code": "items", "Item Group": "item_groups", "Brand": "brands"}.get(
-		pricing_rule.apply_on
-	)
-
-	apply_on_field = frappe.scrub(pricing_rule.apply_on)
-
-	for row in pricing_rule.get(child_doc):
-		if row.get(apply_on_field) == args.get(apply_on_field):
-			pricing_rule.uom = row.uom
-
-
-def get_pricing_rule_for_item(args, doc=None, for_validate=False):
+def get_pricing_rule_for_item(args, price_list_rate=0, doc=None, for_validate=False):
 	from erpnext.accounts.doctype.pricing_rule.utils import (
 		get_applied_pricing_rules,
 		get_pricing_rule_items,
@@ -348,8 +324,7 @@ def get_pricing_rule_for_item(args, doc=None, for_validate=False):
 
 			if isinstance(pricing_rule, str):
 				pricing_rule = frappe.get_cached_doc("Pricing Rule", pricing_rule)
-				update_pricing_rule_uom(pricing_rule, args)
-				pricing_rule.apply_rule_on_other_items = get_pricing_rule_items(pricing_rule) or []
+				pricing_rule.apply_rule_on_other_items = get_pricing_rule_items(pricing_rule)
 
 			if pricing_rule.get("suggestion"):
 				continue
@@ -362,6 +337,7 @@ def get_pricing_rule_for_item(args, doc=None, for_validate=False):
 			if pricing_rule.mixed_conditions or pricing_rule.apply_rule_on_other:
 				item_details.update(
 					{
+						"apply_rule_on_other_items": json.dumps(pricing_rule.apply_rule_on_other_items),
 						"price_or_product_discount": pricing_rule.price_or_product_discount,
 						"apply_rule_on": (
 							frappe.scrub(pricing_rule.apply_rule_on_other)
@@ -371,9 +347,6 @@ def get_pricing_rule_for_item(args, doc=None, for_validate=False):
 					}
 				)
 
-				if pricing_rule.apply_rule_on_other_items:
-					item_details["apply_rule_on_other_items"] = json.dumps(pricing_rule.apply_rule_on_other_items)
-
 			if pricing_rule.coupon_code_based == 1 and args.coupon_code == None:
 				return item_details
 
@@ -465,15 +438,12 @@ def apply_price_discount_rule(pricing_rule, item_details, args):
 		if pricing_rule.currency == args.currency:
 			pricing_rule_rate = pricing_rule.rate
 
-		# TODO https://github.com/frappe/erpnext/pull/23636 solve this in some other way.
 		if pricing_rule_rate:
-			is_blank_uom = pricing_rule.get("uom") != args.get("uom")
 			# Override already set price list rate (from item price)
 			# if pricing_rule_rate > 0
 			item_details.update(
 				{
-					"price_list_rate": pricing_rule_rate
-					* (args.get("conversion_factor", 1) if is_blank_uom else 1),
+					"price_list_rate": pricing_rule_rate * args.get("conversion_factor", 1),
 				}
 			)
 		item_details.update({"discount_percentage": 0.0})
@@ -522,7 +492,7 @@ def remove_pricing_rule_for_item(pricing_rules, item_details, item_code=None, ra
 			)
 
 		if pricing_rule.get("mixed_conditions") or pricing_rule.get("apply_rule_on_other"):
-			items = get_pricing_rule_items(pricing_rule, other_items=True)
+			items = get_pricing_rule_items(pricing_rule)
 			item_details.apply_on = (
 				frappe.scrub(pricing_rule.apply_rule_on_other)
 				if pricing_rule.apply_rule_on_other

erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py

@@ -595,247 +595,6 @@ class TestPricingRule(unittest.TestCase):
 		frappe.get_doc("Item Price", {"item_code": "Water Flask"}).delete()
 		item.delete()
 
-	def test_item_price_with_blank_uom_pricing_rule(self):
-		properties = {
-			"item_code": "Item Blank UOM",
-			"stock_uom": "Nos",
-			"sales_uom": "Box",
-			"uoms": [dict(uom="Box", conversion_factor=10)],
-		}
-		item = make_item(properties=properties)
-
-		make_item_price("Item Blank UOM", "_Test Price List", 100)
-
-		pricing_rule_record = {
-			"doctype": "Pricing Rule",
-			"title": "_Test Item Blank UOM Rule",
-			"apply_on": "Item Code",
-			"items": [
-				{
-					"item_code": "Item Blank UOM",
-				}
-			],
-			"selling": 1,
-			"currency": "INR",
-			"rate_or_discount": "Rate",
-			"rate": 101,
-			"company": "_Test Company",
-		}
-		rule = frappe.get_doc(pricing_rule_record)
-		rule.insert()
-
-		si = create_sales_invoice(
-			do_not_save=True, item_code="Item Blank UOM", uom="Box", conversion_factor=10
-		)
-		si.selling_price_list = "_Test Price List"
-		si.save()
-
-		# If UOM is blank consider it as stock UOM and apply pricing_rule on all UOM.
-		# rate is 101, Selling UOM is Box that have conversion_factor of 10 so 101 * 10 = 1010
-		self.assertEqual(si.items[0].price_list_rate, 1010)
-		self.assertEqual(si.items[0].rate, 1010)
-
-		si.delete()
-
-		si = create_sales_invoice(do_not_save=True, item_code="Item Blank UOM", uom="Nos")
-		si.selling_price_list = "_Test Price List"
-		si.save()
-
-		# UOM is blank so consider it as stock UOM and apply pricing_rule on all UOM.
-		# rate is 101, Selling UOM is Nos that have conversion_factor of 1 so 101 * 1 = 101
-		self.assertEqual(si.items[0].price_list_rate, 101)
-		self.assertEqual(si.items[0].rate, 101)
-
-		si.delete()
-		rule.delete()
-		frappe.get_doc("Item Price", {"item_code": "Item Blank UOM"}).delete()
-
-		item.delete()
-
-	def test_item_price_with_selling_uom_pricing_rule(self):
-		properties = {
-			"item_code": "Item UOM other than Stock",
-			"stock_uom": "Nos",
-			"sales_uom": "Box",
-			"uoms": [dict(uom="Box", conversion_factor=10)],
-		}
-		item = make_item(properties=properties)
-
-		make_item_price("Item UOM other than Stock", "_Test Price List", 100)
-
-		pricing_rule_record = {
-			"doctype": "Pricing Rule",
-			"title": "_Test Item UOM other than Stock Rule",
-			"apply_on": "Item Code",
-			"items": [
-				{
-					"item_code": "Item UOM other than Stock",
-					"uom": "Box",
-				}
-			],
-			"selling": 1,
-			"currency": "INR",
-			"rate_or_discount": "Rate",
-			"rate": 101,
-			"company": "_Test Company",
-		}
-		rule = frappe.get_doc(pricing_rule_record)
-		rule.insert()
-
-		si = create_sales_invoice(
-			do_not_save=True, item_code="Item UOM other than Stock", uom="Box", conversion_factor=10
-		)
-		si.selling_price_list = "_Test Price List"
-		si.save()
-
-		# UOM is Box so apply pricing_rule only on Box UOM.
-		# Selling UOM is Box and as both UOM are same no need to multiply by conversion_factor.
-		self.assertEqual(si.items[0].price_list_rate, 101)
-		self.assertEqual(si.items[0].rate, 101)
-
-		si.delete()
-
-		si = create_sales_invoice(do_not_save=True, item_code="Item UOM other than Stock", uom="Nos")
-		si.selling_price_list = "_Test Price List"
-		si.save()
-
-		# UOM is Box so pricing_rule won't apply as selling_uom is Nos.
-		# As Pricing Rule is not applied price of 100 will be fetched from Item Price List.
-		self.assertEqual(si.items[0].price_list_rate, 100)
-		self.assertEqual(si.items[0].rate, 100)
-
-		si.delete()
-		rule.delete()
-		frappe.get_doc("Item Price", {"item_code": "Item UOM other than Stock"}).delete()
-
-		item.delete()
-
-	def test_item_group_price_with_blank_uom_pricing_rule(self):
-		group = frappe.get_doc(doctype="Item Group", item_group_name="_Test Pricing Rule Item Group")
-		group.save()
-		properties = {
-			"item_code": "Item with Group Blank UOM",
-			"item_group": "_Test Pricing Rule Item Group",
-			"stock_uom": "Nos",
-			"sales_uom": "Box",
-			"uoms": [dict(uom="Box", conversion_factor=10)],
-		}
-		item = make_item(properties=properties)
-
-		make_item_price("Item with Group Blank UOM", "_Test Price List", 100)
-
-		pricing_rule_record = {
-			"doctype": "Pricing Rule",
-			"title": "_Test Item with Group Blank UOM Rule",
-			"apply_on": "Item Group",
-			"item_groups": [
-				{
-					"item_group": "_Test Pricing Rule Item Group",
-				}
-			],
-			"selling": 1,
-			"currency": "INR",
-			"rate_or_discount": "Rate",
-			"rate": 101,
-			"company": "_Test Company",
-		}
-		rule = frappe.get_doc(pricing_rule_record)
-		rule.insert()
-
-		si = create_sales_invoice(
-			do_not_save=True, item_code="Item with Group Blank UOM", uom="Box", conversion_factor=10
-		)
-		si.selling_price_list = "_Test Price List"
-		si.save()
-
-		# If UOM is blank consider it as stock UOM and apply pricing_rule on all UOM.
-		# rate is 101, Selling UOM is Box that have conversion_factor of 10 so 101 * 10 = 1010
-		self.assertEqual(si.items[0].price_list_rate, 1010)
-		self.assertEqual(si.items[0].rate, 1010)
-
-		si.delete()
-
-		si = create_sales_invoice(do_not_save=True, item_code="Item with Group Blank UOM", uom="Nos")
-		si.selling_price_list = "_Test Price List"
-		si.save()
-
-		# UOM is blank so consider it as stock UOM and apply pricing_rule on all UOM.
-		# rate is 101, Selling UOM is Nos that have conversion_factor of 1 so 101 * 1 = 101
-		self.assertEqual(si.items[0].price_list_rate, 101)
-		self.assertEqual(si.items[0].rate, 101)
-
-		si.delete()
-		rule.delete()
-		frappe.get_doc("Item Price", {"item_code": "Item with Group Blank UOM"}).delete()
-		item.delete()
-		group.delete()
-
-	def test_item_group_price_with_selling_uom_pricing_rule(self):
-		group = frappe.get_doc(doctype="Item Group", item_group_name="_Test Pricing Rule Item Group UOM")
-		group.save()
-		properties = {
-			"item_code": "Item with Group UOM other than Stock",
-			"item_group": "_Test Pricing Rule Item Group UOM",
-			"stock_uom": "Nos",
-			"sales_uom": "Box",
-			"uoms": [dict(uom="Box", conversion_factor=10)],
-		}
-		item = make_item(properties=properties)
-
-		make_item_price("Item with Group UOM other than Stock", "_Test Price List", 100)
-
-		pricing_rule_record = {
-			"doctype": "Pricing Rule",
-			"title": "_Test Item with Group UOM other than Stock Rule",
-			"apply_on": "Item Group",
-			"item_groups": [
-				{
-					"item_group": "_Test Pricing Rule Item Group UOM",
-					"uom": "Box",
-				}
-			],
-			"selling": 1,
-			"currency": "INR",
-			"rate_or_discount": "Rate",
-			"rate": 101,
-			"company": "_Test Company",
-		}
-		rule = frappe.get_doc(pricing_rule_record)
-		rule.insert()
-
-		si = create_sales_invoice(
-			do_not_save=True,
-			item_code="Item with Group UOM other than Stock",
-			uom="Box",
-			conversion_factor=10,
-		)
-		si.selling_price_list = "_Test Price List"
-		si.save()
-
-		# UOM is Box so apply pricing_rule only on Box UOM.
-		# Selling UOM is Box and as both UOM are same no need to multiply by conversion_factor.
-		self.assertEqual(si.items[0].price_list_rate, 101)
-		self.assertEqual(si.items[0].rate, 101)
-
-		si.delete()
-
-		si = create_sales_invoice(
-			do_not_save=True, item_code="Item with Group UOM other than Stock", uom="Nos"
-		)
-		si.selling_price_list = "_Test Price List"
-		si.save()
-
-		# UOM is Box so pricing_rule won't apply as selling_uom is Nos.
-		# As Pricing Rule is not applied price of 100 will be fetched from Item Price List.
-		self.assertEqual(si.items[0].price_list_rate, 100)
-		self.assertEqual(si.items[0].rate, 100)
-
-		si.delete()
-		rule.delete()
-		frappe.get_doc("Item Price", {"item_code": "Item with Group UOM other than Stock"}).delete()
-		item.delete()
-		group.delete()
-
 	def test_pricing_rule_for_different_currency(self):
 		make_item("Test Sanitizer Item")
 
@@ -1007,107 +766,6 @@ class TestPricingRule(unittest.TestCase):
 		frappe.delete_doc_if_exists("Pricing Rule", "_Test Pricing Rule with Min Qty - 1")
 		frappe.delete_doc_if_exists("Pricing Rule", "_Test Pricing Rule with Min Qty - 2")
 
-	def test_pricing_rule_for_other_items_cond_with_amount(self):
-		item = make_item("Water Flask New")
-		other_item = make_item("Other Water Flask New")
-		make_item_price(item.name, "_Test Price List", 100)
-		make_item_price(other_item.name, "_Test Price List", 100)
-
-		pricing_rule_record = {
-			"doctype": "Pricing Rule",
-			"title": "_Test Water Flask Rule",
-			"apply_on": "Item Code",
-			"apply_rule_on_other": "Item Code",
-			"price_or_product_discount": "Price",
-			"rate_or_discount": "Discount Percentage",
-			"other_item_code": other_item.name,
-			"items": [
-				{
-					"item_code": item.name,
-				}
-			],
-			"selling": 1,
-			"currency": "INR",
-			"min_amt": 200,
-			"discount_percentage": 10,
-			"company": "_Test Company",
-		}
-		rule = frappe.get_doc(pricing_rule_record)
-		rule.insert()
-
-		si = create_sales_invoice(do_not_save=True, item_code=item.name)
-		si.append(
-			"items",
-			{
-				"item_code": other_item.name,
-				"item_name": other_item.item_name,
-				"description": other_item.description,
-				"stock_uom": other_item.stock_uom,
-				"uom": other_item.stock_uom,
-				"cost_center": si.items[0].cost_center,
-				"expense_account": si.items[0].expense_account,
-				"warehouse": si.items[0].warehouse,
-				"conversion_factor": 1,
-				"qty": 1,
-			},
-		)
-		si.selling_price_list = "_Test Price List"
-		si.save()
-
-		self.assertEqual(si.items[0].discount_percentage, 0)
-		self.assertEqual(si.items[1].discount_percentage, 0)
-
-		si.items[0].qty = 2
-		si.save()
-
-		self.assertEqual(si.items[0].discount_percentage, 0)
-		self.assertEqual(si.items[0].stock_qty, 2)
-		self.assertEqual(si.items[0].amount, 200)
-		self.assertEqual(si.items[0].price_list_rate, 100)
-		self.assertEqual(si.items[1].discount_percentage, 10)
-
-		si.delete()
-		rule.delete()
-
-	def test_pricing_rule_for_product_free_item_rounded_qty_and_recursion(self):
-		frappe.delete_doc_if_exists("Pricing Rule", "_Test Pricing Rule")
-		test_record = {
-			"doctype": "Pricing Rule",
-			"title": "_Test Pricing Rule",
-			"apply_on": "Item Code",
-			"currency": "USD",
-			"items": [
-				{
-					"item_code": "_Test Item",
-				}
-			],
-			"selling": 1,
-			"rate": 0,
-			"min_qty": 3,
-			"max_qty": 7,
-			"price_or_product_discount": "Product",
-			"same_item": 1,
-			"free_qty": 1,
-			"round_free_qty": 1,
-			"is_recursive": 1,
-			"recurse_for": 2,
-			"company": "_Test Company",
-		}
-		frappe.get_doc(test_record.copy()).insert()
-
-		# With pricing rule
-		so = make_sales_order(item_code="_Test Item", qty=5)
-		so.load_from_db()
-		self.assertEqual(so.items[1].is_free_item, 1)
-		self.assertEqual(so.items[1].item_code, "_Test Item")
-		self.assertEqual(so.items[1].qty, 2)
-
-		so = make_sales_order(item_code="_Test Item", qty=7)
-		so.load_from_db()
-		self.assertEqual(so.items[1].is_free_item, 1)
-		self.assertEqual(so.items[1].item_code, "_Test Item")
-		self.assertEqual(so.items[1].qty, 4)
-
 
 test_dependencies = ["Campaign"]
 
@@ -1123,7 +781,7 @@ def make_pricing_rule(**args):
 			"apply_on": args.apply_on or "Item Code",
 			"applicable_for": args.applicable_for,
 			"selling": args.selling or 0,
-			"currency": "INR",
+			"currency": "USD",
 			"apply_discount_on_rate": args.apply_discount_on_rate or 0,
 			"buying": args.buying or 0,
 			"min_qty": args.min_qty or 0.0,

erpnext/accounts/doctype/pricing_rule/utils.py

@@ -111,12 +111,6 @@ def _get_pricing_rules(apply_on, args, values):
 		)
 
 		if apply_on_field == "item_code":
-			if args.get("uom", None):
-				item_conditions += (
-					" and ({child_doc}.uom='{item_uom}' or IFNULL({child_doc}.uom, '')='')".format(
-						child_doc=child_doc, item_uom=args.get("uom")
-					)
-				)
 			if "variant_of" not in args:
 				args.variant_of = frappe.get_cached_value("Item", args.item_code, "variant_of")
 
@@ -127,12 +121,6 @@ def _get_pricing_rules(apply_on, args, values):
 				values["variant_of"] = args.variant_of
 	elif apply_on_field == "item_group":
 		item_conditions = _get_tree_conditions(args, "Item Group", child_doc, False)
-		if args.get("uom", None):
-			item_conditions += (
-				" and ({child_doc}.uom='{item_uom}' or IFNULL({child_doc}.uom, '')='')".format(
-					child_doc=child_doc, item_uom=args.get("uom")
-				)
-			)
 
 	conditions += get_other_conditions(conditions, values, args)
 	warehouse_conditions = _get_tree_conditions(args, "Warehouse", "`tabPricing Rule`")
@@ -250,22 +238,6 @@ def get_other_conditions(conditions, values, args):
 			and ifnull(`tabPricing Rule`.valid_upto, '2500-12-31')"""
 		values["transaction_date"] = args.get("transaction_date")
 
-	if args.get("doctype") in [
-		"Quotation",
-		"Quotation Item",
-		"Sales Order",
-		"Sales Order Item",
-		"Delivery Note",
-		"Delivery Note Item",
-		"Sales Invoice",
-		"Sales Invoice Item",
-		"POS Invoice",
-		"POS Invoice Item",
-	]:
-		conditions += """ and ifnull(`tabPricing Rule`.selling, 0) = 1"""
-	else:
-		conditions += """ and ifnull(`tabPricing Rule`.buying, 0) = 1"""
-
 	return conditions
 
 
@@ -280,6 +252,12 @@ def filter_pricing_rules(args, pricing_rules, doc=None):
 		stock_qty = flt(args.get("stock_qty"))
 		amount = flt(args.get("price_list_rate")) * flt(args.get("qty"))
 
+		if pricing_rules[0].apply_rule_on_other:
+			field = frappe.scrub(pricing_rules[0].apply_rule_on_other)
+
+			if field and pricing_rules[0].get("other_" + field) != args.get(field):
+				return
+
 		pr_doc = frappe.get_cached_doc("Pricing Rule", pricing_rules[0].name)
 
 		if pricing_rules[0].mixed_conditions and doc:
@@ -296,7 +274,7 @@ def filter_pricing_rules(args, pricing_rules, doc=None):
 				amount += data[1]
 
 		if pricing_rules[0].apply_rule_on_other and not pricing_rules[0].mixed_conditions and doc:
-			pricing_rules = get_qty_and_rate_for_other_item(doc, pr_doc, pricing_rules, args) or []
+			pricing_rules = get_qty_and_rate_for_other_item(doc, pr_doc, pricing_rules) or []
 		else:
 			pricing_rules = filter_pricing_rules_for_qty_amount(stock_qty, amount, pricing_rules, args)
 
@@ -374,14 +352,16 @@ def validate_quantity_and_amount_for_suggestion(args, qty, amount, item_code, tr
 	if fieldname:
 		msg = _(
 			"If you {0} {1} quantities of the item {2}, the scheme {3} will be applied on the item."
-		).format(type_of_transaction, args.get(fieldname), bold(item_code), bold(args.title))
+		).format(
+			type_of_transaction, args.get(fieldname), bold(item_code), bold(args.rule_description)
+		)
 
 		if fieldname in ["min_amt", "max_amt"]:
 			msg = _("If you {0} {1} worth item {2}, the scheme {3} will be applied on the item.").format(
 				type_of_transaction,
 				fmt_money(args.get(fieldname), currency=args.get("currency")),
 				bold(item_code),
-				bold(args.title),
+				bold(args.rule_description),
 			)
 
 		frappe.msgprint(msg)
@@ -474,29 +454,17 @@ def get_qty_and_rate_for_mixed_conditions(doc, pr_doc, args):
 	return sum_qty, sum_amt, items
 
 
-def get_qty_and_rate_for_other_item(doc, pr_doc, pricing_rules, row_item):
-	other_items = get_pricing_rule_items(pr_doc, other_items=True)
-	pricing_rule_apply_on = apply_on_table.get(pr_doc.get("apply_on"))
-	apply_on = frappe.scrub(pr_doc.get("apply_on"))
-
-	items = []
-	for d in pr_doc.get(pricing_rule_apply_on):
-		if apply_on == "item_group":
-			items.extend(get_child_item_groups(d.get(apply_on)))
-		else:
-			items.append(d.get(apply_on))
+def get_qty_and_rate_for_other_item(doc, pr_doc, pricing_rules):
+	items = get_pricing_rule_items(pr_doc)
 
 	for row in doc.items:
-		if row.get(apply_on) in items:
-			if not row.get("qty"):
-				continue
-
-			stock_qty = row.get("qty") * (row.get("conversion_factor") or 1.0)
-			amount = stock_qty * (row.get("price_list_rate") or row.get("rate"))
-			pricing_rules = filter_pricing_rules_for_qty_amount(stock_qty, amount, pricing_rules, row)
+		if row.get(frappe.scrub(pr_doc.apply_rule_on_other)) in items:
+			pricing_rules = filter_pricing_rules_for_qty_amount(
+				row.get("stock_qty"), row.get("amount"), pricing_rules, row
+			)
 
 			if pricing_rules and pricing_rules[0]:
-				pricing_rules[0].apply_rule_on_other_items = other_items
+				pricing_rules[0].apply_rule_on_other_items = items
 				return pricing_rules
 
 
@@ -649,13 +617,9 @@ def get_product_discount_rule(pricing_rule, item_details, args=None, doc=None):
 
 	qty = pricing_rule.free_qty or 1
 	if pricing_rule.is_recursive:
-		transaction_qty = (
-			args.get("qty") if args else doc.total_qty
-		) - pricing_rule.apply_recursion_over
+		transaction_qty = args.get("qty") if args else doc.total_qty
 		if transaction_qty:
-			qty = flt(transaction_qty) * qty / pricing_rule.recurse_for
-			if pricing_rule.round_free_qty:
-				qty = round(qty)
+			qty = flt(transaction_qty) * qty
 
 	free_item_data_args = {
 		"item_code": free_item,
@@ -685,40 +649,30 @@ def get_product_discount_rule(pricing_rule, item_details, args=None, doc=None):
 	item_details.free_item_data.append(free_item_data_args)
 
 
-def apply_pricing_rule_for_free_items(doc, pricing_rule_args):
+def apply_pricing_rule_for_free_items(doc, pricing_rule_args, set_missing_values=False):
 	if pricing_rule_args:
-		args = {(d["item_code"], d["pricing_rules"]): d for d in pricing_rule_args}
+		items = tuple((d.item_code, d.pricing_rules) for d in doc.items if d.is_free_item)
 
-		for item in doc.items:
-			if not item.is_free_item:
-				continue
-
-			free_item_data = args.get((item.item_code, item.pricing_rules))
-			if free_item_data:
-				free_item_data.pop("item_name")
-				free_item_data.pop("description")
-				item.update(free_item_data)
-				args.pop((item.item_code, item.pricing_rules))
-
-		for free_item in args.values():
-			doc.append("items", free_item)
+		for args in pricing_rule_args:
+			if not items or (args.get("item_code"), args.get("pricing_rules")) not in items:
+				doc.append("items", args)
 
 
-def get_pricing_rule_items(pr_doc, other_items=False) -> list:
+def get_pricing_rule_items(pr_doc):
 	apply_on_data = []
 	apply_on = frappe.scrub(pr_doc.get("apply_on"))
 
 	pricing_rule_apply_on = apply_on_table.get(pr_doc.get("apply_on"))
 
-	if pr_doc.apply_rule_on_other and other_items:
+	for d in pr_doc.get(pricing_rule_apply_on):
+		if apply_on == "item_group":
+			apply_on_data.extend(get_child_item_groups(d.get(apply_on)))
+		else:
+			apply_on_data.append(d.get(apply_on))
+
+	if pr_doc.apply_rule_on_other:
 		apply_on = frappe.scrub(pr_doc.apply_rule_on_other)
 		apply_on_data.append(pr_doc.get("other_" + apply_on))
-	else:
-		for d in pr_doc.get(pricing_rule_apply_on):
-			if apply_on == "item_group":
-				apply_on_data.extend(get_child_item_groups(d.get(apply_on)))
-			else:
-				apply_on_data.append(d.get(apply_on))
 
 	return list(set(apply_on_data))
 

erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html

@@ -25,7 +25,7 @@
 	</div>
 	<br>
 
-	<table class="table table-bordered" style="font-size: 10px">
+	<table class="table table-bordered">
 		<thead>
 			<tr>
 				<th style="width: 12%">{{ _("Date") }}</th>
@@ -49,6 +49,7 @@
 						<br>
 					{% endif %}
 
+					{{ _("Against") }}: {{ row.against }}
 					<br>{{ _("Remarks") }}: {{ row.remarks }}
 					{% if row.bill_no %}
 						<br>{{ _("Supplier Invoice No") }}: {{ row.bill_no }}

erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js

@@ -9,7 +9,6 @@ frappe.ui.form.on('Process Statement Of Accounts', {
 	refresh: function(frm){
 		if(!frm.doc.__islocal) {
 			frm.add_custom_button(__('Send Emails'), function(){
-				if (frm.is_dirty()) frappe.throw(__("Please save before proceeding."))
 				frappe.call({
 					method: "erpnext.accounts.doctype.process_statement_of_accounts.process_statement_of_accounts.send_emails",
 					args: {
@@ -26,8 +25,7 @@ frappe.ui.form.on('Process Statement Of Accounts', {
 				});
 			});
 			frm.add_custom_button(__('Download'), function(){
-				if (frm.is_dirty()) frappe.throw(__("Please save before proceeding."))
-				let url = frappe.urllib.get_full_url(
+				var url = frappe.urllib.get_full_url(
 					'/api/method/erpnext.accounts.doctype.process_statement_of_accounts.process_statement_of_accounts.download_statements?'
 					+ 'document_name='+encodeURIComponent(frm.doc.name))
 				$.ajax({

erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json

@@ -23,12 +23,10 @@
   "fetch_customers",
   "column_break_6",
   "primary_mandatory",
-  "show_net_values_in_party_account",
   "column_break_17",
   "customers",
   "preferences",
   "orientation",
-  "include_break",
   "include_ageing",
   "ageing_based_on",
   "section_break_14",
@@ -286,22 +284,10 @@
    "fieldtype": "Link",
    "label": "Terms and Conditions",
    "options": "Terms and Conditions"
-  },
-  {
-   "default": "1",
-   "fieldname": "include_break",
-   "fieldtype": "Check",
-   "label": "Page Break After Each SoA"
-  },
-  {
-   "default": "0",
-   "fieldname": "show_net_values_in_party_account",
-   "fieldtype": "Check",
-   "label": "Show Net Values in Party Account"
   }
  ],
  "links": [],
- "modified": "2022-11-10 17:44:17.165991",
+ "modified": "2021-09-06 21:00:45.732505",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Process Statement Of Accounts",
@@ -335,6 +321,5 @@
  ],
  "sort_field": "modified",
  "sort_order": "DESC",
- "states": [],
  "track_changes": 1
 }

erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py

@@ -6,7 +6,6 @@ import copy
 
 import frappe
 from frappe import _
-from frappe.desk.reportview import get_match_cond
 from frappe.model.document import Document
 from frappe.utils import add_days, add_months, format_date, getdate, today
 from frappe.utils.jinja import validate_template
@@ -95,7 +94,6 @@ def get_report_pdf(doc, consolidated=True):
 				"show_opening_entries": 0,
 				"include_default_book_entries": 0,
 				"tax_id": tax_id if tax_id else None,
-				"show_net_values_in_party_account": doc.show_net_values_in_party_account,
 			}
 		)
 		col, res = get_soa(filters)
@@ -130,8 +128,7 @@ def get_report_pdf(doc, consolidated=True):
 	if not bool(statement_dict):
 		return False
 	elif consolidated:
-		delimiter = '<div style="page-break-before: always;"></div>' if doc.include_break else ""
-		result = delimiter.join(list(statement_dict.values()))
+		result = "".join(list(statement_dict.values()))
 		return get_pdf(result, {"orientation": doc.orientation})
 	else:
 		for customer, statement_html in statement_dict.items():
@@ -243,6 +240,8 @@ def fetch_customers(customer_collection, collection_name, primary_mandatory):
 		if int(primary_mandatory):
 			if primary_email == "":
 				continue
+		elif (billing_email == "") and (primary_email == ""):
+			continue
 
 		customer_list.append(
 			{"name": customer.name, "primary_email": primary_email, "billing_email": billing_email}
@@ -274,12 +273,8 @@ def get_customer_emails(customer_name, primary_mandatory, billing_and_primary=Tr
 			link.link_doctype='Customer'
 			and link.link_name=%s
 			and contact.is_billing_contact=1
-			{mcond}
 		ORDER BY
-			contact.creation desc
-		""".format(
-			mcond=get_match_cond("Contact")
-		),
+			contact.creation desc""",
 		customer_name,
 	)
 
@@ -318,8 +313,6 @@ def send_emails(document_name, from_scheduler=False):
 			attachments = [{"fname": customer + ".pdf", "fcontent": report_pdf}]
 
 			recipients, cc = get_recipients_and_cc(customer, doc)
-			if not recipients:
-				continue
 			context = get_context(customer, doc)
 			subject = frappe.render_template(doc.subject, context)
 			message = frappe.render_template(doc.body, context)