perf: add indexes on payment entry reference

Adds index on:
1. reference doctype
2. reference name

*Why not composite index?*

There are three type of queries on this doctype

- filtering ref_doctype - doctype index helps here
- filtering ref_name - name index helps here
- filtering both - name index helps here too. Since it has sufficiently
  high cardinality. Composite index wont help in case where ref_doctype
  isn't specfied.

.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

@@ -8,9 +8,8 @@ sudo apt update && sudo apt install redis-server libcups2-dev
 
 pip install frappe-bench
 
-githubbranch=${GITHUB_BASE_REF:-${GITHUB_REF##*/}}
 frappeuser=${FRAPPE_USER:-"frappe"}
-frappebranch=${FRAPPE_BRANCH:-$githubbranch}
+frappebranch=${FRAPPE_BRANCH:-${GITHUB_BASE_REF:-${GITHUB_REF##*/}}}
 
 git clone "https://github.com/${frappeuser}/frappe" --branch "${frappebranch}" --depth 1
 bench init --skip-assets --frappe-path ~/frappe --python "$(which python)" frappe-bench
@@ -25,15 +24,14 @@ fi
 
 
 if [ "$DB" == "mariadb" ];then
-    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 "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 "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 "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 "UPDATE mysql.user SET Password=PASSWORD('travis') WHERE User='root'"
-    mysql --host 127.0.0.1 --port 3306 -u root -e "FLUSH PRIVILEGES"
+    mysql --host 127.0.0.1 --port 3306 -u root -proot -e "FLUSH PRIVILEGES"
 fi
 
 if [ "$DB" == "postgres" ];then
@@ -57,7 +55,7 @@ sed -i 's/schedule:/# schedule:/g' Procfile
 sed -i 's/socketio:/# socketio:/g' Procfile
 sed -i 's/redis_socketio:/# redis_socketio:/g' Procfile
 
-bench get-app payments --branch ${githubbranch%"-hotfix"}
+bench get-app payments
 bench get-app erpnext "${GITHUB_WORKSPACE}"
 
 if [ "$TYPE" == "server" ]; then bench setup requirements --dev; fi

.github/helper/site_config_mariadb.json

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

.github/stale.yml

@@ -13,7 +13,7 @@ exemptProjects: true
 exemptMilestones: true
 
 pulls:
-  daysUntilStale: 14
+  daysUntilStale: 15
   daysUntilClose: 3
   exemptLabels:
     - hotfix

.github/workflows/initiate_release.yml

@@ -0,0 +1,32 @@
+# 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.number }}
+  group: patch-develop-${{ github.event_name }}-${{ github.event.number || github.event_name == 'workflow_dispatch' && github.run_id || '' }}
   cancel-in-progress: true
 
 jobs:
@@ -25,7 +25,7 @@ jobs:
       mysql:
         image: mariadb:10.3
         env:
-          MYSQL_ALLOW_EMPTY_PASSWORD: YES
+          MARIADB_ROOT_PASSWORD: 'root'
         ports:
           - 3306:3306
         options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
@@ -43,11 +43,9 @@ jobs:
           fi
 
       - name: Setup Python
-        uses: "actions/setup-python@v4"
+        uses: "gabrielfalcao/pyenv-action@v9"
         with:
-          python-version: |
-              3.7
-              3.10
+          versions: 3.10:latest, 3.7:latest
 
       - name: Setup Node
         uses: actions/setup-node@v2
@@ -94,6 +92,7 @@ jobs:
       - name: Install
         run: |
           pip install frappe-bench
+          pyenv global $(pyenv versions | grep '3.10')
           bash ${GITHUB_WORKSPACE}/.github/helper/install.sh
         env:
           DB: mariadb
@@ -108,6 +107,7 @@ jobs:
           git -C "apps/frappe" remote set-url upstream https://github.com/frappe/frappe.git
           git -C "apps/erpnext" remote set-url upstream https://github.com/frappe/erpnext.git
 
+          pyenv global $(pyenv versions | grep '3.7')
           for version in $(seq 12 13)
           do
               echo "Updating to v$version"
@@ -120,7 +120,7 @@ jobs:
               git -C "apps/erpnext" checkout -q -f $branch_name
 
               rm -rf ~/frappe-bench/env
-              bench setup env --python python3.7
+              bench setup env
               bench pip install -e ./apps/payments
               bench pip install -e ./apps/erpnext
 
@@ -132,8 +132,9 @@ jobs:
           git -C "apps/frappe" checkout -q -f "${GITHUB_BASE_REF:-${GITHUB_REF##*/}}"
           git -C "apps/erpnext" checkout -q -f "$GITHUB_SHA"
 
+          pyenv global $(pyenv versions | grep '3.10')
           rm -rf ~/frappe-bench/env
-          bench -v setup env --python python3.10
+          bench -v setup env
           bench pip install -e ./apps/payments
           bench pip install -e ./apps/erpnext
 

.github/workflows/release.yml

@@ -2,7 +2,7 @@ name: Generate Semantic Release
 on:
   push:
     branches:
-      - version-14
+      - version-13
 jobs:
   release:
     name: Release
@@ -13,12 +13,10 @@ jobs:
         with:
           fetch-depth: 0
           persist-credentials: false
-
-      - name: Setup Node.js
+      - name: Setup Node.js v14
         uses: actions/setup-node@v2
         with:
-          node-version: 18
-
+          node-version: 14
       - name: Setup dependencies
         run: |
           npm install @semantic-release/git @semantic-release/exec --no-save
@@ -30,4 +28,4 @@ jobs:
           GIT_AUTHOR_EMAIL: "developers@frappe.io"
           GIT_COMMITTER_NAME: "Frappe PR Bot"
           GIT_COMMITTER_EMAIL: "developers@frappe.io"
-        run: npx semantic-release
+        run: npx semantic-release

.github/workflows/release_notes.yml

@@ -1,38 +0,0 @@
-# This action:
-#
-# 1. Generates release notes using github API.
-# 2. Strips unnecessary info like chore/style etc from notes.
-# 3. Updates release info.
-
-# This action needs to be maintained on all branches that do releases.
-
-name: 'Release Notes'
-
-on:
-  workflow_dispatch:
-    inputs:
-      tag_name:
-        description: 'Tag of release like v13.0.0'
-        required: true
-        type: string
-  release:
-    types: [released]
-
-permissions:
-  contents: read
-
-jobs:
-  regen-notes:
-    name: 'Regenerate release notes'
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Update notes
-      run: |
-        NEW_NOTES=$(gh api --method POST -H "Accept: application/vnd.github+json"  /repos/frappe/erpnext/releases/generate-notes  -f tag_name=$RELEASE_TAG | jq -r '.body' | sed  -E '/^\* (chore|ci|test|docs|style)/d' )
-        RELEASE_ID=$(gh api -H "Accept: application/vnd.github+json" /repos/frappe/erpnext/releases/tags/$RELEASE_TAG | jq -r '.id')
-        gh api --method PATCH -H "Accept: application/vnd.github+json" /repos/frappe/erpnext/releases/$RELEASE_ID -f body="$NEW_NOTES"
-
-      env:
-        GH_TOKEN: ${{ secrets.RELEASE_TOKEN }}
-        RELEASE_TAG: ${{ github.event.inputs.tag_name || github.event.release.tag_name }}

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

@@ -27,7 +27,7 @@ on:
         type: string
 
 concurrency:
-  group: server-mariadb-develop-${{ github.event.number }}
+  group: server-mariadb-develop-${{ github.event_name }}-${{ github.event.number || github.event_name == 'workflow_dispatch' && github.run_id || '' }}
   cancel-in-progress: true
 
 jobs:
@@ -39,15 +39,15 @@ jobs:
       fail-fast: false
 
       matrix:
-        container: [1, 2, 3]
+        container: [1, 2, 3, 4]
 
     name: Python Unit Tests
 
     services:
       mysql:
-        image: mariadb:10.3
+        image: mariadb:10.6
         env:
-          MYSQL_ALLOW_EMPTY_PASSWORD: YES
+          MARIADB_ROOT_PASSWORD: 'root'
         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.10'
+          python-version: '3.11'
 
       - name: Check for valid Python & Merge Conflicts
         run: |
@@ -120,7 +120,32 @@ jobs:
           FRAPPE_BRANCH: ${{ github.event.inputs.branch }}
 
       - name: Run Tests
-        run: 'cd ~/frappe-bench/ && bench --site test_site run-parallel-tests --app erpnext --total-builds 3 --build-number ${{ matrix.container }}'
+        run: 'cd ~/frappe-bench/ && bench --site test_site run-parallel-tests --app erpnext --with-coverage --total-builds 4 --build-number ${{ matrix.container }}'
         env:
           TYPE: server
           CI_BUILD_ID: ${{ github.run_id }}
+          ORCHESTRATOR_URL: http://test-orchestrator.frappe.io
+
+      - name: Upload coverage data
+        uses: actions/upload-artifact@v3
+        with:
+          name: coverage-${{ matrix.container }}
+          path: /home/runner/frappe-bench/sites/coverage.xml
+
+  coverage:
+    name: Coverage Wrap Up
+    needs: test
+    runs-on: ubuntu-latest
+    steps:
+      - name: Clone
+        uses: actions/checkout@v2
+
+      - name: Download artifacts
+        uses: actions/download-artifact@v3
+
+      - name: Upload coverage data
+        uses: codecov/codecov-action@v2
+        with:
+          name: MariaDB
+          fail_ci_if_error: true
+          verbose: true

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

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

.mergify.yml

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

.pre-commit-config.yaml

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

CODEOWNERS

@@ -3,23 +3,26 @@
 # These owners will be the default owners for everything in
 # the repo. Unless a later match takes precedence,
 
-erpnext/accounts/               @deepeshgarg007 @ruthra-kumar
-erpnext/assets/                 @anandbaburajan @deepeshgarg007
-erpnext/loan_management/        @deepeshgarg007
-erpnext/regional                @deepeshgarg007 @ruthra-kumar
-erpnext/selling                 @deepeshgarg007 @ruthra-kumar
-erpnext/support/                @deepeshgarg007
-pos*                            
+erpnext/accounts/               @nextchamp-saqib @deepeshgarg007 @ruthra-kumar
+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/controllers/            @deepeshgarg007 @rohitwaghchaure
-erpnext/patches/                @deepeshgarg007 
+erpnext/crm/                    @NagariaHussain
+erpnext/education/              @rutwikhdev
+erpnext/projects/               @ruchamahabal
 
-.github/                        @deepeshgarg007
+erpnext/controllers/            @deepeshgarg007 @nextchamp-saqib @rohitwaghchaure
+erpnext/patches/                @deepeshgarg007 @nextchamp-saqib
+
+.github/                        @ankush
 pyproject.toml                  @ankush

erpnext/__init__.py

@@ -1,9 +1,8 @@
-import functools
 import inspect
 
 import frappe
 
-__version__ = "14.34.1"
+__version__ = "14.0.0-dev"
 
 
 def get_default_company(user=None):
@@ -121,14 +120,12 @@ def get_region(company=None):
 
 	You can also set global company flag in `frappe.flags.company`
 	"""
-
-	if not company:
-		company = frappe.local.flags.company
-
-	if company:
-		return frappe.get_cached_value("Company", company, "country")
-
-	return frappe.flags.country or frappe.get_system_settings("country")
+	if company or frappe.flags.company:
+		return frappe.get_cached_value("Company", company or frappe.flags.company, "country")
+	elif frappe.flags.country:
+		return frappe.flags.country
+	else:
+		return frappe.get_system_settings("country")
 
 
 def allow_regional(fn):
@@ -139,7 +136,6 @@ def allow_regional(fn):
 	def myfunction():
 	  pass"""
 
-	@functools.wraps(fn)
 	def caller(*args, **kwargs):
 		overrides = frappe.get_hooks("regional_overrides", {}).get(get_region())
 		function_path = f"{inspect.getmodule(fn).__name__}.{fn.__name__}"

erpnext/accounts/dashboard_chart/budget_variance/budget_variance.json

@@ -4,19 +4,18 @@
  "creation": "2020-07-17 11:25:34.593061",
  "docstatus": 0,
  "doctype": "Dashboard Chart",
- "dynamic_filters_json": "{\"company\":\"frappe.defaults.get_user_default(\\\"Company\\\")\",\"from_fiscal_year\":\"erpnext.utils.get_fiscal_year()\",\"to_fiscal_year\":\"erpnext.utils.get_fiscal_year()\"}",
+ "dynamic_filters_json": "{\"company\":\"frappe.defaults.get_user_default(\\\"Company\\\")\",\"from_fiscal_year\":\"frappe.sys_defaults.fiscal_year\",\"to_fiscal_year\":\"frappe.sys_defaults.fiscal_year\"}",
  "filters_json": "{\"period\":\"Monthly\",\"budget_against\":\"Cost Center\",\"show_cumulative\":0}",
  "idx": 0,
  "is_public": 1,
  "is_standard": 1,
- "modified": "2023-07-19 13:13:13.307073",
+ "modified": "2020-07-22 12:24:49.144210",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Budget Variance",
  "number_of_groups": 0,
  "owner": "Administrator",
  "report_name": "Budget Variance Report",
- "roles": [],
  "timeseries": 0,
  "type": "Bar",
  "use_report_chart": 1,

erpnext/accounts/dashboard_chart/profit_and_loss/profit_and_loss.json

@@ -4,19 +4,18 @@
  "creation": "2020-07-17 11:25:34.448572",
  "docstatus": 0,
  "doctype": "Dashboard Chart",
- "dynamic_filters_json": "{\"company\":\"frappe.defaults.get_user_default(\\\"Company\\\")\",\"from_fiscal_year\":\"erpnext.utils.get_fiscal_year()\",\"to_fiscal_year\":\"erpnext.utils.get_fiscal_year()\"}",
+ "dynamic_filters_json": "{\"company\":\"frappe.defaults.get_user_default(\\\"Company\\\")\",\"from_fiscal_year\":\"frappe.sys_defaults.fiscal_year\",\"to_fiscal_year\":\"frappe.sys_defaults.fiscal_year\"}",
  "filters_json": "{\"filter_based_on\":\"Fiscal Year\",\"period_start_date\":\"2020-04-01\",\"period_end_date\":\"2021-03-31\",\"periodicity\":\"Yearly\",\"include_default_book_entries\":1}",
  "idx": 0,
  "is_public": 1,
  "is_standard": 1,
- "modified": "2023-07-19 13:08:56.470390",
+ "modified": "2020-07-22 12:33:48.888943",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Profit and Loss",
  "number_of_groups": 0,
  "owner": "Administrator",
  "report_name": "Profit and Loss Statement",
- "roles": [],
  "timeseries": 0,
  "type": "Bar",
  "use_report_chart": 1,

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.db.get_value("Account", account, "root_type")
+	root_type = frappe.get_cached_value("Account", account, "root_type")
 
 	# start with the first date
 	date_index = 0

erpnext/accounts/deferred_revenue.py

@@ -136,7 +136,7 @@ def convert_deferred_revenue_to_income(
 		send_mail(deferred_process)
 
 
-def get_booking_dates(doc, item, posting_date=None, prev_posting_date=None):
+def get_booking_dates(doc, item, posting_date=None):
 	if not posting_date:
 		posting_date = add_days(today(), -1)
 
@@ -146,42 +146,39 @@ def get_booking_dates(doc, item, posting_date=None, prev_posting_date=None):
 		"deferred_revenue_account" if doc.doctype == "Sales Invoice" else "deferred_expense_account"
 	)
 
-	if not prev_posting_date:
-		prev_gl_entry = frappe.db.sql(
-			"""
-			select name, posting_date from `tabGL Entry` where company=%s and account=%s and
-			voucher_type=%s and voucher_no=%s and voucher_detail_no=%s
-			and is_cancelled = 0
-			order by posting_date desc limit 1
-		""",
-			(doc.company, item.get(deferred_account), doc.doctype, doc.name, item.name),
-			as_dict=True,
-		)
+	prev_gl_entry = frappe.db.sql(
+		"""
+		select name, posting_date from `tabGL Entry` where company=%s and account=%s and
+		voucher_type=%s and voucher_no=%s and voucher_detail_no=%s
+		and is_cancelled = 0
+		order by posting_date desc limit 1
+	""",
+		(doc.company, item.get(deferred_account), doc.doctype, doc.name, item.name),
+		as_dict=True,
+	)
 
-		prev_gl_via_je = frappe.db.sql(
-			"""
-			SELECT p.name, p.posting_date FROM `tabJournal Entry` p, `tabJournal Entry Account` c
-			WHERE p.name = c.parent and p.company=%s and c.account=%s
-			and c.reference_type=%s and c.reference_name=%s
-			and c.reference_detail_no=%s and c.docstatus < 2 order by posting_date desc limit 1
-		""",
-			(doc.company, item.get(deferred_account), doc.doctype, doc.name, item.name),
-			as_dict=True,
-		)
+	prev_gl_via_je = frappe.db.sql(
+		"""
+		SELECT p.name, p.posting_date FROM `tabJournal Entry` p, `tabJournal Entry Account` c
+		WHERE p.name = c.parent and p.company=%s and c.account=%s
+		and c.reference_type=%s and c.reference_name=%s
+		and c.reference_detail_no=%s and c.docstatus < 2 order by posting_date desc limit 1
+	""",
+		(doc.company, item.get(deferred_account), doc.doctype, doc.name, item.name),
+		as_dict=True,
+	)
 
-		if prev_gl_via_je:
-			if (not prev_gl_entry) or (
-				prev_gl_entry and prev_gl_entry[0].posting_date < prev_gl_via_je[0].posting_date
-			):
-				prev_gl_entry = prev_gl_via_je
-
-		if prev_gl_entry:
-			start_date = getdate(add_days(prev_gl_entry[0].posting_date, 1))
-		else:
-			start_date = item.service_start_date
+	if prev_gl_via_je:
+		if (not prev_gl_entry) or (
+			prev_gl_entry and prev_gl_entry[0].posting_date < prev_gl_via_je[0].posting_date
+		):
+			prev_gl_entry = prev_gl_via_je
 
+	if prev_gl_entry:
+		start_date = getdate(add_days(prev_gl_entry[0].posting_date, 1))
 	else:
-		start_date = getdate(add_days(prev_posting_date, 1))
+		start_date = item.service_start_date
+
 	end_date = get_last_day(start_date)
 	if end_date >= item.service_end_date:
 		end_date = item.service_end_date
@@ -341,18 +338,12 @@ def book_deferred_income_or_expense(doc, deferred_process, posting_date=None):
 		"enable_deferred_revenue" if doc.doctype == "Sales Invoice" else "enable_deferred_expense"
 	)
 
-	accounts_frozen_upto = frappe.db.get_single_value("Accounts Settings", "acc_frozen_upto")
+	accounts_frozen_upto = frappe.get_cached_value("Accounts Settings", "None", "acc_frozen_upto")
 
 	def _book_deferred_revenue_or_expense(
-		item,
-		via_journal_entry,
-		submit_journal_entry,
-		book_deferred_entries_based_on,
-		prev_posting_date=None,
+		item, via_journal_entry, submit_journal_entry, book_deferred_entries_based_on
 	):
-		start_date, end_date, last_gl_entry = get_booking_dates(
-			doc, item, posting_date=posting_date, prev_posting_date=prev_posting_date
-		)
+		start_date, end_date, last_gl_entry = get_booking_dates(doc, item, posting_date=posting_date)
 		if not (start_date and end_date):
 			return
 
@@ -386,12 +377,9 @@ def book_deferred_income_or_expense(doc, deferred_process, posting_date=None):
 		if not amount:
 			return
 
-		gl_posting_date = end_date
-		prev_posting_date = None
 		# check if books nor frozen till endate:
-		if accounts_frozen_upto and getdate(end_date) <= getdate(accounts_frozen_upto):
-			gl_posting_date = get_last_day(add_days(accounts_frozen_upto, 1))
-			prev_posting_date = end_date
+		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:
 			book_revenue_via_journal_entry(
@@ -400,7 +388,7 @@ def book_deferred_income_or_expense(doc, deferred_process, posting_date=None):
 				debit_account,
 				amount,
 				base_amount,
-				gl_posting_date,
+				end_date,
 				project,
 				account_currency,
 				item.cost_center,
@@ -416,7 +404,7 @@ def book_deferred_income_or_expense(doc, deferred_process, posting_date=None):
 				against,
 				amount,
 				base_amount,
-				gl_posting_date,
+				end_date,
 				project,
 				account_currency,
 				item.cost_center,
@@ -430,11 +418,7 @@ def book_deferred_income_or_expense(doc, deferred_process, posting_date=None):
 
 		if getdate(end_date) < getdate(posting_date) and not last_gl_entry:
 			_book_deferred_revenue_or_expense(
-				item,
-				via_journal_entry,
-				submit_journal_entry,
-				book_deferred_entries_based_on,
-				prev_posting_date,
+				item, via_journal_entry, submit_journal_entry, book_deferred_entries_based_on
 			)
 
 	via_journal_entry = cint(

erpnext/accounts/doctype/account/account.json

@@ -18,6 +18,7 @@
   "root_type",
   "report_type",
   "account_currency",
+  "inter_company_account",
   "column_break1",
   "parent_account",
   "account_type",
@@ -33,11 +34,15 @@
   {
    "fieldname": "properties",
    "fieldtype": "Section Break",
-   "oldfieldtype": "Section Break"
+   "oldfieldtype": "Section Break",
+   "show_days": 1,
+   "show_seconds": 1
   },
   {
    "fieldname": "column_break0",
    "fieldtype": "Column Break",
+   "show_days": 1,
+   "show_seconds": 1,
    "width": "50%"
   },
   {
@@ -48,7 +53,9 @@
    "no_copy": 1,
    "oldfieldname": "account_name",
    "oldfieldtype": "Data",
-   "reqd": 1
+   "reqd": 1,
+   "show_days": 1,
+   "show_seconds": 1
   },
   {
    "fieldname": "account_number",
@@ -56,13 +63,17 @@
    "in_list_view": 1,
    "in_standard_filter": 1,
    "label": "Account Number",
-   "read_only": 1
+   "read_only": 1,
+   "show_days": 1,
+   "show_seconds": 1
   },
   {
    "default": "0",
    "fieldname": "is_group",
    "fieldtype": "Check",
-   "label": "Is Group"
+   "label": "Is Group",
+   "show_days": 1,
+   "show_seconds": 1
   },
   {
    "fieldname": "company",
@@ -74,7 +85,9 @@
    "options": "Company",
    "read_only": 1,
    "remember_last_selected_value": 1,
-   "reqd": 1
+   "reqd": 1,
+   "show_days": 1,
+   "show_seconds": 1
   },
   {
    "fieldname": "root_type",
@@ -82,7 +95,9 @@
    "in_standard_filter": 1,
    "label": "Root Type",
    "options": "\nAsset\nLiability\nIncome\nExpense\nEquity",
-   "read_only": 1
+   "read_only": 1,
+   "show_days": 1,
+   "show_seconds": 1
   },
   {
    "fieldname": "report_type",
@@ -90,18 +105,32 @@
    "in_standard_filter": 1,
    "label": "Report Type",
    "options": "\nBalance Sheet\nProfit and Loss",
-   "read_only": 1
+   "read_only": 1,
+   "show_days": 1,
+   "show_seconds": 1
   },
   {
    "depends_on": "eval:doc.is_group==0",
    "fieldname": "account_currency",
    "fieldtype": "Link",
    "label": "Currency",
-   "options": "Currency"
+   "options": "Currency",
+   "show_days": 1,
+   "show_seconds": 1
+  },
+  {
+   "default": "0",
+   "fieldname": "inter_company_account",
+   "fieldtype": "Check",
+   "label": "Inter Company Account",
+   "show_days": 1,
+   "show_seconds": 1
   },
   {
    "fieldname": "column_break1",
    "fieldtype": "Column Break",
+   "show_days": 1,
+   "show_seconds": 1,
    "width": "50%"
   },
   {
@@ -113,7 +142,9 @@
    "oldfieldtype": "Link",
    "options": "Account",
    "reqd": 1,
-   "search_index": 1
+   "search_index": 1,
+   "show_days": 1,
+   "show_seconds": 1
   },
   {
    "description": "Setting Account Type helps in selecting this Account in transactions.",
@@ -123,7 +154,9 @@
    "label": "Account Type",
    "oldfieldname": "account_type",
    "oldfieldtype": "Select",
-   "options": "\nAccumulated Depreciation\nAsset Received But Not Billed\nBank\nCash\nChargeable\nCapital Work in Progress\nCost of Goods Sold\nDepreciation\nEquity\nExpense Account\nExpenses Included In Asset Valuation\nExpenses Included In Valuation\nFixed Asset\nIncome Account\nPayable\nReceivable\nRound Off\nStock\nStock Adjustment\nStock Received But Not Billed\nService Received But Not Billed\nTax\nTemporary"
+   "options": "\nAccumulated Depreciation\nAsset Received But Not Billed\nBank\nCash\nChargeable\nCapital Work in Progress\nCost of Goods Sold\nDepreciation\nEquity\nExpense Account\nExpenses Included In Asset Valuation\nExpenses Included In Valuation\nFixed Asset\nIncome Account\nPayable\nReceivable\nRound Off\nStock\nStock Adjustment\nStock Received But Not Billed\nService Received But Not Billed\nTax\nTemporary",
+   "show_days": 1,
+   "show_seconds": 1
   },
   {
    "description": "Rate at which this tax is applied",
@@ -131,7 +164,9 @@
    "fieldtype": "Float",
    "label": "Rate",
    "oldfieldname": "tax_rate",
-   "oldfieldtype": "Currency"
+   "oldfieldtype": "Currency",
+   "show_days": 1,
+   "show_seconds": 1
   },
   {
    "description": "If the account is frozen, entries are allowed to restricted users.",
@@ -140,13 +175,17 @@
    "label": "Frozen",
    "oldfieldname": "freeze_account",
    "oldfieldtype": "Select",
-   "options": "No\nYes"
+   "options": "No\nYes",
+   "show_days": 1,
+   "show_seconds": 1
   },
   {
    "fieldname": "balance_must_be",
    "fieldtype": "Select",
    "label": "Balance must be",
-   "options": "\nDebit\nCredit"
+   "options": "\nDebit\nCredit",
+   "show_days": 1,
+   "show_seconds": 1
   },
   {
    "fieldname": "lft",
@@ -155,7 +194,9 @@
    "label": "Lft",
    "print_hide": 1,
    "read_only": 1,
-   "search_index": 1
+   "search_index": 1,
+   "show_days": 1,
+   "show_seconds": 1
   },
   {
    "fieldname": "rgt",
@@ -164,7 +205,9 @@
    "label": "Rgt",
    "print_hide": 1,
    "read_only": 1,
-   "search_index": 1
+   "search_index": 1,
+   "show_days": 1,
+   "show_seconds": 1
   },
   {
    "fieldname": "old_parent",
@@ -172,27 +215,33 @@
    "hidden": 1,
    "label": "Old Parent",
    "print_hide": 1,
-   "read_only": 1
+   "read_only": 1,
+   "show_days": 1,
+   "show_seconds": 1
   },
   {
    "default": "0",
    "depends_on": "eval:(doc.report_type == 'Profit and Loss' && !doc.is_group)",
    "fieldname": "include_in_gross",
    "fieldtype": "Check",
-   "label": "Include in gross"
+   "label": "Include in gross",
+   "show_days": 1,
+   "show_seconds": 1
   },
   {
    "default": "0",
    "fieldname": "disabled",
    "fieldtype": "Check",
-   "label": "Disable"
+   "label": "Disable",
+   "show_days": 1,
+   "show_seconds": 1
   }
  ],
  "icon": "fa fa-money",
  "idx": 1,
  "is_tree": 1,
  "links": [],
- "modified": "2023-04-11 16:08:46.983677",
+ "modified": "2020-06-11 15:15:54.338622",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Account",
@@ -252,6 +301,5 @@
  "show_name_in_global_search": 1,
  "sort_field": "modified",
  "sort_order": "ASC",
- "states": [],
  "track_changes": 1
 }

erpnext/accounts/doctype/account/account.py

@@ -58,7 +58,7 @@ class Account(NestedSet):
 	def validate_parent(self):
 		"""Fetch Parent Details and validate parent account"""
 		if self.parent_account:
-			par = frappe.db.get_value(
+			par = frappe.get_cached_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.db.get_value(
+			par = frappe.get_cached_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 = frappe.db.get_value("Account", self.name, ["report_type", "root_type"], as_dict=1)
+			db_value = self.get_doc_before_save()
 			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):
-		# 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)
+		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)
 
 		if not self.parent_account and not self.is_group:
-			frappe.throw(_("The root account {0} must be a group").format(frappe.bold(self.name)))
+			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,7 +127,9 @@ class Account(NestedSet):
 			return
 		ancestors = get_root_company(self.company)
 		if ancestors:
-			if frappe.get_value("Company", self.company, "allow_account_creation_against_child_company"):
+			if frappe.get_cached_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"
@@ -138,7 +140,7 @@ class Account(NestedSet):
 			if not descendants:
 				return
 			parent_acc_name_map = {}
-			parent_acc_name, parent_acc_number = frappe.db.get_value(
+			parent_acc_name, parent_acc_number = frappe.get_cached_value(
 				"Account", self.parent_account, ["account_name", "account_number"]
 			)
 			filters = {
@@ -159,27 +161,28 @@ class Account(NestedSet):
 			self.create_account_for_child_company(parent_acc_name_map, descendants, parent_acc_name)
 
 	def validate_group_or_ledger(self):
-		if self.get("__islocal"):
+		doc_before_save = self.get_doc_before_save()
+		if not doc_before_save or cint(doc_before_save.is_group) == cint(self.is_group):
 			return
 
-		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"))
+		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):
-		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"))
+		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"))
 
 	def validate_balance_must_be_debit_or_credit(self):
 		from erpnext.accounts.utils import get_balance_on
@@ -201,11 +204,8 @@ class Account(NestedSet):
 				)
 
 	def validate_account_currency(self):
-		self.currency_explicitly_specified = True
-
 		if not self.account_currency:
 			self.account_currency = frappe.get_cached_value("Company", self.company, "default_currency")
-			self.currency_explicitly_specified = False
 
 		gl_currency = frappe.db.get_value("GL Entry", {"account": self.name}, "account_currency")
 
@@ -226,9 +226,9 @@ class Account(NestedSet):
 				)
 
 			# validate if parent of child company account to be added is a 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"
-			):
+			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"):
 				msg = _(
 					"While creating account for Child Company {0}, parent account {1} found as a ledger account."
 				).format(company_bold, parent_acc_name_bold)
@@ -251,10 +251,8 @@ class Account(NestedSet):
 					{
 						"company": company,
 						# parent account's currency should be passed down to child account's curreny
-						# if currency explicitly specified by user, child will inherit. else, default currency will be used.
-						"account_currency": self.account_currency
-						if self.currency_explicitly_specified
-						else erpnext.get_company_currency(company),
+						# if it is None, it picks it up from default company currency, which might be unintended
+						"account_currency": erpnext.get_company_currency(company),
 						"parent_account": parent_acc_name_map[company],
 					}
 				)
@@ -382,29 +380,21 @@ 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.db.get_value("Account", name, "company", as_dict=True)
+	account = frappe.get_cached_doc("Account", name)
 	if not account:
 		return
 
-	old_acc_name, old_acc_number = frappe.db.get_value(
-		"Account", name, ["account_name", "account_number"]
-	)
+	old_acc_name, old_acc_number = account.account_name, account.account_number
 
 	# check if account exists in parent company
 	ancestors = get_ancestors_of("Company", account.company)
-	allow_independent_account_creation = frappe.get_value(
+	allow_independent_account_creation = frappe.get_cached_value(
 		"Company", account.company, "allow_account_creation_against_child_company"
 	)
 
 	if ancestors and not allow_independent_account_creation:
 		for ancestor in ancestors:
-			old_name = frappe.db.get_value(
-				"Account",
-				{"account_number": old_acc_number, "account_name": old_acc_name, "company": ancestor},
-				"name",
-			)
-
-			if old_name:
+			if frappe.db.get_value("Account", {"account_name": old_acc_name, "company": ancestor}, "name"):
 				# same account in parent company exists
 				allow_child_account_creation = _("Allow Account Creation Against Child Company")
 
@@ -446,22 +436,24 @@ 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
-	if not frappe.db.exists("Account", new):
+	new_account = frappe.get_cached_doc("Account", new)
+
+	if not new_account:
 		throw(_("Account {0} does not exist").format(new))
 
-	val = list(frappe.db.get_value("Account", new, ["is_group", "root_type", "company"]))
-
-	if val != [cint(is_group), root_type, company]:
+	if (new_account.is_group, new_account.root_type, new_account.company) != (
+		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 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")
-		)
+	if is_group and new_account.parent_account == old:
+		new_account.db_set("parent_account", frappe.get_cached_value("Account", old, "parent_account"))
 
 	frappe.rename_doc("Account", old, new, merge=1, force=1)
 

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

@@ -29,7 +29,6 @@ def create_charts(
 					"root_type",
 					"is_group",
 					"tax_rate",
-					"account_currency",
 				]:
 
 					account_number = cstr(child.get("account_number")).strip()
@@ -54,7 +53,7 @@ def create_charts(
 							"account_number": account_number,
 							"account_type": child.get("account_type"),
 							"account_currency": child.get("account_currency")
-							or frappe.db.get_value("Company", company, "default_currency"),
+							or frappe.get_cached_value("Company", company, "default_currency"),
 							"tax_rate": child.get("tax_rate"),
 						}
 					)
@@ -96,17 +95,7 @@ def identify_is_group(child):
 		is_group = child.get("is_group")
 	elif len(
 		set(child.keys())
-		- set(
-			[
-				"account_name",
-				"account_type",
-				"root_type",
-				"is_group",
-				"tax_rate",
-				"account_number",
-				"account_currency",
-			]
-		)
+		- set(["account_name", "account_type", "root_type", "is_group", "tax_rate", "account_number"])
 	):
 		is_group = 1
 	else:
@@ -159,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.db.get_value("Country", country, "code")
+	country_code = frappe.get_cached_value("Country", country, "code")
 	if country_code:
 		folders = ("verified",)
 		if frappe.local.flags.allow_unverified_charts:
@@ -196,7 +185,6 @@ def get_account_tree_from_existing_company(existing_company):
 			"root_type",
 			"tax_rate",
 			"account_number",
-			"account_currency",
 		],
 		order_by="lft, rgt",
 	)
@@ -279,7 +267,6 @@ def build_tree_from_json(chart_template, chart_data=None, from_coa_importer=Fals
 				"root_type",
 				"is_group",
 				"tax_rate",
-				"account_currency",
 			]:
 				continue
 

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

@@ -2,397 +2,438 @@
     "country_code": "at",
     "name": "Austria - Chart of Accounts",
     "tree": {
-        "Summe Abschreibungen und Aufwendungen": {
-            "7010 bis 7080 Abschreibungen auf das Anlageverm\u00f6gen (ausgenommen Finanzanlagen)": {},
-            "7100 bis 7190 Sonstige Steuern": {
-                "account_type": "Tax"
-            },
-            "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"
-        },
-        "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"
-        },
-        "Summe Eigenkapital R\u00fccklagen Abschlusskonten": {
-            "9000 bis 9180 Gezeichnetes bzw. gewidmetes Kapital": {
-                "account_type": "Equity"
-            },
-            "9200 bis 9290 Kapitalr\u00fccklagen": {
-                "account_type": "Equity"
-            },
-            "9300 bis 9380 Gewinnr\u00fccklagen": {
-                "account_type": "Equity"
-            },
-            "9400 bis 9590 Bewertungsreserven uns sonst. unversteuerte R\u00fccklagen": {
-                "account_type": "Equity"
-            },
-            "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": {
+        "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 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)": {
+            "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)": {
                 "account_type": "Tax"
             },
-            "Umsatzsteuer": {},
-            "Umsatzsteuer Zahllast": {
+            "3500 Verbindlichkeiten aus Umsatzsteuer": {"account_type": "Tax"},
+            "3580 Umsatzsteuer Zahllast": {
                 "account_type": "Tax"
             },
-            "Umsatzsteuer aus i.g. Erwerb 10%": {
+            "3510 Umsatzsteuer Inland 20%": {
                 "account_type": "Tax"
             },
-            "Umsatzsteuer aus i.g. Erwerb 20%": {
+            "3515 Umsatzsteuer Inland 10%": {
+                "account_type": "Tax"
+            },            
+            "3520 Umsatzsteuer aus i.g. Erwerb 20%": {
                 "account_type": "Tax"
             },
-            "Umsatzsteuer aus i.g. Lieferungen 10%": {
+            "3525 Umsatzsteuer aus i.g. Erwerb 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": {
+            },            
+            "3560 Umsatzsteuer-Evidenzkonto f\u00fcr erhaltene Anzahlungen auf Bestellungen": {},
+            "3360 Verbindlichkeiten aus Lieferungen u. Leistungen EU": {
                 "account_type": "Payable"
             },
-            "Verbindlichkeiten aus Lieferungen u. Leistungen Inland": {
+            "3000 Verbindlichkeiten aus Lieferungen u. Leistungen Inland": {
                 "account_type": "Payable"
             },
-            "Verbindlichkeiten aus Lieferungen u. Leistungen sonst. Ausland": {
+            "3370 Verbindlichkeiten aus Lieferungen u. Leistungen sonst. Ausland": {
                 "account_type": "Payable"
             },
-            "Verbindlichkeiten gegen\u00fcber Gesellschaften": {},
-            "Verrechnung Finanzamt": {
+            "3400 Verbindlichkeiten gegen\u00fcber verbundenen Unternehmen": {},
+            "3570 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": {},
+        },      
+        "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"
         },
-        "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": {},
+          "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"},
+            "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"
         },
-        "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": {},
+        "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": {
+                "account_type": "Equity"
+            },
+            "9200 Kapitalr\u00fccklagen": {
+                "account_type": "Equity"
+            },
+            "9300 Gewinnr\u00fccklagen": {
+                "account_type": "Equity"
+            },
+            "9400 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": {
+                "account_type": "Equity"
+            },
+            "root_type": "Equity"
         }
-    }
-}
+     }   
+  }

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/account/chart_of_accounts/verified/nl_grootboekschema.json

@@ -2,13 +2,75 @@
     "country_code": "nl", 
     "name": "Netherlands - Grootboekschema", 
     "tree": {
+        "FABRIKAGEREKENINGEN": {
+			"is_group": 1,
+            "root_type": "Expense"
+        }, 
         "FINANCIELE REKENINGEN, KORTLOPENDE VORDERINGEN EN SCHULDEN": {
             "Bank": {
                 "RABO Bank": {
                     "account_type": "Bank"
                 }, 
                 "account_type": "Bank"
-            },
+            }, 
+            "KORTLOPENDE SCHULDEN": {
+                "Af te dragen Btw-verlegd": {
+                    "account_type": "Tax"
+                }, 
+                "Afdracht loonheffing": {}, 
+                "Btw af te dragen hoog": {
+                    "account_type": "Tax"
+                }, 
+                "Btw af te dragen laag": {
+                    "account_type": "Tax"
+                }, 
+                "Btw af te dragen overig": {
+                    "account_type": "Tax"
+                }, 
+                "Btw oude jaren": {
+                    "account_type": "Tax"
+                }, 
+                "Btw te vorderen hoog": {
+                    "account_type": "Tax"
+                }, 
+                "Btw te vorderen laag": {
+                    "account_type": "Tax"
+                }, 
+                "Btw te vorderen overig": {
+                    "account_type": "Tax"
+                }, 
+                "Btw-afdracht": {
+                    "account_type": "Tax"
+                }, 
+                "Crediteuren": {
+                    "account_type": "Payable"
+                }, 
+                "Dividend": {}, 
+                "Dividendbelasting": {}, 
+                "Energiekosten 1": {}, 
+                "Investeringsaftrek": {}, 
+                "Loonheffing": {}, 
+                "Overige te betalen posten": {}, 
+                "Pensioenpremies 1": {}, 
+                "Premie WIR": {}, 
+                "Rekening-courant inkoopvereniging": {}, 
+                "Rente": {}, 
+                "Sociale lasten 1": {}, 
+                "Stock Recieved niet gefactureerd": {
+                    "account_type": "Stock Received But Not Billed"
+                }, 
+                "Tanti\u00e8mes 1": {}, 
+                "Te vorderen Btw-verlegd": {
+                    "account_type": "Tax"
+                }, 
+                "Telefoon/telefax 1": {}, 
+                "Termijnen onderh. werk": {}, 
+                "Vakantiedagen": {}, 
+                "Vakantiegeld 1": {}, 
+                "Vakantiezegels": {}, 
+                "Vennootschapsbelasting": {}, 
+                "Vooruit ontvangen bedr.": {}
+            }, 
             "LIQUIDE MIDDELEN": {
                 "ABN-AMRO bank": {}, 
                 "Bankbetaalkaarten": {}, 
@@ -29,110 +91,6 @@
                 }, 
                 "account_type": "Cash"
             }, 
-            "TUSSENREKENINGEN": {
-                "Betaalwijze cadeaubonnen": {
-                    "account_type": "Cash"
-                }, 
-                "Betaalwijze chipknip": {
-                    "account_type": "Cash"
-                }, 
-                "Betaalwijze contant": {
-                    "account_type": "Cash"
-                }, 
-                "Betaalwijze pin": {
-                    "account_type": "Cash"
-                }, 
-                "Inkopen Nederland hoog": {
-                    "account_type": "Cash"
-                }, 
-                "Inkopen Nederland laag": {
-                    "account_type": "Cash"
-                }, 
-                "Inkopen Nederland onbelast": {
-                    "account_type": "Cash"
-                }, 
-                "Inkopen Nederland overig": {
-                    "account_type": "Cash"
-                }, 
-                "Inkopen Nederland verlegd": {
-                    "account_type": "Cash"
-                }, 
-                "Inkopen binnen EU hoog": {
-                    "account_type": "Cash"
-                }, 
-                "Inkopen binnen EU laag": {
-                    "account_type": "Cash"
-                }, 
-                "Inkopen binnen EU overig": {
-                    "account_type": "Cash"
-                }, 
-                "Inkopen buiten EU hoog": {
-                    "account_type": "Cash"
-                }, 
-                "Inkopen buiten EU laag": {
-                    "account_type": "Cash"
-                }, 
-                "Inkopen buiten EU overig": {
-                    "account_type": "Cash"
-                }, 
-                "Kassa 1": {
-                    "account_type": "Cash"
-                }, 
-                "Kassa 2": {
-                    "account_type": "Cash"
-                }, 
-                "Netto lonen": {
-                    "account_type": "Cash"
-                }, 
-                "Tegenrekening Inkopen": {
-                    "account_type": "Cash"
-                }, 
-                "Tussenrek. autom. betalingen": {
-                    "account_type": "Cash"
-                }, 
-                "Tussenrek. autom. loonbetalingen": {
-                    "account_type": "Cash"
-                }, 
-                "Tussenrek. cadeaubonbetalingen": {
-                    "account_type": "Cash"
-                }, 
-                "Tussenrekening balans": {
-                    "account_type": "Cash"
-                }, 
-                "Tussenrekening chipknip": {
-                    "account_type": "Cash"
-                }, 
-                "Tussenrekening correcties": {
-                    "account_type": "Cash"
-                }, 
-                "Tussenrekening pin": {
-                    "account_type": "Cash"
-                }, 
-                "Vraagposten": {
-                    "account_type": "Cash"
-                },
-                "VOORRAAD GRONDSTOFFEN, HULPMATERIALEN EN HANDELSGOEDEREN": {
-                    "Emballage": {}, 
-                    "Gereed product 1": {}, 
-                    "Gereed product 2": {}, 
-                    "Goederen 1": {}, 
-                    "Goederen 2": {}, 
-                    "Goederen in consignatie": {}, 
-                    "Goederen onderweg": {}, 
-                    "Grondstoffen 1": {}, 
-                    "Grondstoffen 2": {}, 
-                    "Halffabrikaten 1": {}, 
-                    "Halffabrikaten 2": {}, 
-                    "Hulpstoffen 1": {}, 
-                    "Hulpstoffen 2": {}, 
-                    "Kantoorbenodigdheden": {}, 
-                    "Onderhanden werk": {}, 
-                    "Verpakkingsmateriaal": {}, 
-                    "Zegels": {}, 
-                    "root_type": "Asset"
-                },
-                "root_type": "Asset"
-            },
             "VORDERINGEN": {
                 "Debiteuren": {
                     "account_type": "Receivable"
@@ -146,299 +104,278 @@
                 "Voorziening dubieuze debiteuren": {}
             }, 
             "root_type": "Asset"
-        },
-        "KORTLOPENDE SCHULDEN": {
-            "Af te dragen Btw-verlegd": {
-                "account_type": "Tax"
-            }, 
-            "Afdracht loonheffing": {}, 
-            "Btw af te dragen hoog": {
-                "account_type": "Tax"
-            }, 
-            "Btw af te dragen laag": {
-                "account_type": "Tax"
-            }, 
-            "Btw af te dragen overig": {
-                "account_type": "Tax"
-            }, 
-            "Btw oude jaren": {
-                "account_type": "Tax"
-            }, 
-            "Btw te vorderen hoog": {
-                "account_type": "Tax"
-            }, 
-            "Btw te vorderen laag": {
-                "account_type": "Tax"
-            }, 
-            "Btw te vorderen overig": {
-                "account_type": "Tax"
-            }, 
-            "Btw-afdracht": {
-                "account_type": "Tax"
-            }, 
-            "Crediteuren": {
-                "account_type": "Payable"
-            }, 
-            "Dividend": {}, 
-            "Dividendbelasting": {}, 
-            "Energiekosten 1": {}, 
-            "Investeringsaftrek": {}, 
-            "Loonheffing": {}, 
-            "Overige te betalen posten": {}, 
-            "Pensioenpremies 1": {}, 
-            "Premie WIR": {}, 
-            "Rekening-courant inkoopvereniging": {}, 
-            "Rente": {}, 
-            "Sociale lasten 1": {}, 
-            "Stock Recieved niet gefactureerd": {
-                "account_type": "Stock Received But Not Billed"
-            }, 
-            "Tanti\u00e8mes 1": {}, 
-            "Te vorderen Btw-verlegd": {
-                "account_type": "Tax"
-            }, 
-            "Telefoon/telefax 1": {}, 
-            "Termijnen onderh. werk": {}, 
-            "Vakantiedagen": {}, 
-            "Vakantiegeld 1": {}, 
-            "Vakantiezegels": {}, 
-            "Vennootschapsbelasting": {}, 
-            "Vooruit ontvangen bedr.": {},
-            "is_group": 1,
-            "root_type": "Liability"
-        },
-        "FABRIKAGEREKENINGEN": {
+        }, 
+        "INDIRECTE KOSTEN": {
 			"is_group": 1,
-            "root_type": "Expense",
-            "INDIRECTE KOSTEN": {
-                "is_group": 1,
-                "root_type": "Expense"
-            }, 
-            "KOSTENREKENINGEN": {
-                "AFSCHRIJVINGEN": {
-                    "Aanhangwagens": {}, 
-                    "Aankoopkosten": {}, 
-                    "Aanloopkosten": {}, 
-                    "Auteursrechten": {}, 
-                    "Bedrijfsgebouwen": {}, 
-                    "Bedrijfsinventaris": {
-                        "account_type": "Depreciation"
-                    }, 
-                    "Drankvergunningen": {}, 
-                    "Fabrieksinventaris": {
-                        "account_type": "Depreciation"
-                    }, 
-                    "Gebouwen": {}, 
-                    "Gereedschappen": {}, 
-                    "Goodwill": {}, 
-                    "Grondverbetering": {}, 
-                    "Heftrucks": {}, 
-                    "Kantine-inventaris": {}, 
-                    "Kantoorinventaris": {
-                        "account_type": "Depreciation"
-                    }, 
-                    "Kantoormachines": {}, 
-                    "Licenties": {}, 
-                    "Machines 1": {}, 
-                    "Magazijninventaris": {}, 
-                    "Octrooien": {}, 
-                    "Ontwikkelingskosten": {}, 
-                    "Pachtersinvestering": {}, 
-                    "Parkeerplaats": {}, 
-                    "Personenauto's": {
-                        "account_type": "Depreciation"
-                    }, 
-                    "Rijwielen en bromfietsen": {}, 
-                    "Tonnagevergunningen": {}, 
-                    "Verbouwingen": {}, 
-                    "Vergunningen": {}, 
-                    "Voorraadverschillen": {}, 
-                    "Vrachtauto's": {}, 
-                    "Winkels": {}, 
-                    "Woon-winkelhuis": {}, 
+            "root_type": "Expense"
+        }, 
+        "KOSTENREKENINGEN": {
+            "AFSCHRIJVINGEN": {
+                "Aanhangwagens": {}, 
+                "Aankoopkosten": {}, 
+                "Aanloopkosten": {}, 
+                "Auteursrechten": {}, 
+                "Bedrijfsgebouwen": {}, 
+                "Bedrijfsinventaris": {
                     "account_type": "Depreciation"
                 }, 
-                "ALGEMENE KOSTEN": {
-                    "Accountantskosten": {}, 
-                    "Advieskosten": {}, 
-                    "Assuranties 1": {}, 
-                    "Bankkosten": {}, 
-                    "Juridische kosten": {}, 
-                    "Overige algemene kosten": {}, 
-                    "Toev. Ass. eigen risico": {}
+                "Drankvergunningen": {}, 
+                "Fabrieksinventaris": {
+                    "account_type": "Depreciation"
                 }, 
-                "BEDRIJFSKOSTEN": {
-                    "Assuranties 2": {}, 
-                    "Energie (krachtstroom)": {}, 
-                    "Gereedschappen 1": {}, 
-                    "Hulpmaterialen 1": {}, 
-                    "Huur inventaris": {}, 
-                    "Huur machines": {}, 
-                    "Leasing invent.operational": {}, 
-                    "Leasing mach. operational": {}, 
-                    "Onderhoud inventaris": {}, 
-                    "Onderhoud machines": {}, 
-                    "Ophalen/vervoer afval": {}, 
-                    "Overige bedrijfskosten": {}
+                "Gebouwen": {}, 
+                "Gereedschappen": {}, 
+                "Goodwill": {}, 
+                "Grondverbetering": {}, 
+                "Heftrucks": {}, 
+                "Kantine-inventaris": {}, 
+                "Kantoorinventaris": {
+                    "account_type": "Depreciation"
                 }, 
-                "FINANCIERINGSKOSTEN 1": {
-                    "Overige rentebaten": {}, 
-                    "Overige rentelasten": {}, 
-                    "Rente bankkrediet": {}, 
-                    "Rente huurkoopcontracten": {}, 
-                    "Rente hypotheek": {}, 
-                    "Rente leasecontracten": {}, 
-                    "Rente lening o/g": {}, 
-                    "Rente lening u/g": {}
+                "Kantoormachines": {}, 
+                "Licenties": {}, 
+                "Machines 1": {}, 
+                "Magazijninventaris": {}, 
+                "Octrooien": {}, 
+                "Ontwikkelingskosten": {}, 
+                "Pachtersinvestering": {}, 
+                "Parkeerplaats": {}, 
+                "Personenauto's": {
+                    "account_type": "Depreciation"
                 }, 
-                "HUISVESTINGSKOSTEN": {
-                    "Assurantie onroerend goed": {}, 
-                    "Belastingen onr. Goed": {}, 
-                    "Energiekosten": {}, 
-                    "Groot onderhoud onr. Goed": {}, 
-                    "Huur": {}, 
-                    "Huurwaarde woongedeelte": {}, 
-                    "Onderhoud onroerend goed": {}, 
-                    "Ontvangen huren": {}, 
-                    "Overige huisvestingskosten": {}, 
-                    "Pacht": {}, 
-                    "Schoonmaakkosten": {}, 
-                    "Toevoeging egalisatieres. Groot onderhoud": {}
-                }, 
-                "KANTOORKOSTEN": {
-                    "Administratiekosten": {}, 
-                    "Contributies/abonnementen": {}, 
-                    "Huur kantoorapparatuur": {}, 
-                    "Internetaansluiting": {}, 
-                    "Kantoorbenodigdh./drukw.": {}, 
-                    "Onderhoud kantoorinvent.": {}, 
-                    "Overige kantoorkosten": {}, 
-                    "Porti": {}, 
-                    "Telefoon/telefax": {}
-                }, 
-                "OVERIGE BATEN EN LASTEN": {
-                    "Betaalde schadevergoed.": {}, 
-                    "Boekverlies vaste activa": {}, 
-                    "Boekwinst van vaste activa": {}, 
-                    "K.O. regeling OB": {}, 
-                    "Kasverschillen": {}, 
-                    "Kosten loonbelasting": {}, 
-                    "Kosten omzetbelasting": {}, 
-                    "Nadelige koersverschillen": {}, 
-                    "Naheffing bedrijfsver.": {}, 
-                    "Ontvangen schadevergoed.": {}, 
-                    "Overige baten": {}, 
-                    "Overige lasten": {}, 
-                    "Voordelige koersverschil.": {}
-                }, 
-                "PERSONEELSKOSTEN": {
-                    "Autokostenvergoeding": {}, 
-                    "Bedrijfskleding": {}, 
-                    "Belastingvrije uitkeringen": {}, 
-                    "Bijzondere beloningen": {}, 
-                    "Congressen, seminars en symposia": {}, 
-                    "Gereedschapsgeld": {}, 
-                    "Geschenken personeel": {}, 
-                    "Gratificaties": {}, 
-                    "Inhouding pensioenpremies": {}, 
-                    "Inhouding sociale lasten": {}, 
-                    "Kantinekosten": {}, 
-                    "Lonen en salarissen": {}, 
-                    "Loonwerk": {}, 
-                    "Managementvergoedingen": {}, 
-                    "Opleidingskosten": {}, 
-                    "Oprenting stamrechtverpl.": {}, 
-                    "Overhevelingstoeslag": {}, 
-                    "Overige kostenverg.": {}, 
-                    "Overige personeelskosten": {}, 
-                    "Overige uitkeringen": {}, 
-                    "Pensioenpremies": {}, 
-                    "Provisie 1": {}, 
-                    "Reiskosten": {}, 
-                    "Rijwielvergoeding": {}, 
-                    "Sociale lasten": {}, 
-                    "Tanti\u00e8mes": {}, 
-                    "Thuiswerkers": {}, 
-                    "Toev. Backservice pens.verpl.": {}, 
-                    "Toevoeging pensioenverpl.": {}, 
-                    "Uitkering ziekengeld": {}, 
-                    "Uitzendkrachten": {}, 
-                    "Vakantiebonnen": {}, 
-                    "Vakantiegeld": {}, 
-                    "Vergoeding studiekosten": {}, 
-                    "Wervingskosten personeel": {}
-                }, 
-                "VERKOOPKOSTEN": {
-                    "Advertenties": {}, 
-                    "Afschrijving dubieuze deb.": {}, 
-                    "Beurskosten": {}, 
-                    "Etalagekosten": {}, 
-                    "Exportkosten": {}, 
-                    "Kascorrecties": {}, 
-                    "Overige verkoopkosten": {}, 
-                    "Provisie": {}, 
-                    "Reclame": {}, 
-                    "Reis en verblijfkosten": {}, 
-                    "Relatiegeschenken": {}, 
-                    "Representatiekosten": {}, 
-                    "Uitgaande vrachten": {}, 
-                    "Veilingkosten": {}, 
-                    "Verpakkingsmateriaal 1": {}, 
-                    "Websitekosten": {}
-                }, 
-                "VERVOERSKOSTEN": {
-                    "Assuranties auto's": {}, 
-                    "Brandstoffen": {}, 
-                    "Leasing auto's": {}, 
-                    "Onderhoud personenauto's": {}, 
-                    "Onderhoud vrachtauto's": {}, 
-                    "Overige vervoerskosten": {}, 
-                    "Priv\u00e9-gebruik auto's": {}, 
-                    "Wegenbelasting": {}
-                },
-                "VOORRAAD GEREED PRODUCT EN ONDERHANDEN WERK": {
-                    "Betalingskort. crediteuren": {}, 
-                    "Garantiekosten": {}, 
-                    "Hulpmaterialen": {}, 
-                    "Inkomende vrachten": {
-                        "account_type": "Expenses Included In Valuation"
-                    }, 
-                    "Inkoop import buiten EU hoog": {}, 
-                    "Inkoop import buiten EU laag": {}, 
-                    "Inkoop import buiten EU overig": {}, 
-                    "Inkoopbonussen": {}, 
-                    "Inkoopkosten": {}, 
-                    "Inkoopprovisie": {}, 
-                    "Inkopen BTW verlegd": {}, 
-                    "Inkopen EU hoog tarief": {}, 
-                    "Inkopen EU laag tarief": {}, 
-                    "Inkopen EU overig": {}, 
-                    "Inkopen hoog": {}, 
-                    "Inkopen laag": {}, 
-                    "Inkopen nul": {}, 
-                    "Inkopen overig": {}, 
-                    "Invoerkosten": {}, 
-                    "Kosten inkoopvereniging": {}, 
-                    "Kostprijs omzet grondstoffen": {
-                        "account_type": "Cost of Goods Sold"
-                    }, 
-                    "Kostprijs omzet handelsgoederen": {}, 
-                    "Onttrekking uitgev.garantie": {}, 
-                    "Priv\u00e9-gebruik goederen": {}, 
-                    "Stock aanpassing": {
-                        "account_type": "Stock Adjustment"
-                    }, 
-                    "Tegenrekening inkoop": {}, 
-                    "Toev. Voorz. incour. grondst.": {}, 
-                    "Toevoeging garantieverpl.": {}, 
-                    "Toevoeging voorz. incour. handelsgoed.": {}, 
-                    "Uitbesteed werk": {}, 
-                    "Voorz. Incourourant grondst.": {}, 
-                    "Voorz.incour. handelsgoed.": {}, 
-                    "root_type": "Expense"
-                },
-                "root_type": "Expense"
-            }
+                "Rijwielen en bromfietsen": {}, 
+                "Tonnagevergunningen": {}, 
+                "Verbouwingen": {}, 
+                "Vergunningen": {}, 
+                "Voorraadverschillen": {}, 
+                "Vrachtauto's": {}, 
+                "Winkels": {}, 
+                "Woon-winkelhuis": {}, 
+                "account_type": "Depreciation"
+            }, 
+            "ALGEMENE KOSTEN": {
+                "Accountantskosten": {}, 
+                "Advieskosten": {}, 
+                "Assuranties 1": {}, 
+                "Bankkosten": {}, 
+                "Juridische kosten": {}, 
+                "Overige algemene kosten": {}, 
+                "Toev. Ass. eigen risico": {}
+            }, 
+            "BEDRIJFSKOSTEN": {
+                "Assuranties 2": {}, 
+                "Energie (krachtstroom)": {}, 
+                "Gereedschappen 1": {}, 
+                "Hulpmaterialen 1": {}, 
+                "Huur inventaris": {}, 
+                "Huur machines": {}, 
+                "Leasing invent.operational": {}, 
+                "Leasing mach. operational": {}, 
+                "Onderhoud inventaris": {}, 
+                "Onderhoud machines": {}, 
+                "Ophalen/vervoer afval": {}, 
+                "Overige bedrijfskosten": {}
+            }, 
+            "FINANCIERINGSKOSTEN 1": {
+                "Overige rentebaten": {}, 
+                "Overige rentelasten": {}, 
+                "Rente bankkrediet": {}, 
+                "Rente huurkoopcontracten": {}, 
+                "Rente hypotheek": {}, 
+                "Rente leasecontracten": {}, 
+                "Rente lening o/g": {}, 
+                "Rente lening u/g": {}
+            }, 
+            "HUISVESTINGSKOSTEN": {
+                "Assurantie onroerend goed": {}, 
+                "Belastingen onr. Goed": {}, 
+                "Energiekosten": {}, 
+                "Groot onderhoud onr. Goed": {}, 
+                "Huur": {}, 
+                "Huurwaarde woongedeelte": {}, 
+                "Onderhoud onroerend goed": {}, 
+                "Ontvangen huren": {}, 
+                "Overige huisvestingskosten": {}, 
+                "Pacht": {}, 
+                "Schoonmaakkosten": {}, 
+                "Toevoeging egalisatieres. Groot onderhoud": {}
+            }, 
+            "KANTOORKOSTEN": {
+                "Administratiekosten": {}, 
+                "Contributies/abonnementen": {}, 
+                "Huur kantoorapparatuur": {}, 
+                "Internetaansluiting": {}, 
+                "Kantoorbenodigdh./drukw.": {}, 
+                "Onderhoud kantoorinvent.": {}, 
+                "Overige kantoorkosten": {}, 
+                "Porti": {}, 
+                "Telefoon/telefax": {}
+            }, 
+            "OVERIGE BATEN EN LASTEN": {
+                "Betaalde schadevergoed.": {}, 
+                "Boekverlies vaste activa": {}, 
+                "Boekwinst van vaste activa": {}, 
+                "K.O. regeling OB": {}, 
+                "Kasverschillen": {}, 
+                "Kosten loonbelasting": {}, 
+                "Kosten omzetbelasting": {}, 
+                "Nadelige koersverschillen": {}, 
+                "Naheffing bedrijfsver.": {}, 
+                "Ontvangen schadevergoed.": {}, 
+                "Overige baten": {}, 
+                "Overige lasten": {}, 
+                "Voordelige koersverschil.": {}
+            }, 
+            "PERSONEELSKOSTEN": {
+                "Autokostenvergoeding": {}, 
+                "Bedrijfskleding": {}, 
+                "Belastingvrije uitkeringen": {}, 
+                "Bijzondere beloningen": {}, 
+                "Congressen, seminars en symposia": {}, 
+                "Gereedschapsgeld": {}, 
+                "Geschenken personeel": {}, 
+                "Gratificaties": {}, 
+                "Inhouding pensioenpremies": {}, 
+                "Inhouding sociale lasten": {}, 
+                "Kantinekosten": {}, 
+                "Lonen en salarissen": {}, 
+                "Loonwerk": {}, 
+                "Managementvergoedingen": {}, 
+                "Opleidingskosten": {}, 
+                "Oprenting stamrechtverpl.": {}, 
+                "Overhevelingstoeslag": {}, 
+                "Overige kostenverg.": {}, 
+                "Overige personeelskosten": {}, 
+                "Overige uitkeringen": {}, 
+                "Pensioenpremies": {}, 
+                "Provisie 1": {}, 
+                "Reiskosten": {}, 
+                "Rijwielvergoeding": {}, 
+                "Sociale lasten": {}, 
+                "Tanti\u00e8mes": {}, 
+                "Thuiswerkers": {}, 
+                "Toev. Backservice pens.verpl.": {}, 
+                "Toevoeging pensioenverpl.": {}, 
+                "Uitkering ziekengeld": {}, 
+                "Uitzendkrachten": {}, 
+                "Vakantiebonnen": {}, 
+                "Vakantiegeld": {}, 
+                "Vergoeding studiekosten": {}, 
+                "Wervingskosten personeel": {}
+            }, 
+            "VERKOOPKOSTEN": {
+                "Advertenties": {}, 
+                "Afschrijving dubieuze deb.": {}, 
+                "Beurskosten": {}, 
+                "Etalagekosten": {}, 
+                "Exportkosten": {}, 
+                "Kascorrecties": {}, 
+                "Overige verkoopkosten": {}, 
+                "Provisie": {}, 
+                "Reclame": {}, 
+                "Reis en verblijfkosten": {}, 
+                "Relatiegeschenken": {}, 
+                "Representatiekosten": {}, 
+                "Uitgaande vrachten": {}, 
+                "Veilingkosten": {}, 
+                "Verpakkingsmateriaal 1": {}, 
+                "Websitekosten": {}
+            }, 
+            "VERVOERSKOSTEN": {
+                "Assuranties auto's": {}, 
+                "Brandstoffen": {}, 
+                "Leasing auto's": {}, 
+                "Onderhoud personenauto's": {}, 
+                "Onderhoud vrachtauto's": {}, 
+                "Overige vervoerskosten": {}, 
+                "Priv\u00e9-gebruik auto's": {}, 
+                "Wegenbelasting": {}
+            }, 
+            "root_type": "Expense"
+        }, 
+        "TUSSENREKENINGEN": {
+            "Betaalwijze cadeaubonnen": {
+                "account_type": "Cash"
+            }, 
+            "Betaalwijze chipknip": {
+                "account_type": "Cash"
+            }, 
+            "Betaalwijze contant": {
+                "account_type": "Cash"
+            }, 
+            "Betaalwijze pin": {
+                "account_type": "Cash"
+            }, 
+            "Inkopen Nederland hoog": {
+                "account_type": "Cash"
+            }, 
+            "Inkopen Nederland laag": {
+                "account_type": "Cash"
+            }, 
+            "Inkopen Nederland onbelast": {
+                "account_type": "Cash"
+            }, 
+            "Inkopen Nederland overig": {
+                "account_type": "Cash"
+            }, 
+            "Inkopen Nederland verlegd": {
+                "account_type": "Cash"
+            }, 
+            "Inkopen binnen EU hoog": {
+                "account_type": "Cash"
+            }, 
+            "Inkopen binnen EU laag": {
+                "account_type": "Cash"
+            }, 
+            "Inkopen binnen EU overig": {
+                "account_type": "Cash"
+            }, 
+            "Inkopen buiten EU hoog": {
+                "account_type": "Cash"
+            }, 
+            "Inkopen buiten EU laag": {
+                "account_type": "Cash"
+            }, 
+            "Inkopen buiten EU overig": {
+                "account_type": "Cash"
+            }, 
+            "Kassa 1": {
+                "account_type": "Cash"
+            }, 
+            "Kassa 2": {
+                "account_type": "Cash"
+            }, 
+            "Netto lonen": {
+                "account_type": "Cash"
+            }, 
+            "Tegenrekening Inkopen": {
+                "account_type": "Cash"
+            }, 
+            "Tussenrek. autom. betalingen": {
+                "account_type": "Cash"
+            }, 
+            "Tussenrek. autom. loonbetalingen": {
+                "account_type": "Cash"
+            }, 
+            "Tussenrek. cadeaubonbetalingen": {
+                "account_type": "Cash"
+            }, 
+            "Tussenrekening balans": {
+                "account_type": "Cash"
+            }, 
+            "Tussenrekening chipknip": {
+                "account_type": "Cash"
+            }, 
+            "Tussenrekening correcties": {
+                "account_type": "Cash"
+            }, 
+            "Tussenrekening pin": {
+                "account_type": "Cash"
+            }, 
+            "Vraagposten": {
+                "account_type": "Cash"
+            }, 
+            "root_type": "Asset"
         }, 
         "VASTE ACTIVA, EIGEN VERMOGEN, LANGLOPEND VREEMD VERMOGEN EN VOORZIENINGEN": {
             "EIGEN VERMOGEN": {
@@ -665,7 +602,7 @@
                     "account_type": "Equity"
                 }
             }, 
-            "root_type": "Equity"
+            "root_type": "Asset"
         }, 
         "VERKOOPRESULTATEN": {
             "Diensten fabric. 0% niet-EU": {}, 
@@ -690,6 +627,67 @@
             "Verleende Kredietbep. fabricage": {}, 
             "Verleende Kredietbep. handel": {}, 
             "root_type": "Income"
+        }, 
+        "VOORRAAD GEREED PRODUCT EN ONDERHANDEN WERK": {
+            "Betalingskort. crediteuren": {}, 
+            "Garantiekosten": {}, 
+            "Hulpmaterialen": {}, 
+            "Inkomende vrachten": {
+                "account_type": "Expenses Included In Valuation"
+            }, 
+            "Inkoop import buiten EU hoog": {}, 
+            "Inkoop import buiten EU laag": {}, 
+            "Inkoop import buiten EU overig": {}, 
+            "Inkoopbonussen": {}, 
+            "Inkoopkosten": {}, 
+            "Inkoopprovisie": {}, 
+            "Inkopen BTW verlegd": {}, 
+            "Inkopen EU hoog tarief": {}, 
+            "Inkopen EU laag tarief": {}, 
+            "Inkopen EU overig": {}, 
+            "Inkopen hoog": {}, 
+            "Inkopen laag": {}, 
+            "Inkopen nul": {}, 
+            "Inkopen overig": {}, 
+            "Invoerkosten": {}, 
+            "Kosten inkoopvereniging": {}, 
+            "Kostprijs omzet grondstoffen": {
+                "account_type": "Cost of Goods Sold"
+            }, 
+            "Kostprijs omzet handelsgoederen": {}, 
+            "Onttrekking uitgev.garantie": {}, 
+            "Priv\u00e9-gebruik goederen": {}, 
+            "Stock aanpassing": {
+                "account_type": "Stock Adjustment"
+            }, 
+            "Tegenrekening inkoop": {}, 
+            "Toev. Voorz. incour. grondst.": {}, 
+            "Toevoeging garantieverpl.": {}, 
+            "Toevoeging voorz. incour. handelsgoed.": {}, 
+            "Uitbesteed werk": {}, 
+            "Voorz. Incourourant grondst.": {}, 
+            "Voorz.incour. handelsgoed.": {}, 
+            "root_type": "Expense"
+        }, 
+        "VOORRAAD GRONDSTOFFEN, HULPMATERIALEN EN HANDELSGOEDEREN": {
+            "Emballage": {}, 
+            "Gereed product 1": {}, 
+            "Gereed product 2": {}, 
+            "Goederen 1": {}, 
+            "Goederen 2": {}, 
+            "Goederen in consignatie": {}, 
+            "Goederen onderweg": {}, 
+            "Grondstoffen 1": {}, 
+            "Grondstoffen 2": {}, 
+            "Halffabrikaten 1": {}, 
+            "Halffabrikaten 2": {}, 
+            "Hulpstoffen 1": {}, 
+            "Hulpstoffen 2": {}, 
+            "Kantoorbenodigdheden": {}, 
+            "Onderhanden werk": {}, 
+            "Verpakkingsmateriaal": {}, 
+            "Zegels": {}, 
+            "root_type": "Asset"
         }
     }
 }

erpnext/accounts/doctype/account/test_account.py

@@ -5,13 +5,10 @@
 import unittest
 
 import frappe
-from frappe.test_runner import make_test_records
 
 from erpnext.accounts.doctype.account.account import merge_account, update_account_number
 from erpnext.stock import get_company_default_inventory_account, get_warehouse_account
 
-test_dependencies = ["Company"]
-
 
 class TestAccount(unittest.TestCase):
 	def test_rename_account(self):
@@ -191,58 +188,6 @@ class TestAccount(unittest.TestCase):
 		frappe.delete_doc("Account", "1234 - Test Rename Sync Account - _TC4")
 		frappe.delete_doc("Account", "1234 - Test Rename Sync Account - _TC5")
 
-	def test_account_currency_sync(self):
-		"""
-		In a parent->child company setup, child should inherit parent account currency if explicitly specified.
-		"""
-
-		make_test_records("Company")
-
-		frappe.local.flags.pop("ignore_root_company_validation", None)
-
-		def create_bank_account():
-			acc = frappe.new_doc("Account")
-			acc.account_name = "_Test Bank JPY"
-
-			acc.parent_account = "Temporary Accounts - _TC6"
-			acc.company = "_Test Company 6"
-			return acc
-
-		acc = create_bank_account()
-		# Explicitly set currency
-		acc.account_currency = "JPY"
-		acc.insert()
-		self.assertTrue(
-			frappe.db.exists(
-				{
-					"doctype": "Account",
-					"account_name": "_Test Bank JPY",
-					"account_currency": "JPY",
-					"company": "_Test Company 7",
-				}
-			)
-		)
-
-		frappe.delete_doc("Account", "_Test Bank JPY - _TC6")
-		frappe.delete_doc("Account", "_Test Bank JPY - _TC7")
-
-		acc = create_bank_account()
-		# default currency is used
-		acc.insert()
-		self.assertTrue(
-			frappe.db.exists(
-				{
-					"doctype": "Account",
-					"account_name": "_Test Bank JPY",
-					"account_currency": "USD",
-					"company": "_Test Company 7",
-				}
-			)
-		)
-
-		frappe.delete_doc("Account", "_Test Bank JPY - _TC6")
-		frappe.delete_doc("Account", "_Test Bank JPY - _TC7")
-
 	def test_child_company_account_rename_sync(self):
 		frappe.local.flags.pop("ignore_root_company_validation", None)
 
@@ -352,7 +297,7 @@ def _make_test_records(verbose=None):
 		# fixed asset depreciation
 		["_Test Fixed Asset", "Current Assets", 0, "Fixed Asset", None],
 		["_Test Accumulated Depreciations", "Current Assets", 0, "Accumulated Depreciation", None],
-		["_Test Depreciations", "Expenses", 0, "Depreciation", None],
+		["_Test Depreciations", "Expenses", 0, None, None],
 		["_Test Gain/Loss on Asset Disposal", "Expenses", 0, None, None],
 		# Receivable / Payable Account
 		["_Test Receivable", "Current Assets", 0, "Receivable", None],

erpnext/accounts/doctype/account_closing_balance/account_closing_balance.js

@@ -1,8 +0,0 @@
-// Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-// frappe.ui.form.on("Account Closing Balance", {
-// 	refresh(frm) {
-
-// 	},
-// });

erpnext/accounts/doctype/account_closing_balance/account_closing_balance.json

@@ -1,164 +0,0 @@
-{
- "actions": [],
- "creation": "2023-02-21 15:20:59.586811",
- "default_view": "List",
- "doctype": "DocType",
- "document_type": "Document",
- "engine": "InnoDB",
- "field_order": [
-  "closing_date",
-  "account",
-  "cost_center",
-  "debit",
-  "credit",
-  "account_currency",
-  "debit_in_account_currency",
-  "credit_in_account_currency",
-  "project",
-  "company",
-  "finance_book",
-  "period_closing_voucher",
-  "is_period_closing_voucher_entry"
- ],
- "fields": [
-  {
-   "fieldname": "closing_date",
-   "fieldtype": "Date",
-   "in_filter": 1,
-   "in_list_view": 1,
-   "label": "Closing Date",
-   "oldfieldname": "posting_date",
-   "oldfieldtype": "Date",
-   "search_index": 1
-  },
-  {
-   "fieldname": "account",
-   "fieldtype": "Link",
-   "in_filter": 1,
-   "in_list_view": 1,
-   "in_standard_filter": 1,
-   "label": "Account",
-   "oldfieldname": "account",
-   "oldfieldtype": "Link",
-   "options": "Account",
-   "search_index": 1
-  },
-  {
-   "fieldname": "cost_center",
-   "fieldtype": "Link",
-   "in_filter": 1,
-   "in_list_view": 1,
-   "label": "Cost Center",
-   "oldfieldname": "cost_center",
-   "oldfieldtype": "Link",
-   "options": "Cost Center"
-  },
-  {
-   "fieldname": "debit",
-   "fieldtype": "Currency",
-   "label": "Debit Amount",
-   "oldfieldname": "debit",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency"
-  },
-  {
-   "fieldname": "credit",
-   "fieldtype": "Currency",
-   "label": "Credit Amount",
-   "oldfieldname": "credit",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency"
-  },
-  {
-   "fieldname": "account_currency",
-   "fieldtype": "Link",
-   "label": "Account Currency",
-   "options": "Currency"
-  },
-  {
-   "fieldname": "debit_in_account_currency",
-   "fieldtype": "Currency",
-   "label": "Debit Amount in Account Currency",
-   "options": "account_currency"
-  },
-  {
-   "fieldname": "credit_in_account_currency",
-   "fieldtype": "Currency",
-   "label": "Credit Amount in Account Currency",
-   "options": "account_currency"
-  },
-  {
-   "fieldname": "project",
-   "fieldtype": "Link",
-   "label": "Project",
-   "options": "Project"
-  },
-  {
-   "fieldname": "company",
-   "fieldtype": "Link",
-   "in_filter": 1,
-   "in_list_view": 1,
-   "in_standard_filter": 1,
-   "label": "Company",
-   "oldfieldname": "company",
-   "oldfieldtype": "Link",
-   "options": "Company",
-   "search_index": 1
-  },
-  {
-   "fieldname": "finance_book",
-   "fieldtype": "Link",
-   "label": "Finance Book",
-   "options": "Finance Book"
-  },
-  {
-   "fieldname": "period_closing_voucher",
-   "fieldtype": "Link",
-   "in_standard_filter": 1,
-   "label": "Period Closing Voucher",
-   "options": "Period Closing Voucher",
-   "search_index": 1
-  },
-  {
-   "default": "0",
-   "fieldname": "is_period_closing_voucher_entry",
-   "fieldtype": "Check",
-   "label": "Is Period Closing Voucher Entry"
-  }
- ],
- "icon": "fa fa-list",
- "in_create": 1,
- "links": [],
- "modified": "2023-03-06 08:56:36.393237",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Account Closing Balance",
- "owner": "Administrator",
- "permissions": [
-  {
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Accounts User"
-  },
-  {
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Accounts Manager"
-  },
-  {
-   "export": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Auditor"
-  }
- ],
- "sort_field": "modified",
- "sort_order": "DESC",
- "states": []
-}

erpnext/accounts/doctype/account_closing_balance/account_closing_balance.py

@@ -1,126 +0,0 @@
-# Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-import frappe
-from frappe.model.document import Document
-from frappe.utils import cint, cstr
-
-from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import (
-	get_accounting_dimensions,
-)
-
-
-class AccountClosingBalance(Document):
-	pass
-
-
-def make_closing_entries(closing_entries, voucher_name, company, closing_date):
-	accounting_dimensions = get_accounting_dimensions()
-
-	previous_closing_entries = get_previous_closing_entries(
-		company, closing_date, accounting_dimensions
-	)
-	combined_entries = closing_entries + previous_closing_entries
-
-	merged_entries = aggregate_with_last_account_closing_balance(
-		combined_entries, accounting_dimensions
-	)
-
-	for key, value in merged_entries.items():
-		cle = frappe.new_doc("Account Closing Balance")
-		cle.update(value)
-		cle.update(value["dimensions"])
-		cle.update(
-			{
-				"period_closing_voucher": voucher_name,
-				"closing_date": closing_date,
-			}
-		)
-		cle.flags.ignore_permissions = True
-		cle.submit()
-
-
-def aggregate_with_last_account_closing_balance(entries, accounting_dimensions):
-	merged_entries = {}
-	for entry in entries:
-		key, key_values = generate_key(entry, accounting_dimensions)
-		merged_entries.setdefault(
-			key,
-			{
-				"debit": 0,
-				"credit": 0,
-				"debit_in_account_currency": 0,
-				"credit_in_account_currency": 0,
-			},
-		)
-
-		merged_entries[key]["dimensions"] = key_values
-		merged_entries[key]["debit"] += entry.get("debit")
-		merged_entries[key]["credit"] += entry.get("credit")
-		merged_entries[key]["debit_in_account_currency"] += entry.get("debit_in_account_currency")
-		merged_entries[key]["credit_in_account_currency"] += entry.get("credit_in_account_currency")
-
-	return merged_entries
-
-
-def generate_key(entry, accounting_dimensions):
-	key = [
-		cstr(entry.get("account")),
-		cstr(entry.get("account_currency")),
-		cstr(entry.get("cost_center")),
-		cstr(entry.get("project")),
-		cstr(entry.get("finance_book")),
-		cint(entry.get("is_period_closing_voucher_entry")),
-	]
-
-	key_values = {
-		"company": cstr(entry.get("company")),
-		"account": cstr(entry.get("account")),
-		"account_currency": cstr(entry.get("account_currency")),
-		"cost_center": cstr(entry.get("cost_center")),
-		"project": cstr(entry.get("project")),
-		"finance_book": cstr(entry.get("finance_book")),
-		"is_period_closing_voucher_entry": cint(entry.get("is_period_closing_voucher_entry")),
-	}
-	for dimension in accounting_dimensions:
-		key.append(cstr(entry.get(dimension)))
-		key_values[dimension] = cstr(entry.get(dimension))
-
-	return tuple(key), key_values
-
-
-def get_previous_closing_entries(company, closing_date, accounting_dimensions):
-	entries = []
-	last_period_closing_voucher = frappe.db.get_all(
-		"Period Closing Voucher",
-		filters={"docstatus": 1, "company": company, "posting_date": ("<", closing_date)},
-		fields=["name"],
-		order_by="posting_date desc",
-		limit=1,
-	)
-
-	if last_period_closing_voucher:
-		account_closing_balance = frappe.qb.DocType("Account Closing Balance")
-		query = frappe.qb.from_(account_closing_balance).select(
-			account_closing_balance.company,
-			account_closing_balance.account,
-			account_closing_balance.account_currency,
-			account_closing_balance.debit,
-			account_closing_balance.credit,
-			account_closing_balance.debit_in_account_currency,
-			account_closing_balance.credit_in_account_currency,
-			account_closing_balance.cost_center,
-			account_closing_balance.project,
-			account_closing_balance.finance_book,
-			account_closing_balance.is_period_closing_voucher_entry,
-		)
-
-		for dimension in accounting_dimensions:
-			query = query.select(account_closing_balance[dimension])
-
-		query = query.where(
-			account_closing_balance.period_closing_voucher == last_period_closing_voucher[0].name
-		)
-		entries = query.run(as_dict=1)
-
-	return entries

erpnext/accounts/doctype/account_closing_balance/test_account_closing_balance.py

@@ -1,9 +0,0 @@
-# Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-
-# import frappe
-from frappe.tests.utils import FrappeTestCase
-
-
-class TestAccountClosingBalance(FrappeTestCase):
-	pass

erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py

@@ -50,15 +50,13 @@ class AccountingDimension(Document):
 		if frappe.flags.in_test:
 			make_dimension_in_accounting_doctypes(doc=self)
 		else:
-			frappe.enqueue(
-				make_dimension_in_accounting_doctypes, doc=self, queue="long", enqueue_after_commit=True
-			)
+			frappe.enqueue(make_dimension_in_accounting_doctypes, doc=self, queue="long")
 
 	def on_trash(self):
 		if frappe.flags.in_test:
 			delete_accounting_dimension(doc=self)
 		else:
-			frappe.enqueue(delete_accounting_dimension, doc=self, queue="long", enqueue_after_commit=True)
+			frappe.enqueue(delete_accounting_dimension, doc=self, queue="long")
 
 	def set_fieldname_and_label(self):
 		if not self.label:
@@ -271,12 +269,6 @@ def get_dimensions(with_cost_center_and_project=False):
 		as_dict=1,
 	)
 
-	if isinstance(with_cost_center_and_project, str):
-		if with_cost_center_and_project.lower().strip() == "true":
-			with_cost_center_and_project = True
-		else:
-			with_cost_center_and_project = False
-
 	if with_cost_center_and_project:
 		dimension_filters.extend(
 			[

erpnext/accounts/doctype/accounting_period/accounting_period.js

@@ -20,11 +20,5 @@ frappe.ui.form.on('Accounting Period', {
 				}
 			});
 		}
-
-		frm.set_query("document_type", "closed_documents", () => {
-			return {
-				query: "erpnext.controllers.queries.get_doctypes_for_closing",
-			}
-		});
 	}
 });

erpnext/accounts/doctype/accounting_period/accounting_period.py

@@ -11,10 +11,6 @@ class OverlapError(frappe.ValidationError):
 	pass
 
 
-class ClosedAccountingPeriod(frappe.ValidationError):
-	pass
-
-
 class AccountingPeriod(Document):
 	def validate(self):
 		self.validate_overlap()
@@ -69,42 +65,3 @@ class AccountingPeriod(Document):
 					"closed_documents",
 					{"document_type": doctype_for_closing.document_type, "closed": doctype_for_closing.closed},
 				)
-
-
-def validate_accounting_period_on_doc_save(doc, method=None):
-	if doc.doctype == "Bank Clearance":
-		return
-	elif doc.doctype == "Asset":
-		if doc.is_existing_asset:
-			return
-		else:
-			date = doc.available_for_use_date
-	elif doc.doctype == "Asset Repair":
-		date = doc.completion_date
-	else:
-		date = doc.posting_date
-
-	ap = frappe.qb.DocType("Accounting Period")
-	cd = frappe.qb.DocType("Closed Document")
-
-	accounting_period = (
-		frappe.qb.from_(ap)
-		.from_(cd)
-		.select(ap.name)
-		.where(
-			(ap.name == cd.parent)
-			& (ap.company == doc.company)
-			& (cd.closed == 1)
-			& (cd.document_type == doc.doctype)
-			& (date >= ap.start_date)
-			& (date <= ap.end_date)
-		)
-	).run(as_dict=1)
-
-	if accounting_period:
-		frappe.throw(
-			_("You cannot create a {0} within the closed Accounting Period {1}").format(
-				doc.doctype, frappe.bold(accounting_period[0]["name"])
-			),
-			ClosedAccountingPeriod,
-		)

erpnext/accounts/doctype/accounting_period/test_accounting_period.py

@@ -6,11 +6,9 @@ import unittest
 import frappe
 from frappe.utils import add_months, nowdate
 
-from erpnext.accounts.doctype.accounting_period.accounting_period import (
-	ClosedAccountingPeriod,
-	OverlapError,
-)
+from erpnext.accounts.doctype.accounting_period.accounting_period import OverlapError
 from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
+from erpnext.accounts.general_ledger import ClosedAccountingPeriod
 
 test_dependencies = ["Item"]
 
@@ -35,9 +33,9 @@ class TestAccountingPeriod(unittest.TestCase):
 		ap1.save()
 
 		doc = create_sales_invoice(
-			do_not_save=1, cost_center="_Test Company - _TC", warehouse="Stores - _TC"
+			do_not_submit=1, cost_center="_Test Company - _TC", warehouse="Stores - _TC"
 		)
-		self.assertRaises(ClosedAccountingPeriod, doc.save)
+		self.assertRaises(ClosedAccountingPeriod, doc.submit)
 
 	def tearDown(self):
 		for d in frappe.get_all("Accounting Period"):

erpnext/accounts/doctype/accounts_settings/accounts_settings.json

@@ -19,8 +19,6 @@
   "column_break_17",
   "enable_common_party_accounting",
   "allow_multi_currency_invoices_against_single_party_account",
-  "journals_section",
-  "merge_similar_account_heads",
   "report_setting_section",
   "use_custom_cash_flow",
   "deferred_accounting_settings_section",
@@ -33,16 +31,12 @@
   "determine_address_tax_category_from",
   "column_break_19",
   "add_taxes_from_item_tax_template",
-  "book_tax_discount_loss",
   "print_settings",
   "show_inclusive_tax_in_print",
-  "show_taxes_as_table_in_print",
   "column_break_12",
   "show_payment_schedule_in_print",
   "currency_exchange_section",
   "allow_stale",
-  "section_break_jpd0",
-  "auto_reconcile_payments",
   "stale_days",
   "invoicing_settings_tab",
   "accounts_transactions_settings_section",
@@ -60,13 +54,9 @@
   "closing_settings_tab",
   "period_closing_settings_section",
   "acc_frozen_upto",
-  "ignore_account_closing_balance",
   "column_break_25",
   "frozen_accounts_modifier",
-  "report_settings_sb",
-  "banking_tab",
-  "enable_party_matching",
-  "enable_fuzzy_matching"
+  "report_settings_sb"
  ],
  "fields": [
   {
@@ -177,6 +167,11 @@
    "fieldtype": "Int",
    "label": "Stale Days"
   },
+  {
+   "fieldname": "report_settings_sb",
+   "fieldtype": "Section Break",
+   "label": "Report Settings"
+  },
   {
    "default": "0",
    "description": "Only select this if you have set up the Cash Flow Mapper documents",
@@ -186,7 +181,6 @@
   },
   {
    "default": "0",
-   "description": "Payment Terms from orders will be fetched into the invoices as is",
    "fieldname": "automatically_fetch_payment_terms",
    "fieldtype": "Check",
    "label": "Automatically Fetch Payment Terms from Order"
@@ -353,69 +347,6 @@
    "fieldname": "allow_multi_currency_invoices_against_single_party_account",
    "fieldtype": "Check",
    "label": "Allow multi-currency invoices against single party account "
-  },
-  {
-   "default": "0",
-   "description": "Split Early Payment Discount Loss into Income and Tax Loss",
-   "fieldname": "book_tax_discount_loss",
-   "fieldtype": "Check",
-   "label": "Book Tax Loss on Early Payment Discount"
-  },
-  {
-   "fieldname": "journals_section",
-   "fieldtype": "Section Break",
-   "label": "Journals"
-  },
-  {
-   "default": "0",
-   "description": "Rows with Same Account heads will be merged on Ledger",
-   "fieldname": "merge_similar_account_heads",
-   "fieldtype": "Check",
-   "label": "Merge Similar Account Heads"
-  },
-  {
-   "fieldname": "section_break_jpd0",
-   "fieldtype": "Section Break",
-   "label": "Payment Reconciliations"
-  },
-  {
-   "default": "0",
-   "fieldname": "auto_reconcile_payments",
-   "fieldtype": "Check",
-   "label": "Auto Reconcile Payments"
-  },
-  {
-   "default": "0",
-   "fieldname": "show_taxes_as_table_in_print",
-   "fieldtype": "Check",
-   "label": "Show Taxes as Table in Print"
-  },
-  {
-   "fieldname": "banking_tab",
-   "fieldtype": "Tab Break",
-   "label": "Banking"
-  },
-  {
-   "default": "0",
-   "description": "Auto match and set the Party in Bank Transactions",
-   "fieldname": "enable_party_matching",
-   "fieldtype": "Check",
-   "label": "Enable Automatic Party Matching"
-  },
-  {
-   "default": "0",
-   "depends_on": "enable_party_matching",
-   "description": "Approximately match the description/party name against parties",
-   "fieldname": "enable_fuzzy_matching",
-   "fieldtype": "Check",
-   "label": "Enable Fuzzy Matching"
-  },
-  {
-   "default": "0",
-   "description": "Financial reports will be generated using GL Entry doctypes (should be enabled if Period Closing Voucher is not posted for all years sequentially or missing) ",
-   "fieldname": "ignore_account_closing_balance",
-   "fieldtype": "Check",
-   "label": "Ignore Account Closing Balance"
   }
  ],
  "icon": "icon-cog",
@@ -423,7 +354,7 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2023-07-27 15:05:34.000264",
+ "modified": "2022-11-27 21:49:52.538655",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Accounts Settings",
@@ -452,4 +383,4 @@
  "sort_order": "ASC",
  "states": [],
  "track_changes": 1
-}
+}

erpnext/accounts/doctype/accounts_settings/accounts_settings.py

@@ -14,32 +14,21 @@ from erpnext.stock.utils import check_pending_reposting
 
 
 class AccountsSettings(Document):
+	def on_update(self):
+		frappe.clear_cache()
+
 	def validate(self):
-		old_doc = self.get_doc_before_save()
-		clear_cache = False
+		frappe.db.set_default(
+			"add_taxes_from_item_tax_template", self.get("add_taxes_from_item_tax_template", 0)
+		)
 
-		if old_doc.add_taxes_from_item_tax_template != self.add_taxes_from_item_tax_template:
-			frappe.db.set_default(
-				"add_taxes_from_item_tax_template", self.get("add_taxes_from_item_tax_template", 0)
-			)
-			clear_cache = True
-
-		if old_doc.enable_common_party_accounting != self.enable_common_party_accounting:
-			frappe.db.set_default(
-				"enable_common_party_accounting", self.get("enable_common_party_accounting", 0)
-			)
-			clear_cache = True
+		frappe.db.set_default(
+			"enable_common_party_accounting", self.get("enable_common_party_accounting", 0)
+		)
 
 		self.validate_stale_days()
-
-		if old_doc.show_payment_schedule_in_print != self.show_payment_schedule_in_print:
-			self.enable_payment_schedule_in_print()
-
-		if old_doc.acc_frozen_upto != self.acc_frozen_upto:
-			self.validate_pending_reposts()
-
-		if clear_cache:
-			frappe.clear_cache()
+		self.enable_payment_schedule_in_print()
+		self.validate_pending_reposts()
 
 	def validate_stale_days(self):
 		if not self.allow_stale and cint(self.stale_days) <= 0:

erpnext/accounts/doctype/bank/bank.js

@@ -118,10 +118,6 @@ erpnext.integrations.refreshPlaidLink = class refreshPlaidLink {
 	}
 
 	plaid_success(token, response) {
-		frappe.xcall('erpnext.erpnext_integrations.doctype.plaid_settings.plaid_settings.update_bank_account_ids', {
-			response: response,
-		}).then(() => {
-			frappe.show_alert({ message: __('Plaid Link Updated'), indicator: 'green' });
-		});
+		frappe.show_alert({ message: __('Plaid Link Updated'), indicator: 'green' });
 	}
 };

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.db.get_value(
+	return frappe.get_cached_value(
 		"Bank Account", bank_account, ["account", "bank", "bank_account_no"], as_dict=1
 	)

erpnext/accounts/doctype/bank_clearance/bank_clearance.js

@@ -37,11 +37,14 @@ 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');
+		if (frm.doc.account && frm.doc.from_date && frm.doc.to_date) {
+			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) {

erpnext/accounts/doctype/bank_clearance/bank_clearance.py

@@ -56,7 +56,7 @@ class BankClearance(Document):
 			select
 				"Payment Entry" as payment_document, name as payment_entry,
 				reference_no as cheque_number, reference_date as cheque_date,
-				if(paid_from=%(account)s, paid_amount + total_taxes_and_charges, 0) as credit,
+				if(paid_from=%(account)s, paid_amount, 0) as credit,
 				if(paid_from=%(account)s, 0, received_amount) as debit,
 				posting_date, ifnull(party,if(paid_from=%(account)s,paid_to,paid_from)) as against_account, clearance_date,
 				if(paid_to=%(account)s, paid_to_account_currency, paid_from_account_currency) as account_currency
@@ -81,7 +81,7 @@ class BankClearance(Document):
 
 		loan_disbursement = frappe.qb.DocType("Loan Disbursement")
 
-		query = (
+		loan_disbursements = (
 			frappe.qb.from_(loan_disbursement)
 			.select(
 				ConstantColumn("Loan Disbursement").as_("payment_document"),
@@ -90,22 +90,17 @@ class BankClearance(Document):
 				ConstantColumn(0).as_("debit"),
 				loan_disbursement.reference_number.as_("cheque_number"),
 				loan_disbursement.reference_date.as_("cheque_date"),
-				loan_disbursement.clearance_date.as_("clearance_date"),
 				loan_disbursement.disbursement_date.as_("posting_date"),
 				loan_disbursement.applicant.as_("against_account"),
 			)
 			.where(loan_disbursement.docstatus == 1)
 			.where(loan_disbursement.disbursement_date >= self.from_date)
 			.where(loan_disbursement.disbursement_date <= self.to_date)
+			.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)
-		)
-
-		if not self.include_reconciled_entries:
-			query = query.where(loan_disbursement.clearance_date.isnull())
-
-		loan_disbursements = query.run(as_dict=1)
+		).run(as_dict=1)
 
 		loan_repayment = frappe.qb.DocType("Loan Repayment")
 
@@ -118,19 +113,16 @@ class BankClearance(Document):
 				ConstantColumn(0).as_("credit"),
 				loan_repayment.reference_number.as_("cheque_number"),
 				loan_repayment.reference_date.as_("cheque_date"),
-				loan_repayment.clearance_date.as_("clearance_date"),
 				loan_repayment.applicant.as_("against_account"),
 				loan_repayment.posting_date,
 			)
 			.where(loan_repayment.docstatus == 1)
+			.where(loan_repayment.clearance_date.isnull())
 			.where(loan_repayment.posting_date >= self.from_date)
 			.where(loan_repayment.posting_date <= self.to_date)
 			.where(loan_repayment.payment_account.isin([self.bank_account, self.account]))
 		)
 
-		if not self.include_reconciled_entries:
-			query = query.where(loan_repayment.clearance_date.isnull())
-
 		if frappe.db.has_column("Loan Repayment", "repay_from_salary"):
 			query = query.where((loan_repayment.repay_from_salary == 0))
 

erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js

@@ -18,30 +18,16 @@ frappe.ui.form.on("Bank Reconciliation Tool", {
 	},
 
 	onload: function (frm) {
-		// Set default filter dates
-		let today = frappe.datetime.get_today()
-		frm.doc.bank_statement_from_date = frappe.datetime.add_months(today, -1);
-		frm.doc.bank_statement_to_date = today;
 		frm.trigger('bank_account');
 	},
 
-	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) {
-		frm.disable_save();
 		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",
@@ -63,26 +49,10 @@ 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,
-				},
-			})
-		});
-
-		frm.add_custom_button(__('Get Unreconciled Entries'), function() {
-			frm.trigger("make_reconciliation_tool");
-		});
-		frm.change_custom_button_type('Get Unreconciled Entries', null, 'primary');
-
+	after_save: function (frm) {
+		frm.trigger("make_reconciliation_tool");
 	},
 
 	bank_account: function (frm) {
@@ -96,7 +66,7 @@ frappe.ui.form.on("Bank Reconciliation Tool", {
 					r.account,
 					"account_currency",
 					(r) => {
-						frm.doc.account_currency = r.account_currency;
+						frm.currency = r.account_currency;
 						frm.trigger("render_chart");
 					}
 				);
@@ -162,19 +132,19 @@ frappe.ui.form.on("Bank Reconciliation Tool", {
 		}
 	},
 
-	render_chart(frm) {
+	render_chart: frappe.utils.debounce((frm) => {
 		frm.cards_manager = new erpnext.accounts.bank_reconciliation.NumberCardManager(
 			{
 				$reconciliation_tool_cards: frm.get_field(
 					"reconciliation_tool_cards"
 				).$wrapper,
 				bank_statement_closing_balance:
-				frm.doc.bank_statement_closing_balance,
+					frm.doc.bank_statement_closing_balance,
 				cleared_balance: frm.cleared_balance,
-				currency: frm.doc.account_currency,
+				currency: frm.currency,
 			}
 		);
-	},
+	}, 500),
 
 	render(frm) {
 		if (frm.doc.bank_account) {
@@ -190,9 +160,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,11 +10,7 @@
   "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_currency",
   "account_opening_balance",
   "bank_statement_closing_balance",
   "section_break_1",
@@ -40,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"
@@ -60,7 +56,7 @@
    "fieldname": "account_opening_balance",
    "fieldtype": "Currency",
    "label": "Account Opening Balance",
-   "options": "account_currency",
+   "options": "Currency",
    "read_only": 1
   },
   {
@@ -68,7 +64,7 @@
    "fieldname": "bank_statement_closing_balance",
    "fieldtype": "Currency",
    "label": "Closing Balance",
-   "options": "account_currency"
+   "options": "Currency"
   },
   {
    "fieldname": "section_break_1",
@@ -85,40 +81,14 @@
   },
   {
    "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"
-  },
-  {
-   "fieldname": "account_currency",
-   "fieldtype": "Link",
-   "hidden": 1,
-   "label": "Account Currency",
-   "options": "Currency"
+   "fieldtype": "HTML"
   }
  ],
  "hide_toolbar": 1,
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2023-03-07 11:02:24.535714",
+ "modified": "2021-04-21 11:13:49.831769",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Bank Reconciliation Tool",
@@ -137,6 +107,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,10 +8,9 @@ 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 import get_default_cost_center
-from erpnext.accounts.doctype.bank_transaction.bank_transaction import get_total_allocated_amount
+from erpnext.accounts.doctype.bank_transaction.bank_transaction import get_paid_amount
 from erpnext.accounts.report.bank_reconciliation_statement.bank_reconciliation_statement import (
 	get_amounts_not_reflected_in_system,
 	get_entries,
@@ -29,7 +28,7 @@ def get_bank_transactions(bank_account, from_date=None, to_date=None):
 	filters = []
 	filters.append(["bank_account", "=", bank_account])
 	filters.append(["docstatus", "=", 1])
-	filters.append(["unallocated_amount", ">", 0.0])
+	filters.append(["unallocated_amount", ">", 0])
 	if to_date:
 		filters.append(["date", "<=", to_date])
 	if from_date:
@@ -51,7 +50,6 @@ def get_bank_transactions(bank_account, from_date=None, to_date=None):
 			"party",
 		],
 		filters=filters,
-		order_by="date",
 	)
 	return transactions
 
@@ -59,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.db.get_value("Bank Account", bank_account, "account")
+	account = frappe.get_cached_value("Bank Account", bank_account, "account")
 	filters = frappe._dict(
 		{"account": account, "report_date": till_date, "include_pos_transactions": 1}
 	)
@@ -67,7 +65,7 @@ def get_account_balance(bank_account, till_date):
 
 	balance_as_per_system = get_balance_on(filters["account"], filters["report_date"])
 
-	total_debit, total_credit = 0.0, 0.0
+	total_debit, total_credit = 0, 0
 	for d in data:
 		total_debit += flt(d.debit)
 		total_credit += flt(d.credit)
@@ -132,8 +130,10 @@ def create_journal_entry_bts(
 		fieldname=["name", "deposit", "withdrawal", "bank_account"],
 		as_dict=True,
 	)[0]
-	company_account = frappe.get_value("Bank Account", bank_transaction.bank_account, "account")
-	account_type = frappe.db.get_value("Account", second_account, "account_type")
+	company_account = frappe.get_cached_value(
+		"Bank Account", bank_transaction.bank_account, "account"
+	)
+	account_type = frappe.get_cached_value("Account", second_account, "account_type")
 	if account_type in ["Receivable", "Payable"]:
 		if not (party_type and party):
 			frappe.throw(
@@ -141,19 +141,17 @@ def create_journal_entry_bts(
 					second_account
 				)
 			)
-
-	company = frappe.get_value("Account", company_account, "company")
-
 	accounts = []
 	# Multi Currency?
 	accounts.append(
 		{
 			"account": second_account,
-			"credit_in_account_currency": bank_transaction.deposit,
-			"debit_in_account_currency": bank_transaction.withdrawal,
+			"credit_in_account_currency": bank_transaction.deposit if bank_transaction.deposit > 0 else 0,
+			"debit_in_account_currency": bank_transaction.withdrawal
+			if bank_transaction.withdrawal > 0
+			else 0,
 			"party_type": party_type,
 			"party": party,
-			"cost_center": get_default_cost_center(company),
 		}
 	)
 
@@ -161,12 +159,15 @@ def create_journal_entry_bts(
 		{
 			"account": company_account,
 			"bank_account": bank_transaction.bank_account,
-			"credit_in_account_currency": bank_transaction.withdrawal,
-			"debit_in_account_currency": bank_transaction.deposit,
-			"cost_center": get_default_cost_center(company),
+			"credit_in_account_currency": bank_transaction.withdrawal
+			if bank_transaction.withdrawal > 0
+			else 0,
+			"debit_in_account_currency": bank_transaction.deposit if bank_transaction.deposit > 0 else 0,
 		}
 	)
 
+	company = frappe.get_cached_value("Account", company_account, "company")
+
 	journal_entry_dict = {
 		"voucher_type": entry_type,
 		"company": company,
@@ -185,22 +186,16 @@ def create_journal_entry_bts(
 	journal_entry.insert()
 	journal_entry.submit()
 
-	if bank_transaction.deposit > 0.0:
+	if bank_transaction.deposit > 0:
 		paid_amount = bank_transaction.deposit
 	else:
 		paid_amount = bank_transaction.withdrawal
 
 	vouchers = json.dumps(
-		[
-			{
-				"payment_doctype": "Journal Entry",
-				"payment_name": journal_entry.name,
-				"amount": paid_amount,
-			}
-		]
+		[{"payment_doctype": "Journal Entry", "payment_name": journal_entry.name, "amount": paid_amount}]
 	)
 
-	return reconcile_vouchers(bank_transaction_name, vouchers)
+	return reconcile_vouchers(bank_transaction.name, vouchers)
 
 
 @frappe.whitelist()
@@ -224,10 +219,12 @@ def create_payment_entry_bts(
 		as_dict=True,
 	)[0]
 	paid_amount = bank_transaction.unallocated_amount
-	payment_type = "Receive" if bank_transaction.deposit > 0.0 else "Pay"
+	payment_type = "Receive" if bank_transaction.deposit > 0 else "Pay"
 
-	company_account = frappe.get_value("Bank Account", bank_transaction.bank_account, "account")
-	company = frappe.get_value("Account", company_account, "company")
+	company_account = frappe.get_cached_value(
+		"Bank Account", bank_transaction.bank_account, "account"
+	)
+	company = frappe.get_cached_value("Account", company_account, "company")
 	payment_entry_dict = {
 		"company": company,
 		"payment_type": payment_type,
@@ -263,89 +260,9 @@ def create_payment_entry_bts(
 
 	payment_entry.submit()
 	vouchers = json.dumps(
-		[
-			{
-				"payment_doctype": "Payment Entry",
-				"payment_name": payment_entry.name,
-				"amount": paid_amount,
-			}
-		]
+		[{"payment_doctype": "Payment Entry", "payment_name": payment_entry.name, "amount": paid_amount}]
 	)
-	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)
+	return reconcile_vouchers(bank_transaction.name, vouchers)
 
 
 @frappe.whitelist()
@@ -353,88 +270,80 @@ 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)
-	transaction.add_payment_entries(vouchers)
+	company_account = frappe.get_cached_value("Bank Account", transaction.bank_account, "account")
+
+	if transaction.unallocated_amount == 0:
+		frappe.throw(_("This bank transaction is already fully reconciled"))
+	total_amount = 0
+	for voucher in vouchers:
+		voucher["payment_entry"] = frappe.get_doc(voucher["payment_doctype"], voucher["payment_name"])
+		total_amount += get_paid_amount(
+			frappe._dict(
+				{
+					"payment_document": voucher["payment_doctype"],
+					"payment_entry": voucher["payment_name"],
+				}
+			),
+			transaction.currency,
+			company_account,
+		)
+
+	if total_amount > transaction.unallocated_amount:
+		frappe.throw(
+			_(
+				"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")
+
+	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_entry"].doctype,
+				"payment_entry": voucher["payment_entry"].name,
+				"allocated_amount": allocated_amount,
+			},
+		)
+
+	transaction.save()
+	transaction.update_allocations()
 	return frappe.get_doc("Bank Transaction", bank_transaction_name)
 
 
 @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]
-	(gl_account, company) = (bank_account.account, bank_account.company)
-	matching = check_matching(
-		gl_account,
-		company,
-		transaction,
-		document_types,
-		from_date,
-		to_date,
-		filter_by_reference_date,
-		from_reference_date,
-		to_reference_date,
-	)
-	return subtract_allocations(gl_account, matching)
+	(account, company) = (bank_account.account, bank_account.company)
+	matching = check_matching(account, company, transaction, document_types)
+	return matching
 
 
-def subtract_allocations(gl_account, vouchers):
-	"Look up & subtract any existing Bank Transaction allocations"
-	copied = []
-	for voucher in vouchers:
-		rows = get_total_allocated_amount(voucher[1], voucher[2])
-		amount = None
-		for row in rows:
-			if row["gl_account"] == gl_account:
-				amount = row["total"]
-				break
-
-		if amount:
-			l = list(voucher)
-			l[3] -= amount
-			copied.append(tuple(l))
-		else:
-			copied.append(voucher)
-	return copied
-
-
-def check_matching(
-	bank_account,
-	company,
-	transaction,
-	document_types,
-	from_date,
-	to_date,
-	filter_by_reference_date,
-	from_reference_date,
-	to_reference_date,
-):
-	exact_match = True if "exact_match" in document_types else False
+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,
-		exact_match,
-	)
+	subquery = get_queries(bank_account, company, transaction, document_types)
 	filters = {
 		"amount": transaction.unallocated_amount,
-		"payment_type": "Receive" if transaction.deposit > 0.0 else "Pay",
+		"payment_type": "Receive" if transaction.deposit > 0 else "Pay",
 		"reference_no": transaction.reference_number,
 		"party_type": transaction.party_type,
 		"party": transaction.party,
@@ -443,9 +352,7 @@ def check_matching(
 
 	matching_vouchers = []
 
-	matching_vouchers.extend(
-		get_loan_vouchers(bank_account, transaction, document_types, filters, exact_match)
-	)
+	matching_vouchers.extend(get_loan_vouchers(bank_account, transaction, document_types, filters))
 
 	for query in subquery:
 		matching_vouchers.extend(
@@ -454,23 +361,14 @@ 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,
-	exact_match,
-):
+def get_queries(bank_account, company, transaction, document_types):
 	# get queries to get matching vouchers
-	account_from_to = "paid_to" if transaction.deposit > 0.0 else "paid_from"
+	amount_condition = "=" if "exact_match" in document_types else "<="
+	account_from_to = "paid_to" if transaction.deposit > 0 else "paid_from"
 	queries = []
 
 	# get matching queries from all the apps
@@ -481,13 +379,8 @@ def get_queries(
 				company,
 				transaction,
 				document_types,
-				exact_match,
+				amount_condition,
 				account_from_to,
-				from_date,
-				to_date,
-				filter_by_reference_date,
-				from_reference_date,
-				to_reference_date,
 			)
 			or []
 		)
@@ -496,106 +389,43 @@ def get_queries(
 
 
 def get_matching_queries(
-	bank_account,
-	company,
-	transaction,
-	document_types,
-	exact_match,
-	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:
-		query = get_pe_matching_query(
-			exact_match,
-			account_from_to,
-			transaction,
-			from_date,
-			to_date,
-			filter_by_reference_date,
-			from_reference_date,
-			to_reference_date,
-		)
-		queries.append(query)
+		pe_amount_matching = get_pe_matching_query(amount_condition, account_from_to, transaction)
+		queries.extend([pe_amount_matching])
 
 	if "journal_entry" in document_types:
-		query = get_je_matching_query(
-			exact_match,
-			transaction,
-			from_date,
-			to_date,
-			filter_by_reference_date,
-			from_reference_date,
-			to_reference_date,
-		)
-		queries.append(query)
+		je_amount_matching = get_je_matching_query(amount_condition, transaction)
+		queries.extend([je_amount_matching])
 
-	if transaction.deposit > 0.0 and "sales_invoice" in document_types:
-		query = get_si_matching_query(exact_match)
-		queries.append(query)
+	if transaction.deposit > 0 and "sales_invoice" in document_types:
+		si_amount_matching = get_si_matching_query(amount_condition)
+		queries.extend([si_amount_matching])
 
-	if transaction.withdrawal > 0.0:
+	if transaction.withdrawal > 0:
 		if "purchase_invoice" in document_types:
-			query = get_pi_matching_query(exact_match)
-			queries.append(query)
-
-	if "bank_transaction" in document_types:
-		query = get_bt_matching_query(exact_match, transaction)
-		queries.append(query)
+			pi_amount_matching = get_pi_matching_query(amount_condition)
+			queries.extend([pi_amount_matching])
 
 	return queries
 
 
-def get_loan_vouchers(bank_account, transaction, document_types, filters, exact_match):
+def get_loan_vouchers(bank_account, transaction, document_types, filters):
 	vouchers = []
+	amount_condition = True if "exact_match" in document_types else False
 
-	if transaction.withdrawal > 0.0 and "loan_disbursement" in document_types:
-		vouchers.extend(get_ld_matching_query(bank_account, exact_match, filters))
+	if transaction.withdrawal > 0 and "loan_disbursement" in document_types:
+		vouchers.extend(get_ld_matching_query(bank_account, amount_condition, filters))
 
-	if transaction.deposit > 0.0 and "loan_repayment" in document_types:
-		vouchers.extend(get_lr_matching_query(bank_account, exact_match, filters))
+	if transaction.deposit > 0 and "loan_repayment" in document_types:
+		vouchers.extend(get_lr_matching_query(bank_account, amount_condition, filters))
 
 	return vouchers
 
 
-def get_bt_matching_query(exact_match, transaction):
-	# get matching bank transaction query
-	# find bank transactions in the same bank account with opposite sign
-	# same bank account must have same company and currency
-	field = "deposit" if transaction.withdrawal > 0.0 else "withdrawal"
-
-	return f"""
-
-		SELECT
-			(CASE WHEN reference_number = %(reference_no)s THEN 1 ELSE 0 END
-			+ CASE WHEN {field} = %(amount)s THEN 1 ELSE 0 END
-			+ CASE WHEN ( party_type = %(party_type)s AND party = %(party)s ) THEN 1 ELSE 0 END
-			+ CASE WHEN unallocated_amount = %(amount)s THEN 1 ELSE 0 END
-			+ 1) AS rank,
-			'Bank Transaction' AS doctype,
-			name,
-			unallocated_amount AS paid_amount,
-			reference_number AS reference_no,
-			date AS reference_date,
-			party,
-			party_type,
-			date AS posting_date,
-			currency
-		FROM
-			`tabBank Transaction`
-		WHERE
-			status != 'Reconciled'
-			AND name != '{transaction.name}'
-			AND bank_account = '{transaction.bank_account}'
-			AND {field} {'= %(amount)s' if exact_match else '> 0.0'}
-	"""
-
-
-def get_ld_matching_query(bank_account, exact_match, filters):
+def get_ld_matching_query(bank_account, amount_condition, filters):
 	loan_disbursement = frappe.qb.DocType("Loan Disbursement")
 	matching_reference = loan_disbursement.reference_number == filters.get("reference_number")
 	matching_party = loan_disbursement.applicant_type == filters.get(
@@ -623,17 +453,17 @@ def get_ld_matching_query(bank_account, exact_match, filters):
 		.where(loan_disbursement.disbursement_account == bank_account)
 	)
 
-	if exact_match:
+	if amount_condition:
 		query.where(loan_disbursement.disbursed_amount == filters.get("amount"))
 	else:
-		query.where(loan_disbursement.disbursed_amount > 0.0)
+		query.where(loan_disbursement.disbursed_amount <= filters.get("amount"))
 
 	vouchers = query.run(as_list=True)
 
 	return vouchers
 
 
-def get_lr_matching_query(bank_account, exact_match, filters):
+def get_lr_matching_query(bank_account, amount_condition, filters):
 	loan_repayment = frappe.qb.DocType("Loan Repayment")
 	matching_reference = loan_repayment.reference_number == filters.get("reference_number")
 	matching_party = loan_repayment.applicant_type == filters.get(
@@ -664,129 +494,88 @@ def get_lr_matching_query(bank_account, exact_match, filters):
 	if frappe.db.has_column("Loan Repayment", "repay_from_salary"):
 		query = query.where((loan_repayment.repay_from_salary == 0))
 
-	if exact_match:
+	if amount_condition:
 		query.where(loan_repayment.amount_paid == filters.get("amount"))
 	else:
-		query.where(loan_repayment.amount_paid > 0.0)
+		query.where(loan_repayment.amount_paid <= filters.get("amount"))
 
 	vouchers = query.run()
 
 	return vouchers
 
 
-def get_pe_matching_query(
-	exact_match,
-	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.0:
+	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
-			+ CASE WHEN paid_amount = %(amount)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
-			docstatus = 1
-			AND payment_type IN (%(payment_type)s, 'Internal Transfer')
-			AND ifnull(clearance_date, '') = ""
-			AND {account_from_to} = %(bank_account)s
-			AND paid_amount {'= %(amount)s' if exact_match else '> 0.0'}
-			{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(
-	exact_match,
-	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.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}'"
+	cr_or_dr = "credit" if transaction.withdrawal > 0 else "debit"
+
 	return f"""
+
 		SELECT
 			(CASE WHEN je.cheque_no=%(reference_no)s THEN 1 ELSE 0 END
-			+ CASE WHEN jea.{cr_or_dr}_in_account_currency = %(amount)s THEN 1 ELSE 0 END
 			+ 1) AS rank ,
-			'Journal Entry' AS doctype,
+			'Journal Entry' as doctype,
 			je.name,
-			jea.{cr_or_dr}_in_account_currency AS paid_amount,
-			je.cheque_no AS reference_no,
-			je.cheque_date AS reference_date,
-			je.pay_to_recd_from AS party,
+			jea.{cr_or_dr}_in_account_currency as paid_amount,
+			je.cheque_no as reference_no,
+			je.cheque_date as reference_date,
+			je.pay_to_recd_from as party,
 			jea.party_type,
 			je.posting_date,
-			jea.account_currency AS currency
+			jea.account_currency as currency
 		FROM
-			`tabJournal Entry Account` AS jea
+			`tabJournal Entry Account` as jea
 		JOIN
-			`tabJournal Entry` AS je
+			`tabJournal Entry` as je
 		ON
 			jea.parent = je.name
 		WHERE
-			je.docstatus = 1
-			AND je.voucher_type NOT IN ('Opening Entry')
-			AND (je.clearance_date IS NULL OR je.clearance_date='0000-00-00')
+			(je.clearance_date is null or je.clearance_date='0000-00-00')
 			AND jea.account = %(bank_account)s
-			AND jea.{cr_or_dr}_in_account_currency {'= %(amount)s' if exact_match else '> 0.0'}
+			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}
 	"""
 
 
-def get_si_matching_query(exact_match):
-	# get matching sales invoice query
+def get_si_matching_query(amount_condition):
+	# get matchin sales invoice query
 	return f"""
 		SELECT
-			( CASE WHEN si.customer = %(party)s  THEN 1 ELSE 0 END
-			+ CASE WHEN sip.amount = %(amount)s THEN 1 ELSE 0 END
+			( CASE WHEN si.customer = %(party)s  THEN 1 ELSE 0  END
 			+ 1 ) AS rank,
 			'Sales Invoice' as doctype,
 			si.name,
@@ -804,20 +593,18 @@ def get_si_matching_query(exact_match):
 			`tabSales Invoice` as si
 		ON
 			sip.parent = si.name
-		WHERE
-			si.docstatus = 1
-			AND (sip.clearance_date is null or sip.clearance_date='0000-00-00')
+		WHERE (sip.clearance_date is null or sip.clearance_date='0000-00-00')
 			AND sip.account = %(bank_account)s
-			AND sip.amount {'= %(amount)s' if exact_match else '> 0.0'}
+			AND sip.amount {amount_condition} %(amount)s
+			AND si.docstatus = 1
 	"""
 
 
-def get_pi_matching_query(exact_match):
-	# get matching purchase invoice query when they are also used as payment entries (is_paid)
+def get_pi_matching_query(amount_condition):
+	# get matching purchase invoice query
 	return f"""
 		SELECT
 			( CASE WHEN supplier = %(party)s THEN 1 ELSE 0 END
-			+ CASE WHEN paid_amount = %(amount)s THEN 1 ELSE 0 END
 			+ 1 ) AS rank,
 			'Purchase Invoice' as doctype,
 			name,
@@ -831,9 +618,9 @@ def get_pi_matching_query(exact_match):
 		FROM
 			`tabPurchase Invoice`
 		WHERE
-			docstatus = 1
+			paid_amount {amount_condition} %(amount)s
+			AND docstatus = 1
 			AND is_paid = 1
 			AND ifnull(clearance_date, '') = ""
-			AND cash_bank_account = %(bank_account)s
-			AND paid_amount {'= %(amount)s' if exact_match else '> 0.0'}
+			AND cash_bank_account  = %(bank_account)s
 	"""

erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py

@@ -53,15 +53,13 @@ class BankStatementImport(DataImport):
 		if "Bank Account" not in json.dumps(preview["columns"]):
 			frappe.throw(_("Please add the Bank Account column"))
 
-		from frappe.core.page.background_jobs.background_jobs import get_info
+		from frappe.utils.background_jobs import is_job_queued
 		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"))
 
-		enqueued_jobs = [d.get("job_name") for d in get_info()]
-
-		if self.name not in enqueued_jobs:
+		if not is_job_queued(self.name):
 			enqueue(
 				start_import,
 				queue="default",

erpnext/accounts/doctype/bank_transaction/auto_match_party.py

@@ -1,178 +0,0 @@
-from typing import Tuple, Union
-
-import frappe
-from frappe.utils import flt
-from rapidfuzz import fuzz, process
-
-
-class AutoMatchParty:
-	"""
-	Matches by Account/IBAN and then by Party Name/Description sequentially.
-	Returns when a result is obtained.
-
-	Result (if present) is of the form: (Party Type, Party,)
-	"""
-
-	def __init__(self, **kwargs) -> None:
-		self.__dict__.update(kwargs)
-
-	def get(self, key):
-		return self.__dict__.get(key, None)
-
-	def match(self) -> Union[Tuple, None]:
-		result = None
-		result = AutoMatchbyAccountIBAN(
-			bank_party_account_number=self.bank_party_account_number,
-			bank_party_iban=self.bank_party_iban,
-			deposit=self.deposit,
-		).match()
-
-		fuzzy_matching_enabled = frappe.db.get_single_value("Accounts Settings", "enable_fuzzy_matching")
-		if not result and fuzzy_matching_enabled:
-			result = AutoMatchbyPartyNameDescription(
-				bank_party_name=self.bank_party_name, description=self.description, deposit=self.deposit
-			).match()
-
-		return result
-
-
-class AutoMatchbyAccountIBAN:
-	def __init__(self, **kwargs) -> None:
-		self.__dict__.update(kwargs)
-
-	def get(self, key):
-		return self.__dict__.get(key, None)
-
-	def match(self):
-		if not (self.bank_party_account_number or self.bank_party_iban):
-			return None
-
-		result = self.match_account_in_party()
-		return result
-
-	def match_account_in_party(self) -> Union[Tuple, None]:
-		"""Check if there is a IBAN/Account No. match in Customer/Supplier/Employee"""
-		result = None
-		parties = get_parties_in_order(self.deposit)
-		or_filters = self.get_or_filters()
-
-		for party in parties:
-			party_result = frappe.db.get_all(
-				"Bank Account", or_filters=or_filters, pluck="party", limit_page_length=1
-			)
-
-			if party == "Employee" and not party_result:
-				# Search in Bank Accounts first for Employee, and then Employee record
-				if "bank_account_no" in or_filters:
-					or_filters["bank_ac_no"] = or_filters.pop("bank_account_no")
-
-				party_result = frappe.db.get_all(
-					party, or_filters=or_filters, pluck="name", limit_page_length=1
-				)
-
-			if party_result:
-				result = (
-					party,
-					party_result[0],
-				)
-				break
-
-		return result
-
-	def get_or_filters(self) -> dict:
-		or_filters = {}
-		if self.bank_party_account_number:
-			or_filters["bank_account_no"] = self.bank_party_account_number
-
-		if self.bank_party_iban:
-			or_filters["iban"] = self.bank_party_iban
-
-		return or_filters
-
-
-class AutoMatchbyPartyNameDescription:
-	def __init__(self, **kwargs) -> None:
-		self.__dict__.update(kwargs)
-
-	def get(self, key):
-		return self.__dict__.get(key, None)
-
-	def match(self) -> Union[Tuple, None]:
-		# fuzzy search by customer/supplier & employee
-		if not (self.bank_party_name or self.description):
-			return None
-
-		result = self.match_party_name_desc_in_party()
-		return result
-
-	def match_party_name_desc_in_party(self) -> Union[Tuple, None]:
-		"""Fuzzy search party name and/or description against parties in the system"""
-		result = None
-		parties = get_parties_in_order(self.deposit)
-
-		for party in parties:
-			filters = {"status": "Active"} if party == "Employee" else {"disabled": 0}
-			names = frappe.get_all(party, filters=filters, pluck=party.lower() + "_name")
-
-			for field in ["bank_party_name", "description"]:
-				if not self.get(field):
-					continue
-
-				result, skip = self.fuzzy_search_and_return_result(party, names, field)
-				if result or skip:
-					break
-
-			if result or skip:
-				# Skip If: It was hard to distinguish between close matches and so match is None
-				# OR if the right match was found
-				break
-
-		return result
-
-	def fuzzy_search_and_return_result(self, party, names, field) -> Union[Tuple, None]:
-		skip = False
-		result = process.extract(query=self.get(field), choices=names, scorer=fuzz.token_set_ratio)
-		party_name, skip = self.process_fuzzy_result(result)
-
-		if not party_name:
-			return None, skip
-
-		return (
-			party,
-			party_name,
-		), skip
-
-	def process_fuzzy_result(self, result: Union[list, None]):
-		"""
-		If there are multiple valid close matches return None as result may be faulty.
-		Return the result only if one accurate match stands out.
-
-		Returns: Result, Skip (whether or not to discontinue matching)
-		"""
-		PARTY, SCORE, CUTOFF = 0, 1, 80
-
-		if not result or not len(result):
-			return None, False
-
-		first_result = result[0]
-		if len(result) == 1:
-			return (first_result[PARTY] if first_result[SCORE] > CUTOFF else None), True
-
-		second_result = result[1]
-		if first_result[SCORE] > CUTOFF:
-			# If multiple matches with the same score, return None but discontinue matching
-			# Matches were found but were too close to distinguish between
-			if first_result[SCORE] == second_result[SCORE]:
-				return None, True
-
-			return first_result[PARTY], True
-		else:
-			return None, False
-
-
-def get_parties_in_order(deposit: float) -> list:
-	parties = ["Supplier", "Employee", "Customer"]  # most -> least likely to receive
-	if flt(deposit) > 0:
-		parties = ["Customer", "Supplier", "Employee"]  # most -> least likely to pay
-
-	return parties

erpnext/accounts/doctype/bank_transaction/bank_transaction.js

@@ -12,13 +12,8 @@ frappe.ui.form.on("Bank Transaction", {
 			};
 		});
 	},
-	refresh(frm) {
-		frm.add_custom_button(__('Unreconcile Transaction'), () => {
-			frm.call('remove_payment_entries')
-			.then( () => frm.refresh() );
-		});
-	},
-	bank_account: function (frm) {
+
+	bank_account: function(frm) {
 		set_bank_statement_filter(frm);
 	},
 
@@ -39,7 +34,6 @@ frappe.ui.form.on("Bank Transaction", {
 			"Journal Entry",
 			"Sales Invoice",
 			"Purchase Invoice",
-			"Bank Transaction",
 		];
 	}
 });
@@ -55,7 +49,7 @@ const update_clearance_date = (frm, cdt, cdn) => {
 		frappe
 			.xcall(
 				"erpnext.accounts.doctype.bank_transaction.bank_transaction.unclear_reference_payment",
-				{ doctype: cdt, docname: cdn, bt_name: frm.doc.name }
+				{ doctype: cdt, docname: cdn }
 			)
 			.then((e) => {
 				if (e == "success") {

erpnext/accounts/doctype/bank_transaction/bank_transaction.json

@@ -20,11 +20,9 @@
   "currency",
   "section_break_10",
   "description",
-  "reference_number",
-  "column_break_10",
-  "transaction_id",
-  "transaction_type",
   "section_break_14",
+  "reference_number",
+  "transaction_id",
   "payment_entries",
   "section_break_18",
   "allocated_amount",
@@ -33,11 +31,7 @@
   "unallocated_amount",
   "party_section",
   "party_type",
-  "party",
-  "column_break_3czf",
-  "bank_party_name",
-  "bank_party_account_number",
-  "bank_party_iban"
+  "party"
  ],
  "fields": [
   {
@@ -67,7 +61,7 @@
    "fieldtype": "Select",
    "in_standard_filter": 1,
    "label": "Status",
-   "options": "\nPending\nSettled\nUnreconciled\nReconciled\nCancelled"
+   "options": "\nPending\nSettled\nUnreconciled\nReconciled"
   },
   {
    "fieldname": "bank_account",
@@ -196,40 +190,11 @@
    "label": "Withdrawal",
    "oldfieldname": "credit",
    "options": "currency"
-  },
-  {
-   "fieldname": "column_break_10",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "transaction_type",
-   "fieldtype": "Data",
-   "label": "Transaction Type",
-   "length": 50
-  },
-  {
-   "fieldname": "column_break_3czf",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "bank_party_name",
-   "fieldtype": "Data",
-   "label": "Party Name/Account Holder (Bank Statement)"
-  },
-  {
-    "fieldname": "bank_party_iban",
-    "fieldtype": "Data",
-    "label": "Party IBAN (Bank Statement)"
-  },
-  {
-   "fieldname": "bank_party_account_number",
-   "fieldtype": "Data",
-   "label": "Party Account No. (Bank Statement)"
   }
  ],
  "is_submittable": 1,
  "links": [],
- "modified": "2023-06-06 13:58:12.821411",
+ "modified": "2022-03-21 19:05:04.208222",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Bank Transaction",

erpnext/accounts/doctype/bank_transaction/bank_transaction.py

@@ -1,6 +1,9 @@
 # Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
 # For license information, please see license.txt
 
+
+from functools import reduce
+
 import frappe
 from frappe.utils import flt
 
@@ -15,159 +18,73 @@ class BankTransaction(StatusUpdater):
 		self.clear_linked_payment_entries()
 		self.set_status()
 
-		if frappe.db.get_single_value("Accounts Settings", "enable_party_matching"):
-			self.auto_set_party()
-
-	_saving_flag = False
-
-	# nosemgrep: frappe-semgrep-rules.rules.frappe-modifying-but-not-comitting
 	def on_update_after_submit(self):
-		"Run on save(). Avoid recursion caused by multiple saves"
-		if not self._saving_flag:
-			self._saving_flag = True
-			self.clear_linked_payment_entries()
-			self.update_allocations()
-			self._saving_flag = False
+		self.update_allocations()
+		self.clear_linked_payment_entries()
+		self.set_status(update=True)
 
 	def on_cancel(self):
 		self.clear_linked_payment_entries(for_cancel=True)
 		self.set_status(update=True)
 
 	def update_allocations(self):
-		"The doctype does not allow modifications after submission, so write to the db direct"
 		if self.payment_entries:
-			allocated_amount = sum(p.allocated_amount for p in self.payment_entries)
+			allocated_amount = reduce(
+				lambda x, y: flt(x) + flt(y), [x.allocated_amount for x in self.payment_entries]
+			)
 		else:
-			allocated_amount = 0.0
+			allocated_amount = 0
 
-		amount = abs(flt(self.withdrawal) - flt(self.deposit))
-		self.db_set("allocated_amount", flt(allocated_amount))
-		self.db_set("unallocated_amount", amount - flt(allocated_amount))
-		self.reload()
-		self.set_status(update=True)
+		if allocated_amount:
+			frappe.db.set_value(self.doctype, self.name, "allocated_amount", flt(allocated_amount))
+			frappe.db.set_value(
+				self.doctype,
+				self.name,
+				"unallocated_amount",
+				abs(flt(self.withdrawal) - flt(self.deposit)) - flt(allocated_amount),
+			)
 
-	def add_payment_entries(self, vouchers):
-		"Add the vouchers with zero allocation. Save() will perform the allocations and clearance"
-		if 0.0 >= self.unallocated_amount:
-			frappe.throw(frappe._("Bank Transaction {0} is already fully reconciled").format(self.name))
+		else:
+			frappe.db.set_value(self.doctype, self.name, "allocated_amount", 0)
+			frappe.db.set_value(
+				self.doctype, self.name, "unallocated_amount", abs(flt(self.withdrawal) - flt(self.deposit))
+			)
 
-		added = False
-		for voucher in vouchers:
-			# Can't add same voucher twice
-			found = False
-			for pe in self.payment_entries:
-				if (
-					pe.payment_document == voucher["payment_doctype"]
-					and pe.payment_entry == voucher["payment_name"]
-				):
-					found = True
-
-			if not found:
-				pe = {
-					"payment_document": voucher["payment_doctype"],
-					"payment_entry": voucher["payment_name"],
-					"allocated_amount": 0.0,  # Temporary
-				}
-				child = self.append("payment_entries", pe)
-				added = True
-
-		# runs on_update_after_submit
-		if added:
-			self.save()
-
-	def allocate_payment_entries(self):
-		"""Refactored from bank reconciliation tool.
-		Non-zero allocations must be amended/cleared manually
-		Get the bank transaction amount (b) and remove as we allocate
-		For each payment_entry if allocated_amount == 0:
-		- get the amount already allocated against all transactions (t), need latest date
-		- get the voucher amount (from gl) (v)
-		- allocate (a = v - t)
-		    - a = 0: should already be cleared, so clear & remove payment_entry
-		    - 0 < a <= u: allocate a & clear
-		    - 0 < a, a > u: allocate u
-		    - 0 > a: Error: already over-allocated
-		- clear means: set the latest transaction date as clearance date
-		"""
-		gl_bank_account = frappe.db.get_value("Bank Account", self.bank_account, "account")
-		remaining_amount = self.unallocated_amount
-		for payment_entry in self.payment_entries:
-			if payment_entry.allocated_amount == 0.0:
-				unallocated_amount, should_clear, latest_transaction = get_clearance_details(
-					self, payment_entry
-				)
-
-				if 0.0 == unallocated_amount:
-					if should_clear:
-						latest_transaction.clear_linked_payment_entry(payment_entry)
-					self.db_delete_payment_entry(payment_entry)
-
-				elif remaining_amount <= 0.0:
-					self.db_delete_payment_entry(payment_entry)
-
-				elif 0.0 < unallocated_amount and unallocated_amount <= remaining_amount:
-					payment_entry.db_set("allocated_amount", unallocated_amount)
-					remaining_amount -= unallocated_amount
-					if should_clear:
-						latest_transaction.clear_linked_payment_entry(payment_entry)
-
-				elif 0.0 < unallocated_amount and unallocated_amount > remaining_amount:
-					payment_entry.db_set("allocated_amount", remaining_amount)
-					remaining_amount = 0.0
-
-				elif 0.0 > unallocated_amount:
-					self.db_delete_payment_entry(payment_entry)
-					frappe.throw(frappe._("Voucher {0} is over-allocated by {1}").format(unallocated_amount))
+		amount = self.deposit or self.withdrawal
+		if amount == self.allocated_amount:
+			frappe.db.set_value(self.doctype, self.name, "status", "Reconciled")
 
 		self.reload()
 
-	def db_delete_payment_entry(self, payment_entry):
-		frappe.db.delete("Bank Transaction Payments", {"name": payment_entry.name})
-
-	@frappe.whitelist()
-	def remove_payment_entries(self):
-		for payment_entry in self.payment_entries:
-			self.remove_payment_entry(payment_entry)
-		# runs on_update_after_submit
-		self.save()
-
-	def remove_payment_entry(self, payment_entry):
-		"Clear payment entry and clearance"
-		self.clear_linked_payment_entry(payment_entry, for_cancel=True)
-		self.remove(payment_entry)
-
 	def clear_linked_payment_entries(self, for_cancel=False):
-		if for_cancel:
-			for payment_entry in self.payment_entries:
-				self.clear_linked_payment_entry(payment_entry, for_cancel)
-		else:
-			self.allocate_payment_entries()
+		for payment_entry in self.payment_entries:
+			if payment_entry.payment_document == "Sales Invoice":
+				self.clear_sales_invoice(payment_entry, for_cancel=for_cancel)
+			elif payment_entry.payment_document in get_doctypes_for_bank_reconciliation():
+				self.clear_simple_entry(payment_entry, for_cancel=for_cancel)
 
-	def clear_linked_payment_entry(self, payment_entry, for_cancel=False):
-		clearance_date = None if for_cancel else self.date
-		set_voucher_clearance(
-			payment_entry.payment_document, payment_entry.payment_entry, clearance_date, self
+	def clear_simple_entry(self, payment_entry, for_cancel=False):
+		if payment_entry.payment_document == "Payment Entry":
+			if (
+				frappe.db.get_value("Payment Entry", payment_entry.payment_entry, "payment_type")
+				== "Internal Transfer"
+			):
+				if len(get_reconciled_bank_transactions(payment_entry)) < 2:
+					return
+
+		clearance_date = self.date if not for_cancel else None
+		frappe.db.set_value(
+			payment_entry.payment_document, payment_entry.payment_entry, "clearance_date", clearance_date
 		)
 
-	def auto_set_party(self):
-		from erpnext.accounts.doctype.bank_transaction.auto_match_party import AutoMatchParty
-
-		if self.party_type and self.party:
-			return
-
-		result = AutoMatchParty(
-			bank_party_account_number=self.bank_party_account_number,
-			bank_party_iban=self.bank_party_iban,
-			bank_party_name=self.bank_party_name,
-			description=self.description,
-			deposit=self.deposit,
-		).match()
-
-		if result:
-			party_type, party = result
-			frappe.db.set_value(
-				"Bank Transaction", self.name, field={"party_type": party_type, "party": party}
-			)
+	def clear_sales_invoice(self, payment_entry, for_cancel=False):
+		clearance_date = self.date if not for_cancel else None
+		frappe.db.set_value(
+			"Sales Invoice Payment",
+			dict(parenttype=payment_entry.payment_document, parent=payment_entry.payment_entry),
+			"clearance_date",
+			clearance_date,
+		)
 
 
 @frappe.whitelist()
@@ -176,114 +93,38 @@ def get_doctypes_for_bank_reconciliation():
 	return frappe.get_hooks("bank_reconciliation_doctypes")
 
 
-def get_clearance_details(transaction, payment_entry):
-	"""
-	There should only be one bank gle for a voucher.
-	Could be none for a Bank Transaction.
-	But if a JE, could affect two banks.
-	Should only clear the voucher if all bank gles are allocated.
-	"""
-	gl_bank_account = frappe.db.get_value("Bank Account", transaction.bank_account, "account")
-	gles = get_related_bank_gl_entries(payment_entry.payment_document, payment_entry.payment_entry)
-	bt_allocations = get_total_allocated_amount(
-		payment_entry.payment_document, payment_entry.payment_entry
+def get_reconciled_bank_transactions(payment_entry):
+	reconciled_bank_transactions = frappe.get_all(
+		"Bank Transaction Payments",
+		filters={"payment_entry": payment_entry.payment_entry},
+		fields=["parent"],
 	)
 
-	unallocated_amount = min(
-		transaction.unallocated_amount,
-		get_paid_amount(payment_entry, transaction.currency, gl_bank_account),
-	)
-	unmatched_gles = len(gles)
-	latest_transaction = transaction
-	for gle in gles:
-		if gle["gl_account"] == gl_bank_account:
-			if gle["amount"] <= 0.0:
-				frappe.throw(
-					frappe._("Voucher {0} value is broken: {1}").format(
-						payment_entry.payment_entry, gle["amount"]
-					)
-				)
-
-			unmatched_gles -= 1
-			unallocated_amount = gle["amount"]
-			for a in bt_allocations:
-				if a["gl_account"] == gle["gl_account"]:
-					unallocated_amount = gle["amount"] - a["total"]
-					if frappe.utils.getdate(transaction.date) < a["latest_date"]:
-						latest_transaction = frappe.get_doc("Bank Transaction", a["latest_name"])
-		else:
-			# Must be a Journal Entry affecting more than one bank
-			for a in bt_allocations:
-				if a["gl_account"] == gle["gl_account"] and a["total"] == gle["amount"]:
-					unmatched_gles -= 1
-
-	return unallocated_amount, unmatched_gles == 0, latest_transaction
+	return reconciled_bank_transactions
 
 
-def get_related_bank_gl_entries(doctype, docname):
-	# nosemgrep: frappe-semgrep-rules.rules.frappe-using-db-sql
-	result = frappe.db.sql(
+def get_total_allocated_amount(payment_entry):
+	return frappe.db.sql(
 		"""
 		SELECT
-			ABS(gle.credit_in_account_currency - gle.debit_in_account_currency) AS amount,
-			gle.account AS gl_account
+			SUM(btp.allocated_amount) as allocated_amount,
+			bt.name
 		FROM
-			`tabGL Entry` gle
+			`tabBank Transaction Payments` as btp
 		LEFT JOIN
-			`tabAccount` ac ON ac.name=gle.account
+			`tabBank Transaction` bt ON bt.name=btp.parent
 		WHERE
-			ac.account_type = 'Bank'
-			AND gle.voucher_type = %(doctype)s
-			AND gle.voucher_no = %(docname)s
-			AND is_cancelled = 0
-		""",
-		dict(doctype=doctype, docname=docname),
+			btp.payment_document = %s
+		AND
+			btp.payment_entry = %s
+		AND
+			bt.docstatus = 1""",
+		(payment_entry.payment_document, payment_entry.payment_entry),
 		as_dict=True,
 	)
-	return result
 
 
-def get_total_allocated_amount(doctype, docname):
-	"""
-	Gets the sum of allocations for a voucher on each bank GL account
-	along with the latest bank transaction name & date
-	NOTE: query may also include just saved vouchers/payments but with zero allocated_amount
-	"""
-	# nosemgrep: frappe-semgrep-rules.rules.frappe-using-db-sql
-	result = frappe.db.sql(
-		"""
-		SELECT total, latest_name, latest_date, gl_account FROM (
-			SELECT
-				ROW_NUMBER() OVER w AS rownum,
-				SUM(btp.allocated_amount) OVER(PARTITION BY ba.account) AS total,
-				FIRST_VALUE(bt.name) OVER w AS latest_name,
-				FIRST_VALUE(bt.date) OVER w AS latest_date,
-				ba.account AS gl_account
-			FROM
-				`tabBank Transaction Payments` btp
-			LEFT JOIN `tabBank Transaction` bt ON bt.name=btp.parent
-			LEFT JOIN `tabBank Account` ba ON ba.name=bt.bank_account
-			WHERE
-				btp.payment_document = %(doctype)s
-				AND btp.payment_entry = %(docname)s
-				AND bt.docstatus = 1
-			WINDOW w AS (PARTITION BY ba.account ORDER BY bt.date desc)
-		) temp
-		WHERE
-			rownum = 1
-		""",
-		dict(doctype=doctype, docname=docname),
-		as_dict=True,
-	)
-	for row in result:
-		# Why is this *sometimes* a byte string?
-		if isinstance(row["latest_name"], bytes):
-			row["latest_name"] = row["latest_name"].decode()
-		row["latest_date"] = frappe.utils.getdate(row["latest_date"])
-	return result
-
-
-def get_paid_amount(payment_entry, currency, gl_bank_account):
+def get_paid_amount(payment_entry, currency, bank_account):
 	if payment_entry.payment_document in ["Payment Entry", "Sales Invoice", "Purchase Invoice"]:
 
 		paid_amount_field = "paid_amount"
@@ -296,7 +137,7 @@ def get_paid_amount(payment_entry, currency, gl_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(
@@ -304,13 +145,10 @@ def get_paid_amount(payment_entry, currency, gl_bank_account):
 		)
 
 	elif payment_entry.payment_document == "Journal Entry":
-		return abs(
-			frappe.db.get_value(
-				"Journal Entry Account",
-				{"parent": payment_entry.payment_entry, "account": gl_bank_account},
-				"sum(debit_in_account_currency-credit_in_account_currency)",
-			)
-			or 0
+		return frappe.db.get_value(
+			"Journal Entry Account",
+			{"parent": payment_entry.payment_entry, "account": bank_account},
+			"sum(credit_in_account_currency)",
 		)
 
 	elif payment_entry.payment_document == "Expense Claim":
@@ -328,12 +166,6 @@ def get_paid_amount(payment_entry, currency, gl_bank_account):
 			payment_entry.payment_document, payment_entry.payment_entry, "amount_paid"
 		)
 
-	elif payment_entry.payment_document == "Bank Transaction":
-		dep, wth = frappe.db.get_value(
-			"Bank Transaction", payment_entry.payment_entry, ("deposit", "withdrawal")
-		)
-		return abs(flt(wth) - flt(dep))
-
 	else:
 		frappe.throw(
 			"Please reconcile {0}: {1} manually".format(
@@ -342,55 +174,18 @@ def get_paid_amount(payment_entry, currency, gl_bank_account):
 		)
 
 
-def set_voucher_clearance(doctype, docname, clearance_date, self):
-	if doctype in [
-		"Payment Entry",
-		"Journal Entry",
-		"Purchase Invoice",
-		"Expense Claim",
-		"Loan Repayment",
-		"Loan Disbursement",
-	]:
-		if (
-			doctype == "Payment Entry"
-			and frappe.db.get_value("Payment Entry", docname, "payment_type") == "Internal Transfer"
-			and len(get_reconciled_bank_transactions(doctype, docname)) < 2
-		):
-			return
-		frappe.db.set_value(doctype, docname, "clearance_date", clearance_date)
-
-	elif doctype == "Sales Invoice":
-		frappe.db.set_value(
-			"Sales Invoice Payment",
-			dict(parenttype=doctype, parent=docname),
-			"clearance_date",
-			clearance_date,
-		)
-
-	elif doctype == "Bank Transaction":
-		# For when a second bank transaction has fixed another, e.g. refund
-		bt = frappe.get_doc(doctype, docname)
-		if clearance_date:
-			vouchers = [{"payment_doctype": "Bank Transaction", "payment_name": self.name}]
-			bt.add_payment_entries(vouchers)
-		else:
-			for pe in bt.payment_entries:
-				if pe.payment_document == self.doctype and pe.payment_entry == self.name:
-					bt.remove(pe)
-					bt.save()
-					break
-
-
-def get_reconciled_bank_transactions(doctype, docname):
-	return frappe.get_all(
-		"Bank Transaction Payments",
-		filters={"payment_document": doctype, "payment_entry": docname},
-		pluck="parent",
-	)
-
-
 @frappe.whitelist()
-def unclear_reference_payment(doctype, docname, bt_name):
-	bt = frappe.get_doc("Bank Transaction", bt_name)
-	set_voucher_clearance(doctype, docname, None, bt)
-	return docname
+def unclear_reference_payment(doctype, docname):
+	if frappe.db.exists(doctype, docname):
+		doc = frappe.get_doc(doctype, docname)
+		if doctype == "Sales Invoice":
+			frappe.db.set_value(
+				"Sales Invoice Payment",
+				dict(parenttype=doc.payment_document, parent=doc.payment_entry),
+				"clearance_date",
+				None,
+			)
+		else:
+			frappe.db.set_value(doc.payment_document, doc.payment_entry, "clearance_date", None)
+
+		return doc.payment_entry

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.db.get_value("Bank Account", bank_account, "bank")
+	bank_name = frappe.get_cached_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_auto_match_party.py

@@ -1,151 +0,0 @@
-# Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-import frappe
-from frappe.tests.utils import FrappeTestCase
-from frappe.utils import nowdate
-
-from erpnext.accounts.doctype.bank_transaction.test_bank_transaction import create_bank_account
-
-
-class TestAutoMatchParty(FrappeTestCase):
-	@classmethod
-	def setUpClass(cls):
-		create_bank_account()
-		frappe.db.set_single_value("Accounts Settings", "enable_party_matching", 1)
-		frappe.db.set_single_value("Accounts Settings", "enable_fuzzy_matching", 1)
-		return super().setUpClass()
-
-	@classmethod
-	def tearDownClass(cls):
-		frappe.db.set_single_value("Accounts Settings", "enable_party_matching", 0)
-		frappe.db.set_single_value("Accounts Settings", "enable_fuzzy_matching", 0)
-
-	def test_match_by_account_number(self):
-		create_supplier_for_match(account_no="000000003716541159")
-		doc = create_bank_transaction(
-			withdrawal=1200,
-			transaction_id="562213b0ca1bf838dab8f2c6a39bbc3b",
-			account_no="000000003716541159",
-			iban="DE02000000003716541159",
-		)
-
-		self.assertEqual(doc.party_type, "Supplier")
-		self.assertEqual(doc.party, "John Doe & Co.")
-
-	def test_match_by_iban(self):
-		create_supplier_for_match(iban="DE02000000003716541159")
-		doc = create_bank_transaction(
-			withdrawal=1200,
-			transaction_id="c5455a224602afaa51592a9d9250600d",
-			account_no="000000003716541159",
-			iban="DE02000000003716541159",
-		)
-
-		self.assertEqual(doc.party_type, "Supplier")
-		self.assertEqual(doc.party, "John Doe & Co.")
-
-	def test_match_by_party_name(self):
-		create_supplier_for_match(supplier_name="Jackson Ella W.")
-		doc = create_bank_transaction(
-			withdrawal=1200,
-			transaction_id="1f6f661f347ff7b1ea588665f473adb1",
-			party_name="Ella Jackson",
-			iban="DE04000000003716545346",
-		)
-		self.assertEqual(doc.party_type, "Supplier")
-		self.assertEqual(doc.party, "Jackson Ella W.")
-
-	def test_match_by_description(self):
-		create_supplier_for_match(supplier_name="Microsoft")
-		doc = create_bank_transaction(
-			description="Auftraggeber: microsoft payments Buchungstext: msft ..e3006b5hdy. ref. j375979555927627/5536",
-			withdrawal=1200,
-			transaction_id="8df880a2d09c3bed3fea358ca5168c5a",
-			party_name="",
-		)
-		self.assertEqual(doc.party_type, "Supplier")
-		self.assertEqual(doc.party, "Microsoft")
-
-	def test_skip_match_if_multiple_close_results(self):
-		create_supplier_for_match(supplier_name="Adithya Medical & General Stores")
-		create_supplier_for_match(supplier_name="Adithya Medical And General Stores")
-
-		doc = create_bank_transaction(
-			description="Paracetamol Consignment, SINV-0009",
-			withdrawal=24.85,
-			transaction_id="3a1da4ee2dc5a980138d56ef3460cbd9",
-			party_name="Adithya Medical & General",
-		)
-
-		# Mapping is skipped as both Supplier names have the same match score
-		self.assertEqual(doc.party_type, None)
-		self.assertEqual(doc.party, None)
-
-
-def create_supplier_for_match(supplier_name="John Doe & Co.", iban=None, account_no=None):
-	if frappe.db.exists("Supplier", {"supplier_name": supplier_name}):
-		# Update related Bank Account details
-		if not (iban or account_no):
-			return
-
-		frappe.db.set_value(
-			dt="Bank Account",
-			dn={"party": supplier_name},
-			field={"iban": iban, "bank_account_no": account_no},
-		)
-		return
-
-	# Create Supplier and Bank Account for the same
-	supplier = frappe.new_doc("Supplier")
-	supplier.supplier_name = supplier_name
-	supplier.supplier_group = "Services"
-	supplier.supplier_type = "Company"
-	supplier.insert()
-
-	if not frappe.db.exists("Bank", "TestBank"):
-		bank = frappe.new_doc("Bank")
-		bank.bank_name = "TestBank"
-		bank.insert(ignore_if_duplicate=True)
-
-	if not frappe.db.exists("Bank Account", supplier.name + " - " + "TestBank"):
-		bank_account = frappe.new_doc("Bank Account")
-		bank_account.account_name = supplier.name
-		bank_account.bank = "TestBank"
-		bank_account.iban = iban
-		bank_account.bank_account_no = account_no
-		bank_account.party_type = "Supplier"
-		bank_account.party = supplier.name
-		bank_account.insert()
-
-
-def create_bank_transaction(
-	description=None,
-	withdrawal=0,
-	deposit=0,
-	transaction_id=None,
-	party_name=None,
-	account_no=None,
-	iban=None,
-):
-	doc = frappe.new_doc("Bank Transaction")
-	doc.update(
-		{
-			"doctype": "Bank Transaction",
-			"description": description or "1512567 BG/000002918 OPSKATTUZWXXX AT776000000098709837 Herr G",
-			"date": nowdate(),
-			"withdrawal": withdrawal,
-			"deposit": deposit,
-			"currency": "INR",
-			"bank_account": "Checking Account - Citi Bank",
-			"transaction_id": transaction_id,
-			"bank_party_name": party_name,
-			"bank_party_account_number": account_no,
-			"bank_party_iban": iban,
-		}
-	)
-	doc.insert()
-	doc.submit()
-	doc.reload()
-
-	return doc

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

@@ -59,7 +59,7 @@ class Budget(Document):
 		account_list = []
 		for d in self.get("accounts"):
 			if d.account:
-				account_details = frappe.db.get_value(
+				account_details = frappe.get_cached_value(
 					"Account", d.account, ["is_group", "company", "report_type"], as_dict=1
 				)
 
@@ -125,27 +125,14 @@ def validate_expense_against_budget(args, expense_amount=0):
 	if not args.account:
 		return
 
-	default_dimensions = [
-		{
-			"fieldname": "project",
-			"document_type": "Project",
-		},
-		{
-			"fieldname": "cost_center",
-			"document_type": "Cost Center",
-		},
-	]
-
-	for dimension in default_dimensions + get_accounting_dimensions(as_list=False):
-		budget_against = dimension.get("fieldname")
-
+	for budget_against in ["project", "cost_center"] + get_accounting_dimensions():
 		if (
 			args.get(budget_against)
 			and args.account
 			and frappe.db.get_value("Account", {"name": args.account, "root_type": "Expense"})
 		):
 
-			doctype = dimension.get("document_type")
+			doctype = frappe.unscrub(budget_against)
 
 			if frappe.get_cached_value("DocType", doctype, "is_tree"):
 				lft, rgt = frappe.db.get_value(doctype, args.get(budget_against), ["lft", "rgt"])
@@ -197,11 +184,6 @@ def validate_budget_records(args, budget_records, expense_amount):
 			amount = expense_amount or 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
@@ -213,28 +195,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)),
 		)
 
@@ -245,9 +227,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):
@@ -324,7 +306,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.db.get_value(
+		start_date, end_date = frappe.get_cached_value(
 			"Fiscal Year", args.get("fiscal_year"), ["year_start_date", "year_end_date"]
 		)
 
@@ -369,9 +351,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
@@ -399,7 +379,7 @@ def get_accumulated_monthly_budget(monthly_distribution, posting_date, fiscal_ye
 		):
 			distribution.setdefault(d.month, d.percentage_allocation)
 
-	dt = frappe.db.get_value("Fiscal Year", fiscal_year, "year_start_date")
+	dt = frappe.get_cached_value("Fiscal Year", fiscal_year, "year_start_date")
 	accumulated_percentage = 0.0
 
 	while dt <= getdate(posting_date):

erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py

@@ -36,7 +36,7 @@ def validate_columns(data):
 
 	no_of_columns = max([len(d) for d in data])
 
-	if no_of_columns > 8:
+	if no_of_columns > 7:
 		frappe.throw(
 			_("More columns found than expected. Please compare the uploaded file with standard template"),
 			title=(_("Wrong Template")),
@@ -45,8 +45,8 @@ def validate_columns(data):
 
 @frappe.whitelist()
 def validate_company(company):
-	parent_company, allow_account_creation_against_child_company = frappe.db.get_value(
-		"Company", {"name": company}, ["parent_company", "allow_account_creation_against_child_company"]
+	parent_company, allow_account_creation_against_child_company = frappe.get_cached_value(
+		"Company", company, ["parent_company", "allow_account_creation_against_child_company"]
 	)
 
 	if parent_company and (not allow_account_creation_against_child_company):
@@ -233,7 +233,6 @@ def build_forest(data):
 			is_group,
 			account_type,
 			root_type,
-			account_currency,
 		) = i
 
 		if not account_name:
@@ -254,8 +253,6 @@ def build_forest(data):
 			charts_map[account_name]["account_type"] = account_type
 		if root_type:
 			charts_map[account_name]["root_type"] = root_type
-		if account_currency:
-			charts_map[account_name]["account_currency"] = account_currency
 		path = return_parent(data, account_name)[::-1]
 		paths.append(path)  # List of path is created
 		line_no += 1
@@ -318,21 +315,20 @@ def get_template(template_type):
 		"Is Group",
 		"Account Type",
 		"Root Type",
-		"Account Currency",
 	]
 	writer = UnicodeWriter()
 	writer.writerow(fields)
 
 	if template_type == "Blank Template":
 		for root_type in get_root_types():
-			writer.writerow(["", "", "", "", 1, "", root_type])
+			writer.writerow(["", "", "", 1, "", root_type])
 
 		for account in get_mandatory_group_accounts():
-			writer.writerow(["", "", "", "", 1, account, "Asset"])
+			writer.writerow(["", "", "", 1, account, "Asset"])
 
 		for account_type in get_mandatory_account_types():
 			writer.writerow(
-				["", "", "", "", 0, account_type.get("account_type"), account_type.get("root_type")]
+				["", "", "", 0, account_type.get("account_type"), account_type.get("root_type")]
 			)
 	else:
 		writer = get_sample_template(writer)
@@ -489,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_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/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.db.get_value("Company", self.company, "default_income_account")
+			self.income_account = frappe.get_cached_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,26 +35,10 @@ frappe.ui.form.on('Exchange Rate Revaluation', {
 		}
 	},
 
-	validate_rounding_loss: function(frm) {
-		let allowance = frm.doc.rounding_loss_allowance;
-		if (!(allowance >= 0 && allowance < 1)) {
-			frappe.throw(__("Rounding Loss Allowance should be between 0 and 1"));
-		}
-	},
-
-	rounding_loss_allowance: function(frm) {
-		frm.events.validate_rounding_loss(frm);
-	},
-
-	validate: function(frm) {
-		frm.events.validate_rounding_loss(frm);
-	},
-
-	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) {
@@ -73,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));
 		});
 
@@ -81,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);
 				}
 			}
 		});
@@ -141,8 +120,7 @@ var get_account_details = function(frm, cdt, cdn) {
 			company: frm.doc.company,
 			posting_date: frm.doc.posting_date,
 			party_type: row.party_type,
-			party: row.party,
-			rounding_loss_allowance: frm.doc.rounding_loss_allowance
+			party: row.party
 		},
 		callback: function(r){
 			$.extend(row, r.message);

erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.json

@@ -8,16 +8,12 @@
  "engine": "InnoDB",
  "field_order": [
   "posting_date",
-  "rounding_loss_allowance",
   "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"
  ],
@@ -63,30 +59,6 @@
    "fieldname": "section_break_6",
    "fieldtype": "Section Break"
   },
-  {
-   "fieldname": "amended_from",
-   "fieldtype": "Link",
-   "label": "Amended From",
-   "no_copy": 1,
-   "options": "Exchange Rate Revaluation",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "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",
@@ -95,21 +67,18 @@
    "read_only": 1
   },
   {
-   "fieldname": "column_break_10",
-   "fieldtype": "Column Break"
-  },
-  {
-   "default": "0.05",
-   "description": "Only values between [0,1) are allowed. Like {0.00, 0.04, 0.09, ...}\nEx: If allowance is set at 0.07, accounts that have balance of 0.07 in either of the currencies will be considered as zero balance account",
-   "fieldname": "rounding_loss_allowance",
-   "fieldtype": "Float",
-   "label": "Rounding Loss Allowance",
-   "precision": "9"
+   "fieldname": "amended_from",
+   "fieldtype": "Link",
+   "label": "Amended From",
+   "no_copy": 1,
+   "options": "Exchange Rate Revaluation",
+   "print_hide": 1,
+   "read_only": 1
   }
  ],
  "is_submittable": 1,
  "links": [],
- "modified": "2023-06-20 07:29:06.972434",
+ "modified": "2022-11-17 10:28:03.911554",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Exchange Rate Revaluation",

erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py

@@ -3,49 +3,27 @@
 
 
 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
-from erpnext.accounts.utils import get_currency_precision
 from erpnext.setup.utils import get_exchange_rate
 
 
 class ExchangeRateRevaluation(Document):
 	def validate(self):
-		self.validate_rounding_loss_allowance()
 		self.set_total_gain_loss()
 
-	def validate_rounding_loss_allowance(self):
-		if not (self.rounding_loss_allowance >= 0 and self.rounding_loss_allowance < 1):
-			frappe.throw(_("Rounding Loss Allowance should be between 0 and 1"))
-
 	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):
@@ -57,235 +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
-
-	def fetch_and_calculate_accounts_data(self):
-		accounts = self.get_accounts_data()
-		if accounts:
-			for acc in accounts:
-				self.append("accounts", acc)
+		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,
-			rounding_loss_allowance=self.rounding_loss_allowance,
-		)
-		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, rounding_loss_allowance
-	):
-		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)
-				)
-
-				# round off balance based on currency precision
-				# and consider debit-credit difference allowance
-				currency_precision = get_currency_precision()
-				rounding_loss_allowance = float(rounding_loss_allowance) or 0.05
-				for acc in account_details:
-					acc.balance_in_account_currency = flt(acc.balance_in_account_currency, currency_precision)
-					if abs(acc.balance_in_account_currency) <= rounding_loss_allowance:
-						acc.balance_in_account_currency = 0
-
-					acc.balance = flt(acc.balance, currency_precision)
-					if abs(acc.balance) <= rounding_loss_allowance:
-						acc.balance = 0
-
-					acc.zero_balance = (
-						True if (acc.balance == 0 or acc.balance_in_account_currency == 0) else False
-					)
-
-		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]:
-
-				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) or 0.0
-					)
-
-					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")
@@ -293,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"
 		)
@@ -301,148 +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,
-					}
-				)
-
-				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": 0,
-						"credit": 0,
-						"debit_in_account_currency": abs(d.gain_loss) if d.gain_loss < 0 else 0,
-						"credit_in_account_currency": abs(d.gain_loss) if d.gain_loss > 0 else 0,
-						"cost_center": erpnext.get_default_cost_center(self.company),
-						"exchange_rate": 1,
-						"reference_type": "Exchange Rate Revaluation",
-						"reference_name": self.name,
-					}
-				)
-
-			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(d.gain_loss) if d.gain_loss < 0 else 0,
-						"credit": abs(d.gain_loss) if d.gain_loss > 0 else 0,
-						"debit_in_account_currency": 0,
-						"credit_in_account_currency": 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"
@@ -451,10 +154,7 @@ class ExchangeRateRevaluation(Document):
 		journal_entry.multi_currency = 1
 
 		journal_entry_accounts = []
-		for d in accounts:
-			if not flt(d.get("balance_in_account_currency"), d.precision("balance_in_account_currency")):
-				continue
-
+		for d in self.accounts:
 			dr_or_cr = (
 				"debit_in_account_currency"
 				if d.get("balance_in_account_currency") > 0
@@ -479,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,
@@ -497,129 +196,63 @@ 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,
 				}
 			)
 
-		journal_entry.set("accounts", journal_entry_accounts)
-		journal_entry.set_amounts_in_company_currency()
-		journal_entry.set_total_debit_credit()
-
-		self.gain_loss_unbooked += journal_entry.difference - self.gain_loss_unbooked
-		journal_entry.append(
-			"accounts",
+		journal_entry_accounts.append(
 			{
 				"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,
-			},
+			}
 		)
 
+		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)
-		conditions.append((gl.debit > 0) | (gl.credit > 0))
-		conditions.append((gl.debit_in_account_currency > 0) | (gl.credit_in_account_currency > 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, rounding_loss_allowance: float = None
-):
-	if not (company and posting_date):
-		frappe.throw(_("Company and Posting Date is mandatory"))
-
+def get_account_details(account, company, posting_date, party_type=None, party=None):
 	account_currency, account_type = frappe.get_cached_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)
-
+	balance = get_balance_on(
+		account, date=posting_date, party_type=party_type, party=party, in_account_currency=False
+	)
 	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,
-		rounding_loss_allowance=rounding_loss_allowance,
-	)
 
-	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(
+		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_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"],
+				"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,
 			}
 		)
 

erpnext/accounts/doctype/exchange_rate_revaluation_account/exchange_rate_revaluation_account.json

@@ -10,21 +10,14 @@
   "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",
+  "column_break_9",
+  "new_exchange_rate",
   "new_balance_in_base_currency",
-  "section_break_ngrs",
-  "gain_loss",
-  "zero_balance"
+  "gain_loss"
  ],
  "fields": [
   {
@@ -73,7 +66,6 @@
    "fieldname": "current_exchange_rate",
    "fieldtype": "Float",
    "label": "Current Exchange Rate",
-   "precision": "9",
    "read_only": 1
   },
   {
@@ -86,14 +78,13 @@
   },
   {
    "fieldname": "column_break_9",
-   "fieldtype": "Section Break"
+   "fieldtype": "Column Break"
   },
   {
    "fieldname": "new_exchange_rate",
    "fieldtype": "Float",
    "in_list_view": 1,
    "label": "New Exchange Rate",
-   "precision": "9",
    "reqd": 1
   },
   {
@@ -111,45 +102,11 @@
    "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"
   }
  ],
  "istable": 1,
  "links": [],
- "modified": "2023-06-22 12:39:56.446722",
+ "modified": "2022-11-17 10:26:18.302728",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Exchange Rate Revaluation Account",

erpnext/accounts/doctype/fiscal_year/fiscal_year.js

@@ -8,6 +8,17 @@ frappe.ui.form.on('Fiscal Year', {
 				frappe.datetime.add_days(frappe.defaults.get_default("year_end_date"), 1));
 		}
 	},
+	refresh: function (frm) {
+		if (!frm.doc.__islocal && (frm.doc.name != frappe.sys_defaults.fiscal_year)) {
+			frm.add_custom_button(__("Set as Default"), () => frm.events.set_as_default(frm));
+			frm.set_intro(__("To set this Fiscal Year as Default, click on 'Set as Default'"));
+		} else {
+			frm.set_intro("");
+		}
+	},
+	set_as_default: function(frm) {
+		return frm.call('set_as_default');
+	},
 	year_start_date: function(frm) {
 		if (!frm.doc.is_short_year) {
 			let year_end_date =

erpnext/accounts/doctype/fiscal_year/fiscal_year.py

@@ -4,16 +4,28 @@
 
 import frappe
 from dateutil.relativedelta import relativedelta
-from frappe import _
+from frappe import _, msgprint
 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):
+		frappe.db.set_value("Global Defaults", None, "current_fiscal_year", self.name)
+		global_defaults = frappe.get_doc("Global Defaults")
+		global_defaults.check_permission("write")
+		global_defaults.on_update()
+
+		# clear cache
+		frappe.clear_cache()
+
+		msgprint(
+			_(
+				"{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect."
+			).format(self.name)
+		)
+
 	def validate(self):
 		self.validate_dates()
 		self.validate_overlap()
@@ -37,23 +49,18 @@ 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"),
-				FiscalYearIncorrectDate,
+				frappe.exceptions.InvalidDates,
 			)
 
 	def on_update(self):
@@ -61,6 +68,13 @@ class FiscalYear(Document):
 		frappe.cache().delete_value("fiscal_years")
 
 	def on_trash(self):
+		global_defaults = frappe.get_doc("Global Defaults")
+		if global_defaults.current_fiscal_year == self.name:
+			frappe.throw(
+				_(
+					"You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings"
+				).format(self.name)
+			)
 		frappe.cache().delete_value("fiscal_years")
 
 	def validate_overlap(self):

erpnext/accounts/doctype/fiscal_year/test_fiscal_year.py

@@ -7,8 +7,6 @@ import unittest
 import frappe
 from frappe.utils import now_datetime
 
-from erpnext.accounts.doctype.fiscal_year.fiscal_year import FiscalYearIncorrectDate
-
 test_ignore = ["Company"]
 
 
@@ -26,7 +24,7 @@ class TestFiscalYear(unittest.TestCase):
 			}
 		)
 
-		self.assertRaises(FiscalYearIncorrectDate, fy.insert)
+		self.assertRaises(frappe.exceptions.InvalidDates, fy.insert)
 
 
 def test_record_generator():
@@ -35,8 +33,8 @@ def test_record_generator():
 			"doctype": "Fiscal Year",
 			"year": "_Test Short Fiscal Year 2011",
 			"is_short_year": 1,
-			"year_end_date": "2011-04-01",
-			"year_start_date": "2011-12-31",
+			"year_start_date": "2011-04-01",
+			"year_end_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.db.get_value("Account", self.account, "account_type") not in [
+			if frappe.get_cached_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.db.get_value("Account", self.account, "report_type")
+		account_type = frappe.get_cached_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.db.get_value("Account", self.account, "report_type") == "Profit and Loss"
+			and frappe.get_cached_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.db.get_value("Account", account, "balance_must_be")
+		balance_must_be = frappe.get_cached_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.db.get_value("Account", d.tax_type, "account_type")
+				account_type = frappe.get_cached_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', "Repost Payment Ledger", 'Asset', 'Asset Movement'];
+		frm.ignore_doctypes_on_cancel_all = ['Sales Invoice', 'Purchase Invoice'];
 	},
 
 	refresh: function(frm) {

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
   },
@@ -539,7 +539,7 @@
  "idx": 176,
  "is_submittable": 1,
  "links": [],
- "modified": "2023-03-01 14:58:59.286591",
+ "modified": "2022-06-23 22:01:32.348337",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Journal Entry",

erpnext/accounts/doctype/journal_entry/journal_entry.py

@@ -51,7 +51,7 @@ class JournalEntry(AccountsController):
 		self.validate_multi_currency()
 		self.set_amounts_in_company_currency()
 		self.validate_debit_credit_amount()
-		self.set_total_debit_credit()
+
 		# Do not validate while importing via data import
 		if not frappe.flags.in_import:
 			self.validate_total_debit_and_credit()
@@ -69,7 +69,6 @@ class JournalEntry(AccountsController):
 		self.validate_empty_accounts_table()
 		self.set_account_and_party_balance()
 		self.validate_inter_company_accounts()
-		self.validate_depr_entry_voucher_type()
 
 		if self.docstatus == 0:
 			self.apply_tax_withholding()
@@ -82,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()
 
@@ -90,13 +88,7 @@ class JournalEntry(AccountsController):
 		from erpnext.accounts.utils import unlink_ref_doc_from_payment_entries
 
 		unlink_ref_doc_from_payment_entries(self)
-		self.ignore_linked_doctypes = (
-			"GL Entry",
-			"Stock Ledger Entry",
-			"Payment Ledger Entry",
-			"Repost Payment Ledger",
-			"Repost Payment Ledger Items",
-		)
+		self.ignore_linked_doctypes = ("GL Entry", "Stock Ledger Entry", "Payment Ledger Entry")
 		self.make_gl_entries(1)
 		self.update_advance_paid()
 		self.unlink_advance_entry_reference()
@@ -131,13 +123,6 @@ class JournalEntry(AccountsController):
 				if self.total_credit != doc.total_debit or self.total_debit != doc.total_credit:
 					frappe.throw(_("Total Credit/ Debit Amount should be same as linked Journal Entry"))
 
-	def validate_depr_entry_voucher_type(self):
-		if (
-			any(d.account_type == "Depreciation" for d in self.get("accounts"))
-			and self.voucher_type != "Depreciation Entry"
-		):
-			frappe.throw(_("Journal Entry type should be set as Depreciation Entry for asset depreciation"))
-
 	def validate_stock_accounts(self):
 		stock_accounts = get_stock_accounts(self.company, self.doctype, self.name)
 		for account in stock_accounts:
@@ -240,34 +225,6 @@ class JournalEntry(AccountsController):
 		for d in to_remove:
 			self.remove(d)
 
-	def update_asset_value(self):
-		if self.flags.planned_depr_entry or self.voucher_type != "Depreciation Entry":
-			return
-
-		for d in self.get("accounts"):
-			if (
-				d.reference_type == "Asset"
-				and d.reference_name
-				and d.account_type == "Depreciation"
-				and d.debit
-			):
-				asset = frappe.get_doc("Asset", d.reference_name)
-
-				if asset.calculate_depreciation:
-					fb_idx = 1
-					if self.finance_book:
-						for fb_row in asset.get("finance_books"):
-							if fb_row.finance_book == self.finance_book:
-								fb_idx = fb_row.idx
-								break
-					fb_row = asset.get("finance_books")[fb_idx - 1]
-					fb_row.value_after_depreciation -= d.debit
-					fb_row.db_update()
-				else:
-					asset.db_set("value_after_depreciation", asset.value_after_depreciation - d.debit)
-
-				asset.set_status()
-
 	def update_inter_company_jv(self):
 		if (
 			self.voucher_type == "Inter Company Journal Entry"
@@ -327,44 +284,18 @@ class JournalEntry(AccountsController):
 
 	def unlink_asset_reference(self):
 		for d in self.get("accounts"):
-			if (
-				self.voucher_type == "Depreciation Entry"
-				and d.reference_type == "Asset"
-				and d.reference_name
-				and d.account_type == "Depreciation"
-				and d.debit
-			):
+			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:
-					fb_idx = None
-					for s in asset.get("schedules"):
-						if s.journal_entry == self.name:
-							s.db_set("journal_entry", None)
-							fb_idx = cint(s.finance_book_id) or 1
-							break
-					if not fb_idx:
-						fb_idx = 1
-						if self.finance_book:
-							for fb_row in asset.get("finance_books"):
-								if fb_row.finance_book == self.finance_book:
-									fb_idx = fb_row.idx
-									break
-					fb_row = asset.get("finance_books")[fb_idx - 1]
-					fb_row.value_after_depreciation += d.debit
-					fb_row.db_update()
-				else:
-					asset.db_set("value_after_depreciation", asset.value_after_depreciation + d.debit)
-				asset.set_status()
-			elif self.voucher_type == "Journal Entry" and d.reference_type == "Asset" and d.reference_name:
-				journal_entry_for_scrap = frappe.db.get_value(
-					"Asset", d.reference_name, "journal_entry_for_scrap"
-				)
+						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()
 
-				if journal_entry_for_scrap == self.name:
-					frappe.throw(
-						_("Journal Entry for Asset scrapping cannot be cancelled. Please restore the Asset.")
-					)
+						asset.set_status()
 
 	def unlink_inter_company_jv(self):
 		if (
@@ -388,7 +319,7 @@ class JournalEntry(AccountsController):
 
 	def validate_party(self):
 		for d in self.get("accounts"):
-			account_type = frappe.db.get_value("Account", d.account, "account_type")
+			account_type = frappe.get_cached_value("Account", d.account, "account_type")
 			if account_type in ["Receivable", "Payable"]:
 				if not (d.party_type and d.party):
 					frappe.throw(
@@ -396,15 +327,6 @@ class JournalEntry(AccountsController):
 							d.idx, d.account
 						)
 					)
-				elif (
-					d.party_type
-					and frappe.db.get_value("Party Type", d.party_type, "account_type") != account_type
-				):
-					frappe.throw(
-						_("Row {0}: Account {1} and Party Type {2} have different account types").format(
-							d.idx, d.account, d.party_type
-						)
-					)
 
 	def check_credit_limit(self):
 		customers = list(
@@ -460,7 +382,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.db.get_value("Account", d.account, "root_type")
+				account_root_type = frappe.get_cached_value("Account", d.account, "root_type")
 				if account_root_type == "Asset" and flt(d.debit) > 0:
 					frappe.throw(
 						_(
@@ -670,29 +592,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):
-		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)
-				)
+		self.set_total_debit_credit()
+		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
@@ -710,7 +631,7 @@ class JournalEntry(AccountsController):
 	def validate_multi_currency(self):
 		alternate_currency = []
 		for d in self.get("accounts"):
-			account = frappe.db.get_value(
+			account = frappe.get_cached_value(
 				"Account", d.account, ["account_currency", "account_type"], as_dict=1
 			)
 			if account:
@@ -730,17 +651,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"):
@@ -839,10 +759,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.db.get_value("Account", d.account, "account_type") in ["Bank", "Cash"]:
+			elif frappe.get_cached_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
 
@@ -869,7 +789,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)
@@ -907,8 +827,6 @@ class JournalEntry(AccountsController):
 	def make_gl_entries(self, cancel=0, adv_adj=0):
 		from erpnext.accounts.general_ledger import make_gl_entries
 
-		merge_entries = frappe.db.get_single_value("Accounts Settings", "merge_similar_account_heads")
-
 		gl_map = self.build_gl_map()
 		if self.voucher_type in ("Deferred Revenue", "Deferred Expense"):
 			update_outstanding = "No"
@@ -916,16 +834,10 @@ class JournalEntry(AccountsController):
 			update_outstanding = "Yes"
 
 		if gl_map:
-			make_gl_entries(
-				gl_map,
-				cancel=cancel,
-				adv_adj=adv_adj,
-				merge_entries=merge_entries,
-				update_outstanding=update_outstanding,
-			)
+			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:
@@ -940,13 +852,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:
@@ -956,7 +862,6 @@ class JournalEntry(AccountsController):
 					blank_row.debit_in_account_currency = abs(diff)
 					blank_row.debit = abs(diff)
 
-			self.set_total_debit_credit()
 			self.validate_total_debit_and_credit()
 
 	@frappe.whitelist()
@@ -1082,7 +987,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.db.get_value(
+		account_details = frappe.get_cached_value(
 			"Account", account, ["account_currency", "account_type"], as_dict=1
 		)
 
@@ -1211,7 +1116,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.db.get_value("Account", args.get("party_account"), "account_type"),
+			"account_type": frappe.get_cached_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")),
@@ -1378,7 +1283,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.db.get_value("Account", account, "account_currency"),
+		"account_currency": frappe.get_cached_value("Account", account, "account_currency"),
 	}
 
 
@@ -1391,7 +1296,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.db.get_value(
+	account_details = frappe.get_cached_value(
 		"Account", account, ["account_type", "account_currency"], as_dict=1
 	)
 
@@ -1444,7 +1349,7 @@ def get_exchange_rate(
 ):
 	from erpnext.setup.utils import get_exchange_rate
 
-	account_details = frappe.db.get_value(
+	account_details = frappe.get_cached_value(
 		"Account", account, ["account_type", "root_type", "account_currency", "company"], as_dict=1
 	)
 

erpnext/accounts/doctype/journal_entry/test_journal_entry.py

@@ -287,6 +287,10 @@ class TestJournalEntry(unittest.TestCase):
 		jv.submit()
 
 	def test_inter_company_jv(self):
+		frappe.db.set_value("Account", "Sales Expenses - _TC", "inter_company_account", 1)
+		frappe.db.set_value("Account", "Buildings - _TC", "inter_company_account", 1)
+		frappe.db.set_value("Account", "Sales Expenses - _TC1", "inter_company_account", 1)
+		frappe.db.set_value("Account", "Buildings - _TC1", "inter_company_account", 1)
 		jv = make_journal_entry(
 			"Sales Expenses - _TC",
 			"Buildings - _TC",

erpnext/accounts/doctype/journal_entry_template/journal_entry_template.js

@@ -2,21 +2,6 @@
 // For license information, please see license.txt
 
 frappe.ui.form.on("Journal Entry Template", {
-	onload: function(frm) {
-		if(frm.is_new()) {
-			frappe.call({
-				type: "GET",
-				method: "erpnext.accounts.doctype.journal_entry_template.journal_entry_template.get_naming_series",
-				callback: function(r){
-					if(r.message) {
-						frm.set_df_property("naming_series", "options", r.message.split("\n"));
-						frm.set_value("naming_series", r.message.split("\n")[0]);
-						frm.refresh_field("naming_series");
-					}
-				}
-			});
-		}
-	},
 	refresh: function(frm) {
 		frappe.model.set_default_values(frm.doc);
 
@@ -34,6 +19,18 @@ frappe.ui.form.on("Journal Entry Template", {
 
 			return { filters: filters };
 		});
+
+		frappe.call({
+			type: "GET",
+			method: "erpnext.accounts.doctype.journal_entry_template.journal_entry_template.get_naming_series",
+			callback: function(r){
+				if(r.message){
+					frm.set_df_property("naming_series", "options", r.message.split("\n"));
+					frm.set_value("naming_series", r.message.split("\n")[0]);
+					frm.refresh_field("naming_series");
+				}
+			}
+		});
 	},
 	voucher_type: function(frm) {
 		var add_accounts = function(doc, r) {

erpnext/accounts/doctype/ledger_merge/ledger_merge.py

@@ -4,22 +4,20 @@
 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"))
 
-		enqueued_jobs = [d.get("job_name") for d in get_info()]
-
-		if self.name not in enqueued_jobs:
+		if not is_job_queued(self.name):
 			enqueue(
 				start_merge,
 				queue="default",

erpnext/accounts/doctype/loyalty_program/loyalty_program.py

@@ -141,7 +141,7 @@ def validate_loyalty_points(ref_doc, points_to_redeem):
 		)
 
 		if points_to_redeem > loyalty_program_details.loyalty_points:
-			frappe.throw(_("You don't have enough Loyalty Points to redeem"))
+			frappe.throw(_("You don't have enought Loyalty Points to redeem"))
 
 		loyalty_amount = flt(points_to_redeem * loyalty_program_details.conversion_factor)
 

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.db.get_value("Account", entry.default_account, "company") != entry.company:
+			if frappe.get_cached_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.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
+from frappe.utils.background_jobs import enqueue, is_job_queued
 
 from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import (
 	get_accounting_dimensions,
@@ -207,14 +207,12 @@ 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"))
 
-			enqueued_jobs = [d.get("job_name") for d in get_info()]
-			if self.name not in enqueued_jobs:
+			if not is_job_queued(self.name):
 				enqueue(
 					start_import,
 					queue="default",

erpnext/accounts/doctype/payment_entry/payment_entry.js

@@ -7,7 +7,7 @@ cur_frm.cscript.tax_table = "Advance Taxes and Charges";
 
 frappe.ui.form.on('Payment Entry', {
 	onload: function(frm) {
-		frm.ignore_doctypes_on_cancel_all = ['Sales Invoice', 'Purchase Invoice', "Repost Payment Ledger"];
+		frm.ignore_doctypes_on_cancel_all = ['Sales Invoice', 'Purchase Invoice'];
 
 		if(frm.doc.__islocal) {
 			if (!frm.doc.paid_from) frm.set_value("paid_from_account_currency", null);
@@ -122,10 +122,13 @@ frappe.ui.form.on('Payment Entry', {
 		frm.set_query('payment_term', 'references', function(frm, cdt, cdn) {
 			const child = locals[cdt][cdn];
 			if (in_list(['Purchase Invoice', 'Sales Invoice'], child.reference_doctype) && child.reference_name) {
+				let payment_term_list = frappe.get_list('Payment Schedule', {'parent': child.reference_name});
+
+				payment_term_list = payment_term_list.map(pt => pt.payment_term);
+
 				return {
-					query: "erpnext.controllers.queries.get_payment_terms_for_references",
 					filters: {
-						'reference': child.reference_name
+						'name': ['in', payment_term_list]
 					}
 				}
 			}
@@ -242,6 +245,8 @@ frappe.ui.form.on('Payment Entry', {
 		frm.set_currency_labels(["total_amount", "outstanding_amount", "allocated_amount"],
 			party_account_currency, "references");
 
+		frm.set_currency_labels(["amount"], company_currency, "deductions");
+
 		cur_frm.set_df_property("source_exchange_rate", "description",
 			("1 " + frm.doc.paid_from_account_currency + " = [?] " + company_currency));
 
@@ -610,7 +615,7 @@ frappe.ui.form.on('Payment Entry', {
 			frm.events.set_unallocated_amount(frm);
 	},
 
-	get_outstanding_invoices_or_orders: function(frm, get_outstanding_invoices, get_orders_to_be_billed) {
+	get_outstanding_invoice: function(frm) {
 		const today = frappe.datetime.get_today();
 		const fields = [
 			{fieldtype:"Section Break", label: __("Posting Date")},
@@ -640,29 +645,12 @@ frappe.ui.form.on('Payment Entry', {
 			{fieldtype:"Check", label: __("Allocate Payment Amount"), fieldname:"allocate_payment_amount", default:1},
 		];
 
-		let btn_text = "";
-
-		if (get_outstanding_invoices) {
-			btn_text = "Get Outstanding Invoices";
-		}
-		else if (get_orders_to_be_billed) {
-			btn_text = "Get Outstanding Orders";
-		}
-
 		frappe.prompt(fields, function(filters){
 			frappe.flags.allocate_payment_amount = true;
 			frm.events.validate_filters_data(frm, filters);
 			frm.doc.cost_center = filters.cost_center;
-			frm.events.get_outstanding_documents(frm, filters, get_outstanding_invoices, get_orders_to_be_billed);
-		}, __("Filters"), __(btn_text));
-	},
-
-	get_outstanding_invoices: function(frm) {
-		frm.events.get_outstanding_invoices_or_orders(frm, true, false);
-	},
-
-	get_outstanding_orders: function(frm) {
-		frm.events.get_outstanding_invoices_or_orders(frm, false, true);
+			frm.events.get_outstanding_documents(frm, filters);
+		}, __("Filters"), __("Get Outstanding Documents"));
 	},
 
 	validate_filters_data: function(frm, filters) {
@@ -688,7 +676,7 @@ frappe.ui.form.on('Payment Entry', {
 		}
 	},
 
-	get_outstanding_documents: function(frm, filters, get_outstanding_invoices, get_orders_to_be_billed) {
+	get_outstanding_documents: function(frm, filters) {
 		frm.clear_table("references");
 
 		if(!frm.doc.party) {
@@ -712,13 +700,6 @@ frappe.ui.form.on('Payment Entry', {
 			args[key] = filters[key];
 		}
 
-		if (get_outstanding_invoices) {
-			args["get_outstanding_invoices"] = true;
-		}
-		else if (get_orders_to_be_billed) {
-			args["get_orders_to_be_billed"] = true;
-		}
-
 		frappe.flags.allocate_payment_amount = filters['allocate_payment_amount'];
 
 		return  frappe.call({
@@ -894,12 +875,12 @@ frappe.ui.form.on('Payment Entry', {
 			if(frm.doc.payment_type == "Receive"
 				&& frm.doc.base_total_allocated_amount < frm.doc.base_received_amount + total_deductions
 				&& frm.doc.total_allocated_amount < frm.doc.paid_amount + (total_deductions / frm.doc.source_exchange_rate)) {
-					unallocated_amount = (frm.doc.base_received_amount + total_deductions + flt(frm.doc.base_total_taxes_and_charges)
+					unallocated_amount = (frm.doc.base_received_amount + total_deductions + frm.doc.base_total_taxes_and_charges
 						- frm.doc.base_total_allocated_amount) / frm.doc.source_exchange_rate;
 			} else if (frm.doc.payment_type == "Pay"
 				&& frm.doc.base_total_allocated_amount < frm.doc.base_paid_amount - total_deductions
 				&& frm.doc.total_allocated_amount < frm.doc.received_amount + (total_deductions / frm.doc.target_exchange_rate)) {
-					unallocated_amount = (frm.doc.base_paid_amount + flt(frm.doc.base_total_taxes_and_charges) - (total_deductions
+					unallocated_amount = (frm.doc.base_paid_amount + frm.doc.base_total_taxes_and_charges - (total_deductions
 						+ frm.doc.base_total_allocated_amount)) / frm.doc.target_exchange_rate;
 			}
 		}
@@ -926,7 +907,7 @@ frappe.ui.form.on('Payment Entry', {
 			function(d) { return flt(d.amount) }));
 
 		frm.set_value("difference_amount", difference_amount - total_deductions +
-			flt(frm.doc.base_total_taxes_and_charges));
+			frm.doc.base_total_taxes_and_charges);
 
 		frm.events.hide_unhide_fields(frm);
 	},
@@ -992,49 +973,30 @@ frappe.ui.form.on('Payment Entry', {
 				},
 				callback: function(r, rt) {
 					if(r.message) {
-						const write_off_row = $.map(frm.doc["deductions"] || [], function(t) {
+						var write_off_row = $.map(frm.doc["deductions"] || [], function(t) {
 							return t.account==r.message[account] ? t : null; });
 
-						const difference_amount = flt(frm.doc.difference_amount,
+						var row = [];
+
+						var difference_amount = flt(frm.doc.difference_amount,
 							precision("difference_amount"));
 
-						const add_deductions = (details) => {
-							let row = null;
-							if (!write_off_row.length && difference_amount) {
-								row = frm.add_child("deductions");
-								row.account = details[account];
-								row.cost_center = details["cost_center"];
-							} else {
-								row = write_off_row[0];
-							}
-
-							if (row) {
-								row.amount = flt(row.amount) + difference_amount;
-							} else {
-								frappe.msgprint(__("No gain or loss in the exchange rate"))
-							}
-							refresh_field("deductions");
-						};
-
-						if (!r.message[account]) {
-							frappe.prompt({
-								label: __("Please Specify Account"),
-								fieldname: account,
-								fieldtype: "Link",
-								options: "Account",
-								get_query: () => ({
-									filters: {
-										company: frm.doc.company,
-									}
-								})
-							}, (values) => {
-								const details = Object.assign({}, r.message, values);
-								add_deductions(details);
-							}, __(frappe.unscrub(account)));
+						if (!write_off_row.length && difference_amount) {
+							row = frm.add_child("deductions");
+							row.account = r.message[account];
+							row.cost_center = r.message["cost_center"];
 						} else {
-							add_deductions(r.message);
+							row = write_off_row[0];
 						}
 
+						if (row) {
+							row.amount = flt(row.amount) + difference_amount;
+						} else {
+							frappe.msgprint(__("No gain or loss in the exchange rate"))
+						}
+
+						refresh_field("deductions");
+
 						frm.events.set_unallocated_amount(frm);
 					}
 				}

erpnext/accounts/doctype/payment_entry/payment_entry.json

@@ -48,8 +48,7 @@
   "base_received_amount",
   "base_received_amount_after_tax",
   "section_break_14",
-  "get_outstanding_invoices",
-  "get_outstanding_orders",
+  "get_outstanding_invoice",
   "references",
   "section_break_34",
   "total_allocated_amount",
@@ -240,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,
@@ -250,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
@@ -273,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,
@@ -283,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
@@ -305,8 +304,7 @@
   {
    "fieldname": "source_exchange_rate",
    "fieldtype": "Float",
-   "label": "Source Exchange Rate",
-   "precision": "9",
+   "label": "Exchange Rate",
    "print_hide": 1,
    "reqd": 1
   },
@@ -335,8 +333,7 @@
   {
    "fieldname": "target_exchange_rate",
    "fieldtype": "Float",
-   "label": "Target Exchange Rate",
-   "precision": "9",
+   "label": "Exchange Rate",
    "print_hide": 1,
    "reqd": 1
   },
@@ -356,6 +353,12 @@
    "fieldtype": "Section Break",
    "label": "Reference"
   },
+  {
+   "depends_on": "eval:doc.docstatus==0",
+   "fieldname": "get_outstanding_invoice",
+   "fieldtype": "Button",
+   "label": "Get Outstanding Invoice"
+  },
   {
    "fieldname": "references",
    "fieldtype": "Table",
@@ -628,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"
   },
   {
@@ -723,24 +726,12 @@
    "fieldname": "section_break_60",
    "fieldtype": "Section Break",
    "hide_border": 1
-  },
-  {
-   "depends_on": "eval:doc.docstatus==0",
-   "fieldname": "get_outstanding_invoices",
-   "fieldtype": "Button",
-   "label": "Get Outstanding Invoices"
-  },
-  {
-   "depends_on": "eval:doc.docstatus==0",
-   "fieldname": "get_outstanding_orders",
-   "fieldtype": "Button",
-   "label": "Get Outstanding Orders"
   }
  ],
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2023-06-19 11:38:04.387219",
+ "modified": "2022-02-23 20:08:39.559814",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Entry",

erpnext/accounts/doctype/payment_entry/test_payment_entry.py

@@ -5,13 +5,12 @@ import unittest
 
 import frappe
 from frappe import qb
-from frappe.tests.utils import FrappeTestCase, change_settings
+from frappe.tests.utils import FrappeTestCase
 from frappe.utils import flt, nowdate
 
 from erpnext.accounts.doctype.payment_entry.payment_entry import (
 	InvalidPaymentEntry,
 	get_payment_entry,
-	get_reference_details,
 )
 from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import (
 	make_purchase_invoice,
@@ -52,38 +51,6 @@ class TestPaymentEntry(FrappeTestCase):
 		so_advance_paid = frappe.db.get_value("Sales Order", so.name, "advance_paid")
 		self.assertEqual(so_advance_paid, 0)
 
-	def test_payment_against_sales_order_usd_to_inr(self):
-		so = make_sales_order(
-			customer="_Test Customer USD", currency="USD", qty=1, rate=100, do_not_submit=True
-		)
-		so.conversion_rate = 50
-		so.submit()
-		pe = get_payment_entry("Sales Order", so.name)
-		pe.source_exchange_rate = 55
-		pe.received_amount = 5500
-		pe.insert()
-		pe.submit()
-
-		# there should be no difference amount
-		pe.reload()
-		self.assertEqual(pe.difference_amount, 0)
-		self.assertEqual(pe.deductions, [])
-
-		expected_gle = dict(
-			(d[0], d)
-			for d in [["_Test Receivable USD - _TC", 0, 5500, so.name], ["Cash - _TC", 5500.0, 0, None]]
-		)
-
-		self.validate_gl_entries(pe.name, expected_gle)
-
-		so_advance_paid = frappe.db.get_value("Sales Order", so.name, "advance_paid")
-		self.assertEqual(so_advance_paid, 100)
-
-		pe.cancel()
-
-		so_advance_paid = frappe.db.get_value("Sales Order", so.name, "advance_paid")
-		self.assertEqual(so_advance_paid, 0)
-
 	def test_payment_entry_for_blocked_supplier_invoice(self):
 		supplier = frappe.get_doc("Supplier", "_Test Supplier")
 		supplier.on_hold = 1
@@ -289,25 +256,10 @@ class TestPaymentEntry(FrappeTestCase):
 			},
 		)
 		si.save()
+
 		si.submit()
 
-		frappe.db.set_single_value("Accounts Settings", "book_tax_discount_loss", 1)
-		pe_with_tax_loss = get_payment_entry("Sales Invoice", si.name, bank_account="_Test Cash - _TC")
-
-		self.assertEqual(pe_with_tax_loss.references[0].payment_term, "30 Credit Days with 10% Discount")
-		self.assertEqual(pe_with_tax_loss.references[0].allocated_amount, 236.0)
-		self.assertEqual(pe_with_tax_loss.paid_amount, 212.4)
-		self.assertEqual(pe_with_tax_loss.deductions[0].amount, 20.0)  # Loss on Income
-		self.assertEqual(pe_with_tax_loss.deductions[1].amount, 3.6)  # Loss on Tax
-		self.assertEqual(pe_with_tax_loss.deductions[1].account, "_Test Account Service Tax - _TC")
-
-		frappe.db.set_single_value("Accounts Settings", "book_tax_discount_loss", 0)
 		pe = get_payment_entry("Sales Invoice", si.name, bank_account="_Test Cash - _TC")
-
-		self.assertEqual(pe.references[0].allocated_amount, 236.0)
-		self.assertEqual(pe.paid_amount, 212.4)
-		self.assertEqual(pe.deductions[0].amount, 23.6)
-
 		pe.submit()
 		si.load_from_db()
 
@@ -317,190 +269,6 @@ class TestPaymentEntry(FrappeTestCase):
 		self.assertEqual(si.payment_schedule[0].outstanding, 0)
 		self.assertEqual(si.payment_schedule[0].discounted_amount, 23.6)
 
-	def test_payment_entry_against_payment_terms_with_discount_amount(self):
-		si = create_sales_invoice(do_not_save=1, qty=1, rate=200)
-
-		si.payment_terms_template = "Test Discount Amount Template"
-		create_payment_terms_template_with_discount(
-			name="30 Credit Days with Rs.50 Discount",
-			discount_type="Amount",
-			discount=50,
-			template_name="Test Discount Amount Template",
-		)
-		frappe.db.set_value("Company", si.company, "default_discount_account", "Write Off - _TC")
-
-		si.append(
-			"taxes",
-			{
-				"charge_type": "On Net Total",
-				"account_head": "_Test Account Service Tax - _TC",
-				"cost_center": "_Test Cost Center - _TC",
-				"description": "Service Tax",
-				"rate": 18,
-			},
-		)
-		si.save()
-		si.submit()
-
-		# Set reference date past discount cut off date
-		pe_1 = get_payment_entry(
-			"Sales Invoice",
-			si.name,
-			bank_account="_Test Cash - _TC",
-			reference_date=frappe.utils.add_days(si.posting_date, 2),
-		)
-		self.assertEqual(pe_1.paid_amount, 236.0)  # discount not applied
-
-		# Test if tax loss is booked on enabling configuration
-		frappe.db.set_single_value("Accounts Settings", "book_tax_discount_loss", 1)
-		pe_with_tax_loss = get_payment_entry("Sales Invoice", si.name, bank_account="_Test Cash - _TC")
-		self.assertEqual(pe_with_tax_loss.deductions[0].amount, 42.37)  # Loss on Income
-		self.assertEqual(pe_with_tax_loss.deductions[1].amount, 7.63)  # Loss on Tax
-		self.assertEqual(pe_with_tax_loss.deductions[1].account, "_Test Account Service Tax - _TC")
-
-		frappe.db.set_single_value("Accounts Settings", "book_tax_discount_loss", 0)
-		pe = get_payment_entry("Sales Invoice", si.name, bank_account="_Test Cash - _TC")
-		self.assertEqual(pe.references[0].allocated_amount, 236.0)
-		self.assertEqual(pe.paid_amount, 186)
-		self.assertEqual(pe.deductions[0].amount, 50.0)
-
-		pe.submit()
-		si.load_from_db()
-
-		self.assertEqual(si.payment_schedule[0].payment_amount, 236.0)
-		self.assertEqual(si.payment_schedule[0].paid_amount, 186)
-		self.assertEqual(si.payment_schedule[0].outstanding, 0)
-		self.assertEqual(si.payment_schedule[0].discounted_amount, 50)
-
-	@change_settings(
-		"Accounts Settings",
-		{
-			"allow_multi_currency_invoices_against_single_party_account": 1,
-			"book_tax_discount_loss": 1,
-		},
-	)
-	def test_payment_entry_multicurrency_si_with_base_currency_accounting_early_payment_discount(
-		self,
-	):
-		"""
-		1. Multi-currency SI with single currency accounting (company currency)
-		2. PE with early payment discount
-		3. Test if Paid Amount is calculated in company currency
-		4. Test if deductions are calculated in company currency
-
-		SI is in USD to document agreed amounts that are in USD, but the accounting is in base currency.
-		"""
-		si = create_sales_invoice(
-			customer="_Test Customer",
-			currency="USD",
-			conversion_rate=50,
-			do_not_save=1,
-		)
-		create_payment_terms_template_with_discount()
-		si.payment_terms_template = "Test Discount Template"
-
-		frappe.db.set_value("Company", si.company, "default_discount_account", "Write Off - _TC")
-		si.save()
-		si.submit()
-
-		pe = get_payment_entry(
-			"Sales Invoice",
-			si.name,
-			bank_account="_Test Bank - _TC",
-		)
-		pe.reference_no = si.name
-		pe.reference_date = nowdate()
-
-		# Early payment discount loss on income
-		self.assertEqual(pe.paid_amount, 4500.0)  # Amount in company currency
-		self.assertEqual(pe.received_amount, 4500.0)
-		self.assertEqual(pe.deductions[0].amount, 500.0)
-		self.assertEqual(pe.deductions[0].account, "Write Off - _TC")
-		self.assertEqual(pe.difference_amount, 0.0)
-
-		pe.insert()
-		pe.submit()
-
-		expected_gle = dict(
-			(d[0], d)
-			for d in [
-				["Debtors - _TC", 0, 5000, si.name],
-				["_Test Bank - _TC", 4500, 0, None],
-				["Write Off - _TC", 500.0, 0, None],
-			]
-		)
-
-		self.validate_gl_entries(pe.name, expected_gle)
-
-		outstanding_amount = flt(frappe.db.get_value("Sales Invoice", si.name, "outstanding_amount"))
-		self.assertEqual(outstanding_amount, 0)
-
-	def test_payment_entry_multicurrency_accounting_si_with_early_payment_discount(self):
-		"""
-		1. Multi-currency SI with multi-currency accounting
-		2. PE with early payment discount and also exchange loss
-		3. Test if Paid Amount is calculated in transaction currency
-		4. Test if deductions are calculated in base/company currency
-		5. Test if exchange loss is reflected in difference
-		"""
-		si = create_sales_invoice(
-			customer="_Test Customer USD",
-			debit_to="_Test Receivable USD - _TC",
-			currency="USD",
-			conversion_rate=50,
-			do_not_save=1,
-		)
-		create_payment_terms_template_with_discount()
-		si.payment_terms_template = "Test Discount Template"
-
-		frappe.db.set_value("Company", si.company, "default_discount_account", "Write Off - _TC")
-		si.save()
-		si.submit()
-
-		pe = get_payment_entry(
-			"Sales Invoice", si.name, bank_account="_Test Bank - _TC", bank_amount=4700
-		)
-		pe.reference_no = si.name
-		pe.reference_date = nowdate()
-
-		# Early payment discount loss on income
-		self.assertEqual(pe.paid_amount, 90.0)
-		self.assertEqual(pe.received_amount, 4200.0)  # 5000 - 500 (discount) - 300 (exchange loss)
-		self.assertEqual(pe.deductions[0].amount, 500.0)
-		self.assertEqual(pe.deductions[0].account, "Write Off - _TC")
-
-		# Exchange loss
-		self.assertEqual(pe.difference_amount, 300.0)
-
-		pe.append(
-			"deductions",
-			{
-				"account": "_Test Exchange Gain/Loss - _TC",
-				"cost_center": "_Test Cost Center - _TC",
-				"amount": 300.0,
-			},
-		)
-
-		pe.insert()
-		pe.submit()
-
-		self.assertEqual(pe.difference_amount, 0.0)
-
-		expected_gle = dict(
-			(d[0], d)
-			for d in [
-				["_Test Receivable USD - _TC", 0, 5000, si.name],
-				["_Test Bank - _TC", 4200, 0, None],
-				["Write Off - _TC", 500.0, 0, None],
-				["_Test Exchange Gain/Loss - _TC", 300.0, 0, None],
-			]
-		)
-
-		self.validate_gl_entries(pe.name, expected_gle)
-
-		outstanding_amount = flt(frappe.db.get_value("Sales Invoice", si.name, "outstanding_amount"))
-		self.assertEqual(outstanding_amount, 0)
-
 	def test_payment_against_purchase_invoice_to_check_status(self):
 		pi = make_purchase_invoice(
 			supplier="_Test Supplier USD",
@@ -1014,194 +782,6 @@ class TestPaymentEntry(FrappeTestCase):
 		employee = make_employee("test_payment_entry@salary.com", company="_Test Company")
 		create_payment_entry(party_type="Employee", party=employee, save=True)
 
-	def test_duplicate_payment_entry_allocate_amount(self):
-		si = create_sales_invoice()
-
-		pe_draft = get_payment_entry("Sales Invoice", si.name)
-		pe_draft.insert()
-
-		pe = get_payment_entry("Sales Invoice", si.name)
-		pe.submit()
-
-		self.assertRaises(frappe.ValidationError, pe_draft.submit)
-
-	def test_duplicate_payment_entry_partial_allocate_amount(self):
-		si = create_sales_invoice()
-
-		pe_draft = get_payment_entry("Sales Invoice", si.name)
-		pe_draft.insert()
-
-		pe = get_payment_entry("Sales Invoice", si.name)
-		pe.received_amount = si.total / 2
-		pe.references[0].allocated_amount = si.total / 2
-		pe.submit()
-
-		self.assertRaises(frappe.ValidationError, pe_draft.submit)
-
-	def test_details_update_on_reference_table(self):
-		so = make_sales_order(
-			customer="_Test Customer USD", currency="USD", qty=1, rate=100, do_not_submit=True
-		)
-		so.conversion_rate = 50
-		so.submit()
-		pe = get_payment_entry("Sales Order", so.name)
-		pe.references.clear()
-		pe.paid_from = "Debtors - _TC"
-		pe.paid_from_account_currency = "INR"
-		pe.source_exchange_rate = 50
-		pe.save()
-
-		ref_details = get_reference_details(so.doctype, so.name, pe.paid_from_account_currency)
-		expected_response = {
-			"total_amount": 5000.0,
-			"outstanding_amount": 5000.0,
-			"exchange_rate": 1.0,
-			"due_date": None,
-			"bill_no": None,
-		}
-		self.assertDictEqual(ref_details, expected_response)
-
-	@change_settings(
-		"Accounts Settings",
-		{
-			"unlink_payment_on_cancellation_of_invoice": 1,
-			"delete_linked_ledger_entries": 1,
-			"allow_multi_currency_invoices_against_single_party_account": 1,
-		},
-	)
-	def test_overallocation_validation_on_payment_terms(self):
-		"""
-		Validate Allocation on Payment Entry based on Payment Schedule. Upon overallocation, validation error must be thrown.
-
-		"""
-		customer = create_customer()
-		create_payment_terms_template()
-
-		# Validate allocation on base/company currency
-		si1 = create_sales_invoice(do_not_save=1, qty=1, rate=200)
-		si1.payment_terms_template = "Test Receivable Template"
-		si1.save().submit()
-
-		si1.reload()
-		pe = get_payment_entry(si1.doctype, si1.name).save()
-		# Allocated amount should be according to the payment schedule
-		for idx, schedule in enumerate(si1.payment_schedule):
-			with self.subTest(idx=idx):
-				self.assertEqual(flt(schedule.payment_amount), flt(pe.references[idx].allocated_amount))
-		pe.save()
-
-		# Overallocation validation should trigger
-		pe.paid_amount = 400
-		pe.references[0].allocated_amount = 200
-		pe.references[1].allocated_amount = 200
-		self.assertRaises(frappe.ValidationError, pe.save)
-		pe.delete()
-		si1.cancel()
-		si1.delete()
-
-		# Validate allocation on foreign currency
-		si2 = create_sales_invoice(
-			customer="_Test Customer USD",
-			debit_to="_Test Receivable USD - _TC",
-			currency="USD",
-			conversion_rate=80,
-			do_not_save=1,
-		)
-		si2.payment_terms_template = "Test Receivable Template"
-		si2.save().submit()
-
-		si2.reload()
-		pe = get_payment_entry(si2.doctype, si2.name).save()
-		# Allocated amount should be according to the payment schedule
-		for idx, schedule in enumerate(si2.payment_schedule):
-			with self.subTest(idx=idx):
-				self.assertEqual(flt(schedule.payment_amount), flt(pe.references[idx].allocated_amount))
-		pe.save()
-
-		# Overallocation validation should trigger
-		pe.paid_amount = 200
-		pe.references[0].allocated_amount = 100
-		pe.references[1].allocated_amount = 100
-		self.assertRaises(frappe.ValidationError, pe.save)
-		pe.delete()
-		si2.cancel()
-		si2.delete()
-
-		# Validate allocation in base/company currency on a foreign currency document
-		# when invoice is made is foreign currency, but posted to base/company currency debtors account
-		si3 = create_sales_invoice(
-			customer=customer,
-			currency="USD",
-			conversion_rate=80,
-			do_not_save=1,
-		)
-		si3.payment_terms_template = "Test Receivable Template"
-		si3.save().submit()
-
-		si3.reload()
-		pe = get_payment_entry(si3.doctype, si3.name).save()
-		# Allocated amount should be equal to payment term outstanding
-		self.assertEqual(len(pe.references), 2)
-		for idx, ref in enumerate(pe.references):
-			with self.subTest(idx=idx):
-				self.assertEqual(ref.payment_term_outstanding, ref.allocated_amount)
-		pe.save()
-
-		# Overallocation validation should trigger
-		pe.paid_amount = 16000
-		pe.references[0].allocated_amount = 8000
-		pe.references[1].allocated_amount = 8000
-		self.assertRaises(frappe.ValidationError, pe.save)
-		pe.delete()
-		si3.cancel()
-		si3.delete()
-
-	@change_settings(
-		"Accounts Settings",
-		{
-			"unlink_payment_on_cancellation_of_invoice": 1,
-			"delete_linked_ledger_entries": 1,
-			"allow_multi_currency_invoices_against_single_party_account": 1,
-		},
-	)
-	def test_overallocation_validation_shouldnt_misfire(self):
-		"""
-		Overallocation validation shouldn't fire for Template without "Allocate Payment based on Payment Terms" enabled
-
-		"""
-		customer = create_customer()
-		create_payment_terms_template()
-
-		template = frappe.get_doc("Payment Terms Template", "Test Receivable Template")
-		template.allocate_payment_based_on_payment_terms = 0
-		template.save()
-
-		# Validate allocation on base/company currency
-		si = create_sales_invoice(do_not_save=1, qty=1, rate=200)
-		si.payment_terms_template = "Test Receivable Template"
-		si.save().submit()
-
-		si.reload()
-		pe = get_payment_entry(si.doctype, si.name).save()
-		# There will no term based allocation
-		self.assertEqual(len(pe.references), 1)
-		self.assertEqual(pe.references[0].payment_term, None)
-		self.assertEqual(flt(pe.references[0].allocated_amount), flt(si.grand_total))
-		pe.save()
-
-		# specify a term
-		pe.references[0].payment_term = template.terms[0].payment_term
-		# no validation error should be thrown
-		pe.save()
-
-		pe.paid_amount = si.grand_total + 1
-		pe.references[0].allocated_amount = si.grand_total + 1
-		self.assertRaises(frappe.ValidationError, pe.save)
-
-		template = frappe.get_doc("Payment Terms Template", "Test Receivable Template")
-		template.allocate_payment_based_on_payment_terms = 1
-		template.save()
-
 
 def create_payment_entry(**args):
 	payment_entry = frappe.new_doc("Payment Entry")
@@ -1259,27 +839,24 @@ def create_payment_terms_template():
 		).insert()
 
 
-def create_payment_terms_template_with_discount(
-	name=None, discount_type=None, discount=None, template_name=None
-):
-	create_payment_term(name or "30 Credit Days with 10% Discount")
-	template_name = template_name or "Test Discount Template"
+def create_payment_terms_template_with_discount():
 
-	if not frappe.db.exists("Payment Terms Template", template_name):
-		frappe.get_doc(
+	create_payment_term("30 Credit Days with 10% Discount")
+
+	if not frappe.db.exists("Payment Terms Template", "Test Discount Template"):
+		payment_term_template = frappe.get_doc(
 			{
 				"doctype": "Payment Terms Template",
-				"template_name": template_name,
+				"template_name": "Test Discount Template",
 				"allocate_payment_based_on_payment_terms": 1,
 				"terms": [
 					{
 						"doctype": "Payment Terms Template Detail",
-						"payment_term": name or "30 Credit Days with 10% Discount",
+						"payment_term": "30 Credit Days with 10% Discount",
 						"invoice_portion": 100,
 						"credit_days_based_on": "Day(s) after invoice date",
 						"credit_days": 2,
-						"discount_type": discount_type or "Percentage",
-						"discount": discount or 10,
+						"discount": 10,
 						"discount_validity_based_on": "Day(s) after invoice date",
 						"discount_validity": 1,
 					}
@@ -1291,17 +868,3 @@ def create_payment_terms_template_with_discount(
 def create_payment_term(name):
 	if not frappe.db.exists("Payment Term", name):
 		frappe.get_doc({"doctype": "Payment Term", "payment_term_name": name}).insert()
-
-
-def create_customer(name="_Test Customer 2 USD", currency="USD"):
-	customer = None
-	if frappe.db.exists("Customer", name):
-		customer = name
-	else:
-		customer = frappe.new_doc("Customer")
-		customer.customer_name = name
-		customer.default_currency = currency
-		customer.type = "Individual"
-		customer.save()
-		customer = customer.name
-	return customer

erpnext/accounts/doctype/payment_entry_deduction/payment_entry_deduction.json

@@ -3,7 +3,6 @@
  "creation": "2016-06-15 15:56:30.815503",
  "doctype": "DocType",
  "editable_grid": 1,
- "engine": "InnoDB",
  "field_order": [
   "account",
   "cost_center",
@@ -18,7 +17,9 @@
    "in_list_view": 1,
    "label": "Account",
    "options": "Account",
-   "reqd": 1
+   "reqd": 1,
+   "show_days": 1,
+   "show_seconds": 1
   },
   {
    "fieldname": "cost_center",
@@ -27,30 +28,37 @@
    "label": "Cost Center",
    "options": "Cost Center",
    "print_hide": 1,
-   "reqd": 1
+   "reqd": 1,
+   "show_days": 1,
+   "show_seconds": 1
   },
   {
    "fieldname": "amount",
    "fieldtype": "Currency",
    "in_list_view": 1,
-   "label": "Amount (Company Currency)",
-   "options": "Company:company:default_currency",
-   "reqd": 1
+   "label": "Amount",
+   "reqd": 1,
+   "show_days": 1,
+   "show_seconds": 1
   },
   {
    "fieldname": "column_break_2",
-   "fieldtype": "Column Break"
+   "fieldtype": "Column Break",
+   "show_days": 1,
+   "show_seconds": 1
   },
   {
    "fieldname": "description",
    "fieldtype": "Small Text",
-   "label": "Description"
+   "label": "Description",
+   "show_days": 1,
+   "show_seconds": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2023-03-06 07:11:57.739619",
+ "modified": "2020-09-12 20:38:08.110674",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Entry Deduction",
@@ -58,6 +66,5 @@
  "permissions": [],
  "quick_entry": 1,
  "sort_field": "modified",
- "sort_order": "DESC",
- "states": []
+ "sort_order": "DESC"
 }

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.db.get_value("Account", self.payment_account, "account_currency")
+		self.currency = frappe.get_cached_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.db.get_value("Account", self.account, "report_type")
+		account_type = frappe.get_cached_value("Account", self.account, "report_type")
 
 		for dimension in get_checks_for_pl_and_bs_accounts():
 			if (

erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js

@@ -82,36 +82,6 @@ erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationCo
 			this.frm.change_custom_button_type('Get Unreconciled Entries', null, 'default');
 			this.frm.change_custom_button_type('Allocate', null, 'default');
 		}
-
-		// check for any running reconciliation jobs
-		if (this.frm.doc.receivable_payable_account) {
-			this.frm.call({
-				doc: this.frm.doc,
-				method: 'is_auto_process_enabled',
-				callback: (r) => {
-					if (r.message) {
-						this.frm.call({
-							'method': "erpnext.accounts.doctype.process_payment_reconciliation.process_payment_reconciliation.is_any_doc_running",
-							"args": {
-								for_filter: {
-									company: this.frm.doc.company,
-									party_type: this.frm.doc.party_type,
-									party: this.frm.doc.party,
-									receivable_payable_account: this.frm.doc.receivable_payable_account
-								}
-							}
-						}).then(r => {
-							if (r.message) {
-								let doc_link = frappe.utils.get_form_link("Process Payment Reconciliation", r.message, true);
-								let msg = __("Payment Reconciliation Job: {0} is running for this party. Can't reconcile now.", [doc_link]);
-								this.frm.dashboard.add_comment(msg, "yellow");
-							}
-						});
-					}
-				}
-			});
-		}
-
 	}
 
 	company() {
@@ -200,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) {
 
@@ -209,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;
 						},
@@ -252,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"];
@@ -272,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,
@@ -302,32 +264,4 @@ erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationCo
 	}
 };
 
-frappe.ui.form.on('Payment Reconciliation Allocation', {
-	allocated_amount: function(frm, cdt, cdn) {
-		let row = locals[cdt][cdn];
-		// filter invoice
-		let invoice = frm.doc.invoices.filter((x) => (x.invoice_number == row.invoice_number));
-		// filter payment
-		let payment = frm.doc.payments.filter((x) => (x.reference_name == row.reference_name));
-
-		frm.call({
-			doc: frm.doc,
-			method: 'calculate_difference_on_allocation_change',
-			args: {
-				payment_entry: payment,
-				invoice: invoice,
-				allocated_amount: row.allocated_amount
-			},
-			callback: (r) => {
-				if (r.message) {
-					row.difference_amount = r.message;
-					frm.refresh();
-				}
-			}
-		});
-	}
-});
-
-
-
 extend_cscript(cur_frm.cscript, new erpnext.accounts.PaymentReconciliationController({frm: cur_frm}));

erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py

@@ -6,16 +6,15 @@ import frappe
 from frappe import _, msgprint, qb
 from frappe.model.document import Document
 from frappe.query_builder.custom import ConstantColumn
-from frappe.utils import flt, get_link_to_form, getdate, nowdate, today
+from frappe.query_builder.functions import IfNull
+from frappe.utils import flt, getdate, nowdate, today
 
 import erpnext
-from erpnext.accounts.doctype.process_payment_reconciliation.process_payment_reconciliation import (
-	is_any_doc_running,
-)
 from erpnext.accounts.utils import (
 	QueryPaymentLedger,
 	get_outstanding_invoices,
 	reconcile_against_document,
+	update_reference_in_payment_entry,
 )
 from erpnext.controllers.accounts_controller import get_advance_payment_entries
 
@@ -24,7 +23,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()
@@ -71,10 +69,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"
@@ -85,13 +79,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
@@ -126,29 +119,12 @@ class PaymentReconciliation(Document):
 
 		return list(journal_entries)
 
-	def get_return_invoices(self):
-		voucher_type = "Sales Invoice" if self.party_type == "Customer" else "Purchase Invoice"
-		doc = qb.DocType(voucher_type)
-		self.return_invoices = (
-			qb.from_(doc)
-			.select(
-				ConstantColumn(voucher_type).as_("voucher_type"),
-				doc.name.as_("voucher_no"),
-				doc.return_against,
-			)
-			.where(
-				(doc.docstatus == 1)
-				& (doc[frappe.scrub(self.party_type)] == self.party)
-				& (doc.is_return == 1)
-			)
-			.run(as_dict=True)
-		)
-
 	def get_dr_or_cr_notes(self):
 
 		self.build_qb_filter_conditions(get_return_invoices=True)
 
 		ple = qb.DocType("Payment Ledger Entry")
+		voucher_type = "Sales Invoice" if self.party_type == "Customer" else "Purchase Invoice"
 
 		if erpnext.get_party_account_type(self.party_type) == "Receivable":
 			self.common_filter_conditions.append(ple.account_type == "Receivable")
@@ -156,10 +132,19 @@ class PaymentReconciliation(Document):
 			self.common_filter_conditions.append(ple.account_type == "Payable")
 		self.common_filter_conditions.append(ple.account == self.receivable_payable_account)
 
-		self.get_return_invoices()
-		return_invoices = [
-			x for x in self.return_invoices if x.return_against == None or x.return_against == ""
-		]
+		# get return invoices
+		doc = qb.DocType(voucher_type)
+		return_invoices = (
+			qb.from_(doc)
+			.select(ConstantColumn(voucher_type).as_("voucher_type"), doc.name.as_("voucher_no"))
+			.where(
+				(doc.docstatus == 1)
+				& (doc[frappe.scrub(self.party_type)] == self.party)
+				& (doc.is_return == 1)
+				& (IfNull(doc.return_against, "") == "")
+			)
+			.run(as_dict=True)
+		)
 
 		outstanding_dr_or_cr = []
 		if return_invoices:
@@ -208,18 +193,8 @@ 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,
 		)
 
-		cr_dr_notes = (
-			[x.voucher_no for x in self.return_invoices]
-			if self.party_type in ["Customer", "Supplier"]
-			else []
-		)
-		# Filter out cr/dr notes from outstanding invoices list
-		# Happens when non-standalone cr/dr notes are linked with another invoice through journal entry
-		non_reconciled_invoices = [x for x in non_reconciled_invoices if x.voucher_no not in cr_dr_notes]
-
 		if self.invoice_limit:
 			non_reconciled_invoices = non_reconciled_invoices[: self.invoice_limit]
 
@@ -238,42 +213,26 @@ 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 frappe.get_cached_value(
-			"Account", self.receivable_payable_account, "account_currency"
-		) != frappe.get_cached_value("Company", self.company, "default_currency"):
-			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
+	def get_difference_amount(self, allocated_entry):
+		if allocated_entry.get("reference_type") != "Payment Entry":
+			return
 
-		return difference_amount
-
-	@frappe.whitelist()
-	def is_auto_process_enabled(self):
-		return frappe.db.get_single_value("Accounts Settings", "auto_reconcile_payments")
-
-	@frappe.whitelist()
-	def calculate_difference_on_allocation_change(self, payment_entry, invoice, allocated_amount):
-		invoice_exchange_map = self.get_invoice_exchange_map(invoice, payment_entry)
-		invoice[0]["exchange_rate"] = invoice_exchange_map.get(invoice[0].get("invoice_number"))
-		new_difference_amount = self.get_difference_amount(
-			payment_entry[0], invoice[0], allocated_amount
+		dr_or_cr = (
+			"credit_in_account_currency"
+			if erpnext.get_party_account_type(self.party_type) == "Receivable"
+			else "debit_in_account_currency"
 		)
-		return new_difference_amount
+
+		row = self.get_payment_details(allocated_entry, dr_or_cr)
+
+		doc = frappe.get_doc(allocated_entry.reference_type, allocated_entry.reference_name)
+		update_reference_in_payment_entry(row, doc, do_not_save=True)
+
+		return doc.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")})
@@ -287,13 +246,7 @@ class PaymentReconciliation(Document):
 					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")
+				res.difference_amount = self.get_difference_amount(res)
 
 				if pay.get("amount") == 0:
 					entries.append(res)
@@ -323,11 +276,12 @@ class PaymentReconciliation(Document):
 				"amount": pay.get("amount"),
 				"allocated_amount": allocated_amount,
 				"difference_amount": pay.get("difference_amount"),
-				"currency": inv.get("currency"),
 			}
 		)
 
-	def reconcile_allocations(self, skip_ref_details_update_for_pe=False):
+	@frappe.whitelist()
+	def reconcile(self):
+		self.validate_allocation()
 		dr_or_cr = (
 			"credit_in_account_currency"
 			if erpnext.get_party_account_type(self.party_type) == "Receivable"
@@ -344,100 +298,17 @@ 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 and row.reference_type not in [
-					"Sales Invoice",
-					"Purchase Invoice",
-				]:
-					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, skip_ref_details_update_for_pe)
+			reconcile_against_document(entry_list)
 
 		if dr_or_cr_notes:
 			reconcile_dr_cr_note(dr_or_cr_notes, self.company)
 
-	@frappe.whitelist()
-	def reconcile(self):
-		if frappe.db.get_single_value("Accounts Settings", "auto_reconcile_payments"):
-			running_doc = is_any_doc_running(
-				dict(
-					company=self.company,
-					party_type=self.party_type,
-					party=self.party,
-					receivable_payable_account=self.receivable_payable_account,
-				)
-			)
-
-			if running_doc:
-				frappe.throw(
-					_("A Reconciliation Job {0} is running for the same filters. Cannot reconcile now").format(
-						get_link_to_form("Auto Reconcile", running_doc)
-					)
-				)
-				return
-
-		self.validate_allocation()
-		self.reconcile_allocations()
 		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),
-				reverse_dr_or_cr: flt(row.difference_amount),
-			}
-		)
-
-		journal_entry.append("accounts", journal_account)
-
-		journal_entry.save()
-		journal_entry.submit()
-
-		return journal_entry
-
 	def get_payment_details(self, row, dr_or_cr):
 		return frappe._dict(
 			{
@@ -447,7 +318,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"),
@@ -472,49 +342,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()
 
@@ -548,14 +375,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:
@@ -603,16 +429,6 @@ class PaymentReconciliation(Document):
 
 
 def reconcile_dr_cr_note(dr_cr_notes, company):
-	def get_difference_row(inv):
-		if inv.difference_amount != 0 and inv.difference_account:
-			difference_row = {
-				"account": inv.difference_account,
-				inv.dr_or_cr: abs(inv.difference_amount) if inv.difference_amount > 0 else 0,
-				reconcile_dr_or_cr: abs(inv.difference_amount) if inv.difference_amount < 0 else 0,
-				"cost_center": erpnext.get_default_cost_center(company),
-			}
-			return difference_row
-
 	for inv in dr_cr_notes:
 		voucher_type = "Credit Note" if inv.voucher_type == "Sales Invoice" else "Debit Note"
 
@@ -657,9 +473,5 @@ def reconcile_dr_cr_note(dr_cr_notes, company):
 				],
 			}
 		)
-
-		if difference_entry := get_difference_row(inv):
-			jv.append("accounts", difference_entry)
-
 		jv.flags.ignore_mandatory = True
 		jv.submit()

erpnext/accounts/doctype/payment_reconciliation/test_payment_reconciliation.py

@@ -5,19 +5,14 @@ import unittest
 
 import frappe
 from frappe import qb
-from frappe.tests.utils import FrappeTestCase, change_settings
-from frappe.utils import add_days, flt, nowdate
+from frappe.tests.utils import FrappeTestCase
+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.purchase_invoice.test_purchase_invoice import make_purchase_invoice
 from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
 from erpnext.accounts.party import get_party_account
 from erpnext.stock.doctype.item.test_item import create_item
 
-test_dependencies = ["Item"]
-
 
 class TestPaymentReconciliation(FrappeTestCase):
 	def setUp(self):
@@ -25,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):
@@ -78,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"
@@ -166,9 +182,7 @@ class TestPaymentReconciliation(FrappeTestCase):
 	def create_payment_reconciliation(self):
 		pr = frappe.new_doc("Payment Reconciliation")
 		pr.company = self.company
-		pr.party_type = (
-			self.party_type if hasattr(self, "party_type") and self.party_type else "Customer"
-		)
+		pr.party_type = "Customer"
 		pr.party = self.customer
 		pr.receivable_payable_account = get_party_account(pr.party_type, pr.party, pr.company)
 		pr.from_invoice_date = pr.to_invoice_date = pr.from_payment_date = pr.to_payment_date = nowdate()
@@ -202,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)
@@ -354,11 +352,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}))
-
-		# Difference amount should not be calculated for base currency accounts
-		for row in pr.allocation:
-			self.assertEqual(flt(row.get("difference_amount")), 0.0)
-
 		pr.reconcile()
 
 		si.reload()
@@ -400,11 +393,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}))
-
-		# Difference amount should not be calculated for base currency accounts
-		for row in pr.allocation:
-			self.assertEqual(flt(row.get("difference_amount")), 0.0)
-
 		pr.reconcile()
 
 		# check PR tool output
@@ -429,11 +417,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}))
-
-		# Difference amount should not be calculated for base currency accounts
-		for row in pr.allocation:
-			self.assertEqual(flt(row.get("difference_amount")), 0.0)
-
 		pr.reconcile()
 
 		# assert outstanding
@@ -470,11 +453,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}))
-
-		# Difference amount should not be calculated for base currency accounts
-		for row in pr.allocation:
-			self.assertEqual(flt(row.get("difference_amount")), 0.0)
-
 		pr.reconcile()
 
 		self.assertEqual(pr.get("invoices"), [])
@@ -498,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()
@@ -536,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
@@ -610,337 +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])
-
-	@change_settings(
-		"Accounts Settings",
-		{
-			"allow_multi_currency_invoices_against_single_party_account": 1,
-		},
-	)
-	def test_no_difference_amount_for_base_currency_accounts(self):
-		# Make Sale Invoice
-		si = self.create_sales_invoice(
-			qty=1, rate=1, posting_date=nowdate(), do_not_save=True, do_not_submit=True
-		)
-		si.customer = self.customer
-		si.currency = "EUR"
-		si.conversion_rate = 85
-		si.debit_to = self.debit_to
-		si.save().submit()
-
-		# Make payment using Payment Entry
-		pe1 = create_payment_entry(
-			company=self.company,
-			payment_type="Receive",
-			party_type="Customer",
-			party=self.customer,
-			paid_from=self.debit_to,
-			paid_to=self.bank,
-			paid_amount=100,
-		)
-
-		pe1.save()
-		pe1.submit()
-
-		pr = self.create_payment_reconciliation()
-		pr.party = self.customer
-		pr.receivable_payable_account = self.debit_to
-		pr.get_unreconciled_entries()
-
-		self.assertEqual(len(pr.invoices), 1)
-		self.assertEqual(len(pr.payments), 1)
-
-		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, 85)
-		self.assertEqual(pr.allocation[0].difference_amount, 0)
-
-	def test_reconciliation_purchase_invoice_against_return(self):
-		pi = make_purchase_invoice(
-			supplier="_Test Supplier USD", currency="USD", conversion_rate=50
-		).submit()
-
-		pi_return = frappe.get_doc(pi.as_dict())
-		pi_return.name = None
-		pi_return.docstatus = 0
-		pi_return.is_return = 1
-		pi_return.conversion_rate = 80
-		pi_return.items[0].qty = -pi_return.items[0].qty
-		pi_return.submit()
-
-		self.company = "_Test Company"
-		self.party_type = "Supplier"
-		self.customer = "_Test Supplier USD"
-
-		pr = self.create_payment_reconciliation()
-		pr.get_unreconciled_entries()
-
-		invoices = []
-		payments = []
-		for invoice in pr.invoices:
-			if invoice.invoice_number == pi.name:
-				invoices.append(invoice.as_dict())
-				break
-		for payment in pr.payments:
-			if payment.reference_name == pi_return.name:
-				payments.append(payment.as_dict())
-				break
-
-		pr.allocate_entries(frappe._dict({"invoices": invoices, "payments": payments}))
-
-		# Should not raise frappe.exceptions.ValidationError: Total Debit must be equal to Total Credit.
-		pr.reconcile()
-
-
-def make_customer(customer_name, currency=None):
-	if not frappe.db.exists("Customer", customer_name):
-		customer = frappe.new_doc("Customer")
-		customer.customer_name = customer_name
-		customer.type = "Individual"
-
-		if currency:
-			customer.default_currency = currency
-		customer.save()
-		return customer.name
-	else:
-		return customer_name

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",
@@ -366,35 +362,13 @@
    "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": "2022-09-30 16:19:43.680025",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Request",

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.db.get_value(
+		if self.payment_account and ref_doc.currency != frappe.get_cached_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
 
@@ -495,28 +466,26 @@ def get_amount(ref_doc, payment_account=None):
 	"""get amount based on doctype"""
 	dt = ref_doc.doctype
 	if dt in ["Sales Order", "Purchase Order"]:
-		grand_total = flt(ref_doc.rounded_total) or flt(ref_doc.grand_total)
+		grand_total = flt(ref_doc.grand_total) - flt(ref_doc.advance_paid)
+
 	elif dt in ["Sales Invoice", "Purchase Invoice"]:
-		if not ref_doc.get("is_pos"):
-			if ref_doc.party_account_currency == ref_doc.currency:
-				grand_total = flt(ref_doc.outstanding_amount)
-			else:
-				grand_total = flt(ref_doc.outstanding_amount) / ref_doc.conversion_rate
-		elif dt == "Sales Invoice":
-			for pay in ref_doc.payments:
-				if pay.type == "Phone" and pay.account == payment_account:
-					grand_total = pay.amount
-					break
+		if ref_doc.party_account_currency == ref_doc.currency:
+			grand_total = flt(ref_doc.outstanding_amount)
+		else:
+			grand_total = flt(ref_doc.outstanding_amount) / ref_doc.conversion_rate
+
 	elif dt == "POS Invoice":
 		for pay in ref_doc.payments:
 			if pay.type == "Phone" and pay.account == payment_account:
 				grand_total = pay.amount
 				break
+
 	elif dt == "Fees":
 		grand_total = ref_doc.outstanding_amount
 
 	if grand_total > 0:
 		return grand_total
+
 	else:
 		frappe.throw(_("Payment Entry is already created"))
 

erpnext/accounts/doctype/payment_request/test_payment_request.py

@@ -6,7 +6,6 @@ import unittest
 import frappe
 
 from erpnext.accounts.doctype.payment_request.payment_request import make_payment_request
-from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make_purchase_invoice
 from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
 from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
 from erpnext.setup.utils import get_exchange_rate
@@ -46,10 +45,7 @@ class TestPaymentRequest(unittest.TestCase):
 				frappe.get_doc(method).insert(ignore_permissions=True)
 
 	def test_payment_request_linkings(self):
-		so_inr = make_sales_order(currency="INR", do_not_save=True)
-		so_inr.disable_rounded_total = 1
-		so_inr.save()
-
+		so_inr = make_sales_order(currency="INR")
 		pr = make_payment_request(
 			dt="Sales Order",
 			dn=so_inr.name,
@@ -75,29 +71,6 @@ class TestPaymentRequest(unittest.TestCase):
 		self.assertEqual(pr.reference_name, si_usd.name)
 		self.assertEqual(pr.currency, "USD")
 
-	def test_payment_entry_against_purchase_invoice(self):
-		si_usd = make_purchase_invoice(
-			customer="_Test Supplier USD",
-			debit_to="_Test Payable USD - _TC",
-			currency="USD",
-			conversion_rate=50,
-		)
-
-		pr = make_payment_request(
-			dt="Purchase Invoice",
-			dn=si_usd.name,
-			recipient_id="user@example.com",
-			mute_email=1,
-			payment_gateway_account="_Test Gateway - USD",
-			submit_doc=1,
-			return_doc=1,
-		)
-
-		pe = pr.create_payment_entry()
-		pr.load_from_db()
-
-		self.assertEqual(pr.status, "Paid")
-
 	def test_payment_entry(self):
 		frappe.db.set_value(
 			"Company", "_Test Company", "exchange_gain_loss_account", "_Test Exchange Gain/Loss - _TC"

erpnext/accounts/doctype/payment_terms_template/payment_terms_template.js

@@ -2,11 +2,7 @@
 // For license information, please see license.txt
 
 frappe.ui.form.on('Payment Terms Template', {
-	refresh: function(frm) {
-		frm.fields_dict.terms.grid.toggle_reqd("payment_term", frm.doc.allocate_payment_based_on_payment_terms);
-	},
+	setup: function(frm) {
 
-	allocate_payment_based_on_payment_terms: function(frm) {
-		frm.fields_dict.terms.grid.toggle_reqd("payment_term", frm.doc.allocate_payment_based_on_payment_terms);
 	}
 });

erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py

@@ -11,7 +11,7 @@ from frappe.utils import flt
 class PaymentTermsTemplate(Document):
 	def validate(self):
 		self.validate_invoice_portion()
-		self.validate_terms()
+		self.check_duplicate_terms()
 
 	def validate_invoice_portion(self):
 		total_portion = 0
@@ -23,12 +23,9 @@ class PaymentTermsTemplate(Document):
 				_("Combined invoice portion must equal 100%"), raise_exception=1, indicator="red"
 			)
 
-	def validate_terms(self):
+	def check_duplicate_terms(self):
 		terms = []
 		for term in self.terms:
-			if self.allocate_payment_based_on_payment_terms and not term.payment_term:
-				frappe.throw(_("Row {0}: Payment Term is mandatory").format(term.idx))
-
 			term_info = (term.payment_term, term.credit_days, term.credit_months, term.due_date_based_on)
 			if term_info in terms:
 				frappe.msgprint(

erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py

@@ -4,13 +4,12 @@
 
 import frappe
 from frappe import _
-from frappe.query_builder.functions import Sum
-from frappe.utils import add_days, flt
+from frappe.utils import flt
 
 from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import (
 	get_accounting_dimensions,
 )
-from erpnext.accounts.utils import get_account_currency, get_fiscal_year, validate_fiscal_year
+from erpnext.accounts.utils import get_account_currency
 from erpnext.controllers.accounts_controller import AccountsController
 
 
@@ -21,17 +20,9 @@ class PeriodClosingVoucher(AccountsController):
 
 	def on_submit(self):
 		self.db_set("gle_processing_status", "In Progress")
-		get_opening_entries = False
-
-		if not frappe.db.exists(
-			"Period Closing Voucher", {"company": self.company, "docstatus": 1, "name": ("!=", self.name)}
-		):
-			get_opening_entries = True
-
-		self.make_gl_entries(get_opening_entries=get_opening_entries)
+		self.make_gl_entries()
 
 	def on_cancel(self):
-		self.validate_future_closing_vouchers()
 		self.db_set("gle_processing_status", "In Progress")
 		self.ignore_linked_doctypes = ("GL Entry", "Stock Ledger Entry")
 		gle_count = frappe.db.count(
@@ -44,7 +35,6 @@ class PeriodClosingVoucher(AccountsController):
 				voucher_type="Period Closing Voucher",
 				voucher_no=self.name,
 				queue="long",
-				enqueue_after_commit=True,
 			)
 			frappe.msgprint(
 				_("The GL Entries will be cancelled in the background, it can take a few minutes."), alert=True
@@ -52,25 +42,6 @@ class PeriodClosingVoucher(AccountsController):
 		else:
 			make_reverse_gl_entries(voucher_type="Period Closing Voucher", voucher_no=self.name)
 
-		self.delete_closing_entries()
-
-	def validate_future_closing_vouchers(self):
-		if frappe.db.exists(
-			"Period Closing Voucher",
-			{"posting_date": (">", self.posting_date), "docstatus": 1, "company": self.company},
-		):
-			frappe.throw(
-				_(
-					"You can not cancel this Period Closing Voucher, please cancel the future Period Closing Vouchers first"
-				)
-			)
-
-	def delete_closing_entries(self):
-		closing_balance = frappe.qb.DocType("Account Closing Balance")
-		frappe.qb.from_(closing_balance).delete().where(
-			closing_balance.period_closing_voucher == self.name
-		).run()
-
 	def validate_account_head(self):
 		closing_account_type = frappe.get_cached_value("Account", self.closing_account_head, "root_type")
 
@@ -85,6 +56,8 @@ class PeriodClosingVoucher(AccountsController):
 			frappe.throw(_("Currency of the Closing Account must be {0}").format(company_currency))
 
 	def validate_posting_date(self):
+		from erpnext.accounts.utils import get_fiscal_year, validate_fiscal_year
+
 		validate_fiscal_year(
 			self.posting_date, self.fiscal_year, self.company, label=_("Posting Date"), doc=self
 		)
@@ -93,8 +66,6 @@ class PeriodClosingVoucher(AccountsController):
 			self.posting_date, self.fiscal_year, company=self.company
 		)[1]
 
-		self.check_if_previous_year_closed()
-
 		pce = frappe.db.sql(
 			"""select name from `tabPeriod Closing Voucher`
 			where posting_date > %s and fiscal_year = %s and docstatus = 1 and company = %s""",
@@ -107,65 +78,28 @@ class PeriodClosingVoucher(AccountsController):
 				)
 			)
 
-	def check_if_previous_year_closed(self):
-		last_year_closing = add_days(self.year_start_date, -1)
-
-		previous_fiscal_year = get_fiscal_year(last_year_closing, company=self.company, boolean=True)
-
-		if previous_fiscal_year and not frappe.db.exists(
-			"GL Entry", {"posting_date": ("<=", last_year_closing), "company": self.company}
-		):
-			return
-
-		if previous_fiscal_year and not frappe.db.exists(
-			"Period Closing Voucher",
-			{"posting_date": ("<=", last_year_closing), "docstatus": 1, "company": self.company},
-		):
-			frappe.throw(_("Previous Year is not closed, please close it first"))
-
-	def make_gl_entries(self, get_opening_entries=False):
+	def make_gl_entries(self):
 		gl_entries = self.get_gl_entries()
-		closing_entries = self.get_grouped_gl_entries(get_opening_entries=get_opening_entries)
-		if len(gl_entries) > 5000:
-			frappe.enqueue(
-				process_gl_entries,
-				gl_entries=gl_entries,
-				closing_entries=closing_entries,
-				voucher_name=self.name,
-				company=self.company,
-				closing_date=self.posting_date,
-				queue="long",
-			)
-			frappe.msgprint(
-				_("The GL Entries will be processed in the background, it can take a few minutes."),
-				alert=True,
-			)
-		else:
-			process_gl_entries(gl_entries, closing_entries, self.name, self.company, self.posting_date)
-
-	def get_grouped_gl_entries(self, get_opening_entries=False):
-		closing_entries = []
-		for acc in self.get_balances_based_on_dimensions(
-			group_by_account=True, for_aggregation=True, get_opening_entries=get_opening_entries
-		):
-			closing_entries.append(self.get_closing_entries(acc))
-
-		return closing_entries
+		if gl_entries:
+			if len(gl_entries) > 5000:
+				frappe.enqueue(process_gl_entries, gl_entries=gl_entries, queue="long")
+				frappe.msgprint(
+					_("The GL Entries will be processed in the background, it can take a few minutes."),
+					alert=True,
+				)
+			else:
+				process_gl_entries(gl_entries)
 
 	def get_gl_entries(self):
 		gl_entries = []
 
 		# pl account
-		for acc in self.get_balances_based_on_dimensions(
-			group_by_account=True, report_type="Profit and Loss"
-		):
+		for acc in self.get_pl_balances_based_on_dimensions(group_by_account=True):
 			if flt(acc.bal_in_company_currency):
 				gl_entries.append(self.get_gle_for_pl_account(acc))
 
 		# closing liability account
-		for acc in self.get_balances_based_on_dimensions(
-			group_by_account=False, report_type="Profit and Loss"
-		):
+		for acc in self.get_pl_balances_based_on_dimensions(group_by_account=False):
 			if flt(acc.bal_in_company_currency):
 				gl_entries.append(self.get_gle_for_closing_account(acc))
 
@@ -174,8 +108,6 @@ class PeriodClosingVoucher(AccountsController):
 	def get_gle_for_pl_account(self, acc):
 		gl_entry = self.get_gl_dict(
 			{
-				"company": self.company,
-				"closing_date": self.posting_date,
 				"account": acc.account,
 				"cost_center": acc.cost_center,
 				"finance_book": acc.finance_book,
@@ -188,7 +120,6 @@ class PeriodClosingVoucher(AccountsController):
 				if flt(acc.bal_in_account_currency) > 0
 				else 0,
 				"credit": abs(flt(acc.bal_in_company_currency)) if flt(acc.bal_in_company_currency) > 0 else 0,
-				"is_period_closing_voucher_entry": 1,
 			},
 			item=acc,
 		)
@@ -198,8 +129,6 @@ class PeriodClosingVoucher(AccountsController):
 	def get_gle_for_closing_account(self, acc):
 		gl_entry = self.get_gl_dict(
 			{
-				"company": self.company,
-				"closing_date": self.posting_date,
 				"account": self.closing_account_head,
 				"cost_center": acc.cost_center,
 				"finance_book": acc.finance_book,
@@ -212,36 +141,12 @@ class PeriodClosingVoucher(AccountsController):
 				if flt(acc.bal_in_account_currency) < 0
 				else 0,
 				"credit": abs(flt(acc.bal_in_company_currency)) if flt(acc.bal_in_company_currency) < 0 else 0,
-				"is_period_closing_voucher_entry": 1,
 			},
 			item=acc,
 		)
 		self.update_default_dimensions(gl_entry, acc)
 		return gl_entry
 
-	def get_closing_entries(self, acc):
-		closing_entry = self.get_gl_dict(
-			{
-				"company": self.company,
-				"closing_date": self.posting_date,
-				"period_closing_voucher": self.name,
-				"account": acc.account,
-				"cost_center": acc.cost_center,
-				"finance_book": acc.finance_book,
-				"account_currency": acc.account_currency,
-				"debit_in_account_currency": flt(acc.debit_in_account_currency),
-				"debit": flt(acc.debit),
-				"credit_in_account_currency": flt(acc.credit_in_account_currency),
-				"credit": flt(acc.credit),
-			},
-			item=acc,
-		)
-
-		for dimension in self.accounting_dimensions:
-			closing_entry.update({dimension: acc.get(dimension)})
-
-		return closing_entry
-
 	def update_default_dimensions(self, gl_entry, acc):
 		if not self.accounting_dimensions:
 			self.accounting_dimensions = get_accounting_dimensions()
@@ -249,95 +154,56 @@ class PeriodClosingVoucher(AccountsController):
 		for dimension in self.accounting_dimensions:
 			gl_entry.update({dimension: acc.get(dimension)})
 
-	def get_balances_based_on_dimensions(
-		self, group_by_account=False, report_type=None, for_aggregation=False, get_opening_entries=False
-	):
+	def get_pl_balances_based_on_dimensions(self, group_by_account=False):
 		"""Get balance for dimension-wise pl accounts"""
 
-		qb_dimension_fields = ["cost_center", "finance_book", "project"]
+		dimension_fields = ["t1.cost_center", "t1.finance_book"]
 
 		self.accounting_dimensions = get_accounting_dimensions()
 		for dimension in self.accounting_dimensions:
-			qb_dimension_fields.append(dimension)
+			dimension_fields.append("t1.{0}".format(dimension))
 
 		if group_by_account:
-			qb_dimension_fields.append("account")
+			dimension_fields.append("t1.account")
 
-		account_filters = {
-			"company": self.company,
-			"is_group": 0,
-		}
-
-		if report_type:
-			account_filters.update({"report_type": report_type})
-
-		accounts = frappe.get_all("Account", filters=account_filters, pluck="name")
-
-		gl_entry = frappe.qb.DocType("GL Entry")
-		query = frappe.qb.from_(gl_entry).select(gl_entry.account, gl_entry.account_currency)
-
-		if not for_aggregation:
-			query = query.select(
-				(Sum(gl_entry.debit_in_account_currency) - Sum(gl_entry.credit_in_account_currency)).as_(
-					"bal_in_account_currency"
-				),
-				(Sum(gl_entry.debit) - Sum(gl_entry.credit)).as_("bal_in_company_currency"),
-			)
-		else:
-			query = query.select(
-				(Sum(gl_entry.debit_in_account_currency)).as_("debit_in_account_currency"),
-				(Sum(gl_entry.credit_in_account_currency)).as_("credit_in_account_currency"),
-				(Sum(gl_entry.debit)).as_("debit"),
-				(Sum(gl_entry.credit)).as_("credit"),
-			)
-
-		for dimension in qb_dimension_fields:
-			query = query.select(gl_entry[dimension])
-
-		query = query.where(
-			(gl_entry.company == self.company)
-			& (gl_entry.is_cancelled == 0)
-			& (gl_entry.account.isin(accounts))
+		return frappe.db.sql(
+			"""
+			select
+				t2.account_currency,
+				{dimension_fields},
+				sum(t1.debit_in_account_currency) - sum(t1.credit_in_account_currency) as bal_in_account_currency,
+				sum(t1.debit) - sum(t1.credit) as bal_in_company_currency
+			from `tabGL Entry` t1, `tabAccount` t2
+			where
+				t1.is_cancelled = 0
+				and t1.account = t2.name
+				and t2.report_type = 'Profit and Loss'
+				and t2.docstatus < 2
+				and t2.company = %s
+				and t1.posting_date between %s and %s
+			group by {dimension_fields}
+		""".format(
+				dimension_fields=", ".join(dimension_fields)
+			),
+			(self.company, self.get("year_start_date"), self.posting_date),
+			as_dict=1,
 		)
 
-		if get_opening_entries:
-			query = query.where(
-				gl_entry.posting_date.between(self.get("year_start_date"), self.posting_date)
-				| gl_entry.is_opening
-				== "Yes"
-			)
-		else:
-			query = query.where(
-				gl_entry.posting_date.between(self.get("year_start_date"), self.posting_date)
-				& gl_entry.is_opening
-				== "No"
-			)
 
-		if for_aggregation:
-			query = query.where(gl_entry.voucher_type != "Period Closing Voucher")
-
-		for dimension in qb_dimension_fields:
-			query = query.groupby(gl_entry[dimension])
-
-		return query.run(as_dict=1)
-
-
-def process_gl_entries(gl_entries, closing_entries, voucher_name, company, closing_date):
-	from erpnext.accounts.doctype.account_closing_balance.account_closing_balance import (
-		make_closing_entries,
-	)
+def process_gl_entries(gl_entries):
 	from erpnext.accounts.general_ledger import make_gl_entries
 
 	try:
-		if gl_entries:
-			make_gl_entries(gl_entries, merge_entries=False)
-
-		make_closing_entries(gl_entries + closing_entries, voucher_name, company, closing_date)
-		frappe.db.set_value("Period Closing Voucher", voucher_name, "gle_processing_status", "Completed")
+		make_gl_entries(gl_entries, merge_entries=False)
+		frappe.db.set_value(
+			"Period Closing Voucher", gl_entries[0].get("voucher_no"), "gle_processing_status", "Completed"
+		)
 	except Exception as e:
 		frappe.db.rollback()
 		frappe.log_error(e)
-		frappe.db.set_value("Period Closing Voucher", voucher_name, "gle_processing_status", "Failed")
+		frappe.db.set_value(
+			"Period Closing Voucher", gl_entries[0].get("voucher_no"), "gle_processing_status", "Failed"
+		)
 
 
 def make_reverse_gl_entries(voucher_type, voucher_no):

erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py

@@ -5,7 +5,7 @@
 import unittest
 
 import frappe
-from frappe.utils import add_months, today
+from frappe.utils import today
 
 from erpnext.accounts.doctype.finance_book.test_finance_book import create_finance_book
 from erpnext.accounts.doctype.journal_entry.test_journal_entry import make_journal_entry
@@ -16,17 +16,16 @@ from erpnext.accounts.utils import get_fiscal_year, now
 class TestPeriodClosingVoucher(unittest.TestCase):
 	def test_closing_entry(self):
 		frappe.db.sql("delete from `tabGL Entry` where company='Test PCV Company'")
-		frappe.db.sql("delete from `tabPeriod Closing Voucher` where company='Test PCV Company'")
 
 		company = create_company()
 		cost_center = create_cost_center("Test Cost Center 1")
 
 		jv1 = make_journal_entry(
-			posting_date="2021-03-15",
 			amount=400,
 			account1="Cash - TPC",
 			account2="Sales - TPC",
 			cost_center=cost_center,
+			posting_date=now(),
 			save=False,
 		)
 		jv1.company = company
@@ -34,18 +33,18 @@ class TestPeriodClosingVoucher(unittest.TestCase):
 		jv1.submit()
 
 		jv2 = make_journal_entry(
-			posting_date="2021-03-15",
 			amount=600,
 			account1="Cost of Goods Sold - TPC",
 			account2="Cash - TPC",
 			cost_center=cost_center,
+			posting_date=now(),
 			save=False,
 		)
 		jv2.company = company
 		jv2.save()
 		jv2.submit()
 
-		pcv = self.make_period_closing_voucher(posting_date="2021-03-31")
+		pcv = self.make_period_closing_voucher()
 		surplus_account = pcv.closing_account_head
 
 		expected_gle = (
@@ -66,7 +65,6 @@ class TestPeriodClosingVoucher(unittest.TestCase):
 
 	def test_cost_center_wise_posting(self):
 		frappe.db.sql("delete from `tabGL Entry` where company='Test PCV Company'")
-		frappe.db.sql("delete from `tabPeriod Closing Voucher` where company='Test PCV Company'")
 
 		company = create_company()
 		surplus_account = create_account()
@@ -83,7 +81,6 @@ class TestPeriodClosingVoucher(unittest.TestCase):
 			debit_to="Debtors - TPC",
 			currency="USD",
 			customer="_Test Customer USD",
-			posting_date="2021-03-15",
 		)
 		create_sales_invoice(
 			company=company,
@@ -94,10 +91,9 @@ class TestPeriodClosingVoucher(unittest.TestCase):
 			debit_to="Debtors - TPC",
 			currency="USD",
 			customer="_Test Customer USD",
-			posting_date="2021-03-15",
 		)
 
-		pcv = self.make_period_closing_voucher(posting_date="2021-03-31", submit=False)
+		pcv = self.make_period_closing_voucher(submit=False)
 		pcv.save()
 		pcv.submit()
 		surplus_account = pcv.closing_account_head
@@ -132,13 +128,12 @@ class TestPeriodClosingVoucher(unittest.TestCase):
 
 	def test_period_closing_with_finance_book_entries(self):
 		frappe.db.sql("delete from `tabGL Entry` where company='Test PCV Company'")
-		frappe.db.sql("delete from `tabPeriod Closing Voucher` where company='Test PCV Company'")
 
 		company = create_company()
 		surplus_account = create_account()
 		cost_center = create_cost_center("Test Cost Center 1")
 
-		create_sales_invoice(
+		si = create_sales_invoice(
 			company=company,
 			income_account="Sales - TPC",
 			expense_account="Cost of Goods Sold - TPC",
@@ -147,7 +142,6 @@ class TestPeriodClosingVoucher(unittest.TestCase):
 			debit_to="Debtors - TPC",
 			currency="USD",
 			customer="_Test Customer USD",
-			posting_date="2021-03-15",
 		)
 
 		jv = make_journal_entry(
@@ -155,14 +149,14 @@ class TestPeriodClosingVoucher(unittest.TestCase):
 			account2="Sales - TPC",
 			amount=400,
 			cost_center=cost_center,
-			posting_date="2021-03-15",
+			posting_date=now(),
 		)
 		jv.company = company
 		jv.finance_book = create_finance_book().name
 		jv.save()
 		jv.submit()
 
-		pcv = self.make_period_closing_voucher(posting_date="2021-03-31")
+		pcv = self.make_period_closing_voucher()
 		surplus_account = pcv.closing_account_head
 
 		expected_gle = (
@@ -182,148 +176,15 @@ class TestPeriodClosingVoucher(unittest.TestCase):
 		)
 
 		self.assertSequenceEqual(pcv_gle, expected_gle)
-		warehouse = frappe.db.get_value("Warehouse", {"company": company}, "name")
 
-		repost_doc = frappe.get_doc(
-			{
-				"doctype": "Repost Item Valuation",
-				"company": company,
-				"posting_date": "2020-03-15",
-				"based_on": "Item and Warehouse",
-				"item_code": "Test Item 1",
-				"warehouse": warehouse,
-			}
-		)
-
-		self.assertRaises(frappe.ValidationError, repost_doc.save)
-
-		repost_doc.posting_date = add_months(today(), 13)
-		repost_doc.save()
-
-	def test_gl_entries_restrictions(self):
-		frappe.db.sql("delete from `tabGL Entry` where company='Test PCV Company'")
-		frappe.db.sql("delete from `tabPeriod Closing Voucher` where company='Test PCV Company'")
-
-		company = create_company()
-		cost_center = create_cost_center("Test Cost Center 1")
-
-		self.make_period_closing_voucher(posting_date="2021-03-31")
-
-		jv1 = make_journal_entry(
-			posting_date="2021-03-15",
-			amount=400,
-			account1="Cash - TPC",
-			account2="Sales - TPC",
-			cost_center=cost_center,
-			save=False,
-		)
-		jv1.company = company
-		jv1.save()
-
-		self.assertRaises(frappe.ValidationError, jv1.submit)
-
-	def test_closing_balance_with_dimensions(self):
-		frappe.db.sql("delete from `tabGL Entry` where company='Test PCV Company'")
-		frappe.db.sql("delete from `tabPeriod Closing Voucher` where company='Test PCV Company'")
-		frappe.db.sql("delete from `tabAccount Closing Balance` where company='Test PCV Company'")
-
-		company = create_company()
-		cost_center1 = create_cost_center("Test Cost Center 1")
-		cost_center2 = create_cost_center("Test Cost Center 2")
-
-		jv1 = make_journal_entry(
-			posting_date="2021-03-15",
-			amount=400,
-			account1="Cash - TPC",
-			account2="Sales - TPC",
-			cost_center=cost_center1,
-			save=False,
-		)
-		jv1.company = company
-		jv1.save()
-		jv1.submit()
-
-		jv2 = make_journal_entry(
-			posting_date="2021-03-15",
-			amount=200,
-			account1="Cash - TPC",
-			account2="Sales - TPC",
-			cost_center=cost_center2,
-			save=False,
-		)
-		jv2.company = company
-		jv2.save()
-		jv2.submit()
-
-		pcv1 = self.make_period_closing_voucher(posting_date="2021-03-31")
-
-		closing_balance = frappe.db.get_value(
-			"Account Closing Balance",
-			{
-				"account": "Sales - TPC",
-				"cost_center": cost_center1,
-				"period_closing_voucher": pcv1.name,
-				"is_period_closing_voucher_entry": 0,
-			},
-			["credit", "credit_in_account_currency"],
-			as_dict=1,
-		)
-
-		self.assertEqual(closing_balance.credit, 400)
-		self.assertEqual(closing_balance.credit_in_account_currency, 400)
-
-		jv3 = make_journal_entry(
-			posting_date="2022-03-15",
-			amount=300,
-			account1="Cash - TPC",
-			account2="Sales - TPC",
-			cost_center=cost_center2,
-			save=False,
-		)
-
-		jv3.company = company
-		jv3.save()
-		jv3.submit()
-
-		pcv2 = self.make_period_closing_voucher(posting_date="2022-03-31")
-
-		cc1_closing_balance = frappe.db.get_value(
-			"Account Closing Balance",
-			{
-				"account": "Sales - TPC",
-				"cost_center": cost_center1,
-				"period_closing_voucher": pcv2.name,
-				"is_period_closing_voucher_entry": 0,
-			},
-			["credit", "credit_in_account_currency"],
-			as_dict=1,
-		)
-
-		cc2_closing_balance = frappe.db.get_value(
-			"Account Closing Balance",
-			{
-				"account": "Sales - TPC",
-				"cost_center": cost_center2,
-				"period_closing_voucher": pcv2.name,
-				"is_period_closing_voucher_entry": 0,
-			},
-			["credit", "credit_in_account_currency"],
-			as_dict=1,
-		)
-
-		self.assertEqual(cc1_closing_balance.credit, 400)
-		self.assertEqual(cc1_closing_balance.credit_in_account_currency, 400)
-		self.assertEqual(cc2_closing_balance.credit, 500)
-		self.assertEqual(cc2_closing_balance.credit_in_account_currency, 500)
-
-	def make_period_closing_voucher(self, posting_date=None, submit=True):
+	def make_period_closing_voucher(self, submit=True):
 		surplus_account = create_account()
 		cost_center = create_cost_center("Test Cost Center 1")
 		pcv = frappe.get_doc(
 			{
 				"doctype": "Period Closing Voucher",
-				"transaction_date": posting_date or today(),
-				"posting_date": posting_date or today(),
+				"transaction_date": today(),
+				"posting_date": today(),
 				"company": "Test PCV Company",
 				"fiscal_year": get_fiscal_year(today(), company="Test PCV Company")[0],
 				"cost_center": cost_center,

erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.js

@@ -123,29 +123,22 @@ frappe.ui.form.on('POS Closing Entry', {
 			row.expected_amount = row.opening_amount;
 		}
 
-		await Promise.all([
-			frappe.call({
-				method: 'erpnext.accounts.doctype.pos_closing_entry.pos_closing_entry.get_pos_invoices',
-				args: {
-					start: frappe.datetime.get_datetime_as_string(frm.doc.period_start_date),
-					end: frappe.datetime.get_datetime_as_string(frm.doc.period_end_date),
-					pos_profile: frm.doc.pos_profile,
-					user: frm.doc.user
-				},
-				callback: (r) => {
-					let pos_invoices = r.message;
-					for (let doc of pos_invoices) {
-						frm.doc.grand_total += flt(doc.grand_total);
-						frm.doc.net_total += flt(doc.net_total);
-						frm.doc.total_quantity += flt(doc.total_qty);
-						refresh_payments(doc, frm);
-						refresh_taxes(doc, frm);
-						refresh_fields(frm);
-						set_html_data(frm);
-					}
-				}
-			})
-		])
+		const pos_inv_promises = frm.doc.pos_transactions.map(
+			row => frappe.db.get_doc("POS Invoice", row.pos_invoice)
+		);
+
+		const pos_invoices = await Promise.all(pos_inv_promises);
+
+		for (let doc of pos_invoices) {
+			frm.doc.grand_total += flt(doc.grand_total);
+			frm.doc.net_total += flt(doc.net_total);
+			frm.doc.total_quantity += flt(doc.total_qty);
+			refresh_payments(doc, frm);
+			refresh_taxes(doc, frm);
+			refresh_fields(frm);
+			set_html_data(frm);
+		}
+
 		frappe.dom.unfreeze();
 	}
 });

erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py

@@ -21,24 +21,8 @@ class POSClosingEntry(StatusUpdater):
 		if frappe.db.get_value("POS Opening Entry", self.pos_opening_entry, "status") != "Open":
 			frappe.throw(_("Selected POS Opening Entry should be open."), title=_("Invalid Opening Entry"))
 
-		self.validate_duplicate_pos_invoices()
 		self.validate_pos_invoices()
 
-	def validate_duplicate_pos_invoices(self):
-		pos_occurences = {}
-		for idx, inv in enumerate(self.pos_transactions, 1):
-			pos_occurences.setdefault(inv.pos_invoice, []).append(idx)
-
-		error_list = []
-		for key, value in pos_occurences.items():
-			if len(value) > 1:
-				error_list.append(
-					_("{} is added multiple times on rows: {}".format(frappe.bold(key), frappe.bold(value)))
-				)
-
-		if error_list:
-			frappe.throw(error_list, title=_("Duplicate POS Invoices found"), as_list=True)
-
 	def validate_pos_invoices(self):
 		invalid_rows = []
 		for d in self.pos_transactions:

erpnext/accounts/doctype/pos_invoice/pos_invoice.js

@@ -112,8 +112,7 @@ erpnext.selling.POSInvoiceController = class POSInvoiceController extends erpnex
 				party_type: "Customer",
 				account: this.frm.doc.debit_to,
 				price_list: this.frm.doc.selling_price_list,
-				pos_profile: pos_profile,
-				company_address: this.frm.doc.company_address
+				pos_profile: pos_profile
 			}, () => {
 				this.apply_pricing_rule();
 			});