chore: version bump

chore: version-14 beta release

.editorconfig

@@ -9,13 +9,6 @@ trim_trailing_whitespace = true
 charset = utf-8
 
 # python, js indentation settings
-[{*.py,*.js,*.vue,*.css,*.scss,*.html}]
+[{*.py,*.js}]
 indent_style = tab
 indent_size = 4
-max_line_length = 110
-
-# JSON files - mostly doctype schema files
-[{*.json}]
-insert_final_newline = false
-indent_style = space
-indent_size = 2

.eslintrc

@@ -156,7 +156,6 @@
 		"onScan": true,
 		"html2canvas": true,
 		"extend_cscript": true,
-		"localforage": true,
-		"Plaid": true
+		"localforage": true
 	}
 }

.git-blame-ignore-revs

@@ -28,7 +28,4 @@ b147b85e6ac19a9220cd1e2958a6ebd99373283a
 494bd9ef78313436f0424b918f200dab8fc7c20b
 
 # bulk format python code with black
-baec607ff5905b1c67531096a9cf50ec7ff00a5d
-
-# ruff
-4d34b1ead73baf4c5430a2ecbe44b9e8468d7626
+baec607ff5905b1c67531096a9cf50ec7ff00a5d

.github/helper/.flake8_strict

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

.github/helper/documentation.py

@@ -3,72 +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",
-	"docs.frappe.io",
-	"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
@@ -57,7 +56,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

@@ -11,6 +11,6 @@
  "root_login": "root",
  "root_password": "travis",
  "host_name": "http://test_site:8000",
- "install_apps": ["payments", "erpnext"],
+ "install_apps": ["erpnext"],
  "throttle_user_limit": 100
 }

.github/release.yml

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

.github/stale.yml

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

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

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

.github/workflows/linters.yml

@@ -9,22 +9,21 @@ jobs:
     name: linters
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
 
       - name: Set up Python 3.10
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v2
         with:
           python-version: '3.10'
-          cache: pip
 
       - name: Install and Run Pre-commit
-        uses: pre-commit/action@v3.0.0
+        uses: pre-commit/action@v2.0.3
 
       - name: Download Semgrep rules
         run: git clone --depth 1 https://github.com/frappe/semgrep-rules.git frappe-semgrep-rules
 
       - name: Download semgrep
-        run: pip install semgrep
+        run: pip install semgrep==0.97.0
 
       - name: Run Semgrep rules
         run: semgrep ci --config ./frappe-semgrep-rules/rules --config r/python.lang.correctness

.github/workflows/patch.yml

@@ -16,7 +16,7 @@ concurrency:
 
 jobs:
   test:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     timeout-minutes: 60
 
     name: Patch Test
@@ -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
@@ -59,7 +57,7 @@ jobs:
         run: echo "127.0.0.1 test_site" | sudo tee -a /etc/hosts
 
       - name: Cache pip
-        uses: actions/cache@v4
+        uses: actions/cache@v2
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/pyproject.toml') }}
@@ -68,7 +66,7 @@ jobs:
             ${{ runner.os }}-
 
       - name: Cache node modules
-        uses: actions/cache@v4
+        uses: actions/cache@v2
         env:
           cache-name: cache-node-modules
         with:
@@ -83,7 +81,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
 
-      - uses: actions/cache@v4
+      - uses: actions/cache@v2
         id: yarn-cache
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -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: 20
-
+          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/semantic-commits.yml

@@ -21,7 +21,7 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: 20
+          node-version: 14
           check-latest: true
 
       - name: Check commit titles

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

@@ -39,7 +39,7 @@ jobs:
       fail-fast: false
 
       matrix:
-        container: [1, 2, 3]
+        container: [1, 2, 3, 4]
 
     name: Python Unit Tests
 
@@ -79,7 +79,7 @@ jobs:
         run: echo "127.0.0.1 test_site" | sudo tee -a /etc/hosts
 
       - name: Cache pip
-        uses: actions/cache@v4
+        uses: actions/cache@v2
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/pyproject.toml') }}
@@ -88,7 +88,7 @@ jobs:
             ${{ runner.os }}-
 
       - name: Cache node modules
-        uses: actions/cache@v4
+        uses: actions/cache@v2
         env:
           cache-name: cache-node-modules
         with:
@@ -103,7 +103,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
 
-      - uses: actions/cache@v4
+      - uses: actions/cache@v2
         id: yarn-cache
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -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 --use-orchestrator --with-coverage
         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

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

.pre-commit-config.yaml

@@ -1,11 +1,11 @@
 exclude: 'node_modules|.git'
-default_stages: [pre-commit]
+default_stages: [commit]
 fail_fast: false
 
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+    rev: v4.0.1
     hooks:
       - id: trailing-whitespace
         files: "erpnext.*"
@@ -15,68 +15,29 @@ repos:
         args: ['--branch', 'develop']
       - id: check-merge-conflict
       - id: check-ast
-      - id: check-json
-      - id: check-toml
-      - id: check-yaml
-      - id: debug-statements
 
-  - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v2.7.1
+  - repo: https://gitlab.com/pycqa/flake8
+    rev: 3.9.2
     hooks:
-      - id: prettier
-        types_or: [javascript, vue, scss]
-        # Ignore any files that might contain jinja / bundles
-        exclude: |
-            (?x)^(
-                erpnext/public/dist/.*|
-                cypress/.*|
-                .*node_modules.*|
-                .*boilerplate.*|
-                erpnext/public/js/controllers/.*|
-                erpnext/templates/pages/order.js|
-                erpnext/templates/includes/.*|
-                .*/supplier_quotation.js|
-                .*/sales_taxes_and_charges_template.js|
-                .*/purchase_taxes_and_charges_template.js|
-                .*/subcontracting_order.js|
-                .*/landed_cost_voucher.js|
-                .*/payment_entry.js|
-                .*/loan_interest_accrual.js|
-                .*/loan_disbursement.js|
-                .*/loan_application.js|
-                .*/italy.js|
-                .*/sales_invoice.js|
-                .*/subcontracting_receipt.js|
-                .*/request_for_quotation.js|
-                .*/pos_profile.js|
-                .*/opportunity.js|
-                .*/quotation.js|
-                .*/sales_common.js|
-                .*/sales_order.js|
-                .*/pos_invoice.js|
-                .*/purchase_invoice.js|
-                .*/loan_repayment.js|
-                .*/material_request.js|
-                .*/purchase_receipt.js|
-                .*/delivery_note.js|
-                .*/loan.js|
-                .*/stock_entry.js|
-                .*/purchase_order.js|
-                .*/loan_write_off.js
-            )$
+      - id: flake8
+        additional_dependencies: [
+          'flake8-bugbear',
+        ]
+        args: ['--config', '.github/helper/.flake8_strict']
+        exclude: ".*setup.py$"
 
-  - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.2.0
+  - repo: https://github.com/adityahase/black
+    rev: 9cb0a69f4d0030cdf687eddf314468b39ed54119
     hooks:
-      - id: ruff
-        name: "Run ruff import sorter"
-        args: ["--select=I", "--fix"]
+      - id: black
+        additional_dependencies: ['click==8.0.4']
 
-      - id: ruff
-        name: "Run ruff linter"
+  - repo: https://github.com/timothycrosley/isort
+    rev: 5.9.1
+    hooks:
+      - id: isort
+        exclude: ".*setup.py$"
 
-      - id: ruff-format
-        name: "Run ruff formatter"
 
 ci:
     autoupdate_schedule: weekly

.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,30 @@
 # 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/                 @khushi8112 @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
-erpnext/maintenance/            @rohitwaghchaure
-erpnext/manufacturing/          @rohitwaghchaure
-erpnext/quality_management/     @rohitwaghchaure
-erpnext/stock/                  @rohitwaghchaure
-erpnext/subcontracting          @rohitwaghchaure
+erpnext/buying/                 @marination @rohitwaghchaure @s-aga-r
+erpnext/e_commerce/             @marination
+erpnext/maintenance/            @marination @rohitwaghchaure @s-aga-r
+erpnext/manufacturing/          @marination @rohitwaghchaure @s-aga-r
+erpnext/portal/                 @marination
+erpnext/quality_management/     @marination @rohitwaghchaure @s-aga-r
+erpnext/shopping_cart/          @marination
+erpnext/stock/                  @marination @rohitwaghchaure @s-aga-r
 
-erpnext/controllers/            @deepeshgarg007 @rohitwaghchaure
-erpnext/patches/                @deepeshgarg007 
+erpnext/crm/                    @NagariaHussain 
+erpnext/education/              @rutwikhdev 
+erpnext/projects/               @ruchamahabal
 
-.github/                        @deepeshgarg007
-pyproject.toml                  @akhilnarang
+erpnext/controllers/            @deepeshgarg007 @nextchamp-saqib @rohitwaghchaure @marination
+erpnext/patches/                @deepeshgarg007 @nextchamp-saqib @marination
+erpnext/public/                 @nextchamp-saqib @marination
+
+.github/                        @ankush
+pyproject.toml                  @gavindsouza @ankush

README.md

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

commitlint.config.js

@@ -1,13 +1,25 @@
 module.exports = {
-	parserPreset: "conventional-changelog-conventionalcommits",
+	parserPreset: 'conventional-changelog-conventionalcommits',
 	rules: {
-		"subject-empty": [2, "never"],
-		"type-case": [2, "always", "lower-case"],
-		"type-empty": [2, "never"],
-		"type-enum": [
+		'subject-empty': [2, 'never'],
+		'type-case': [2, 'always', 'lower-case'],
+		'type-empty': [2, 'never'],
+		'type-enum': [
 			2,
-			"always",
-			["build", "chore", "ci", "docs", "feat", "fix", "perf", "refactor", "revert", "style", "test"],
+			'always',
+			[
+				'build',
+				'chore',
+				'ci',
+				'docs',
+				'feat',
+				'fix',
+				'perf',
+				'refactor',
+				'revert',
+				'style',
+				'test',
+			],
 		],
 	},
 };

erpnext/__init__.py

@@ -1,9 +1,8 @@
-import functools
 import inspect
 
 import frappe
 
-__version__ = "14.86.4"
+__version__ = "14.0.0-beta.7"
 
 
 def get_default_company(user=None):
@@ -13,7 +12,7 @@ def get_default_company(user=None):
 	if not user:
 		user = frappe.session.user
 
-	companies = get_user_default_as_list("company", user)
+	companies = get_user_default_as_list(user, "company")
 	if companies:
 		default_company = companies[0]
 	else:
@@ -36,8 +35,10 @@ def get_default_cost_center(company):
 
 	if not frappe.flags.company_cost_center:
 		frappe.flags.company_cost_center = {}
-	if company not in frappe.flags.company_cost_center:
-		frappe.flags.company_cost_center[company] = frappe.get_cached_value("Company", company, "cost_center")
+	if not company in frappe.flags.company_cost_center:
+		frappe.flags.company_cost_center[company] = frappe.get_cached_value(
+			"Company", company, "cost_center"
+		)
 	return frappe.flags.company_cost_center[company]
 
 
@@ -45,7 +46,7 @@ def get_company_currency(company):
 	"""Returns the default company currency"""
 	if not frappe.flags.company_currency:
 		frappe.flags.company_currency = {}
-	if company not in frappe.flags.company_currency:
+	if not company in frappe.flags.company_currency:
 		frappe.flags.company_currency[company] = frappe.db.get_value(
 			"Company", company, "default_currency", cache=True
 		)
@@ -79,7 +80,7 @@ def is_perpetual_inventory_enabled(company):
 	if not hasattr(frappe.local, "enable_perpetual_inventory"):
 		frappe.local.enable_perpetual_inventory = {}
 
-	if company not in frappe.local.enable_perpetual_inventory:
+	if not company in frappe.local.enable_perpetual_inventory:
 		frappe.local.enable_perpetual_inventory[company] = (
 			frappe.get_cached_value("Company", company, "enable_perpetual_inventory") or 0
 		)
@@ -94,7 +95,7 @@ def get_default_finance_book(company=None):
 	if not hasattr(frappe.local, "default_finance_book"):
 		frappe.local.default_finance_book = {}
 
-	if company not in frappe.local.default_finance_book:
+	if not company in frappe.local.default_finance_book:
 		frappe.local.default_finance_book[company] = frappe.get_cached_value(
 			"Company", company, "default_finance_book"
 		)
@@ -106,7 +107,7 @@ def get_party_account_type(party_type):
 	if not hasattr(frappe.local, "party_account_types"):
 		frappe.local.party_account_types = {}
 
-	if party_type not in frappe.local.party_account_types:
+	if not party_type in frappe.local.party_account_types:
 		frappe.local.party_account_types[party_type] = (
 			frappe.db.get_value("Party Type", party_type, "account_type") or ""
 		)
@@ -119,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):
@@ -137,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/custom/address.py

@@ -11,14 +11,14 @@ class ERPNextAddress(Address):
 	def validate(self):
 		self.validate_reference()
 		self.update_compnay_address()
-		super().validate()
+		super(ERPNextAddress, self).validate()
 
 	def link_address(self):
 		"""Link address based on owner"""
 		if self.is_your_company_address:
 			return
 
-		return super().link_address()
+		return super(ERPNextAddress, self).link_address()
 
 	def update_compnay_address(self):
 		for link in self.get("links"):
@@ -26,11 +26,11 @@ class ERPNextAddress(Address):
 				self.is_your_company_address = 1
 
 	def validate_reference(self):
-		if self.is_your_company_address and not [row for row in self.links if row.link_doctype == "Company"]:
+		if self.is_your_company_address and not [
+			row for row in self.links if row.link_doctype == "Company"
+		]:
 			frappe.throw(
-				_(
-					"Address needs to be linked to a Company. Please add a row for Company in the Links table."
-				),
+				_("Address needs to be linked to a Company. Please add a row for Company in the Links table."),
 				title=_("Company Not Linked"),
 			)
 

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

@@ -1,4 +1,4 @@
-frappe.provide("frappe.dashboards.chart_sources");
+frappe.provide('frappe.dashboards.chart_sources');
 
 frappe.dashboards.chart_sources["Account Balance Timeline"] = {
 	method: "erpnext.accounts.dashboard_chart_source.account_balance_timeline.account_balance_timeline.get",
@@ -9,14 +9,14 @@ frappe.dashboards.chart_sources["Account Balance Timeline"] = {
 			fieldtype: "Link",
 			options: "Company",
 			default: frappe.defaults.get_user_default("Company"),
-			reqd: 1,
+			reqd: 1
 		},
 		{
 			fieldname: "account",
 			label: __("Account"),
 			fieldtype: "Link",
 			options: "Account",
-			reqd: 1,
+			reqd: 1
 		},
-	],
+	]
 };

erpnext/accounts/dashboard_chart_source/account_balance_timeline/account_balance_timeline.py

@@ -37,7 +37,7 @@ def get(
 	filters = frappe.parse_json(filters) or frappe.parse_json(chart.filters_json)
 
 	account = filters.get("account")
-	filters.get("company")
+	company = filters.get("company")
 
 	if not account and chart_name:
 		frappe.throw(
@@ -83,6 +83,7 @@ def build_result(account, dates, gl_entries):
 
 	# get balances in debit
 	for entry in gl_entries:
+
 		# entry date is after the current pointer, so move the pointer forward
 		while getdate(entry.posting_date) > result[date_index][0]:
 			date_index += 1
@@ -132,6 +133,8 @@ def get_dates_from_timegrain(from_date, to_date, timegrain):
 
 	dates = [get_period_ending(from_date, timegrain)]
 	while getdate(dates[-1]) < getdate(to_date):
-		date = get_period_ending(add_to_date(dates[-1], years=years, months=months, days=days), timegrain)
+		date = get_period_ending(
+			add_to_date(dates[-1], years=years, months=months, days=days), timegrain
+		)
 		dates.append(date)
 	return dates

erpnext/accounts/deferred_revenue.py

@@ -24,10 +24,14 @@ from erpnext.accounts.utils import get_account_currency
 def validate_service_stop_date(doc):
 	"""Validates service_stop_date for Purchase Invoice and Sales Invoice"""
 
-	enable_check = "enable_deferred_revenue" if doc.doctype == "Sales Invoice" else "enable_deferred_expense"
+	enable_check = (
+		"enable_deferred_revenue" if doc.doctype == "Sales Invoice" else "enable_deferred_expense"
+	)
 
 	old_stop_dates = {}
-	old_doc = frappe.db.get_all(f"{doc.doctype} Item", {"parent": doc.name}, ["name", "service_stop_date"])
+	old_doc = frappe.db.get_all(
+		"{0} Item".format(doc.doctype), {"parent": doc.name}, ["name", "service_stop_date"]
+	)
 
 	for d in old_doc:
 		old_stop_dates[d.name] = d.service_stop_date or ""
@@ -58,14 +62,16 @@ def build_conditions(process_type, account, company):
 	)
 
 	if account:
-		conditions += f"AND {deferred_account}={frappe.db.escape(account)}"
+		conditions += "AND %s='%s'" % (deferred_account, account)
 	elif company:
 		conditions += f"AND p.company = {frappe.db.escape(company)}"
 
 	return conditions
 
 
-def convert_deferred_expense_to_expense(deferred_process, start_date=None, end_date=None, conditions=""):
+def convert_deferred_expense_to_expense(
+	deferred_process, start_date=None, end_date=None, conditions=""
+):
 	# book the expense/income on the last day, but it will be trigger on the 1st of month at 12:00 AM
 
 	if not start_date:
@@ -75,14 +81,16 @@ def convert_deferred_expense_to_expense(deferred_process, start_date=None, end_d
 
 	# check for the purchase invoice for which GL entries has to be done
 	invoices = frappe.db.sql_list(
-		f"""
+		"""
 		select distinct item.parent
 		from `tabPurchase Invoice Item` item, `tabPurchase Invoice` p
 		where item.service_start_date<=%s and item.service_end_date>=%s
 		and item.enable_deferred_expense = 1 and item.parent=p.name
 		and item.docstatus = 1 and ifnull(item.amount, 0) > 0
-		{conditions}
-	""",
+		{0}
+	""".format(
+			conditions
+		),
 		(end_date, start_date),
 	)  # nosec
 
@@ -95,7 +103,9 @@ def convert_deferred_expense_to_expense(deferred_process, start_date=None, end_d
 		send_mail(deferred_process)
 
 
-def convert_deferred_revenue_to_income(deferred_process, start_date=None, end_date=None, conditions=""):
+def convert_deferred_revenue_to_income(
+	deferred_process, start_date=None, end_date=None, conditions=""
+):
 	# book the expense/income on the last day, but it will be trigger on the 1st of month at 12:00 AM
 
 	if not start_date:
@@ -105,14 +115,16 @@ def convert_deferred_revenue_to_income(deferred_process, start_date=None, end_da
 
 	# check for the sales invoice for which GL entries has to be done
 	invoices = frappe.db.sql_list(
-		f"""
+		"""
 		select distinct item.parent
 		from `tabSales Invoice Item` item, `tabSales Invoice` p
 		where item.service_start_date<=%s and item.service_end_date>=%s
 		and item.enable_deferred_revenue = 1 and item.parent=p.name
 		and item.docstatus = 1 and ifnull(item.amount, 0) > 0
-		{conditions}
-	""",
+		{0}
+	""".format(
+			conditions
+		),
 		(end_date, start_date),
 	)  # nosec
 
@@ -124,7 +136,7 @@ def convert_deferred_revenue_to_income(deferred_process, start_date=None, end_da
 		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)
 
@@ -134,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
@@ -231,7 +240,9 @@ def calculate_monthly_amount(
 		already_booked_amount, already_booked_amount_in_account_currency = get_already_booked_amount(
 			doc, item
 		)
-		base_amount = flt(item.base_net_amount - already_booked_amount, item.precision("base_net_amount"))
+		base_amount = flt(
+			item.base_net_amount - already_booked_amount, item.precision("base_net_amount")
+		)
 		if account_currency == doc.company_currency:
 			amount = base_amount
 		else:
@@ -251,13 +262,17 @@ def calculate_amount(doc, item, last_gl_entry, total_days, total_booking_days, a
 		if account_currency == doc.company_currency:
 			amount = base_amount
 		else:
-			amount = flt(item.net_amount * total_booking_days / flt(total_days), item.precision("net_amount"))
+			amount = flt(
+				item.net_amount * total_booking_days / flt(total_days), item.precision("net_amount")
+			)
 	else:
 		already_booked_amount, already_booked_amount_in_account_currency = get_already_booked_amount(
 			doc, item
 		)
 
-		base_amount = flt(item.base_net_amount - already_booked_amount, item.precision("base_net_amount"))
+		base_amount = flt(
+			item.base_net_amount - already_booked_amount, item.precision("base_net_amount")
+		)
 		if account_currency == doc.company_currency:
 			amount = base_amount
 		else:
@@ -278,22 +293,26 @@ def get_already_booked_amount(doc, item):
 
 	gl_entries_details = frappe.db.sql(
 		"""
-		select sum({}) as total_credit, sum({}) as total_credit_in_account_currency, voucher_detail_no
+		select sum({0}) as total_credit, sum({1}) as total_credit_in_account_currency, voucher_detail_no
 		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
 		group by voucher_detail_no
-	""".format(total_credit_debit, total_credit_debit_currency),
+	""".format(
+			total_credit_debit, total_credit_debit_currency
+		),
 		(doc.company, item.get(deferred_account), doc.doctype, doc.name, item.name),
 		as_dict=True,
 	)
 
 	journal_entry_details = frappe.db.sql(
 		"""
-		SELECT sum(c.{}) as total_credit, sum(c.{}) as total_credit_in_account_currency, reference_detail_no
+		SELECT sum(c.{0}) as total_credit, sum(c.{1}) as total_credit_in_account_currency, reference_detail_no
 		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 p.docstatus < 2 group by reference_detail_no
-	""".format(total_credit_debit, total_credit_debit_currency),
+	""".format(
+			total_credit_debit, total_credit_debit_currency
+		),
 		(doc.company, item.get(deferred_account), doc.doctype, doc.name, item.name),
 		as_dict=True,
 	)
@@ -315,20 +334,16 @@ def get_already_booked_amount(doc, item):
 
 
 def book_deferred_income_or_expense(doc, deferred_process, posting_date=None):
-	enable_check = "enable_deferred_revenue" if doc.doctype == "Sales Invoice" else "enable_deferred_expense"
+	enable_check = (
+		"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
 
@@ -360,45 +375,42 @@ def book_deferred_income_or_expense(doc, deferred_process, posting_date=None):
 			)
 
 		if not amount:
-			prev_posting_date = end_date
-		else:
-			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
+			return
 
-			if via_journal_entry:
-				book_revenue_via_journal_entry(
-					doc,
-					credit_account,
-					debit_account,
-					amount,
-					base_amount,
-					gl_posting_date,
-					project,
-					account_currency,
-					item.cost_center,
-					item,
-					deferred_process,
-					submit_journal_entry,
-				)
-			else:
-				make_gl_entries(
-					doc,
-					credit_account,
-					debit_account,
-					against,
-					amount,
-					base_amount,
-					gl_posting_date,
-					project,
-					account_currency,
-					item.cost_center,
-					item,
-					deferred_process,
-				)
+		# check if books nor frozen till endate:
+		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(
+				doc,
+				credit_account,
+				debit_account,
+				amount,
+				base_amount,
+				end_date,
+				project,
+				account_currency,
+				item.cost_center,
+				item,
+				deferred_process,
+				submit_journal_entry,
+			)
+		else:
+			make_gl_entries(
+				doc,
+				credit_account,
+				debit_account,
+				against,
+				amount,
+				base_amount,
+				end_date,
+				project,
+				account_currency,
+				item.cost_center,
+				item,
+				deferred_process,
+			)
 
 		# Returned in case of any errors because it tries to submit the same record again and again in case of errors
 		if frappe.flags.deferred_accounting_error:
@@ -406,17 +418,15 @@ 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(
 		frappe.db.get_singles_value("Accounts Settings", "book_deferred_entries_via_journal_entry")
 	)
-	submit_journal_entry = cint(frappe.db.get_singles_value("Accounts Settings", "submit_journal_entries"))
+	submit_journal_entry = cint(
+		frappe.db.get_singles_value("Accounts Settings", "submit_journal_entries")
+	)
 	book_deferred_entries_based_on = frappe.db.get_singles_value(
 		"Accounts Settings", "book_deferred_entries_based_on"
 	)
@@ -436,7 +446,9 @@ def process_deferred_accounting(posting_date=None):
 		posting_date = today()
 
 	if not cint(
-		frappe.db.get_singles_value("Accounts Settings", "automatically_process_deferred_accounting_entry")
+		frappe.db.get_singles_value(
+			"Accounts Settings", "automatically_process_deferred_accounting_entry"
+		)
 	):
 		return
 
@@ -559,13 +571,16 @@ def book_revenue_via_journal_entry(
 	deferred_process=None,
 	submit="No",
 ):
+
 	if amount == 0:
 		return
 
 	journal_entry = frappe.new_doc("Journal Entry")
 	journal_entry.posting_date = posting_date
 	journal_entry.company = doc.company
-	journal_entry.voucher_type = "Deferred Revenue" if doc.doctype == "Sales Invoice" else "Deferred Expense"
+	journal_entry.voucher_type = (
+		"Deferred Revenue" if doc.doctype == "Sales Invoice" else "Deferred Expense"
+	)
 	journal_entry.process_deferred_accounting = deferred_process
 
 	debit_entry = {
@@ -614,6 +629,7 @@ def book_revenue_via_journal_entry(
 
 
 def get_deferred_booking_accounts(doctype, voucher_detail_no, dr_or_cr):
+
 	if doctype == "Sales Invoice":
 		credit_account, debit_account = frappe.db.get_value(
 			"Sales Invoice Item",

erpnext/accounts/doctype/account/account.js

@@ -1,32 +1,33 @@
 // Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-frappe.ui.form.on("Account", {
-	setup: function (frm) {
-		frm.add_fetch("parent_account", "report_type", "report_type");
-		frm.add_fetch("parent_account", "root_type", "root_type");
+frappe.ui.form.on('Account', {
+	setup: function(frm) {
+		frm.add_fetch('parent_account', 'report_type', 'report_type');
+		frm.add_fetch('parent_account', 'root_type', 'root_type');
 	},
-	onload: function (frm) {
-		frm.set_query("parent_account", function (doc) {
+	onload: function(frm) {
+		frm.set_query('parent_account', function(doc) {
 			return {
 				filters: {
-					is_group: 1,
-					company: doc.company,
-				},
+					"is_group": 1,
+					"company": doc.company
+				}
 			};
 		});
 	},
-	refresh: function (frm) {
-		frm.toggle_display("account_name", frm.is_new());
+	refresh: function(frm) {
+		frm.toggle_display('account_name', frm.is_new());
 
 		// hide fields if group
-		frm.toggle_display(["account_type", "tax_rate"], cint(frm.doc.is_group) == 0);
+		frm.toggle_display(['account_type', 'tax_rate'], cint(frm.doc.is_group) == 0);
 
 		// disable fields
-		frm.toggle_enable(["is_group", "company"], false);
+		frm.toggle_enable(['is_group', 'company'], false);
 
 		if (cint(frm.doc.is_group) == 0) {
-			frm.toggle_display("freeze_account", frm.doc.__onload && frm.doc.__onload.can_freeze_account);
+			frm.toggle_display('freeze_account', frm.doc.__onload
+				&& frm.doc.__onload.can_freeze_account);
 		}
 
 		// read-only for root accounts
@@ -37,147 +38,125 @@ frappe.ui.form.on("Account", {
 			} else {
 				// credit days and type if customer or supplier
 				frm.set_intro(null);
-				frm.trigger("account_type");
+				frm.trigger('account_type');
 				// show / hide convert buttons
-				frm.trigger("add_toolbar_buttons");
+				frm.trigger('add_toolbar_buttons');
 			}
-			if (frm.has_perm("write")) {
-				frm.add_custom_button(
-					__("Merge Account"),
-					function () {
-						frm.trigger("merge_account");
-					},
-					__("Actions")
-				);
-				frm.add_custom_button(
-					__("Update Account Name / Number"),
-					function () {
-						frm.trigger("update_account_number");
-					},
-					__("Actions")
-				);
+			if (frm.has_perm('write')) {
+				frm.add_custom_button(__('Merge Account'), function () {
+					frm.trigger("merge_account");
+				}, __('Actions'));
+				frm.add_custom_button(__('Update Account Name / Number'), function () {
+					frm.trigger("update_account_number");
+				}, __('Actions'));
 			}
 		}
 	},
 	account_type: function (frm) {
 		if (frm.doc.is_group == 0) {
-			frm.toggle_display(["tax_rate"], frm.doc.account_type == "Tax");
-			frm.toggle_display("warehouse", frm.doc.account_type == "Stock");
+			frm.toggle_display(['tax_rate'], frm.doc.account_type == 'Tax');
+			frm.toggle_display('warehouse', frm.doc.account_type == 'Stock');
 		}
 	},
-	add_toolbar_buttons: function (frm) {
-		frm.add_custom_button(
-			__("Chart of Accounts"),
-			() => {
-				frappe.set_route("Tree", "Account");
-			},
-			__("View")
-		);
+	add_toolbar_buttons: function(frm) {
+		frm.add_custom_button(__('Chart of Accounts'), () => {
+			frappe.set_route("Tree", "Account");
+		}, __('View'));
 
 		if (frm.doc.is_group == 1) {
-			frm.add_custom_button(
-				__("Convert to Non-Group"),
-				function () {
-					return frappe.call({
-						doc: frm.doc,
-						method: "convert_group_to_ledger",
-						callback: function () {
-							frm.refresh();
-						},
-					});
-				},
-				__("Actions")
-			);
-		} else if (cint(frm.doc.is_group) == 0 && frappe.boot.user.can_read.indexOf("GL Entry") !== -1) {
-			frm.add_custom_button(
-				__("General Ledger"),
-				function () {
-					frappe.route_options = {
-						account: frm.doc.name,
-						from_date: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
-						to_date: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
-						company: frm.doc.company,
-					};
-					frappe.set_route("query-report", "General Ledger");
-				},
-				__("View")
-			);
+			frm.add_custom_button(__('Convert to Non-Group'), function () {
+				return frappe.call({
+					doc: frm.doc,
+					method: 'convert_group_to_ledger',
+					callback: function() {
+						frm.refresh();
+					}
+				});
+			}, __('Actions'));
 
-			frm.add_custom_button(
-				__("Convert to Group"),
-				function () {
-					return frappe.call({
-						doc: frm.doc,
-						method: "convert_ledger_to_group",
-						callback: function () {
-							frm.refresh();
-						},
-					});
-				},
-				__("Actions")
-			);
+		} else if (cint(frm.doc.is_group) == 0
+			&& frappe.boot.user.can_read.indexOf("GL Entry") !== -1) {
+			frm.add_custom_button(__('General Ledger'), function () {
+				frappe.route_options = {
+					"account": frm.doc.name,
+					"from_date": frappe.sys_defaults.year_start_date,
+					"to_date": frappe.sys_defaults.year_end_date,
+					"company": frm.doc.company
+				};
+				frappe.set_route("query-report", "General Ledger");
+			}, __('View'));
+
+			frm.add_custom_button(__('Convert to Group'), function () {
+				return frappe.call({
+					doc: frm.doc,
+					method: 'convert_ledger_to_group',
+					callback: function() {
+						frm.refresh();
+					}
+				});
+			}, __('Actions'));
 		}
 	},
 
-	merge_account: function (frm) {
+	merge_account: function(frm) {
 		var d = new frappe.ui.Dialog({
-			title: __("Merge with Existing Account"),
+			title: __('Merge with Existing Account'),
 			fields: [
 				{
-					label: "Name",
-					fieldname: "name",
-					fieldtype: "Data",
-					reqd: 1,
-					default: frm.doc.name,
-				},
+					"label" : "Name",
+					"fieldname": "name",
+					"fieldtype": "Data",
+					"reqd": 1,
+					"default": frm.doc.name
+				}
 			],
-			primary_action: function () {
+			primary_action: function() {
 				var data = d.get_values();
 				frappe.call({
 					method: "erpnext.accounts.doctype.account.account.merge_account",
 					args: {
 						old: frm.doc.name,
 						new: data.name,
+						is_group: frm.doc.is_group,
+						root_type: frm.doc.root_type,
+						company: frm.doc.company
 					},
-					callback: function (r) {
-						if (!r.exc) {
-							if (r.message) {
+					callback: function(r) {
+						if(!r.exc) {
+							if(r.message) {
 								frappe.set_route("Form", "Account", r.message);
 							}
 							d.hide();
 						}
-					},
+					}
 				});
 			},
-			primary_action_label: __("Merge"),
+			primary_action_label: __('Merge')
 		});
 		d.show();
 	},
 
-	update_account_number: function (frm) {
+	update_account_number: function(frm) {
 		var d = new frappe.ui.Dialog({
-			title: __("Update Account Number / Name"),
+			title: __('Update Account Number / Name'),
 			fields: [
 				{
-					label: "Account Name",
-					fieldname: "account_name",
-					fieldtype: "Data",
-					reqd: 1,
-					default: frm.doc.account_name,
+					"label": "Account Name",
+					"fieldname": "account_name",
+					"fieldtype": "Data",
+					"reqd": 1,
+					"default": frm.doc.account_name
 				},
 				{
-					label: "Account Number",
-					fieldname: "account_number",
-					fieldtype: "Data",
-					default: frm.doc.account_number,
-				},
+					"label": "Account Number",
+					"fieldname": "account_number",
+					"fieldtype": "Data",
+					"default": frm.doc.account_number
+				}
 			],
-			primary_action: function () {
+			primary_action: function() {
 				var data = d.get_values();
-				if (
-					data.account_number === frm.doc.account_number &&
-					data.account_name === frm.doc.account_name
-				) {
+				if(data.account_number === frm.doc.account_number && data.account_name === frm.doc.account_name) {
 					d.hide();
 					return;
 				}
@@ -187,11 +166,11 @@ frappe.ui.form.on("Account", {
 					args: {
 						account_number: data.account_number,
 						account_name: data.account_name,
-						name: frm.doc.name,
+						name: frm.doc.name
 					},
-					callback: function (r) {
-						if (!r.exc) {
-							if (r.message) {
+					callback: function(r) {
+						if(!r.exc) {
+							if(r.message) {
 								frappe.set_route("Form", "Account", r.message);
 							} else {
 								frm.set_value("account_number", data.account_number);
@@ -199,11 +178,11 @@ frappe.ui.form.on("Account", {
 							}
 							d.hide();
 						}
-					},
+					}
 				});
 			},
-			primary_action_label: __("Update"),
+			primary_action_label: __('Update')
 		});
 		d.show();
-	},
+	}
 });

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

@@ -4,7 +4,7 @@
 
 import frappe
 from frappe import _, throw
-from frappe.utils import add_to_date, cint, cstr, pretty_date
+from frappe.utils import cint, cstr
 from frappe.utils.nestedset import NestedSet, get_ancestors_of, get_descendants_of
 
 import erpnext
@@ -18,10 +18,6 @@ class BalanceMismatchError(frappe.ValidationError):
 	pass
 
 
-class InvalidAccountMergeError(frappe.ValidationError):
-	pass
-
-
 class Account(NestedSet):
 	nsm_parent_field = "parent_account"
 
@@ -29,7 +25,7 @@ class Account(NestedSet):
 		if frappe.local.flags.ignore_update_nsm:
 			return
 		else:
-			super().on_update()
+			super(Account, self).on_update()
 
 	def onload(self):
 		frozen_accounts_modifier = frappe.db.get_value(
@@ -41,7 +37,7 @@ class Account(NestedSet):
 	def autoname(self):
 		from erpnext.accounts.utils import get_autoname_with_number
 
-		self.name = get_autoname_with_number(self.account_number, self.account_name, self.company)
+		self.name = get_autoname_with_number(self.account_number, self.account_name, None, self.company)
 
 	def validate(self):
 		from erpnext.accounts.utils import validate_field_number
@@ -58,7 +54,6 @@ class Account(NestedSet):
 		self.validate_balance_must_be_debit_or_credit()
 		self.validate_account_currency()
 		self.validate_root_company_and_sync_account_to_children()
-		self.validate_receivable_payable_account_type()
 
 	def validate_parent(self):
 		"""Fetch Parent Details and validate parent account"""
@@ -87,7 +82,9 @@ class Account(NestedSet):
 
 	def set_root_and_report_type(self):
 		if self.parent_account:
-			par = frappe.db.get_value("Account", self.parent_account, ["report_type", "root_type"], as_dict=1)
+			par = frappe.db.get_value(
+				"Account", self.parent_account, ["report_type", "root_type"], as_dict=1
+			)
 
 			if par.report_type:
 				self.report_type = par.report_type
@@ -113,24 +110,6 @@ class Account(NestedSet):
 				"Balance Sheet" if self.root_type in ("Asset", "Liability", "Equity") else "Profit and Loss"
 			)
 
-	def validate_receivable_payable_account_type(self):
-		doc_before_save = self.get_doc_before_save()
-		receivable_payable_types = ["Receivable", "Payable"]
-		if (
-			doc_before_save
-			and doc_before_save.account_type in receivable_payable_types
-			and doc_before_save.account_type != self.account_type
-		):
-			# check for ledger entries
-			if frappe.db.get_all("GL Entry", filters={"account": self.name, "is_cancelled": 0}, limit=1):
-				msg = _(
-					"There are ledger entries against this account. Changing {0} to non-{1} in live system will cause incorrect output in 'Accounts {2}' report"
-				).format(
-					frappe.bold("Account Type"), doc_before_save.account_type, doc_before_save.account_type
-				)
-				frappe.msgprint(msg)
-				self.add_comment("Comment", msg)
-
 	def validate_root_details(self):
 		# does not exists parent
 		if frappe.db.exists("Account", self.name):
@@ -142,7 +121,9 @@ class Account(NestedSet):
 
 	def validate_root_company_and_sync_account_to_children(self):
 		# ignore validation while creating new compnay or while syncing to child companies
-		if frappe.local.flags.ignore_root_company_validation or self.flags.ignore_root_company_validation:
+		if (
+			frappe.local.flags.ignore_root_company_validation or self.flags.ignore_root_company_validation
+		):
 			return
 		ancestors = get_root_company(self.company)
 		if ancestors:
@@ -220,11 +201,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")
 
@@ -270,10 +248,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],
 					}
 				)
@@ -337,7 +313,7 @@ class Account(NestedSet):
 		if self.check_gle_exists():
 			throw(_("Account with existing transaction can not be deleted"))
 
-		super().on_trash(True)
+		super(Account, self).on_trash(True)
 
 
 @frappe.whitelist()
@@ -345,8 +321,9 @@ class Account(NestedSet):
 def get_parent_account(doctype, txt, searchfield, start, page_len, filters):
 	return frappe.db.sql(
 		"""select name from tabAccount
-		where is_group = 1 and docstatus != 2 and company = {}
-		and {} like {} order by name limit {} offset {}""".format("%s", searchfield, "%s", "%s", "%s"),
+		where is_group = 1 and docstatus != 2 and company = %s
+		and %s like %s order by name limit %s offset %s"""
+		% ("%s", searchfield, "%s", "%s", "%s"),
 		(filters["company"], "%%%s%%" % txt, page_len, start),
 		as_list=1,
 	)
@@ -400,12 +377,13 @@ def validate_account_number(name, account_number, company):
 
 @frappe.whitelist()
 def update_account_number(name, account_name, account_number=None, from_descendant=False):
-	_ensure_idle_system()
 	account = frappe.db.get_value("Account", name, "company", as_dict=True)
 	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 = frappe.db.get_value(
+		"Account", name, ["account_name", "account_number"]
+	)
 
 	# check if account exists in parent company
 	ancestors = get_ancestors_of("Company", account.company)
@@ -415,13 +393,7 @@ def update_account_number(name, account_name, account_number=None, from_descenda
 
 	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 and not from_descendant:
+			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")
 
@@ -461,36 +433,24 @@ def update_account_number(name, account_name, account_number=None, from_descenda
 
 
 @frappe.whitelist()
-def merge_account(old, new):
-	_ensure_idle_system()
+def merge_account(old, new, is_group, root_type, company):
 	# Validate properties before merging
-	new_account = frappe.get_cached_doc("Account", new)
-	old_account = frappe.get_cached_doc("Account", old)
-
-	if not new_account:
+	if not frappe.db.exists("Account", new):
 		throw(_("Account {0} does not exist").format(new))
 
-	if (
-		cint(new_account.is_group),
-		new_account.root_type,
-		new_account.company,
-		cstr(new_account.account_currency),
-	) != (
-		cint(old_account.is_group),
-		old_account.root_type,
-		old_account.company,
-		cstr(old_account.account_currency),
-	):
+	val = list(frappe.db.get_value("Account", new, ["is_group", "root_type", "company"]))
+
+	if val != [cint(is_group), root_type, company]:
 		throw(
-			msg=_(
-				"""Merging is only possible if following properties are same in both records. Is Group, Root Type, Company and Account Currency"""
-			),
-			title=("Invalid Accounts"),
-			exc=InvalidAccountMergeError,
+			_(
+				"""Merging is only possible if following properties are same in both records. Is Group, Root Type, Company"""
+			)
 		)
 
-	if old_account.is_group and new_account.parent_account == old:
-		new_account.db_set("parent_account", frappe.get_cached_value("Account", old, "parent_account"))
+	if is_group and frappe.db.get_value("Account", new, "parent_account") == old:
+		frappe.db.set_value(
+			"Account", new, "parent_account", frappe.db.get_value("Account", old, "parent_account")
+		)
 
 	frappe.rename_doc("Account", old, new, merge=1, force=1)
 
@@ -514,29 +474,7 @@ def sync_update_account_number_in_child(
 	if old_acc_number:
 		filters["account_number"] = old_acc_number
 
-	for d in frappe.db.get_values("Account", filters=filters, fieldname=["company", "name"], as_dict=True):
+	for d in frappe.db.get_values(
+		"Account", filters=filters, fieldname=["company", "name"], as_dict=True
+	):
 		update_account_number(d["name"], account_name, account_number, from_descendant=True)
-
-
-def _ensure_idle_system():
-	# Don't allow renaming if accounting entries are actively being updated, there are two main reasons:
-	# 1. Correctness: It's next to impossible to ensure that renamed account is not being used *right now*.
-	# 2. Performance: Renaming requires locking out many tables entirely and severely degrades performance.
-
-	if frappe.flags.in_test:
-		return
-
-	try:
-		# We also lock inserts to GL entry table with for_update here.
-		last_gl_update = frappe.db.get_value("GL Entry", {}, "modified", for_update=True, wait=False)
-	except frappe.QueryTimeoutError:
-		# wait=False fails immediately if there's an active transaction.
-		last_gl_update = add_to_date(None, seconds=-1)
-
-	if last_gl_update > add_to_date(None, minutes=-5):
-		frappe.throw(
-			_(
-				"Last GL Entry update was done {}. This operation is not allowed while system is actively being used. Please wait for 5 minutes before retrying."
-			).format(pretty_date(last_gl_update)),
-			title=_("System In Use"),
-		)

erpnext/accounts/doctype/account/account_tree.js

@@ -1,4 +1,4 @@
-frappe.provide("frappe.treeview_settings");
+frappe.provide("frappe.treeview_settings")
 
 frappe.treeview_settings["Account"] = {
 	breadcrumb: "Accounts",
@@ -7,12 +7,12 @@ frappe.treeview_settings["Account"] = {
 	filters: [
 		{
 			fieldname: "company",
-			fieldtype: "Select",
+			fieldtype:"Select",
 			options: erpnext.utils.get_tree_options("company"),
 			label: __("Company"),
 			default: erpnext.utils.get_tree_default("company"),
-			on_change: function () {
-				var me = frappe.treeview_settings["Account"].treeview;
+			on_change: function() {
+				var me = frappe.treeview_settings['Account'].treeview;
 				var company = me.page.fields_dict.company.get_value();
 				if (!company) {
 					frappe.throw(__("Please set a Company"));
@@ -22,36 +22,30 @@ frappe.treeview_settings["Account"] = {
 					args: {
 						company: company,
 					},
-					callback: function (r) {
-						if (r.message) {
+					callback: function(r) {
+						if(r.message) {
 							let root_company = r.message.length ? r.message[0] : "";
 							me.page.fields_dict.root_company.set_value(root_company);
 
-							frappe.db.get_value(
-								"Company",
-								{ name: company },
-								"allow_account_creation_against_child_company",
-								(r) => {
-									frappe.flags.ignore_root_company_validation =
-										r.allow_account_creation_against_child_company;
-								}
-							);
+							frappe.db.get_value("Company", {"name": company}, "allow_account_creation_against_child_company", (r) => {
+								frappe.flags.ignore_root_company_validation = r.allow_account_creation_against_child_company;
+							});
 						}
-					},
+					}
 				});
-			},
+			}
 		},
 		{
 			fieldname: "root_company",
-			fieldtype: "Data",
+			fieldtype:"Data",
 			label: __("Root Company"),
 			hidden: true,
-			disable_onchange: true,
-		},
+			disable_onchange: true
+		}
 	],
 	root_label: "Accounts",
-	get_tree_nodes: "erpnext.accounts.utils.get_children",
-	on_get_node: function (nodes, deep = false) {
+	get_tree_nodes: 'erpnext.accounts.utils.get_children',
+	on_get_node: function(nodes, deep=false) {
 		if (frappe.boot.user.can_read.indexOf("GL Entry") == -1) return;
 
 		let accounts = [];
@@ -62,232 +56,147 @@ frappe.treeview_settings["Account"] = {
 			accounts = nodes;
 		}
 
-		frappe.db.get_single_value("Accounts Settings", "show_balance_in_coa").then((value) => {
-			if (value) {
-				const get_balances = frappe.call({
-					method: "erpnext.accounts.utils.get_account_balances",
-					args: {
-						accounts: accounts,
-						company: cur_tree.args.company,
-					},
-				});
+		const get_balances = frappe.call({
+			method: 'erpnext.accounts.utils.get_account_balances',
+			args: {
+				accounts: accounts,
+				company: cur_tree.args.company
+			},
+		});
 
-				get_balances.then((r) => {
-					if (!r.message || r.message.length == 0) return;
+		get_balances.then(r => {
+			if (!r.message || r.message.length == 0) return;
 
-					for (let account of r.message) {
-						const node = cur_tree.nodes && cur_tree.nodes[account.value];
-						if (!node || node.is_root) continue;
+			for (let account of r.message) {
 
-						// show Dr if positive since balance is calculated as debit - credit else show Cr
-						const balance = account.balance_in_account_currency || account.balance;
-						const dr_or_cr = balance > 0 ? "Dr" : "Cr";
-						const format = (value, currency) => format_currency(Math.abs(value), currency);
+				const node = cur_tree.nodes && cur_tree.nodes[account.value];
+				if (!node || node.is_root) continue;
 
-						if (account.balance !== undefined) {
-							node.parent && node.parent.find(".balance-area").remove();
-							$(
-								'<span class="balance-area pull-right">' +
-									(account.balance_in_account_currency
-										? format(
-												account.balance_in_account_currency,
-												account.account_currency
-										  ) + " / "
-										: "") +
-									format(account.balance, account.company_currency) +
-									" " +
-									dr_or_cr +
-									"</span>"
-							).insertBefore(node.$ul);
-						}
-					}
-				});
+				// show Dr if positive since balance is calculated as debit - credit else show Cr
+				const balance = account.balance_in_account_currency || account.balance;
+				const dr_or_cr = balance > 0 ? "Dr": "Cr";
+				const format = (value, currency) => format_currency(Math.abs(value), currency);
+
+				if (account.balance!==undefined) {
+					node.parent && node.parent.find('.balance-area').remove();
+					$('<span class="balance-area pull-right">'
+						+ (account.balance_in_account_currency ?
+							(format(account.balance_in_account_currency, account.account_currency) + " / ") : "")
+						+ format(account.balance, account.company_currency)
+						+ " " + dr_or_cr
+						+ '</span>').insertBefore(node.$ul);
+				}
 			}
 		});
 	},
-	add_tree_node: "erpnext.accounts.utils.add_ac",
-	menu_items: [
+	add_tree_node: 'erpnext.accounts.utils.add_ac',
+	menu_items:[
 		{
-			label: __("New Company"),
-			action: function () {
-				frappe.new_doc("Company", true);
-			},
-			condition: 'frappe.boot.user.can_create.indexOf("Company") !== -1',
-		},
+			label: __('New Company'),
+			action: function() { frappe.new_doc("Company", true) },
+			condition: 'frappe.boot.user.can_create.indexOf("Company") !== -1'
+		}
 	],
 	fields: [
-		{
-			fieldtype: "Data",
-			fieldname: "account_name",
-			label: __("New Account Name"),
-			reqd: true,
-			description: __(
-				"Name of new Account. Note: Please don't create accounts for Customers and Suppliers"
-			),
-		},
-		{
-			fieldtype: "Data",
-			fieldname: "account_number",
-			label: __("Account Number"),
-			description: __("Number of new Account, it will be included in the account name as a prefix"),
-		},
-		{
-			fieldtype: "Check",
-			fieldname: "is_group",
-			label: __("Is Group"),
-			description: __(
-				"Further accounts can be made under Groups, but entries can be made against non-Groups"
-			),
-		},
-		{
-			fieldtype: "Select",
-			fieldname: "root_type",
-			label: __("Root Type"),
-			options: ["Asset", "Liability", "Equity", "Income", "Expense"].join("\n"),
-			depends_on: "eval:doc.is_group && !doc.parent_account",
-		},
-		{
-			fieldtype: "Select",
-			fieldname: "account_type",
-			label: __("Account Type"),
-			options: frappe.get_meta("Account").fields.filter((d) => d.fieldname == "account_type")[0]
-				.options,
-			description: __("Optional. This setting will be used to filter in various transactions."),
-		},
-		{
-			fieldtype: "Float",
-			fieldname: "tax_rate",
-			label: __("Tax Rate"),
-			depends_on: 'eval:doc.is_group==0&&doc.account_type=="Tax"',
-		},
-		{
-			fieldtype: "Link",
-			fieldname: "account_currency",
-			label: __("Currency"),
-			options: "Currency",
-			description: __("Optional. Sets company's default currency, if not specified."),
+		{fieldtype:'Data', fieldname:'account_name', label:__('New Account Name'), reqd:true,
+			description: __("Name of new Account. Note: Please don't create accounts for Customers and Suppliers")},
+		{fieldtype:'Data', fieldname:'account_number', label:__('Account Number'),
+			description: __("Number of new Account, it will be included in the account name as a prefix")},
+		{fieldtype:'Check', fieldname:'is_group', label:__('Is Group'),
+			description: __('Further accounts can be made under Groups, but entries can be made against non-Groups')},
+		{fieldtype:'Select', fieldname:'root_type', label:__('Root Type'),
+			options: ['Asset', 'Liability', 'Equity', 'Income', 'Expense'].join('\n'),
+			depends_on: 'eval:doc.is_group && !doc.parent_account'},
+		{fieldtype:'Select', fieldname:'account_type', label:__('Account Type'),
+			options: frappe.get_meta("Account").fields.filter(d => d.fieldname=='account_type')[0].options,
+			description: __("Optional. This setting will be used to filter in various transactions.")
 		},
+		{fieldtype:'Float', fieldname:'tax_rate', label:__('Tax Rate'),
+			depends_on: 'eval:doc.is_group==0&&doc.account_type=="Tax"'},
+		{fieldtype:'Link', fieldname:'account_currency', label:__('Currency'), options:"Currency",
+			description: __("Optional. Sets company's default currency, if not specified.")}
 	],
-	ignore_fields: ["parent_account"],
-	onload: function (treeview) {
-		frappe.treeview_settings["Account"].treeview = {};
-		$.extend(frappe.treeview_settings["Account"].treeview, treeview);
+	ignore_fields:["parent_account"],
+	onload: function(treeview) {
+		frappe.treeview_settings['Account'].treeview = {};
+		$.extend(frappe.treeview_settings['Account'].treeview, treeview);
 		function get_company() {
 			return treeview.page.fields_dict.company.get_value();
 		}
 
 		// tools
-		treeview.page.add_inner_button(
-			__("Chart of Cost Centers"),
-			function () {
-				frappe.set_route("Tree", "Cost Center", { company: get_company() });
-			},
-			__("View")
-		);
+		treeview.page.add_inner_button(__("Chart of Cost Centers"), function() {
+			frappe.set_route('Tree', 'Cost Center', {company: get_company()});
+		}, __('View'));
 
-		treeview.page.add_inner_button(
-			__("Opening Invoice Creation Tool"),
-			function () {
-				frappe.set_route("Form", "Opening Invoice Creation Tool", { company: get_company() });
-			},
-			__("View")
-		);
+		treeview.page.add_inner_button(__("Opening Invoice Creation Tool"), function() {
+			frappe.set_route('Form', 'Opening Invoice Creation Tool', {company: get_company()});
+		}, __('View'));
 
-		treeview.page.add_inner_button(
-			__("Period Closing Voucher"),
-			function () {
-				frappe.set_route("List", "Period Closing Voucher", { company: get_company() });
-			},
-			__("View")
-		);
+		treeview.page.add_inner_button(__("Period Closing Voucher"), function() {
+			frappe.set_route('List', 'Period Closing Voucher', {company: get_company()});
+		}, __('View'));
 
-		treeview.page.add_inner_button(
-			__("Journal Entry"),
-			function () {
-				frappe.new_doc("Journal Entry", { company: get_company() });
-			},
-			__("Create")
-		);
-		treeview.page.add_inner_button(
-			__("Company"),
-			function () {
-				frappe.new_doc("Company");
-			},
-			__("Create")
-		);
+
+		treeview.page.add_inner_button(__("Journal Entry"), function() {
+			frappe.new_doc('Journal Entry', {company: get_company()});
+		}, __('Create'));
+		treeview.page.add_inner_button(__("Company"), function() {
+			frappe.new_doc('Company');
+		}, __('Create'));
 
 		// financial statements
-		for (let report of [
-			"Trial Balance",
-			"General Ledger",
-			"Balance Sheet",
-			"Profit and Loss Statement",
-			"Cash Flow Statement",
-			"Accounts Payable",
-			"Accounts Receivable",
-		]) {
-			treeview.page.add_inner_button(
-				__(report),
-				function () {
-					frappe.set_route("query-report", report, { company: get_company() });
-				},
-				__("Financial Statements")
-			);
+		for (let report of ['Trial Balance', 'General Ledger', 'Balance Sheet',
+			'Profit and Loss Statement', 'Cash Flow Statement', 'Accounts Payable', 'Accounts Receivable']) {
+			treeview.page.add_inner_button(__(report), function() {
+				frappe.set_route('query-report', report, {company: get_company()});
+			}, __('Financial Statements'));
 		}
-	},
-	post_render: function (treeview) {
-		frappe.treeview_settings["Account"].treeview["tree"] = treeview.tree;
-		treeview.page.set_primary_action(
-			__("New"),
-			function () {
-				let root_company = treeview.page.fields_dict.root_company.get_value();
 
-				if (root_company) {
-					frappe.throw(__("Please add the account to root level Company - {0}"), [root_company]);
-				} else {
-					treeview.new_node();
-				}
-			},
-			"add"
-		);
+	},
+	post_render: function(treeview) {
+		frappe.treeview_settings['Account'].treeview["tree"] = treeview.tree;
+		treeview.page.set_primary_action(__("New"), function() {
+			let root_company = treeview.page.fields_dict.root_company.get_value();
+
+			if(root_company) {
+				frappe.throw(__("Please add the account to root level Company - {0}"), [root_company]);
+			} else {
+				treeview.new_node();
+			}
+		}, "add");
 	},
 	toolbar: [
 		{
-			label: __("Add Child"),
-			condition: function (node) {
-				return (
-					frappe.boot.user.can_create.indexOf("Account") !== -1 &&
-					(!frappe.treeview_settings[
-						"Account"
-					].treeview.page.fields_dict.root_company.get_value() ||
-						frappe.flags.ignore_root_company_validation) &&
-					node.expandable &&
-					!node.hide_add
-				);
+			label:__("Add Child"),
+			condition: function(node) {
+				return frappe.boot.user.can_create.indexOf("Account") !== -1
+					&& (!frappe.treeview_settings['Account'].treeview.page.fields_dict.root_company.get_value()
+					|| frappe.flags.ignore_root_company_validation)
+					&& node.expandable && !node.hide_add;
 			},
-			click: function () {
-				var me = frappe.views.trees["Account"];
+			click: function() {
+				var me = frappe.views.trees['Account'];
 				me.new_node();
 			},
-			btnClass: "hidden-xs",
+			btnClass: "hidden-xs"
 		},
 		{
-			condition: function (node) {
-				return !node.root && frappe.boot.user.can_read.indexOf("GL Entry") !== -1;
+			condition: function(node) {
+				return !node.root && frappe.boot.user.can_read.indexOf("GL Entry") !== -1
 			},
 			label: __("View Ledger"),
-			click: function (node, btn) {
+			click: function(node, btn) {
 				frappe.route_options = {
-					account: node.label,
-					from_date: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
-					to_date: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
-					company:
-						frappe.treeview_settings["Account"].treeview.page.fields_dict.company.get_value(),
+					"account": node.label,
+					"from_date": frappe.sys_defaults.year_start_date,
+					"to_date": frappe.sys_defaults.year_end_date,
+					"company": frappe.treeview_settings['Account'].treeview.page.fields_dict.company.get_value()
 				};
 				frappe.set_route("query-report", "General Ledger");
 			},
-			btnClass: "hidden-xs",
-		},
+			btnClass: "hidden-xs"
+		}
 	],
-	extend_toolbar: true,
-};
+	extend_toolbar: true
+}

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

@@ -29,8 +29,8 @@ def create_charts(
 					"root_type",
 					"is_group",
 					"tax_rate",
-					"account_currency",
 				]:
+
 					account_number = cstr(child.get("account_number")).strip()
 					account_name, account_name_in_db = add_suffix_if_duplicate(
 						account_name, account_number, accounts
@@ -38,9 +38,7 @@ def create_charts(
 
 					is_group = identify_is_group(child)
 					report_type = (
-						"Balance Sheet"
-						if root_type in ["Asset", "Liability", "Equity"]
-						else "Profit and Loss"
+						"Balance Sheet" if root_type in ["Asset", "Liability", "Equity"] else "Profit and Loss"
 					)
 
 					account = frappe.get_doc(
@@ -97,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:
@@ -142,7 +130,7 @@ def get_chart(chart_template, existing_company=None):
 			for fname in os.listdir(path):
 				fname = frappe.as_unicode(fname)
 				if fname.endswith(".json"):
-					with open(os.path.join(path, fname)) as f:
+					with open(os.path.join(path, fname), "r") as f:
 						chart = f.read()
 						if chart and json.loads(chart).get("name") == chart_template:
 							return json.loads(chart).get("tree")
@@ -174,7 +162,7 @@ def get_charts_for_country(country, with_standard=False):
 			for fname in os.listdir(path):
 				fname = frappe.as_unicode(fname)
 				if (fname.startswith(country_code) or fname.startswith(country)) and fname.endswith(".json"):
-					with open(os.path.join(path, fname)) as f:
+					with open(os.path.join(path, fname), "r") as f:
 						_get_chart_name(f.read())
 
 	# if more than one charts, returned then add the standard
@@ -197,7 +185,6 @@ def get_account_tree_from_existing_company(existing_company):
 			"root_type",
 			"tax_rate",
 			"account_number",
-			"account_currency",
 		],
 		order_by="lft, rgt",
 	)
@@ -248,13 +235,7 @@ def validate_bank_account(coa, bank_account):
 
 		def _get_account_names(account_master):
 			for account_name, child in account_master.items():
-				if account_name not in [
-					"account_number",
-					"account_type",
-					"root_type",
-					"is_group",
-					"tax_rate",
-				]:
+				if account_name not in ["account_number", "account_type", "root_type", "is_group", "tax_rate"]:
 					accounts.append(account_name)
 
 					_get_account_names(child)
@@ -286,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/import_from_openerp.py

@@ -26,7 +26,7 @@ def go():
 	default_account_types = get_default_account_types()
 
 	country_dirs = []
-	for basepath, _folders, _files in os.walk(path):
+	for basepath, folders, files in os.walk(path):
 		basename = os.path.basename(basepath)
 		if basename.startswith("l10n_"):
 			country_dirs.append(basename)
@@ -35,7 +35,9 @@ def go():
 		accounts, charts = {}, {}
 		country_path = os.path.join(path, country_dir)
 		manifest = ast.literal_eval(open(os.path.join(country_path, "__openerp__.py")).read())
-		data_files = manifest.get("data", []) + manifest.get("init_xml", []) + manifest.get("update_xml", [])
+		data_files = (
+			manifest.get("data", []) + manifest.get("init_xml", []) + manifest.get("update_xml", [])
+		)
 		files_path = [os.path.join(country_path, d) for d in data_files]
 		xml_roots = get_xml_roots(files_path)
 		csv_content = get_csv_contents(files_path)
@@ -88,10 +90,10 @@ def get_csv_contents(files_path):
 		fname = os.path.basename(filepath)
 		for file_type in ["account.account.template", "account.account.type", "account.chart.template"]:
 			if fname.startswith(file_type) and fname.endswith(".csv"):
-				with open(filepath) as csvfile:
+				with open(filepath, "r") as csvfile:
 					try:
 						csv_content.setdefault(file_type, []).append(read_csv_content(csvfile.read()))
-					except Exception:
+					except Exception as e:
 						continue
 	return csv_content
 
@@ -136,7 +138,7 @@ def get_account_types(root_list, csv_content, prefix=None):
 
 	if csv_content and csv_content[0][0] == "id":
 		for row in csv_content[1:]:
-			row_dict = dict(zip(csv_content[0], row, strict=False))
+			row_dict = dict(zip(csv_content[0], row))
 			data = {}
 			if row_dict.get("code") and account_type_map.get(row_dict["code"]):
 				data["account_type"] = account_type_map[row_dict["code"]]
@@ -148,7 +150,7 @@ def get_account_types(root_list, csv_content, prefix=None):
 
 def make_maps_for_xml(xml_roots, account_types, country_dir):
 	"""make maps for `charts` and `accounts`"""
-	for _model, root_list in xml_roots.items():
+	for model, root_list in xml_roots.items():
 		for root in root_list:
 			for node in root[0].findall("record"):
 				if node.get("model") == "account.account.template":
@@ -184,7 +186,7 @@ def make_maps_for_xml(xml_roots, account_types, country_dir):
 def make_maps_for_csv(csv_content, account_types, country_dir):
 	for content in csv_content.get("account.account.template", []):
 		for row in content[1:]:
-			data = dict(zip(content[0], row, strict=False))
+			data = dict(zip(content[0], row))
 			account = {
 				"name": data.get("name"),
 				"parent_id": data.get("parent_id:id") or data.get("parent_id/id"),
@@ -204,7 +206,7 @@ def make_maps_for_csv(csv_content, account_types, country_dir):
 	for content in csv_content.get("account.chart.template", []):
 		for row in content[1:]:
 			if row:
-				data = dict(zip(content[0], row, strict=False))
+				data = dict(zip(content[0], row))
 				charts.setdefault(data.get("id"), {}).update(
 					{
 						"account_root_id": data.get("account_root_id:id") or data.get("account_root_id/id"),
@@ -239,7 +241,7 @@ def make_charts():
 		if not src.get("name") or not src.get("account_root_id"):
 			continue
 
-		if src["account_root_id"] not in accounts:
+		if not src["account_root_id"] in accounts:
 			continue
 
 		filename = src["id"][5:] + "_" + chart_id
@@ -253,20 +255,14 @@ def make_charts():
 		for key, val in chart["tree"].items():
 			if key in ["name", "parent_id"]:
 				chart["tree"].pop(key)
-			if isinstance(val, dict):
+			if type(val) == dict:
 				val["root_type"] = ""
 		if chart:
 			fpath = os.path.join(
-				"erpnext",
-				"erpnext",
-				"accounts",
-				"doctype",
-				"account",
-				"chart_of_accounts",
-				filename + ".json",
+				"erpnext", "erpnext", "accounts", "doctype", "account", "chart_of_accounts", filename + ".json"
 			)
 
-			with open(fpath) as chartfile:
+			with open(fpath, "r") as chartfile:
 				old_content = chartfile.read()
 				if not old_content or (
 					json.loads(old_content).get("is_active", "No") == "No"

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"
@@ -53,58 +53,43 @@
 				},
 				"II. Forderungen und sonstige Vermögensgegenstände": {
 					"is_group": 1,
-					"Forderungen aus Lieferungen und Leistungen mit Kontokorrent": {
+					"Ford. a. Lieferungen und Leistungen": {
 						"account_number": "1400",
-						"account_type": "Receivable",
-						"is_group": 1
-					},
-					"Forderungen aus Lieferungen und Leistungen ohne Kontokorrent": {
-						"account_number": "1410",
 						"account_type": "Receivable"
 					},
 					"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"
 						}
@@ -126,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,
@@ -185,13 +170,8 @@
 				},
 				"IV. Verbindlichkeiten aus Lieferungen und Leistungen": {
 					"is_group": 1,
-					"Verbindlichkeiten aus Lieferungen und Leistungen mit Kontokorrent": {
+					"Verbindlichkeiten aus Lieferungen u. Leistungen": {
 						"account_number": "1600",
-						"account_type": "Payable",
-						"is_group": 1
-					},
-					"Verbindlichkeiten aus Lieferungen und Leistungen ohne Kontokorrent": {
-						"account_number": "1610",
 						"account_type": "Payable"
 					}
 				},
@@ -220,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"
 						}
 					}
@@ -260,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"
 			},
@@ -336,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/de_kontenplan_SKR04_with_account_number.json

@@ -407,10 +407,13 @@
                         "Bewertungskorrektur zu Forderungen aus Lieferungen und Leistungen": {
                             "account_number": "9960"
                         },
-                        "Forderungen aus Lieferungen und Leistungen mit Kontokorrent": {
+                        "Debitoren": {
+                            "is_group": 1,
+                            "account_number": "10000"
+                        },
+                        "Forderungen aus Lieferungen und Leistungen": {
                             "account_number": "1200",
-                            "account_type": "Receivable",
-                            "is_group": 1
+                            "account_type": "Receivable"
                         },
                         "Forderungen aus Lieferungen und Leistungen ohne Kontokorrent": {
                             "account_number": "1210"
@@ -1135,15 +1138,18 @@
                     "Bewertungskorrektur zu Verb. aus Lieferungen und Leistungen": {
                         "account_number": "9964"
                     },
-                    "Verb. aus Lieferungen und Leistungen mit Kontokorrent": {
-                        "account_number": "3300",
-                        "account_type": "Payable",
+                    "Kreditoren": {
+                        "account_number": "70000",
                         "is_group": 1,
-                        "Wareneingangs-Verrechnungskonto" : {
+                        "Wareneingangs-­Verrechnungskonto" : {
                             "account_number": "70001",
                             "account_type": "Stock Received But Not Billed"
                         }
                     },
+                    "Verb. aus Lieferungen und Leistungen": {
+                        "account_number": "3300",
+                        "account_type": "Payable"
+                    },
                     "Verb. aus Lieferungen und Leistungen ohne Kontokorrent": {
                         "account_number": "3310"
                     },

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

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

erpnext/accounts/doctype/account/chart_of_accounts/verified/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,17 +5,10 @@
 import unittest
 
 import frappe
-from frappe.test_runner import make_test_records
 
-from erpnext.accounts.doctype.account.account import (
-	InvalidAccountMergeError,
-	merge_account,
-	update_account_number,
-)
+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):
@@ -51,53 +44,49 @@ class TestAccount(unittest.TestCase):
 		frappe.delete_doc("Account", "1211-11-4 - 6 - Debtors 1 - Test - - _TC")
 
 	def test_merge_account(self):
-		create_account(
-			account_name="Current Assets",
-			is_group=1,
-			parent_account="Application of Funds (Assets) - _TC",
-			company="_Test Company",
-		)
-
-		create_account(
-			account_name="Securities and Deposits",
-			is_group=1,
-			parent_account="Current Assets - _TC",
-			company="_Test Company",
-		)
-
-		create_account(
-			account_name="Earnest Money",
-			parent_account="Securities and Deposits - _TC",
-			company="_Test Company",
-		)
-
-		create_account(
-			account_name="Cash In Hand",
-			is_group=1,
-			parent_account="Current Assets - _TC",
-			company="_Test Company",
-		)
-
-		create_account(
-			account_name="Receivable INR",
-			parent_account="Current Assets - _TC",
-			company="_Test Company",
-			account_currency="INR",
-		)
-
-		create_account(
-			account_name="Receivable USD",
-			parent_account="Current Assets - _TC",
-			company="_Test Company",
-			account_currency="USD",
-		)
+		if not frappe.db.exists("Account", "Current Assets - _TC"):
+			acc = frappe.new_doc("Account")
+			acc.account_name = "Current Assets"
+			acc.is_group = 1
+			acc.parent_account = "Application of Funds (Assets) - _TC"
+			acc.company = "_Test Company"
+			acc.insert()
+		if not frappe.db.exists("Account", "Securities and Deposits - _TC"):
+			acc = frappe.new_doc("Account")
+			acc.account_name = "Securities and Deposits"
+			acc.parent_account = "Current Assets - _TC"
+			acc.is_group = 1
+			acc.company = "_Test Company"
+			acc.insert()
+		if not frappe.db.exists("Account", "Earnest Money - _TC"):
+			acc = frappe.new_doc("Account")
+			acc.account_name = "Earnest Money"
+			acc.parent_account = "Securities and Deposits - _TC"
+			acc.company = "_Test Company"
+			acc.insert()
+		if not frappe.db.exists("Account", "Cash In Hand - _TC"):
+			acc = frappe.new_doc("Account")
+			acc.account_name = "Cash In Hand"
+			acc.is_group = 1
+			acc.parent_account = "Current Assets - _TC"
+			acc.company = "_Test Company"
+			acc.insert()
+		if not frappe.db.exists("Account", "Accumulated Depreciation - _TC"):
+			acc = frappe.new_doc("Account")
+			acc.account_name = "Accumulated Depreciation"
+			acc.parent_account = "Fixed Assets - _TC"
+			acc.company = "_Test Company"
+			acc.account_type = "Accumulated Depreciation"
+			acc.insert()
 
+		doc = frappe.get_doc("Account", "Securities and Deposits - _TC")
 		parent = frappe.db.get_value("Account", "Earnest Money - _TC", "parent_account")
 
 		self.assertEqual(parent, "Securities and Deposits - _TC")
 
-		merge_account("Securities and Deposits - _TC", "Cash In Hand - _TC")
-
+		merge_account(
+			"Securities and Deposits - _TC", "Cash In Hand - _TC", doc.is_group, doc.root_type, doc.company
+		)
 		parent = frappe.db.get_value("Account", "Earnest Money - _TC", "parent_account")
 
 		# Parent account of the child account changes after merging
@@ -106,28 +95,30 @@ class TestAccount(unittest.TestCase):
 		# Old account doesn't exist after merging
 		self.assertFalse(frappe.db.exists("Account", "Securities and Deposits - _TC"))
 
+		doc = frappe.get_doc("Account", "Current Assets - _TC")
+
 		# Raise error as is_group property doesn't match
 		self.assertRaises(
-			InvalidAccountMergeError,
+			frappe.ValidationError,
 			merge_account,
 			"Current Assets - _TC",
 			"Accumulated Depreciation - _TC",
+			doc.is_group,
+			doc.root_type,
+			doc.company,
 		)
 
+		doc = frappe.get_doc("Account", "Capital Stock - _TC")
+
 		# Raise error as root_type property doesn't match
 		self.assertRaises(
-			InvalidAccountMergeError,
+			frappe.ValidationError,
 			merge_account,
 			"Capital Stock - _TC",
 			"Softwares - _TC",
-		)
-
-		# Raise error as currency doesn't match
-		self.assertRaises(
-			InvalidAccountMergeError,
-			merge_account,
-			"Receivable INR - _TC",
-			"Receivable USD - _TC",
+			doc.is_group,
+			doc.root_type,
+			doc.company,
 		)
 
 	def test_account_sync(self):
@@ -197,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)
 
@@ -260,20 +199,28 @@ class TestAccount(unittest.TestCase):
 		acc.insert()
 
 		self.assertTrue(
-			frappe.db.exists("Account", {"account_name": "Test Group Account", "company": "_Test Company 4"})
+			frappe.db.exists(
+				"Account", {"account_name": "Test Group Account", "company": "_Test Company 4"}
+			)
 		)
 		self.assertTrue(
-			frappe.db.exists("Account", {"account_name": "Test Group Account", "company": "_Test Company 5"})
+			frappe.db.exists(
+				"Account", {"account_name": "Test Group Account", "company": "_Test Company 5"}
+			)
 		)
 
 		# Try renaming child company account
 		acc_tc_5 = frappe.db.get_value(
 			"Account", {"account_name": "Test Group Account", "company": "_Test Company 5"}
 		)
-		self.assertRaises(frappe.ValidationError, update_account_number, acc_tc_5, "Test Modified Account")
+		self.assertRaises(
+			frappe.ValidationError, update_account_number, acc_tc_5, "Test Modified Account"
+		)
 
 		# Rename child company account with allow_account_creation_against_child_company enabled
-		frappe.db.set_value("Company", "_Test Company 5", "allow_account_creation_against_child_company", 1)
+		frappe.db.set_value(
+			"Company", "_Test Company 5", "allow_account_creation_against_child_company", 1
+		)
 
 		update_account_number(acc_tc_5, "Test Modified Account")
 		self.assertTrue(
@@ -282,7 +229,9 @@ class TestAccount(unittest.TestCase):
 			)
 		)
 
-		frappe.db.set_value("Company", "_Test Company 5", "allow_account_creation_against_child_company", 0)
+		frappe.db.set_value(
+			"Company", "_Test Company 5", "allow_account_creation_against_child_company", 0
+		)
 
 		to_delete = [
 			"Test Group Account - _TC3",
@@ -307,7 +256,9 @@ class TestAccount(unittest.TestCase):
 		self.assertEqual(acc.account_currency, "INR")
 
 		# Make a JV against this account
-		make_journal_entry("Test Currency Account - _TC", "Miscellaneous Expenses - _TC", 100, submit=True)
+		make_journal_entry(
+			"Test Currency Account - _TC", "Miscellaneous Expenses - _TC", 100, submit=True
+		)
 
 		acc.account_currency = "USD"
 		self.assertRaises(frappe.ValidationError, acc.save)
@@ -346,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],
@@ -394,20 +345,11 @@ def create_account(**kwargs):
 		"Account", filters={"account_name": kwargs.get("account_name"), "company": kwargs.get("company")}
 	)
 	if account:
-		account = frappe.get_doc("Account", account)
-		account.update(
-			dict(
-				is_group=kwargs.get("is_group", 0),
-				parent_account=kwargs.get("parent_account"),
-			)
-		)
-		account.save()
-		return account.name
+		return account
 	else:
 		account = frappe.get_doc(
 			dict(
 				doctype="Account",
-				is_group=kwargs.get("is_group", 0),
 				account_name=kwargs.get("account_name"),
 				account_type=kwargs.get("account_type"),
 				parent_account=kwargs.get("parent_account"),

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,123 +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.flags.ignore_links = 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.js

@@ -1,86 +1,63 @@
 // Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on("Accounting Dimension", {
-	refresh: function (frm) {
-		frm.set_query("document_type", () => {
+frappe.ui.form.on('Accounting Dimension', {
+	refresh: function(frm) {
+		frm.set_query('document_type', () => {
 			let invalid_doctypes = frappe.model.core_doctypes_list;
-			invalid_doctypes.push(
-				"Accounting Dimension",
-				"Project",
-				"Cost Center",
-				"Accounting Dimension Detail",
-				"Company"
-			);
+			invalid_doctypes.push('Accounting Dimension', 'Project',
+				'Cost Center', 'Accounting Dimension Detail', 'Company');
 
 			return {
 				filters: {
-					name: ["not in", invalid_doctypes],
-				},
-			};
-		});
-
-		frm.set_query("offsetting_account", "dimension_defaults", function (doc, cdt, cdn) {
-			let d = locals[cdt][cdn];
-			return {
-				filters: {
-					company: d.company,
-					root_type: ["in", ["Asset", "Liability"]],
-					is_group: 0,
-				},
+					name: ['not in', invalid_doctypes]
+				}
 			};
 		});
 
 		if (!frm.is_new()) {
-			frm.add_custom_button(__("Show {0}", [frm.doc.document_type]), function () {
+			frm.add_custom_button(__('Show {0}', [frm.doc.document_type]), function () {
 				frappe.set_route("List", frm.doc.document_type);
 			});
 
 			let button = frm.doc.disabled ? "Enable" : "Disable";
 
-			frm.add_custom_button(__(button), function () {
-				frm.set_value("disabled", 1 - frm.doc.disabled);
+			frm.add_custom_button(__(button), function() {
+
+				frm.set_value('disabled', 1 - frm.doc.disabled);
 
 				frappe.call({
 					method: "erpnext.accounts.doctype.accounting_dimension.accounting_dimension.disable_dimension",
 					args: {
-						doc: frm.doc,
+						doc: frm.doc
 					},
 					freeze: true,
-					callback: function (r) {
+					callback: function(r) {
 						let message = frm.doc.disabled ? "Dimension Disabled" : "Dimension Enabled";
 						frm.save();
-						frappe.show_alert({ message: __(message), indicator: "green" });
-					},
+						frappe.show_alert({message:__(message), indicator:'green'});
+					}
 				});
 			});
 		}
 	},
 
-	document_type: function (frm) {
-		frm.set_value("label", frm.doc.document_type);
-		frm.set_value("fieldname", frappe.model.scrub(frm.doc.document_type));
+	document_type: function(frm) {
 
-		frappe.db.get_value(
-			"Accounting Dimension",
-			{ document_type: frm.doc.document_type },
-			"document_type",
-			(r) => {
-				if (r && r.document_type) {
-					frm.set_df_property(
-						"document_type",
-						"description",
-						"Document type is already set as dimension"
-					);
-				}
+		frm.set_value('label', frm.doc.document_type);
+		frm.set_value('fieldname', frappe.model.scrub(frm.doc.document_type));
+
+		frappe.db.get_value('Accounting Dimension', {'document_type': frm.doc.document_type}, 'document_type', (r) => {
+			if (r && r.document_type) {
+				frm.set_df_property('document_type', 'description', "Document type is already set as dimension");
 			}
-		);
+		});
 	},
 });
 
-frappe.ui.form.on("Accounting Dimension Detail", {
-	dimension_defaults_add: function (frm, cdt, cdn) {
+frappe.ui.form.on('Accounting Dimension Detail', {
+	dimension_defaults_add: function(frm, cdt, cdn) {
 		let row = locals[cdt][cdn];
 		row.reference_document = frm.doc.document_type;
-	},
+	}
 });

erpnext/accounts/doctype/accounting_dimension/accounting_dimension.json

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

erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py

@@ -17,20 +17,21 @@ class AccountingDimension(Document):
 		self.set_fieldname_and_label()
 
 	def validate(self):
-		if self.document_type in (
-			*core_doctypes_list,
+		if self.document_type in core_doctypes_list + (
 			"Accounting Dimension",
 			"Project",
 			"Cost Center",
 			"Accounting Dimension Detail",
 			"Company",
 			"Account",
-			"Finance Book",
 		):
+
 			msg = _("Not allowed to create accounting dimension for {0}").format(self.document_type)
 			frappe.throw(msg)
 
-		exists = frappe.db.get_value("Accounting Dimension", {"document_type": self.document_type}, ["name"])
+		exists = frappe.db.get_value(
+			"Accounting Dimension", {"document_type": self.document_type}, ["name"]
+		)
 
 		if exists and self.is_new():
 			frappe.throw(_("Document Type already used as a dimension"))
@@ -38,8 +39,6 @@ class AccountingDimension(Document):
 		if not self.is_new():
 			self.validate_document_type_change()
 
-		self.validate_dimension_defaults()
-
 	def validate_document_type_change(self):
 		doctype_before_save = frappe.db.get_value("Accounting Dimension", self.name, "document_type")
 		if doctype_before_save != self.document_type:
@@ -47,27 +46,17 @@ class AccountingDimension(Document):
 			message += _("Please create a new Accounting Dimension if required.")
 			frappe.throw(message)
 
-	def validate_dimension_defaults(self):
-		companies = []
-		for default in self.get("dimension_defaults"):
-			if default.company not in companies:
-				companies.append(default.company)
-			else:
-				frappe.throw(_("Company {0} is added more than once").format(frappe.bold(default.company)))
-
 	def after_insert(self):
 		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:
@@ -88,6 +77,7 @@ def make_dimension_in_accounting_doctypes(doc, doclist=None):
 	count = 0
 
 	for doctype in doclist:
+
 		if (doc_count + 1) % 2 == 0:
 			insert_after_field = "dimension_col_break"
 		else:
@@ -121,7 +111,7 @@ def add_dimension_to_budget_doctype(df, doc):
 	df.update(
 		{
 			"insert_after": "cost_center",
-			"depends_on": f"eval:doc.budget_against == '{doc.document_type}'",
+			"depends_on": "eval:doc.budget_against == '{0}'".format(doc.document_type),
 		}
 	)
 
@@ -155,17 +145,19 @@ def delete_accounting_dimension(doc):
 	frappe.db.sql(
 		"""
 		DELETE FROM `tabCustom Field`
-		WHERE fieldname = {}
-		AND dt IN ({})""".format("%s", ", ".join(["%s"] * len(doclist))),  # nosec
-		tuple([doc.fieldname, *doclist]),
+		WHERE fieldname = %s
+		AND dt IN (%s)"""
+		% ("%s", ", ".join(["%s"] * len(doclist))),  # nosec
+		tuple([doc.fieldname] + doclist),
 	)
 
 	frappe.db.sql(
 		"""
 		DELETE FROM `tabProperty Setter`
-		WHERE field_name = {}
-		AND doc_type IN ({})""".format("%s", ", ".join(["%s"] * len(doclist))),  # nosec
-		tuple([doc.fieldname, *doclist]),
+		WHERE field_name = %s
+		AND doc_type IN (%s)"""
+		% ("%s", ", ".join(["%s"] * len(doclist))),  # nosec
+		tuple([doc.fieldname] + doclist),
 	)
 
 	budget_against_property = frappe.get_doc("Property Setter", "Budget-budget_against-options")
@@ -214,6 +206,7 @@ def get_doctypes_with_dimensions():
 
 
 def get_accounting_dimensions(as_list=True, filters=None):
+
 	if not filters:
 		filters = {"disabled": 0}
 
@@ -231,19 +224,18 @@ def get_accounting_dimensions(as_list=True, filters=None):
 
 
 def get_checks_for_pl_and_bs_accounts():
-	if frappe.flags.accounting_dimensions_details is None:
-		# nosemgrep
-		frappe.flags.accounting_dimensions_details = frappe.db.sql(
-			"""SELECT p.label, p.disabled, p.fieldname, c.default_dimension, c.company, c.mandatory_for_pl, c.mandatory_for_bs
-			FROM `tabAccounting Dimension`p ,`tabAccounting Dimension Detail` c
-			WHERE p.name = c.parent""",
-			as_dict=1,
-		)
+	dimensions = frappe.db.sql(
+		"""SELECT p.label, p.disabled, p.fieldname, c.default_dimension, c.company, c.mandatory_for_pl, c.mandatory_for_bs
+		FROM `tabAccounting Dimension`p ,`tabAccounting Dimension Detail` c
+		WHERE p.name = c.parent""",
+		as_dict=1,
+	)
 
-	return frappe.flags.accounting_dimensions_details
+	return dimensions
 
 
 def get_dimension_with_children(doctype, dimensions):
+
 	if isinstance(dimensions, str):
 		dimensions = [dimensions]
 
@@ -251,7 +243,9 @@ def get_dimension_with_children(doctype, dimensions):
 
 	for dimension in dimensions:
 		lft, rgt = frappe.db.get_value(doctype, dimension, ["lft", "rgt"])
-		children = frappe.get_all(doctype, filters={"lft": [">=", lft], "rgt": ["<=", rgt]}, order_by="lft")
+		children = frappe.get_all(
+			doctype, filters={"lft": [">=", lft], "rgt": ["<=", rgt]}, order_by="lft"
+		)
 		all_dimensions += [c.name for c in children]
 
 	return all_dimensions
@@ -275,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(
 			[
@@ -295,30 +283,3 @@ def get_dimensions(with_cost_center_and_project=False):
 		default_dimensions_map[dimension.company][dimension.fieldname] = dimension.default_dimension
 
 	return dimension_filters, default_dimensions_map
-
-
-def create_accounting_dimensions_for_doctype(doctype):
-	accounting_dimensions = frappe.db.get_all(
-		"Accounting Dimension", fields=["fieldname", "label", "document_type", "disabled"]
-	)
-
-	if not accounting_dimensions:
-		return
-
-	for d in accounting_dimensions:
-		field = frappe.db.get_value("Custom Field", {"dt": doctype, "fieldname": d.fieldname})
-
-		if field:
-			continue
-
-		df = {
-			"fieldname": d.fieldname,
-			"label": d.label,
-			"fieldtype": "Link",
-			"options": d.document_type,
-			"insert_after": "accounting_dimensions_section",
-		}
-
-		create_custom_field(doctype, df, ignore_validate=True)
-
-	frappe.clear_cache(doctype=doctype)

erpnext/accounts/doctype/accounting_dimension/test_accounting_dimension.py

@@ -78,8 +78,6 @@ class TestAccountingDimension(unittest.TestCase):
 
 	def tearDown(self):
 		disable_dimension()
-		frappe.flags.accounting_dimensions_details = None
-		frappe.flags.dimension_filter_map = None
 
 
 def create_dimension():

erpnext/accounts/doctype/accounting_dimension_detail/accounting_dimension_detail.json

@@ -8,10 +8,7 @@
   "reference_document",
   "default_dimension",
   "mandatory_for_bs",
-  "mandatory_for_pl",
-  "column_break_lqns",
-  "automatically_post_balancing_accounting_entry",
-  "offsetting_account"
+  "mandatory_for_pl"
  ],
  "fields": [
   {
@@ -53,23 +50,6 @@
    "fieldtype": "Check",
    "in_list_view": 1,
    "label": "Mandatory For Profit and Loss Account"
-  },
-  {
-   "default": "0",
-   "fieldname": "automatically_post_balancing_accounting_entry",
-   "fieldtype": "Check",
-   "label": "Automatically post balancing accounting entry"
-  },
-  {
-   "fieldname": "offsetting_account",
-   "fieldtype": "Link",
-   "label": "Offsetting Account",
-   "mandatory_depends_on": "eval: doc.automatically_post_balancing_accounting_entry",
-   "options": "Account"
-  },
-  {
-   "fieldname": "column_break_lqns",
-   "fieldtype": "Column Break"
   }
  ],
  "istable": 1,

erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.js

@@ -1,9 +1,14 @@
 // Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on("Accounting Dimension Filter", {
-	refresh: function (frm, cdt, cdn) {
-		let help_content = `<table class="table table-bordered" style="background-color: var(--scrollbar-track-color);">
+frappe.ui.form.on('Accounting Dimension Filter', {
+	refresh: function(frm, cdt, cdn) {
+		if (frm.doc.accounting_dimension) {
+			frm.set_df_property('dimensions', 'label', frm.doc.accounting_dimension, cdn, 'dimension_value');
+		}
+
+		let help_content =
+			`<table class="table table-bordered" style="background-color: var(--scrollbar-track-color);">
 				<tr><td>
 					<p>
 						<i class="fa fa-hand-right"></i>
@@ -12,70 +17,66 @@ frappe.ui.form.on("Accounting Dimension Filter", {
 				</td></tr>
 			</table>`;
 
-		frm.set_df_property("dimension_filter_help", "options", help_content);
+		frm.set_df_property('dimension_filter_help', 'options', help_content);
 	},
-	onload: function (frm) {
-		frm.set_query("applicable_on_account", "accounts", function () {
+	onload: function(frm) {
+		frm.set_query('applicable_on_account', 'accounts', function() {
 			return {
 				filters: {
-					company: frm.doc.company,
-				},
+					'company': frm.doc.company
+				}
 			};
 		});
 
-		frappe.db.get_list("Accounting Dimension", { fields: ["document_type"] }).then((res) => {
-			let options = ["Cost Center", "Project"];
+		frappe.db.get_list('Accounting Dimension',
+			{fields: ['document_type']}).then((res) => {
+			let options = ['Cost Center', 'Project'];
 
 			res.forEach((dimension) => {
 				options.push(dimension.document_type);
 			});
 
-			frm.set_df_property("accounting_dimension", "options", options);
+			frm.set_df_property('accounting_dimension', 'options', options);
 		});
 
-		frm.trigger("setup_filters");
+		frm.trigger('setup_filters');
 	},
 
-	setup_filters: function (frm) {
+	setup_filters: function(frm) {
 		let filters = {};
 
 		if (frm.doc.accounting_dimension) {
-			frappe.model.with_doctype(frm.doc.accounting_dimension, function () {
+			frappe.model.with_doctype(frm.doc.accounting_dimension, function() {
 				if (frappe.model.is_tree(frm.doc.accounting_dimension)) {
-					filters["is_group"] = 0;
+					filters['is_group'] = 0;
 				}
 
-				if (frappe.meta.has_field(frm.doc.accounting_dimension, "company")) {
-					filters["company"] = frm.doc.company;
+				if (frappe.meta.has_field(frm.doc.accounting_dimension, 'company')) {
+					filters['company'] = frm.doc.company;
 				}
 
-				frm.set_query("dimension_value", "dimensions", function () {
+				frm.set_query('dimension_value', 'dimensions', function() {
 					return {
-						filters: filters,
+						filters: filters
 					};
 				});
 			});
 		}
 	},
 
-	accounting_dimension: function (frm) {
+	accounting_dimension: function(frm) {
 		frm.clear_table("dimensions");
 		let row = frm.add_child("dimensions");
 		row.accounting_dimension = frm.doc.accounting_dimension;
-		frm.fields_dict["dimensions"].grid.update_docfield_property(
-			"dimension_value",
-			"label",
-			frm.doc.accounting_dimension
-		);
 		frm.refresh_field("dimensions");
-		frm.trigger("setup_filters");
+		frm.trigger('setup_filters');
 	},
 });
 
-frappe.ui.form.on("Allowed Dimension", {
-	dimensions_add: function (frm, cdt, cdn) {
+frappe.ui.form.on('Allowed Dimension', {
+	dimensions_add: function(frm, cdt, cdn) {
 		let row = locals[cdt][cdn];
 		row.accounting_dimension = frm.doc.accounting_dimension;
 		frm.refresh_field("dimensions");
-	},
+	}
 });

erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.py

@@ -38,41 +38,37 @@ class AccountingDimensionFilter(Document):
 
 
 def get_dimension_filter_map():
-	if not frappe.flags.get("dimension_filter_map"):
-		# nosemgrep
-		filters = frappe.db.sql(
-			"""
-			SELECT
-				a.applicable_on_account, d.dimension_value, p.accounting_dimension,
-				p.allow_or_restrict, a.is_mandatory
-			FROM
-				`tabApplicable On Account` a, `tabAllowed Dimension` d,
-				`tabAccounting Dimension Filter` p
-			WHERE
-				p.name = a.parent
-				AND p.disabled = 0
-				AND p.name = d.parent
-		""",
-			as_dict=1,
+	filters = frappe.db.sql(
+		"""
+		SELECT
+			a.applicable_on_account, d.dimension_value, p.accounting_dimension,
+			p.allow_or_restrict, a.is_mandatory
+		FROM
+			`tabApplicable On Account` a, `tabAllowed Dimension` d,
+			`tabAccounting Dimension Filter` p
+		WHERE
+			p.name = a.parent
+			AND p.disabled = 0
+			AND p.name = d.parent
+	""",
+		as_dict=1,
+	)
+
+	dimension_filter_map = {}
+
+	for f in filters:
+		f.fieldname = scrub(f.accounting_dimension)
+
+		build_map(
+			dimension_filter_map,
+			f.fieldname,
+			f.applicable_on_account,
+			f.dimension_value,
+			f.allow_or_restrict,
+			f.is_mandatory,
 		)
 
-		dimension_filter_map = {}
-
-		for f in filters:
-			f.fieldname = scrub(f.accounting_dimension)
-
-			build_map(
-				dimension_filter_map,
-				f.fieldname,
-				f.applicable_on_account,
-				f.dimension_value,
-				f.allow_or_restrict,
-				f.is_mandatory,
-			)
-
-		frappe.flags.dimension_filter_map = dimension_filter_map
-
-	return frappe.flags.dimension_filter_map
+	return dimension_filter_map
 
 
 def build_map(map_object, dimension, account, filter_value, allow_or_restrict, is_mandatory):

erpnext/accounts/doctype/accounting_dimension_filter/test_accounting_dimension_filter.py

@@ -47,8 +47,6 @@ class TestAccountingDimensionFilter(unittest.TestCase):
 	def tearDown(self):
 		disable_dimension_filter()
 		disable_dimension()
-		frappe.flags.accounting_dimensions_details = None
-		frappe.flags.dimension_filter_map = None
 
 		for si in self.invoice_list:
 			si.load_from_db()
@@ -57,7 +55,9 @@ class TestAccountingDimensionFilter(unittest.TestCase):
 
 
 def create_accounting_dimension_filter():
-	if not frappe.db.get_value("Accounting Dimension Filter", {"accounting_dimension": "Cost Center"}):
+	if not frappe.db.get_value(
+		"Accounting Dimension Filter", {"accounting_dimension": "Cost Center"}
+	):
 		frappe.get_doc(
 			{
 				"doctype": "Accounting Dimension Filter",

erpnext/accounts/doctype/accounting_period/accounting_period.js

@@ -1,33 +1,24 @@
 // Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on("Accounting Period", {
-	onload: function (frm) {
-		if (
-			frm.doc.closed_documents.length === 0 ||
-			(frm.doc.closed_documents.length === 1 && frm.doc.closed_documents[0].document_type == undefined)
-		) {
+frappe.ui.form.on('Accounting Period', {
+	onload: function(frm) {
+		if(frm.doc.closed_documents.length === 0 || (frm.doc.closed_documents.length === 1 && frm.doc.closed_documents[0].document_type == undefined)) {
 			frappe.call({
 				method: "get_doctypes_for_closing",
-				doc: frm.doc,
-				callback: function (r) {
-					if (r.message) {
+				doc:frm.doc,
+				callback: function(r) {
+					if(r.message) {
 						cur_frm.clear_table("closed_documents");
-						r.message.forEach(function (element) {
+						r.message.forEach(function(element) {
 							var c = frm.add_child("closed_documents");
 							c.document_type = element.document_type;
 							c.closed = element.closed;
 						});
 						refresh_field("closed_documents");
 					}
-				},
+				}
 			});
 		}
-
-		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()
@@ -67,47 +63,5 @@ class AccountingPeriod(Document):
 			for doctype_for_closing in self.get_doctypes_for_closing():
 				self.append(
 					"closed_documents",
-					{
-						"document_type": doctype_for_closing.document_type,
-						"closed": doctype_for_closing.closed,
-					},
+					{"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"]
 
@@ -34,8 +32,10 @@ class TestAccountingPeriod(unittest.TestCase):
 		ap1 = create_accounting_period(period_name="Test Accounting Period 2")
 		ap1.save()
 
-		doc = create_sales_invoice(do_not_save=1, cost_center="_Test Company - _TC", warehouse="Stores - _TC")
-		self.assertRaises(ClosedAccountingPeriod, doc.save)
+		doc = create_sales_invoice(
+			do_not_submit=1, cost_center="_Test Company - _TC", warehouse="Stores - _TC"
+		)
+		self.assertRaises(ClosedAccountingPeriod, doc.submit)
 
 	def tearDown(self):
 		for d in frappe.get_all("Accounting Period"):

erpnext/accounts/doctype/accounts_settings/accounts_settings.js

@@ -1,6 +1,8 @@
 // Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on("Accounts Settings", {
-	refresh: function (frm) {},
+frappe.ui.form.on('Accounts Settings', {
+	refresh: function(frm) {
+
+	}
 });

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,18 +31,13 @@
   "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",
-  "exchange_gain_loss_posting_date",
   "invoicing_settings_tab",
   "accounts_transactions_settings_section",
   "over_billing_allowance",
@@ -61,24 +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",
-  "tab_break_dpet",
-  "show_balance_in_coa",
-  "reports_tab",
-  "remarks_section",
-  "general_ledger_remarks_length",
-  "column_break_lvjk",
-  "receivable_payable_remarks_length",
-  "accounts_receivable_payable_tuning_section",
-  "receivable_payable_fetch_method",
-  "legacy_section",
-  "ignore_is_opening_check_for_reporting"
+  "report_settings_sb"
  ],
  "fields": [
   {
@@ -113,7 +91,7 @@
   },
   {
    "default": "0",
-   "description": "Enabling ensure each Purchase Invoice has a unique value in Supplier Invoice No. field",
+   "description": "Enabling ensure each Sales Invoice has a unique value in Supplier Invoice No. field",
    "fieldname": "check_supplier_invoice_uniqueness",
    "fieldtype": "Check",
    "label": "Check Supplier Invoice Number Uniqueness"
@@ -189,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",
@@ -198,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"
@@ -365,140 +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 Reconciliation Settings"
-  },
-  {
-   "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"
-  },
-  {
-   "fieldname": "tab_break_dpet",
-   "fieldtype": "Tab Break",
-   "label": "Chart Of Accounts"
-  },
-  {
-   "default": "1",
-   "fieldname": "show_balance_in_coa",
-   "fieldtype": "Check",
-   "label": "Show Balances in Chart Of Accounts"
-  },
-  {
-   "fieldname": "reports_tab",
-   "fieldtype": "Tab Break",
-   "label": "Reports"
-  },
-  {
-   "default": "0",
-   "description": "Truncates 'Remarks' column to set character length",
-   "fieldname": "general_ledger_remarks_length",
-   "fieldtype": "Int",
-   "label": "General Ledger"
-  },
-  {
-   "default": "0",
-   "description": "Truncates 'Remarks' column to set character length",
-   "fieldname": "receivable_payable_remarks_length",
-   "fieldtype": "Int",
-   "label": "Accounts Receivable/Payable"
-  },
-  {
-   "fieldname": "column_break_lvjk",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "remarks_section",
-   "fieldtype": "Section Break",
-   "label": "Remarks Column Length"
-  },
-  {
-   "default": "Payment",
-   "description": "Only applies for Normal Payments",
-   "fieldname": "exchange_gain_loss_posting_date",
-   "fieldtype": "Select",
-   "label": "Posting Date Inheritance for Exchange Gain / Loss",
-   "options": "Invoice\nPayment\nReconciliation Date"
-  },
-  {
-   "default": "0",
-   "description": "Ignores legacy Is Opening field in GL Entry that allows adding opening balance post the system is in use while generating reports",
-   "fieldname": "ignore_is_opening_check_for_reporting",
-   "fieldtype": "Check",
-   "label": "Ignore Is Opening check for reporting"
-  },
-  {
-   "default": "Buffered Cursor",
-   "fieldname": "receivable_payable_fetch_method",
-   "fieldtype": "Select",
-   "label": "Data Fetch Method",
-   "options": "Buffered Cursor\nUnBuffered Cursor"
-  },
-  {
-   "fieldname": "accounts_receivable_payable_tuning_section",
-   "fieldtype": "Section Break",
-   "label": "Accounts Receivable / Payable Tuning"
-  },
-  {
-   "fieldname": "legacy_section",
-   "fieldtype": "Section Break",
-   "label": "Legacy Fields"
   }
  ],
  "icon": "icon-cog",
@@ -506,7 +354,7 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2025-05-05 12:29:38.302027",
+ "modified": "2022-07-11 13:37:50.605141",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Accounts Settings",
@@ -535,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/accounts_settings/regional/united_states.js

@@ -1,11 +1,8 @@
-frappe.ui.form.on("Accounts Settings", {
-	refresh: function (frm) {
+
+frappe.ui.form.on('Accounts Settings', {
+	refresh: function(frm) {
 		frm.set_df_property("acc_frozen_upto", "label", "Books Closed Through");
-		frm.set_df_property(
-			"frozen_accounts_modifier",
-			"label",
-			"Role Allowed to Close Books & Make Changes to Closed Periods"
-		);
+		frm.set_df_property("frozen_accounts_modifier", "label", "Role Allowed to Close Books & Make Changes to Closed Periods");
 		frm.set_df_property("credit_controller", "label", "Credit Manager");
-	},
+	}
 });

erpnext/accounts/doctype/allowed_to_transact_with/allowed_to_transact_with.json

@@ -11,7 +11,6 @@
   {
    "fieldname": "company",
    "fieldtype": "Link",
-   "ignore_user_permissions": 1,
    "in_list_view": 1,
    "label": "Company",
    "options": "Company",
@@ -20,7 +19,7 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2024-01-03 11:13:02.669632",
+ "modified": "2020-05-01 12:32:34.044911",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Allowed To Transact With",
@@ -29,6 +28,5 @@
  "quick_entry": 1,
  "sort_field": "modified",
  "sort_order": "DESC",
- "states": [],
  "track_changes": 1
 }

erpnext/accounts/doctype/bank/bank.js

@@ -1,39 +1,41 @@
 // Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
-frappe.provide("erpnext.integrations");
+frappe.provide('erpnext.integrations');
 
-frappe.ui.form.on("Bank", {
-	onload: function (frm) {
+frappe.ui.form.on('Bank', {
+	onload: function(frm) {
 		add_fields_to_mapping_table(frm);
 	},
-	refresh: function (frm) {
+	refresh: function(frm) {
 		add_fields_to_mapping_table(frm);
 
-		frappe.dynamic_link = { doc: frm.doc, fieldname: "name", doctype: "Bank" };
+		frappe.dynamic_link = { doc: frm.doc, fieldname: 'name', doctype: 'Bank' };
 
-		frm.toggle_display(["address_html", "contact_html"], !frm.doc.__islocal);
+		frm.toggle_display(['address_html','contact_html'], !frm.doc.__islocal);
 
 		if (frm.doc.__islocal) {
-			frm.set_df_property("address_and_contact", "hidden", 1);
+			frm.set_df_property('address_and_contact', 'hidden', 1);
 			frappe.contacts.clear_address_and_contact(frm);
-		} else {
-			frm.set_df_property("address_and_contact", "hidden", 0);
+		}
+		else {
+			frm.set_df_property('address_and_contact', 'hidden', 0);
 			frappe.contacts.render_address_and_contact(frm);
 		}
 		if (frm.doc.plaid_access_token) {
-			frm.add_custom_button(__("Refresh Plaid Link"), () => {
+			frm.add_custom_button(__('Refresh Plaid Link'), () => {
 				new erpnext.integrations.refreshPlaidLink(frm.doc.plaid_access_token);
 			});
 		}
-	},
+	}
 });
 
+
 let add_fields_to_mapping_table = function (frm) {
 	let options = [];
 
-	frappe.model.with_doctype("Bank Transaction", function () {
+	frappe.model.with_doctype("Bank Transaction", function() {
 		let meta = frappe.get_meta("Bank Transaction");
-		meta.fields.forEach((value) => {
+		meta.fields.forEach(value => {
 			if (!["Section Break", "Column Break"].includes(value.fieldtype)) {
 				options.push(value.fieldname);
 			}
@@ -41,32 +43,30 @@ let add_fields_to_mapping_table = function (frm) {
 	});
 
 	frm.fields_dict.bank_transaction_mapping.grid.update_docfield_property(
-		"bank_transaction_field",
-		"options",
-		options
+		'bank_transaction_field', 'options', options
 	);
 };
 
 erpnext.integrations.refreshPlaidLink = class refreshPlaidLink {
 	constructor(access_token) {
 		this.access_token = access_token;
-		this.plaidUrl = "https://cdn.plaid.com/link/v2/stable/link-initialize.js";
+		this.plaidUrl = 'https://cdn.plaid.com/link/v2/stable/link-initialize.js';
 		this.init_config();
 	}
 
 	async init_config() {
-		this.plaid_env = await frappe.db.get_single_value("Plaid Settings", "plaid_env");
+		this.plaid_env = await frappe.db.get_single_value('Plaid Settings', 'plaid_env');
 		this.token = await this.get_link_token_for_update();
 		this.init_plaid();
 	}
 
 	async get_link_token_for_update() {
 		const token = frappe.xcall(
-			"erpnext.erpnext_integrations.doctype.plaid_settings.plaid_settings.get_link_token_for_update",
+			'erpnext.erpnext_integrations.doctype.plaid_settings.plaid_settings.get_link_token_for_update',
 			{ access_token: this.access_token }
-		);
+		)
 		if (!token) {
-			frappe.throw(__("Cannot retrieve link token for update. Check Error Log for more information"));
+			frappe.throw(__('Cannot retrieve link token for update. Check Error Log for more information'));
 		}
 		return token;
 	}
@@ -93,13 +93,13 @@ erpnext.integrations.refreshPlaidLink = class refreshPlaidLink {
 				resolve();
 				return;
 			}
-			const el = document.createElement("script");
-			el.type = "text/javascript";
+			const el = document.createElement('script');
+			el.type = 'text/javascript';
 			el.async = true;
 			el.src = src;
-			el.addEventListener("load", resolve);
-			el.addEventListener("error", reject);
-			el.addEventListener("abort", reject);
+			el.addEventListener('load', resolve);
+			el.addEventListener('error', reject);
+			el.addEventListener('abort', reject);
 			document.head.appendChild(el);
 		});
 	}
@@ -108,29 +108,16 @@ erpnext.integrations.refreshPlaidLink = class refreshPlaidLink {
 		me.linkHandler = Plaid.create({
 			env: me.plaid_env,
 			token: me.token,
-			onSuccess: me.plaid_success,
+			onSuccess: me.plaid_success
 		});
 	}
 
 	onScriptError(error) {
-		frappe.msgprint(
-			__(
-				"There was an issue connecting to Plaid's authentication server. Check browser console for more information"
-			)
-		);
+		frappe.msgprint(__("There was an issue connecting to Plaid's authentication server. Check browser console for more information"));
 		console.log(error);
 	}
 
 	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.js

@@ -1,49 +1,45 @@
 // Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on("Bank Account", {
-	setup: function (frm) {
-		frm.set_query("account", function () {
+frappe.ui.form.on('Bank Account', {
+	setup: function(frm) {
+		frm.set_query("account", function() {
 			return {
 				filters: {
-					account_type: "Bank",
-					company: frm.doc.company,
-					is_group: 0,
-				},
+					'account_type': 'Bank',
+					'company': frm.doc.company,
+					'is_group': 0
+				}
 			};
 		});
-		frm.set_query("party_type", function () {
+		frm.set_query("party_type", function() {
 			return {
 				query: "erpnext.setup.doctype.party_type.party_type.get_party_type",
 			};
 		});
 	},
-	refresh: function (frm) {
-		frappe.dynamic_link = { doc: frm.doc, fieldname: "name", doctype: "Bank Account" };
+	refresh: function(frm) {
+		frappe.dynamic_link = { doc: frm.doc, fieldname: 'name', doctype: 'Bank Account' }
 
-		frm.toggle_display(["address_html", "contact_html"], !frm.doc.__islocal);
+		frm.toggle_display(['address_html','contact_html'], !frm.doc.__islocal);
 
 		if (frm.doc.__islocal) {
 			frappe.contacts.clear_address_and_contact(frm);
-		} else {
+		}
+		else {
 			frappe.contacts.render_address_and_contact(frm);
 		}
 
 		if (frm.doc.integration_id) {
-			frm.add_custom_button(__("Unlink external integrations"), function () {
-				frappe.confirm(
-					__(
-						"This action will unlink this account from any external service integrating ERPNext with your bank accounts. It cannot be undone. Are you certain ?"
-					),
-					function () {
-						frm.set_value("integration_id", "");
-					}
-				);
+			frm.add_custom_button(__("Unlink external integrations"), function() {
+				frappe.confirm(__("This action will unlink this account from any external service integrating ERPNext with your bank accounts. It cannot be undone. Are you certain ?"), function() {
+					frm.set_value("integration_id", "");
+				});
 			});
 		}
 	},
 
-	is_company_account: function (frm) {
-		frm.set_df_property("account", "reqd", frm.doc.is_company_account);
-	},
+	is_company_account: function(frm) {
+		frm.set_df_property('account', 'reqd', frm.doc.is_company_account);
+	}
 });

erpnext/accounts/doctype/bank_account/bank_account.json

@@ -13,7 +13,6 @@
   "account_type",
   "account_subtype",
   "column_break_7",
-  "disabled",
   "is_default",
   "is_company_account",
   "company",
@@ -200,57 +199,10 @@
    "fieldtype": "Data",
    "in_global_search": 1,
    "label": "Branch Code"
-  },
-  {
-   "default": "0",
-   "fieldname": "disabled",
-   "fieldtype": "Check",
-   "label": "Disabled"
   }
  ],
- "links": [
-  {
-   "group": "Transactions",
-   "link_doctype": "Payment Request",
-   "link_fieldname": "bank_account"
-  },
-  {
-   "group": "Transactions",
-   "link_doctype": "Payment Order",
-   "link_fieldname": "bank_account"
-  },
-  {
-   "group": "Transactions",
-   "link_doctype": "Bank Guarantee",
-   "link_fieldname": "bank_account"
-  },
-  {
-   "group": "Transactions",
-   "link_doctype": "Bank Transaction",
-   "link_fieldname": "bank_account"
-  },
-  {
-   "group": "Accounting",
-   "link_doctype": "Payment Entry",
-   "link_fieldname": "bank_account"
-  },
-  {
-   "group": "Accounting",
-   "link_doctype": "Journal Entry",
-   "link_fieldname": "bank_account"
-  },
-  {
-   "group": "Party",
-   "link_doctype": "Customer",
-   "link_fieldname": "default_bank_account"
-  },
-  {
-   "group": "Party",
-   "link_doctype": "Supplier",
-   "link_fieldname": "default_bank_account"
-  }
- ],
- "modified": "2024-10-30 09:41:14.113414",
+ "links": [],
+ "modified": "2022-05-04 15:49:42.620630",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Bank Account",
@@ -287,4 +239,4 @@
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
-}
+}

erpnext/accounts/doctype/bank_account/bank_account.py

@@ -9,7 +9,6 @@ from frappe.contacts.address_and_contact import (
 	load_address_and_contact,
 )
 from frappe.model.document import Document
-from frappe.utils import comma_and, get_link_to_form
 
 
 class BankAccount(Document):
@@ -21,24 +20,11 @@ class BankAccount(Document):
 		self.name = self.account_name + " - " + self.bank
 
 	def on_trash(self):
-		delete_contact_and_address("Bank Account", self.name)
+		delete_contact_and_address("BankAccount", self.name)
 
 	def validate(self):
 		self.validate_company()
 		self.validate_iban()
-		self.validate_account()
-
-	def validate_account(self):
-		if self.account:
-			if accounts := frappe.db.get_all(
-				"Bank Account", filters={"account": self.account, "name": ["!=", self.name]}, as_list=1
-			):
-				frappe.throw(
-					_("'{0}' account is already used by {1}. Use another account.").format(
-						frappe.bold(self.account),
-						frappe.bold(comma_and([get_link_to_form(self.doctype, x[0]) for x in accounts])),
-					)
-				)
 
 	def validate_company(self):
 		if self.is_company_account and not self.company:

erpnext/accounts/doctype/bank_account/bank_account_dashboard.py

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

erpnext/accounts/doctype/bank_account/test_bank_account.py

@@ -37,11 +37,11 @@ class TestBankAccount(unittest.TestCase):
 			try:
 				bank_account.validate_iban()
 			except ValidationError:
-				msg = f"BankAccount.validate_iban() failed for valid IBAN {iban}"
+				msg = "BankAccount.validate_iban() failed for valid IBAN {}".format(iban)
 				self.fail(msg=msg)
 
 		for not_iban in invalid_ibans:
 			bank_account.iban = not_iban
-			msg = f"BankAccount.validate_iban() accepted invalid IBAN {not_iban}"
+			msg = "BankAccount.validate_iban() accepted invalid IBAN {}".format(not_iban)
 			with self.assertRaises(ValidationError, msg=msg):
 				bank_account.validate_iban()

erpnext/accounts/doctype/bank_account_subtype/bank_account_subtype.js

@@ -1,6 +1,8 @@
 // Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on("Bank Account Subtype", {
-	refresh: function () {},
+frappe.ui.form.on('Bank Account Subtype', {
+	refresh: function() {
+
+	}
 });

erpnext/accounts/doctype/bank_account_type/bank_account_type.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on("Bank Account Type", {
+frappe.ui.form.on('Bank Account Type', {
 	// refresh: function(frm) {
+
 	// }
 });

erpnext/accounts/doctype/bank_clearance/bank_clearance.js

@@ -2,65 +2,57 @@
 // License: GNU General Public License v3. See license.txt
 
 frappe.ui.form.on("Bank Clearance", {
-	setup: function (frm) {
+	setup: function(frm) {
 		frm.add_fetch("account", "account_currency", "account_currency");
-
-		frm.set_query("account", function () {
-			return {
-				filters: {
-					account_type: ["in", ["Bank", "Cash"]],
-					is_group: 0,
-				},
-			};
-		});
-
-		frm.set_query("bank_account", function () {
-			return {
-				filters: {
-					is_company_account: 1,
-				},
-			};
-		});
 	},
 
-	onload: function (frm) {
-		let default_bank_account = frappe.defaults.get_user_default("Company")
-			? locals[":Company"][frappe.defaults.get_user_default("Company")]["default_bank_account"]
-			: "";
+	onload: function(frm) {
+
+		let default_bank_account =  frappe.defaults.get_user_default("Company")?
+			locals[":Company"][frappe.defaults.get_user_default("Company")]["default_bank_account"]: "";
 		frm.set_value("account", default_bank_account);
 
+		frm.set_query("account", function() {
+			return {
+				"filters": {
+					"account_type": ["in",["Bank","Cash"]],
+					"is_group": 0
+				}
+			};
+		});
+
 		frm.set_value("from_date", frappe.datetime.month_start());
 		frm.set_value("to_date", frappe.datetime.month_end());
 	},
 
-	refresh: function (frm) {
+	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.payment_entries.length) {
-			frm.add_custom_button(__("Update Clearance Date"), () => frm.trigger("update_clearance_date"));
-			frm.change_custom_button_type(__("Get Payment Entries"), null, "default");
-			frm.change_custom_button_type(__("Update Clearance Date"), null, "primary");
-		}
 	},
 
-	update_clearance_date: function (frm) {
+	update_clearance_date: function(frm) {
 		return frappe.call({
 			method: "update_clearance_date",
 			doc: frm.doc,
-			callback: function (r, rt) {
-				frm.refresh();
-			},
+			callback: function(r, rt) {
+				frm.refresh_field("payment_entries");
+				frm.refresh_fields();
+			}
 		});
 	},
-
-	get_payment_entries: function (frm) {
+	get_payment_entries: function(frm) {
 		return frappe.call({
 			method: "get_payment_entries",
 			doc: frm.doc,
-			callback: function () {
-				frm.refresh();
-			},
+			callback: function(r, rt) {
+				frm.refresh_field("payment_entries");
+				frm.refresh_fields();
+
+				$(frm.fields_dict.payment_entries.wrapper).find("[data-fieldname=amount]").each(function(i,v){
+					if (i !=0){
+						$(v).addClass("text-right")
+					}
+				})
+			}
 		});
-	},
+	}
 });

erpnext/accounts/doctype/bank_clearance/bank_clearance.json

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

erpnext/accounts/doctype/bank_clearance/bank_clearance.py

@@ -6,7 +6,7 @@ import frappe
 from frappe import _, msgprint
 from frappe.model.document import Document
 from frappe.query_builder.custom import ConstantColumn
-from frappe.utils import flt, fmt_money, get_link_to_form, getdate
+from frappe.utils import flt, fmt_money, getdate
 
 import erpnext
 
@@ -27,7 +27,7 @@ class BankClearance(Document):
 			condition = "and (clearance_date IS NULL or clearance_date='0000-00-00')"
 
 		journal_entries = frappe.db.sql(
-			f"""
+			"""
 			select
 				"Journal Entry" as payment_document, t1.name as payment_entry,
 				t1.cheque_no as cheque_number, t1.cheque_date,
@@ -41,18 +41,23 @@ class BankClearance(Document):
 				and ifnull(t1.is_opening, 'No') = 'No' {condition}
 			group by t2.account, t1.name
 			order by t1.posting_date ASC, t1.name DESC
-		""",
+		""".format(
+				condition=condition
+			),
 			{"account": self.account, "from": self.from_date, "to": self.to_date},
 			as_dict=1,
 		)
 
+		if self.bank_account:
+			condition += "and bank_account = %(bank_account)s"
+
 		payment_entries = frappe.db.sql(
-			f"""
+			"""
 			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, 0, received_amount + total_taxes_and_charges) as debit,
+				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
 			from `tabPayment Entry`
@@ -62,18 +67,21 @@ class BankClearance(Document):
 				{condition}
 			order by
 				posting_date ASC, name DESC
-		""",
+		""".format(
+				condition=condition
+			),
 			{
 				"account": self.account,
 				"from": self.from_date,
 				"to": self.to_date,
+				"bank_account": self.bank_account,
 			},
 			as_dict=1,
 		)
 
 		loan_disbursement = frappe.qb.DocType("Loan Disbursement")
 
-		query = (
+		loan_disbursements = (
 			frappe.qb.from_(loan_disbursement)
 			.select(
 				ConstantColumn("Loan Disbursement").as_("payment_document"),
@@ -82,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.disbursement_account == self.account)
+			.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)
+			.orderby(loan_disbursement.name, frappe.qb.desc)
+		).run(as_dict=1)
 
 		loan_repayment = frappe.qb.DocType("Loan Repayment")
 
@@ -110,23 +113,20 @@ 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 == self.account)
+			.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)
+			query = query.where((loan_repayment.repay_from_salary == 0))
 
-		query = query.orderby(loan_repayment.posting_date).orderby(loan_repayment.name, order=frappe.qb.desc)
+		query = query.orderby(loan_repayment.posting_date).orderby(loan_repayment.name, frappe.qb.desc)
 
 		loan_repayments = query.run(as_dict=True)
 
@@ -177,6 +177,7 @@ class BankClearance(Document):
 		)
 
 		self.set("payment_entries", [])
+		self.total_amount = 0.0
 		default_currency = erpnext.get_default_currency()
 
 		for d in entries:
@@ -195,6 +196,7 @@ class BankClearance(Document):
 			d.pop("debit")
 			d.pop("account_currency")
 			row.update(d)
+			self.total_amount += flt(amount)
 
 	@frappe.whitelist()
 	def update_clearance_date(self):
@@ -206,11 +208,8 @@ class BankClearance(Document):
 
 				if d.cheque_date and getdate(d.clearance_date) < getdate(d.cheque_date):
 					frappe.throw(
-						_("Row #{0}: For {1} Clearance date {2} cannot be before Cheque Date {3}").format(
-							d.idx,
-							get_link_to_form(d.payment_document, d.payment_entry),
-							d.clearance_date,
-							d.cheque_date,
+						_("Row #{0}: Clearance date {1} cannot be before Cheque Date {2}").format(
+							d.idx, d.clearance_date, d.cheque_date
 						)
 					)
 

erpnext/accounts/doctype/bank_guarantee/bank_guarantee.js

@@ -1,39 +1,39 @@
 // Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-cur_frm.add_fetch("bank_account", "account", "account");
-cur_frm.add_fetch("bank_account", "bank_account_no", "bank_account_no");
-cur_frm.add_fetch("bank_account", "iban", "iban");
-cur_frm.add_fetch("bank_account", "branch_code", "branch_code");
-cur_frm.add_fetch("bank", "swift_number", "swift_number");
+cur_frm.add_fetch('bank_account','account','account');
+cur_frm.add_fetch('bank_account','bank_account_no','bank_account_no');
+cur_frm.add_fetch('bank_account','iban','iban');
+cur_frm.add_fetch('bank_account','branch_code','branch_code');
+cur_frm.add_fetch('bank','swift_number','swift_number');
 
-frappe.ui.form.on("Bank Guarantee", {
-	setup: function (frm) {
-		frm.set_query("bank", function () {
+frappe.ui.form.on('Bank Guarantee', {
+	setup: function(frm) {
+		frm.set_query("bank", function() {
+			return {
+				filters: {
+					company: frm.doc.company
+				}
+			};
+		});
+		frm.set_query("bank_account", function() {
 			return {
 				filters: {
 					company: frm.doc.company,
-				},
-			};
+					bank: frm.doc.bank
+				}
+			}
 		});
-		frm.set_query("bank_account", function () {
+		frm.set_query("project", function() {
 			return {
 				filters: {
-					company: frm.doc.company,
-					bank: frm.doc.bank,
-				},
-			};
-		});
-		frm.set_query("project", function () {
-			return {
-				filters: {
-					customer: frm.doc.customer,
-				},
+					customer: frm.doc.customer
+				}
 			};
 		});
 	},
 
-	bg_type: function (frm) {
+	bg_type: function(frm) {
 		if (frm.doc.bg_type == "Receiving") {
 			frm.set_value("reference_doctype", "Sales Order");
 		} else if (frm.doc.bg_type == "Providing") {
@@ -41,33 +41,41 @@ frappe.ui.form.on("Bank Guarantee", {
 		}
 	},
 
-	reference_docname: function (frm) {
+	reference_docname: function(frm) {
 		if (frm.doc.reference_docname && frm.doc.reference_doctype) {
+			let fields_to_fetch = ["grand_total"];
 			let party_field = frm.doc.reference_doctype == "Sales Order" ? "customer" : "supplier";
 
+			if (frm.doc.reference_doctype == "Sales Order") {
+				fields_to_fetch.push("project");
+			}
+
+			fields_to_fetch.push(party_field);
 			frappe.call({
-				method: "erpnext.accounts.doctype.bank_guarantee.bank_guarantee.get_voucher_details",
+				method: "erpnext.accounts.doctype.bank_guarantee.bank_guarantee.get_vouchar_detials",
 				args: {
-					bank_guarantee_type: frm.doc.bg_type,
-					reference_name: frm.doc.reference_docname,
+					"column_list": fields_to_fetch,
+					"doctype": frm.doc.reference_doctype,
+					"docname": frm.doc.reference_docname
 				},
-				callback: function (r) {
+				callback: function(r) {
 					if (r.message) {
 						if (r.message[party_field]) frm.set_value(party_field, r.message[party_field]);
 						if (r.message.project) frm.set_value("project", r.message.project);
 						if (r.message.grand_total) frm.set_value("amount", r.message.grand_total);
 					}
-				},
+				}
 			});
+
 		}
 	},
 
-	start_date: function (frm) {
+	start_date: function(frm) {
 		var end_date = frappe.datetime.add_days(cur_frm.doc.start_date, cur_frm.doc.validity - 1);
 		cur_frm.set_value("end_date", end_date);
 	},
-	validity: function (frm) {
+	validity: function(frm) {
 		var end_date = frappe.datetime.add_days(cur_frm.doc.start_date, cur_frm.doc.validity - 1);
 		cur_frm.set_value("end_date", end_date);
-	},
+	}
 });

erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py

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

erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js

@@ -8,88 +8,67 @@ frappe.ui.form.on("Bank Reconciliation Tool", {
 			return {
 				filters: {
 					company: frm.doc.company,
-					is_company_account: 1,
+					'is_company_account': 1
 				},
 			};
 		});
-		let no_bank_transactions_text = `<div class="text-muted text-center">${__(
-			"No Matching Bank Transactions Found"
-		)}</div>`;
-		set_field_options("no_bank_transactions", no_bank_transactions_text);
 	},
 
 	onload: function (frm) {
-		if (!frm.doc.company) {
-			frm.set_value("company", frappe.defaults.get_default("company"));
-		}
-
-		// Set default filter dates
-		let today = frappe.datetime.get_today();
-		frm.doc.bank_statement_from_date = frappe.datetime.add_months(today, -1);
-		frm.doc.bank_statement_to_date = today;
-
-		frm.trigger("bank_account");
-	},
-
-	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", "");
-		}
+		frm.trigger('bank_account');
 	},
 
 	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"), () =>
-			frappe.call({
-				method: "erpnext.accounts.doctype.bank_statement_import.bank_statement_import.upload_bank_statement",
-				args: {
-					dt: frm.doc.doctype,
-					dn: frm.doc.name,
-					company: frm.doc.company,
-					bank_account: frm.doc.bank_account,
-				},
-				callback: function (r) {
-					if (!r.exc) {
-						var doc = frappe.model.sync(r.message);
-						frappe.set_route("Form", doc[0].doctype, doc[0].name);
-					}
-				},
-			})
+		frappe.require("bank-reconciliation-tool.bundle.js", () =>
+			frm.trigger("make_reconciliation_tool")
 		);
+		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",
+					args: {
+						dt: frm.doc.doctype,
+						dn: frm.doc.name,
+						company: frm.doc.company,
+						bank_account: frm.doc.bank_account,
+					},
+					callback: function (r) {
+						if (!r.exc) {
+							var doc = frappe.model.sync(r.message);
+							frappe.set_route(
+								"Form",
+								doc[0].doctype,
+								doc[0].name
+							);
+						}
+					},
+				})
+		);
+	},
 
-		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) {
-		frappe.db.get_value("Bank Account", frm.doc.bank_account, "account", (r) => {
-			frappe.db.get_value("Account", r.account, "account_currency", (r) => {
-				frm.doc.account_currency = r.account_currency;
-				frm.trigger("render_chart");
-			});
-		});
+		frappe.db.get_value(
+			"Bank Account",
+			frm.doc.bank_account,
+			"account",
+			(r) => {
+				frappe.db.get_value(
+					"Account",
+					r.account,
+					"account_currency",
+					(r) => {
+						frm.currency = r.account_currency;
+						frm.trigger("render_chart");
+					}
+				);
+			}
+		);
 		frm.trigger("get_account_opening_balance");
 	},
 
@@ -99,7 +78,7 @@ frappe.ui.form.on("Bank Reconciliation Tool", {
 
 	make_reconciliation_tool(frm) {
 		frm.get_field("reconciliation_tool_cards").$wrapper.empty();
-		if (frm.doc.company && frm.doc.bank_account && frm.doc.bank_statement_to_date) {
+		if (frm.doc.bank_account && frm.doc.bank_statement_to_date) {
 			frm.trigger("get_cleared_balance").then(() => {
 				if (
 					frm.doc.bank_account &&
@@ -108,19 +87,24 @@ frappe.ui.form.on("Bank Reconciliation Tool", {
 				) {
 					frm.trigger("render_chart");
 					frm.trigger("render");
-					frappe.utils.scroll_to(frm.get_field("reconciliation_tool_cards").$wrapper, true, 30);
+					frappe.utils.scroll_to(
+						frm.get_field("reconciliation_tool_cards").$wrapper,
+						true,
+						30
+					);
 				}
 			});
 		}
 	},
 
 	get_account_opening_balance(frm) {
-		if (frm.doc.company && frm.doc.bank_account && frm.doc.bank_statement_from_date) {
+		if (frm.doc.bank_account && frm.doc.bank_statement_from_date) {
 			frappe.call({
-				method: "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.get_account_balance",
+				method:
+					"erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.get_account_balance",
 				args: {
 					bank_account: frm.doc.bank_account,
-					till_date: frappe.datetime.add_days(frm.doc.bank_statement_from_date, -1),
+					till_date: frm.doc.bank_statement_from_date,
 				},
 				callback: (response) => {
 					frm.set_value("account_opening_balance", response.message);
@@ -130,9 +114,10 @@ frappe.ui.form.on("Bank Reconciliation Tool", {
 	},
 
 	get_cleared_balance(frm) {
-		if (frm.doc.company && frm.doc.bank_account && frm.doc.bank_statement_to_date) {
+		if (frm.doc.bank_account && frm.doc.bank_statement_to_date) {
 			return frappe.call({
-				method: "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.get_account_balance",
+				method:
+					"erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.get_account_balance",
 				args: {
 					bank_account: frm.doc.bank_account,
 					till_date: frm.doc.bank_statement_to_date,
@@ -144,31 +129,39 @@ frappe.ui.form.on("Bank Reconciliation Tool", {
 		}
 	},
 
-	render_chart(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,
-			cleared_balance: frm.cleared_balance,
-			currency: frm.doc.account_currency,
-		});
-	},
+	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,
+				cleared_balance: frm.cleared_balance,
+				currency: frm.currency,
+			}
+		);
+	}, 500),
 
 	render(frm) {
 		if (frm.doc.bank_account) {
-			frm.bank_reconciliation_data_table_manager =
-				new erpnext.accounts.bank_reconciliation.DataTableManager({
+			frm.bank_reconciliation_data_table_manager = new erpnext.accounts.bank_reconciliation.DataTableManager(
+				{
 					company: frm.doc.company,
 					bank_account: frm.doc.bank_account,
-					$reconciliation_tool_dt: frm.get_field("reconciliation_tool_dt").$wrapper,
-					$no_bank_transactions: frm.get_field("no_bank_transactions").$wrapper,
+					$reconciliation_tool_dt: frm.get_field(
+						"reconciliation_tool_dt"
+					).$wrapper,
+					$no_bank_transactions: frm.get_field(
+						"no_bank_transactions"
+					).$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,
+					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",
@@ -87,38 +83,13 @@
    "fieldname": "no_bank_transactions",
    "fieldtype": "HTML",
    "options": "<div class=\"text-muted text-center\">No Matching Bank Transactions Found</div>"
-  },
-  {
-   "depends_on": "eval:doc.filter_by_reference_date",
-   "fieldname": "from_reference_date",
-   "fieldtype": "Date",
-   "label": "From Reference Date"
-  },
-  {
-   "depends_on": "eval:doc.filter_by_reference_date",
-   "fieldname": "to_reference_date",
-   "fieldtype": "Date",
-   "label": "To Reference Date"
-  },
-  {
-   "default": "0",
-   "fieldname": "filter_by_reference_date",
-   "fieldtype": "Check",
-   "label": "Filter by Reference Date"
-  },
-  {
-   "fieldname": "account_currency",
-   "fieldtype": "Link",
-   "hidden": 1,
-   "label": "Account Currency",
-   "options": "Currency"
   }
  ],
  "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 +108,5 @@
  ],
  "quick_entry": 1,
  "sort_field": "modified",
- "sort_order": "DESC",
- "states": []
+ "sort_order": "DESC"
 }

erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py

@@ -8,17 +8,14 @@ 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.party import get_party_account
+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,
 )
 from erpnext.accounts.utils import get_balance_on
-from erpnext.setup.utils import get_exchange_rate
 
 
 class BankReconciliationTool(Document):
@@ -31,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:
@@ -53,7 +50,6 @@ def get_bank_transactions(bank_account, from_date=None, to_date=None):
 			"party",
 		],
 		filters=filters,
-		order_by="date",
 	)
 	return transactions
 
@@ -62,12 +58,14 @@ def get_bank_transactions(bank_account, from_date=None, to_date=None):
 def get_account_balance(bank_account, till_date):
 	# returns account balance till the specified date
 	account = frappe.db.get_value("Bank Account", bank_account, "account")
-	filters = frappe._dict({"account": account, "report_date": till_date, "include_pos_transactions": 1})
+	filters = frappe._dict(
+		{"account": account, "report_date": till_date, "include_pos_transactions": 1}
+	)
 	data = get_entries(filters)
 
 	balance_as_per_system = get_balance_on(filters["account"], filters["report_date"])
 
-	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)
@@ -75,7 +73,10 @@ def get_account_balance(bank_account, till_date):
 	amounts_not_reflected_in_system = get_amounts_not_reflected_in_system(filters)
 
 	bank_bal = (
-		flt(balance_as_per_system) - flt(total_debit) + flt(total_credit) + amounts_not_reflected_in_system
+		flt(balance_as_per_system)
+		- flt(total_debit)
+		+ flt(total_credit)
+		+ amounts_not_reflected_in_system
 	)
 
 	return bank_bal
@@ -126,7 +127,7 @@ def create_journal_entry_bts(
 	bank_transaction = frappe.db.get_values(
 		"Bank Transaction",
 		bank_transaction_name,
-		fieldname=["name", "deposit", "withdrawal", "bank_account", "currency"],
+		fieldname=["name", "deposit", "withdrawal", "bank_account"],
 		as_dict=True,
 	)[0]
 	company_account = frappe.get_value("Bank Account", bank_transaction.bank_account, "account")
@@ -138,96 +139,32 @@ def create_journal_entry_bts(
 					second_account
 				)
 			)
-
-	company = frappe.get_value("Account", company_account, "company")
-	company_default_currency = frappe.get_cached_value("Company", company, "default_currency")
-	company_account_currency = frappe.get_cached_value("Account", company_account, "account_currency")
-	second_account_currency = frappe.get_cached_value("Account", second_account, "account_currency")
-
-	# determine if multi-currency Journal or not
-	is_multi_currency = (
-		True
-		if company_default_currency != company_account_currency
-		or company_default_currency != second_account_currency
-		or company_default_currency != bank_transaction.currency
-		else False
+	accounts = []
+	# Multi Currency?
+	accounts.append(
+		{
+			"account": second_account,
+			"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,
+		}
 	)
 
-	accounts = []
-	second_account_dict = {
-		"account": second_account,
-		"account_currency": second_account_currency,
-		"credit_in_account_currency": bank_transaction.deposit,
-		"debit_in_account_currency": bank_transaction.withdrawal,
-		"party_type": party_type,
-		"party": party,
-		"cost_center": get_default_cost_center(company),
-	}
+	accounts.append(
+		{
+			"account": company_account,
+			"bank_account": bank_transaction.bank_account,
+			"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_account_dict = {
-		"account": company_account,
-		"account_currency": company_account_currency,
-		"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),
-	}
-
-	# convert transaction amount to company currency
-	if is_multi_currency:
-		exc_rate = get_exchange_rate(bank_transaction.currency, company_default_currency, posting_date)
-		withdrawal_in_company_currency = flt(exc_rate * abs(bank_transaction.withdrawal))
-		deposit_in_company_currency = flt(exc_rate * abs(bank_transaction.deposit))
-	else:
-		withdrawal_in_company_currency = bank_transaction.withdrawal
-		deposit_in_company_currency = bank_transaction.deposit
-
-	# if second account is of foreign currency, convert and set debit and credit fields.
-	if second_account_currency != company_default_currency:
-		exc_rate = get_exchange_rate(second_account_currency, company_default_currency, posting_date)
-		second_account_dict.update(
-			{
-				"exchange_rate": exc_rate,
-				"credit": deposit_in_company_currency,
-				"debit": withdrawal_in_company_currency,
-				"credit_in_account_currency": flt(deposit_in_company_currency / exc_rate) or 0,
-				"debit_in_account_currency": flt(withdrawal_in_company_currency / exc_rate) or 0,
-			}
-		)
-	else:
-		second_account_dict.update(
-			{
-				"exchange_rate": 1,
-				"credit": deposit_in_company_currency,
-				"debit": withdrawal_in_company_currency,
-				"credit_in_account_currency": deposit_in_company_currency,
-				"debit_in_account_currency": withdrawal_in_company_currency,
-			}
-		)
-
-	# if company account is of foreign currency, convert and set debit and credit fields.
-	if company_account_currency != company_default_currency:
-		exc_rate = get_exchange_rate(company_account_currency, company_default_currency, posting_date)
-		company_account_dict.update(
-			{
-				"exchange_rate": exc_rate,
-				"credit": withdrawal_in_company_currency,
-				"debit": deposit_in_company_currency,
-			}
-		)
-	else:
-		company_account_dict.update(
-			{
-				"exchange_rate": 1,
-				"credit": withdrawal_in_company_currency,
-				"debit": deposit_in_company_currency,
-				"credit_in_account_currency": withdrawal_in_company_currency,
-				"debit_in_account_currency": deposit_in_company_currency,
-			}
-		)
-
-	accounts.append(second_account_dict)
-	accounts.append(company_account_dict)
+	company = frappe.get_value("Account", company_account, "company")
 
 	journal_entry_dict = {
 		"voucher_type": entry_type,
@@ -237,9 +174,6 @@ def create_journal_entry_bts(
 		"cheque_no": reference_number,
 		"mode_of_payment": mode_of_payment,
 	}
-	if is_multi_currency:
-		journal_entry_dict.update({"multi_currency": True})
-
 	journal_entry = frappe.new_doc("Journal Entry")
 	journal_entry.update(journal_entry_dict)
 	journal_entry.set("accounts", accounts)
@@ -250,22 +184,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()
@@ -285,135 +213,52 @@ def create_payment_entry_bts(
 	bank_transaction = frappe.db.get_values(
 		"Bank Transaction",
 		bank_transaction_name,
-		fieldname=["name", "unallocated_amount", "deposit", "bank_account", "currency"],
+		fieldname=["name", "unallocated_amount", "deposit", "bank_account"],
 		as_dict=True,
 	)[0]
+	paid_amount = bank_transaction.unallocated_amount
+	payment_type = "Receive" if bank_transaction.deposit > 0 else "Pay"
 
-	payment_type = "Receive" if bank_transaction.deposit > 0.0 else "Pay"
+	company_account = frappe.get_value("Bank Account", bank_transaction.bank_account, "account")
+	company = frappe.get_value("Account", company_account, "company")
+	payment_entry_dict = {
+		"company": company,
+		"payment_type": payment_type,
+		"reference_no": reference_number,
+		"reference_date": reference_date,
+		"party_type": party_type,
+		"party": party,
+		"posting_date": posting_date,
+		"paid_amount": paid_amount,
+		"received_amount": paid_amount,
+	}
+	payment_entry = frappe.new_doc("Payment Entry")
 
-	bank_account = frappe.get_cached_value("Bank Account", bank_transaction.bank_account, "account")
-	company = frappe.get_cached_value("Account", bank_account, "company")
-	party_account = get_party_account(party_type, party, company)
+	payment_entry.update(payment_entry_dict)
 
-	bank_currency = bank_transaction.currency
-	party_currency = frappe.get_cached_value("Account", party_account, "account_currency")
+	if mode_of_payment:
+		payment_entry.mode_of_payment = mode_of_payment
+	if project:
+		payment_entry.project = project
+	if cost_center:
+		payment_entry.cost_center = cost_center
+	if payment_type == "Receive":
+		payment_entry.paid_to = company_account
+	else:
+		payment_entry.paid_from = company_account
 
-	exc_rate = get_exchange_rate(bank_currency, party_currency, posting_date)
-
-	amt_in_bank_acc_currency = bank_transaction.unallocated_amount
-	amount_in_party_currency = bank_transaction.unallocated_amount * exc_rate
-
-	pe = frappe.new_doc("Payment Entry")
-	pe.payment_type = payment_type
-	pe.company = company
-	pe.reference_no = reference_number
-	pe.reference_date = reference_date
-	pe.party_type = party_type
-	pe.party = party
-	pe.posting_date = posting_date
-	pe.paid_from = party_account if payment_type == "Receive" else bank_account
-	pe.paid_to = party_account if payment_type == "Pay" else bank_account
-	pe.paid_from_account_currency = party_currency if payment_type == "Receive" else bank_currency
-	pe.paid_to_account_currency = party_currency if payment_type == "Pay" else bank_currency
-	pe.paid_amount = amount_in_party_currency if payment_type == "Receive" else amt_in_bank_acc_currency
-	pe.received_amount = amount_in_party_currency if payment_type == "Pay" else amt_in_bank_acc_currency
-	pe.mode_of_payment = mode_of_payment
-	pe.project = project
-	pe.cost_center = cost_center
-
-	pe.validate()
+	payment_entry.validate()
 
 	if allow_edit:
-		return pe
+		return payment_entry
 
-	pe.insert()
-	pe.submit()
+	payment_entry.insert()
 
+	payment_entry.submit()
 	vouchers = json.dumps(
-		[
-			{
-				"payment_doctype": "Payment Entry",
-				"payment_name": pe.name,
-				"amount": amt_in_bank_acc_currency,
-			}
-		]
+		[{"payment_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")
-		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()
@@ -421,92 +266,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.db.get_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.db.get_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 = []
-
-	voucher_docs = [(voucher[1], voucher[2]) for voucher in vouchers]
-	voucher_allocated_amounts = get_total_allocated_amount(voucher_docs)
-
-	for voucher in vouchers:
-		rows = voucher_allocated_amounts.get((voucher[1], voucher[2])) or []
-		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,
@@ -515,9 +348,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(
@@ -526,23 +357,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
@@ -553,13 +375,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 []
 		)
@@ -568,106 +385,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(
@@ -695,17 +449,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(
@@ -734,131 +488,90 @@ 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)
+		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 is 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 is 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,
@@ -876,20 +589,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,
@@ -903,9 +614,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.js

@@ -2,24 +2,16 @@
 // For license information, please see license.txt
 
 frappe.ui.form.on("Bank Statement Import", {
-	onload(frm) {
-		frm.set_query("bank_account", function (doc) {
-			return {
-				filters: {
-					company: doc.company,
-				},
-			};
-		});
-	},
-
 	setup(frm) {
 		frappe.realtime.on("data_import_refresh", ({ data_import }) => {
 			frm.import_in_progress = false;
 			if (data_import !== frm.doc.name) return;
 			frappe.model.clear_doc("Bank Statement Import", frm.doc.name);
-			frappe.model.with_doc("Bank Statement Import", frm.doc.name).then(() => {
-				frm.refresh();
-			});
+			frappe.model
+				.with_doc("Bank Statement Import", frm.doc.name)
+				.then(() => {
+					frm.refresh();
+				});
 		});
 		frappe.realtime.on("data_import_progress", (data) => {
 			frm.import_in_progress = true;
@@ -46,9 +38,20 @@ frappe.ui.form.on("Bank Statement Import", {
 						: __("Updating {0} of {1}, {2}", message_args);
 			}
 			if (data.skipping) {
-				message = __("Skipping {0} of {1}, {2}", [data.current, data.total, eta_message]);
+				message = __(
+					"Skipping {0} of {1}, {2}",
+					[
+						data.current,
+						data.total,
+						eta_message,
+					]
+				);
 			}
-			frm.dashboard.show_progress(__("Import Progress"), percent, message);
+			frm.dashboard.show_progress(
+				__("Import Progress"),
+				percent,
+				message
+			);
 			frm.page.set_indicator(__("In Progress"), "orange");
 
 			// hide progress when complete
@@ -90,12 +93,15 @@ frappe.ui.form.on("Bank Statement Import", {
 		frm.trigger("show_report_error_button");
 
 		if (frm.doc.status === "Partial Success") {
-			frm.add_custom_button(__("Export Errored Rows"), () => frm.trigger("export_errored_rows"));
+			frm.add_custom_button(__("Export Errored Rows"), () =>
+				frm.trigger("export_errored_rows")
+			);
 		}
 
 		if (frm.doc.status.includes("Success")) {
-			frm.add_custom_button(__("Go to {0} List", [__(frm.doc.reference_doctype)]), () =>
-				frappe.set_route("List", frm.doc.reference_doctype)
+			frm.add_custom_button(
+				__("Go to {0} List", [frm.doc.reference_doctype]),
+				() => frappe.set_route("List", frm.doc.reference_doctype)
 			);
 		}
 	},
@@ -112,8 +118,13 @@ frappe.ui.form.on("Bank Statement Import", {
 		frm.disable_save();
 		if (frm.doc.status !== "Success") {
 			if (!frm.is_new() && frm.has_import_file()) {
-				let label = frm.doc.status === "Pending" ? __("Start Import") : __("Retry");
-				frm.page.set_primary_action(label, () => frm.events.start_import(frm));
+				let label =
+					frm.doc.status === "Pending"
+						? __("Start Import")
+						: __("Retry");
+				frm.page.set_primary_action(label, () =>
+					frm.events.start_import(frm)
+				);
 			} else {
 				frm.page.set_primary_action(__("Save"), () => frm.save());
 			}
@@ -130,7 +141,7 @@ frappe.ui.form.on("Bank Statement Import", {
 	},
 
 	show_import_status(frm) {
-		let import_log = JSON.parse(frm.doc.statement_import_log || "[]");
+		let import_log = JSON.parse(frm.doc.import_log || "[]");
 		let successful_records = import_log.filter((log) => log.success);
 		let failed_records = import_log.filter((log) => !log.success);
 		if (successful_records.length === 0) return;
@@ -155,24 +166,24 @@ frappe.ui.form.on("Bank Statement Import", {
 				message =
 					successful_records.length > 1
 						? __(
-								"Successfully imported {0} records out of {1}. Click on Export Errored Rows, fix the errors and import again.",
-								message_args
-						  )
+							"Successfully imported {0} records out of {1}. Click on Export Errored Rows, fix the errors and import again.",
+							message_args
+						)
 						: __(
-								"Successfully imported {0} record out of {1}. Click on Export Errored Rows, fix the errors and import again.",
-								message_args
-						  );
+							"Successfully imported {0} record out of {1}. Click on Export Errored Rows, fix the errors and import again.",
+							message_args
+						);
 			} else {
 				message =
 					successful_records.length > 1
 						? __(
-								"Successfully updated {0} records out of {1}. Click on Export Errored Rows, fix the errors and import again.",
-								message_args
-						  )
+							"Successfully updated {0} records out of {1}. Click on Export Errored Rows, fix the errors and import again.",
+							message_args
+						)
 						: __(
-								"Successfully updated {0} record out of {1}. Click on Export Errored Rows, fix the errors and import again.",
-								message_args
-						  );
+							"Successfully updated {0} record out of {1}. Click on Export Errored Rows, fix the errors and import again.",
+							message_args
+						);
 			}
 		}
 		frm.dashboard.set_headline(message);
@@ -215,7 +226,8 @@ frappe.ui.form.on("Bank Statement Import", {
 	},
 
 	download_template() {
-		let method = "/api/method/frappe.core.doctype.data_import.data_import.download_template";
+		let method =
+			"/api/method/frappe.core.doctype.data_import.data_import.download_template";
 
 		open_url_post(method, {
 			doctype: "Bank Transaction",
@@ -228,7 +240,7 @@ frappe.ui.form.on("Bank Statement Import", {
 					"description",
 					"reference_number",
 					"bank_account",
-					"currency",
+					"currency"
 				],
 			},
 		});
@@ -297,9 +309,12 @@ frappe.ui.form.on("Bank Statement Import", {
 	// method: 'frappe.core.doctype.data_import.data_import.get_preview_from_template',
 
 	show_import_preview(frm, preview_data) {
-		let import_log = JSON.parse(frm.doc.statement_import_log || "[]");
+		let import_log = JSON.parse(frm.doc.import_log || "[]");
 
-		if (frm.import_preview && frm.import_preview.doctype === frm.doc.reference_doctype) {
+		if (
+			frm.import_preview &&
+			frm.import_preview.doctype === frm.doc.reference_doctype
+		) {
 			frm.import_preview.preview_data = preview_data;
 			frm.import_preview.import_log = import_log;
 			frm.import_preview.refresh();
@@ -315,10 +330,19 @@ frappe.ui.form.on("Bank Statement Import", {
 				frm,
 				events: {
 					remap_column(changed_map) {
-						let template_options = JSON.parse(frm.doc.template_options || "{}");
-						template_options.column_to_field_map = template_options.column_to_field_map || {};
-						Object.assign(template_options.column_to_field_map, changed_map);
-						frm.set_value("template_options", JSON.stringify(template_options));
+						let template_options = JSON.parse(
+							frm.doc.template_options || "{}"
+						);
+						template_options.column_to_field_map =
+							template_options.column_to_field_map || {};
+						Object.assign(
+							template_options.column_to_field_map,
+							changed_map
+						);
+						frm.set_value(
+							"template_options",
+							JSON.stringify(template_options)
+						);
 						frm.save().then(() => frm.trigger("import_file"));
 					},
 				},
@@ -328,11 +352,10 @@ frappe.ui.form.on("Bank Statement Import", {
 
 	export_errored_rows(frm) {
 		open_url_post(
-			"/api/method/erpnext.accounts.doctype.bank_statement_import.bank_statement_import.download_errored_template",
+			"/api/method/frappe.core.doctype.data_import.data_import.download_errored_template",
 			{
 				data_import_name: frm.doc.name,
-			},
-			true
+			}
 		);
 	},
 
@@ -352,7 +375,8 @@ frappe.ui.form.on("Bank Statement Import", {
 		let other_warnings = [];
 		for (let warning of warnings) {
 			if (warning.row) {
-				warnings_by_row[warning.row] = warnings_by_row[warning.row] || [];
+				warnings_by_row[warning.row] =
+					warnings_by_row[warning.row] || [];
 				warnings_by_row[warning.row].push(warning);
 			} else {
 				other_warnings.push(warning);
@@ -367,7 +391,9 @@ frappe.ui.form.on("Bank Statement Import", {
 						if (w.field) {
 							let label =
 								w.field.label +
-								(w.field.parent !== frm.doc.reference_doctype ? ` (${w.field.parent})` : "");
+								(w.field.parent !== frm.doc.reference_doctype
+									? ` (${w.field.parent})`
+									: "");
 							return `<li>${label}: ${w.message}</li>`;
 						}
 						return `<li>${w.message}</li>`;
@@ -386,9 +412,10 @@ frappe.ui.form.on("Bank Statement Import", {
 			.map((warning) => {
 				let header = "";
 				if (warning.col) {
-					let column_number = `<span class="text-uppercase">${__("Column {0}", [
-						warning.col,
-					])}</span>`;
+					let column_number = `<span class="text-uppercase">${__(
+						"Column {0}",
+						[warning.col]
+					)}</span>`;
 					let column_header = columns[warning.col].header_title;
 					header = `${column_number} (${column_header})`;
 				}
@@ -412,7 +439,7 @@ frappe.ui.form.on("Bank Statement Import", {
 	},
 
 	show_import_log(frm) {
-		let import_log = JSON.parse(frm.doc.statement_import_log || "[]");
+		let import_log = JSON.parse(frm.doc.import_log || "[]");
 		let logs = import_log;
 		frm.toggle_display("import_log", false);
 		frm.toggle_display("import_log_section", logs.length > 0);
@@ -427,28 +454,36 @@ frappe.ui.form.on("Bank Statement Import", {
 				let html = "";
 				if (log.success) {
 					if (frm.doc.import_type === "Insert New Records") {
-						html = __("Successfully imported {0}", [
-							`<span class="underline">${frappe.utils.get_form_link(
-								frm.doc.reference_doctype,
-								log.docname,
-								true
-							)}<span>`,
-						]);
+						html = __(
+							"Successfully imported {0}", [
+								`<span class="underline">${frappe.utils.get_form_link(
+									frm.doc.reference_doctype,
+									log.docname,
+									true
+								)}<span>`,
+							]
+						);
 					} else {
-						html = __("Successfully updated {0}", [
-							`<span class="underline">${frappe.utils.get_form_link(
-								frm.doc.reference_doctype,
-								log.docname,
-								true
-							)}<span>`,
-						]);
+						html = __(
+							"Successfully updated {0}", [
+								`<span class="underline">${frappe.utils.get_form_link(
+									frm.doc.reference_doctype,
+									log.docname,
+									true
+								)}<span>`,
+							]
+						);
 					}
 				} else {
 					let messages = log.messages
 						.map(JSON.parse)
 						.map((m) => {
-							let title = m.title ? `<strong>${m.title}</strong>` : "";
-							let message = m.message ? `<div>${m.message}</div>` : "";
+							let title = m.title
+								? `<strong>${m.title}</strong>`
+								: "";
+							let message = m.message
+								? `<div>${m.message}</div>`
+								: "";
 							return title + message;
 						})
 						.join("");

erpnext/accounts/doctype/bank_statement_import/bank_statement_import.json

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

erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py

@@ -21,7 +21,7 @@ INVALID_VALUES = ("", None)
 
 class BankStatementImport(DataImport):
 	def __init__(self, *args, **kwargs):
-		super().__init__(*args, **kwargs)
+		super(BankStatementImport, self).__init__(*args, **kwargs)
 
 	def validate(self):
 		doc_before_save = self.get_doc_before_save()
@@ -30,6 +30,7 @@ class BankStatementImport(DataImport):
 			or (doc_before_save and doc_before_save.import_file != self.import_file)
 			or (doc_before_save and doc_before_save.google_sheets_url != self.google_sheets_url)
 		):
+
 			template_options_dict = {}
 			column_to_field_map = {}
 			bank = frappe.get_doc("Bank", self.bank)
@@ -44,6 +45,7 @@ class BankStatementImport(DataImport):
 		self.validate_google_sheets_url()
 
 	def start_import(self):
+
 		preview = frappe.get_doc("Bank Statement Import", self.name).get_preview_from_template(
 			self.import_file, self.google_sheets_url
 		)
@@ -100,7 +102,7 @@ def download_errored_template(data_import_name):
 def parse_data_from_template(raw_data):
 	data = []
 
-	for _i, row in enumerate(raw_data):
+	for i, row in enumerate(raw_data):
 		if all(v in INVALID_VALUES for v in row):
 			# empty row
 			continue
@@ -110,7 +112,9 @@ def parse_data_from_template(raw_data):
 	return data
 
 
-def start_import(data_import, bank_account, import_file_path, google_sheets_url, bank, template_options):
+def start_import(
+	data_import, bank_account, import_file_path, google_sheets_url, bank, template_options
+):
 	"""This method runs in background job"""
 
 	update_mapping_db(bank, template_options)

erpnext/accounts/doctype/bank_statement_import/bank_statement_import_list.js

@@ -1,34 +1,36 @@
 let imports_in_progress = [];
 
-frappe.listview_settings["Bank Statement Import"] = {
+frappe.listview_settings['Bank Statement Import'] = {
 	onload(listview) {
-		frappe.realtime.on("data_import_progress", (data) => {
+		frappe.realtime.on('data_import_progress', data => {
 			if (!imports_in_progress.includes(data.data_import)) {
 				imports_in_progress.push(data.data_import);
 			}
 		});
-		frappe.realtime.on("data_import_refresh", (data) => {
-			imports_in_progress = imports_in_progress.filter((d) => d !== data.data_import);
+		frappe.realtime.on('data_import_refresh', data => {
+			imports_in_progress = imports_in_progress.filter(
+				d => d !== data.data_import
+			);
 			listview.refresh();
 		});
 	},
-	get_indicator: function (doc) {
+	get_indicator: function(doc) {
 		var colors = {
-			Pending: "orange",
-			"Not Started": "orange",
-			"Partial Success": "orange",
-			Success: "green",
-			"In Progress": "orange",
-			Error: "red",
+			'Pending': 'orange',
+			'Not Started': 'orange',
+			'Partial Success': 'orange',
+			'Success': 'green',
+			'In Progress': 'orange',
+			'Error': 'red'
 		};
 		let status = doc.status;
 		if (imports_in_progress.includes(doc.name)) {
-			status = "In Progress";
+			status = 'In Progress';
 		}
-		if (status == "Pending") {
-			status = "Not Started";
+		if (status == 'Pending') {
+			status = 'Not Started';
 		}
-		return [__(status), colors[status], "status,=," + doc.status];
+		return [__(status), colors[status], 'status,=,' + doc.status];
 	},
-	hide_name_column: true,
+	hide_name_column: true
 };

erpnext/accounts/doctype/bank_transaction/auto_match_party.py

@@ -1,173 +0,0 @@
-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) -> 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
-
-		return self.match_account_in_party()
-
-	def match_account_in_party(self) -> tuple | None:
-		"""
-		Returns (Party Type, Party) if a matching account is found in Bank Account or Employee:
-		1. Get party from a matching (iban/account no) Bank Account
-		2. If not found, get party from Employee with matching bank account details (iban/account no)
-		"""
-		if not (self.bank_party_account_number or self.bank_party_iban):
-			# Nothing to match
-			return None
-
-		# Search for a matching Bank Account that has party set
-		party_result = frappe.db.get_all(
-			"Bank Account",
-			or_filters=self.get_or_filters(),
-			filters={"party_type": ("is", "set"), "party": ("is", "set")},
-			fields=["party", "party_type"],
-			limit_page_length=1,
-		)
-		if result := party_result[0] if party_result else None:
-			return (result["party_type"], result["party"])
-
-		# If no party is found, search in Employee (since it has bank account details)
-		if employee_result := frappe.db.get_all(
-			"Employee", or_filters=self.get_or_filters("Employee"), pluck="name", limit_page_length=1
-		):
-			return ("Employee", employee_result[0])
-
-	def get_or_filters(self, party: str | None = None) -> dict:
-		"""Return OR filters for Bank Account and IBAN"""
-		or_filters = {}
-		if self.bank_party_account_number:
-			bank_ac_field = "bank_ac_no" if party == "Employee" else "bank_account_no"
-			or_filters[bank_ac_field] = self.bank_party_account_number
-
-		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) -> tuple | None:
-		# fuzzy search by customer/supplier & employee
-		if not (self.bank_party_name or self.description):
-			return None
-
-		return self.match_party_name_desc_in_party()
-
-	def match_party_name_desc_in_party(self) -> 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}
-			field = f"{party.lower()}_name"
-			names = frappe.get_all(party, filters=filters, fields=[f"{field} as party_name", "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) -> tuple | None:
-		skip = False
-		result = process.extract(
-			query=self.get(field),
-			choices={row.get("name"): row.get("party_name") for row in names},
-			scorer=fuzz.token_set_ratio,
-		)
-		party_name, skip = self.process_fuzzy_result(result)
-
-		return ((party, party_name), skip) if party_name else (None, skip)
-
-	def process_fuzzy_result(self, result: 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)
-		"""
-		SCORE, PARTY_ID, CUTOFF = 1, 2, 80
-
-		if not result or not len(result):
-			return None, False
-
-		first_result = result[0]
-		if len(result) == 1:
-			return (first_result[PARTY_ID] if first_result[SCORE] > CUTOFF else None), True
-
-		if first_result[SCORE] > CUTOFF:
-			second_result = result[1]
-			# If multiple matches with the same score, return None but discontinue matching
-			# Matches were found but were too close to distinguish between
-			if first_result[SCORE] == second_result[SCORE]:
-				return None, True
-
-			return first_result[PARTY_ID], True
-		else:
-			return None, False
-
-
-def get_parties_in_order(deposit: float) -> list:
-	return (
-		["Customer", "Supplier", "Employee"]  # most -> least likely to pay us
-		if flt(deposit) > 0
-		else ["Supplier", "Employee", "Customer"]  # most -> least likely to receive from us
-	)

erpnext/accounts/doctype/bank_transaction/bank_transaction.js

@@ -3,7 +3,7 @@
 
 frappe.ui.form.on("Bank Transaction", {
 	onload(frm) {
-		frm.set_query("payment_document", "payment_entries", function () {
+		frm.set_query("payment_document", "payment_entries", function() {
 			const payment_doctypes = frm.events.get_payment_doctypes(frm);
 			return {
 				filters: {
@@ -12,18 +12,12 @@ frappe.ui.form.on("Bank Transaction", {
 			};
 		});
 	},
-	refresh(frm) {
-		if (!frm.is_dirty() && frm.doc.payment_entries.length > 0) {
-			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);
 	},
 
-	setup: function (frm) {
+	setup: function(frm) {
 		frm.set_query("party_type", function () {
 			return {
 				filters: {
@@ -33,10 +27,15 @@ frappe.ui.form.on("Bank Transaction", {
 		});
 	},
 
-	get_payment_doctypes: function () {
+	get_payment_doctypes: function() {
 		// get payment doctypes from all the apps
-		return ["Payment Entry", "Journal Entry", "Sales Invoice", "Purchase Invoice", "Bank Transaction"];
-	},
+		return [
+			"Payment Entry",
+			"Journal Entry",
+			"Sales Invoice",
+			"Purchase Invoice",
+		];
+	}
 });
 
 frappe.ui.form.on("Bank Transaction Payments", {
@@ -48,11 +47,10 @@ frappe.ui.form.on("Bank Transaction Payments", {
 const update_clearance_date = (frm, cdt, cdn) => {
 	if (frm.doc.docstatus === 1) {
 		frappe
-			.xcall("erpnext.accounts.doctype.bank_transaction.bank_transaction.unclear_reference_payment", {
-				doctype: cdt,
-				docname: cdn,
-				bt_name: frm.doc.name,
-			})
+			.xcall(
+				"erpnext.accounts.doctype.bank_transaction.bank_transaction.unclear_reference_payment",
+				{ doctype: cdt, docname: cdn }
+			)
 			.then((e) => {
 				if (e == "success") {
 					frappe.show_alert({

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,9 +1,10 @@
 # Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
 # For license information, please see license.txt
 
+
+from functools import reduce
+
 import frappe
-from frappe import _
-from frappe.model.docstatus import DocStatus
 from frappe.utils import flt
 
 from erpnext.controllers.status_updater import StatusUpdater
@@ -17,169 +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
 
-		unallocated_amount = abs(flt(self.withdrawal) - flt(self.deposit)) - allocated_amount
+		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),
+			)
 
-		self.db_set("allocated_amount", flt(allocated_amount, self.precision("allocated_amount")))
-		self.db_set("unallocated_amount", flt(unallocated_amount, self.precision("unallocated_amount")))
-		self.reload()
-		self.set_status(update=True)
+		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))
+			)
 
-	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))
-
-		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
-				}
-				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
-		"""
-		remaining_amount = self.unallocated_amount
-		payment_entry_docs = [(pe.payment_document, pe.payment_entry) for pe in self.payment_entries]
-		pe_bt_allocations = get_total_allocated_amount(payment_entry_docs)
-
-		for payment_entry in self.payment_entries:
-			if payment_entry.allocated_amount == 0.0:
-				unallocated_amount, should_clear, latest_transaction = get_clearance_details(
-					self,
-					payment_entry,
-					pe_bt_allocations.get((payment_entry.payment_document, payment_entry.payment_entry))
-					or [],
-				)
-
-				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 = None
-		try:
-			result = AutoMatchParty(
-				bank_party_account_number=self.bank_party_account_number,
-				bank_party_iban=self.bank_party_iban,
-				bank_party_name=self.bank_party_name,
-				description=self.description,
-				deposit=self.deposit,
-			).match()
-		except Exception:
-			frappe.log_error(title=_("Error in party matching for Bank Transaction {0}").format(self.name))
-
-		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()
@@ -188,120 +93,40 @@ def get_doctypes_for_bank_reconciliation():
 	return frappe.get_hooks("bank_reconciliation_doctypes")
 
 
-def get_clearance_details(transaction, payment_entry, bt_allocations):
-	"""
-	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)
-
-	unallocated_amount = min(
-		transaction.unallocated_amount,
-		get_paid_amount(payment_entry, transaction.currency, gl_bank_account),
+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"],
 	)
-	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),
-		as_dict=True,
-	)
-	return result
-
-
-def get_total_allocated_amount(docs):
-	"""
-	Gets the sum of allocations for a voucher on each bank GL account
-	along with the latest bank transaction name & date
-	NOTE: query may also include just saved vouchers/payments but with zero allocated_amount
-	"""
-	if not docs:
-		return {}
-
-	# nosemgrep: frappe-semgrep-rules.rules.frappe-using-db-sql
-	result = frappe.db.sql(
-		"""
-		SELECT total, latest_name, latest_date, gl_account, payment_document, payment_entry FROM (
-			SELECT
-				ROW_NUMBER() OVER w AS rownum,
-				SUM(btp.allocated_amount) OVER(PARTITION BY ba.account, btp.payment_document, btp.payment_entry) AS total,
-				FIRST_VALUE(bt.name) OVER w AS latest_name,
-				FIRST_VALUE(bt.date) OVER w AS latest_date,
-				ba.account AS gl_account,
-				btp.payment_document,
-				btp.payment_entry
-			FROM
-				`tabBank Transaction Payments` btp
-			LEFT JOIN `tabBank Transaction` bt ON bt.name=btp.parent
-			LEFT JOIN `tabBank Account` ba ON ba.name=bt.bank_account
-			WHERE
-				(btp.payment_document, btp.payment_entry) IN %(docs)s
-				AND bt.docstatus = 1
-			WINDOW w AS (PARTITION BY ba.account, btp.payment_document, btp.payment_entry ORDER BY bt.date DESC)
-		) temp
-		WHERE
-			rownum = 1
-		""",
-		dict(docs=docs),
+			btp.payment_document = %s
+		AND
+			btp.payment_entry = %s
+		AND
+			bt.docstatus = 1""",
+		(payment_entry.payment_document, payment_entry.payment_entry),
 		as_dict=True,
 	)
 
-	payment_allocation_details = {}
-	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"])
-		payment_allocation_details.setdefault((row["payment_document"], row["payment_entry"]), []).append(row)
 
-	return payment_allocation_details
-
-
-def get_paid_amount(payment_entry, currency, gl_bank_account):
+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"
 		if payment_entry.payment_document == "Payment Entry":
 			doc = frappe.get_doc("Payment Entry", payment_entry.payment_entry)
@@ -312,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(
@@ -320,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":
@@ -340,87 +162,30 @@ def get_paid_amount(payment_entry, currency, gl_bank_account):
 		)
 
 	elif payment_entry.payment_document == "Loan Repayment":
-		return frappe.db.get_value(payment_entry.payment_document, payment_entry.payment_entry, "amount_paid")
-
-	elif payment_entry.payment_document == "Bank Transaction":
-		dep, wth = frappe.db.get_value(
-			"Bank Transaction", payment_entry.payment_entry, ("deposit", "withdrawal")
+		return frappe.db.get_value(
+			payment_entry.payment_document, payment_entry.payment_entry, "amount_paid"
 		)
-		return abs(flt(wth) - flt(dep))
 
 	else:
 		frappe.throw(
-			f"Please reconcile {payment_entry.payment_document}: {payment_entry.payment_entry} manually"
+			"Please reconcile {0}: {1} manually".format(
+				payment_entry.payment_document, payment_entry.payment_entry
+			)
 		)
 
 
-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)
 
-
-def remove_from_bank_transaction(doctype, docname):
-	"""Remove a (cancelled) voucher from all Bank Transactions."""
-	for bt_name in get_reconciled_bank_transactions(doctype, docname):
-		bt = frappe.get_doc("Bank Transaction", bt_name)
-		if bt.docstatus == DocStatus.cancelled():
-			continue
-
-		modified = False
-
-		for pe in bt.payment_entries:
-			if pe.payment_document == doctype and pe.payment_entry == docname:
-				bt.remove(pe)
-				modified = True
-
-		if modified:
-			bt.save()
+		return doc.payment_entry

erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js

@@ -1,15 +1,15 @@
 // Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-frappe.listview_settings["Bank Transaction"] = {
+frappe.listview_settings['Bank Transaction'] = {
 	add_fields: ["unallocated_amount"],
-	get_indicator: function (doc) {
-		if (doc.docstatus == 2) {
+	get_indicator: function(doc) {
+		if(doc.docstatus == 2) {
 			return [__("Cancelled"), "red", "docstatus,=,2"];
-		} else if (flt(doc.unallocated_amount) <= 0) {
+		} else if(flt(doc.unallocated_amount)<=0) {
 			return [__("Reconciled"), "green", "unallocated_amount,=,0"];
-		} else if (flt(doc.unallocated_amount) > 0) {
+		} else if(flt(doc.unallocated_amount)>0) {
 			return [__("Unreconciled"), "orange", "unallocated_amount,>,0"];
 		}
-	},
+	}
 };

erpnext/accounts/doctype/bank_transaction/bank_transaction_upload.py

@@ -18,12 +18,12 @@ def upload_bank_statement():
 		fcontent = frappe.local.uploaded_file
 		fname = frappe.local.uploaded_filename
 
-	if frappe.safe_encode(fname).lower().endswith(b"csv"):
+	if frappe.safe_encode(fname).lower().endswith("csv".encode("utf-8")):
 		from frappe.utils.csvutils import read_csv_content
 
 		rows = read_csv_content(fcontent, False)
 
-	elif frappe.safe_encode(fname).lower().endswith(b"xlsx"):
+	elif frappe.safe_encode(fname).lower().endswith("xlsx".encode("utf-8")):
 		from frappe.utils.xlsxutils import read_xlsx_file_from_attached_file
 
 		rows = read_xlsx_file_from_attached_file(fcontent=fcontent)

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

@@ -2,10 +2,9 @@
 # See license.txt
 
 import json
+import unittest
 
 import frappe
-from frappe import utils
-from frappe.model.docstatus import DocStatus
 from frappe.tests.utils import FrappeTestCase
 
 from erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool import (
@@ -32,16 +31,8 @@ class TestBankTransaction(FrappeTestCase):
 			frappe.db.delete(dt)
 
 		make_pos_profile()
-
-		# generate and use a uniq hash identifier for 'Bank Account' and it's linked GL 'Account' to avoid validation error
-		uniq_identifier = frappe.generate_hash(length=10)
-		gl_account = create_gl_account("_Test Bank " + uniq_identifier)
-		bank_account = create_bank_account(
-			gl_account=gl_account, bank_account_name="Checking Account " + uniq_identifier
-		)
-
-		add_transactions(bank_account=bank_account)
-		add_vouchers(gl_account=gl_account)
+		add_transactions()
+		add_vouchers()
 
 	# This test checks if ERPNext is able to provide a linked payment for a bank transaction based on the amount of the bank transaction.
 	def test_linked_payments(self):
@@ -49,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
@@ -89,41 +75,13 @@ class TestBankTransaction(FrappeTestCase):
 		clearance_date = frappe.db.get_value("Payment Entry", payment.name, "clearance_date")
 		self.assertFalse(clearance_date)
 
-	def test_cancel_voucher(self):
-		bank_transaction = frappe.get_doc(
-			"Bank Transaction",
-			dict(description="1512567 BG/000003025 OPSKATTUZWXXX AT776000000098709849 Herr G"),
-		)
-		payment = frappe.get_doc("Payment Entry", dict(party="Mr G", paid_amount=1700))
-		vouchers = json.dumps(
-			[
-				{
-					"payment_doctype": "Payment Entry",
-					"payment_name": payment.name,
-					"amount": bank_transaction.unallocated_amount,
-				}
-			]
-		)
-		reconcile_vouchers(bank_transaction.name, vouchers)
-		payment.reload()
-		payment.cancel()
-		bank_transaction.reload()
-		self.assertEqual(bank_transaction.docstatus, DocStatus.submitted())
-		self.assertEqual(bank_transaction.unallocated_amount, 1700)
-		self.assertEqual(bank_transaction.payment_entries, [])
-
 	# Check if ERPNext can correctly filter a linked payments based on the debit/credit amount
 	def test_debit_credit_output(self):
 		bank_transaction = frappe.get_doc(
 			"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
@@ -221,9 +179,7 @@ class TestBankTransaction(FrappeTestCase):
 		self.assertEqual(linked_payments[0][2], repayment_entry.name)
 
 
-def create_bank_account(
-	bank_name="Citi Bank", gl_account="_Test Bank - _TC", bank_account_name="Checking Account"
-):
+def create_bank_account(bank_name="Citi Bank", account_name="_Test Bank - _TC"):
 	try:
 		frappe.get_doc(
 			{
@@ -235,35 +191,21 @@ def create_bank_account(
 		pass
 
 	try:
-		bank_account = frappe.get_doc(
+		frappe.get_doc(
 			{
 				"doctype": "Bank Account",
-				"account_name": bank_account_name,
+				"account_name": "Checking Account",
 				"bank": bank_name,
-				"account": gl_account,
+				"account": account_name,
 			}
 		).insert(ignore_if_duplicate=True)
 	except frappe.DuplicateEntryError:
 		pass
 
-	return bank_account.name
 
+def add_transactions():
+	create_bank_account()
 
-def create_gl_account(gl_account_name="_Test Bank - _TC"):
-	gl_account = frappe.get_doc(
-		{
-			"doctype": "Account",
-			"company": "_Test Company",
-			"parent_account": "Current Assets - _TC",
-			"account_type": "Bank",
-			"is_group": 0,
-			"account_name": gl_account_name,
-		}
-	).insert()
-	return gl_account.name
-
-
-def add_transactions(bank_account="_Test Bank - _TC"):
 	doc = frappe.get_doc(
 		{
 			"doctype": "Bank Transaction",
@@ -271,7 +213,7 @@ def add_transactions(bank_account="_Test Bank - _TC"):
 			"date": "2018-10-23",
 			"deposit": 1200,
 			"currency": "INR",
-			"bank_account": bank_account,
+			"bank_account": "Checking Account - Citi Bank",
 		}
 	).insert()
 	doc.submit()
@@ -283,7 +225,7 @@ def add_transactions(bank_account="_Test Bank - _TC"):
 			"date": "2018-10-23",
 			"deposit": 1700,
 			"currency": "INR",
-			"bank_account": bank_account,
+			"bank_account": "Checking Account - Citi Bank",
 		}
 	).insert()
 	doc.submit()
@@ -295,7 +237,7 @@ def add_transactions(bank_account="_Test Bank - _TC"):
 			"date": "2018-10-26",
 			"withdrawal": 690,
 			"currency": "INR",
-			"bank_account": bank_account,
+			"bank_account": "Checking Account - Citi Bank",
 		}
 	).insert()
 	doc.submit()
@@ -307,7 +249,7 @@ def add_transactions(bank_account="_Test Bank - _TC"):
 			"date": "2018-10-27",
 			"deposit": 3900,
 			"currency": "INR",
-			"bank_account": bank_account,
+			"bank_account": "Checking Account - Citi Bank",
 		}
 	).insert()
 	doc.submit()
@@ -319,13 +261,13 @@ def add_transactions(bank_account="_Test Bank - _TC"):
 			"date": "2018-10-27",
 			"withdrawal": 109080,
 			"currency": "INR",
-			"bank_account": bank_account,
+			"bank_account": "Checking Account - Citi Bank",
 		}
 	).insert()
 	doc.submit()
 
 
-def add_vouchers(gl_account="_Test Bank - _TC"):
+def add_vouchers():
 	try:
 		frappe.get_doc(
 			{
@@ -341,7 +283,7 @@ def add_vouchers(gl_account="_Test Bank - _TC"):
 
 	pi = make_purchase_invoice(supplier="Conrad Electronic", qty=1, rate=690)
 
-	pe = get_payment_entry("Purchase Invoice", pi.name, bank_account=gl_account)
+	pe = get_payment_entry("Purchase Invoice", pi.name, bank_account="_Test Bank - _TC")
 	pe.reference_no = "Conrad Oct 18"
 	pe.reference_date = "2018-10-24"
 	pe.insert()
@@ -360,14 +302,14 @@ def add_vouchers(gl_account="_Test Bank - _TC"):
 		pass
 
 	pi = make_purchase_invoice(supplier="Mr G", qty=1, rate=1200)
-	pe = get_payment_entry("Purchase Invoice", pi.name, bank_account=gl_account)
+	pe = get_payment_entry("Purchase Invoice", pi.name, bank_account="_Test Bank - _TC")
 	pe.reference_no = "Herr G Oct 18"
 	pe.reference_date = "2018-10-24"
 	pe.insert()
 	pe.submit()
 
 	pi = make_purchase_invoice(supplier="Mr G", qty=1, rate=1700)
-	pe = get_payment_entry("Purchase Invoice", pi.name, bank_account=gl_account)
+	pe = get_payment_entry("Purchase Invoice", pi.name, bank_account="_Test Bank - _TC")
 	pe.reference_no = "Herr G Nov 18"
 	pe.reference_date = "2018-11-01"
 	pe.insert()
@@ -398,10 +340,10 @@ def add_vouchers(gl_account="_Test Bank - _TC"):
 		pass
 
 	pi = make_purchase_invoice(supplier="Poore Simon's", qty=1, rate=3900, is_paid=1, do_not_save=1)
-	pi.cash_bank_account = gl_account
+	pi.cash_bank_account = "_Test Bank - _TC"
 	pi.insert()
 	pi.submit()
-	pe = get_payment_entry("Purchase Invoice", pi.name, bank_account=gl_account)
+	pe = get_payment_entry("Purchase Invoice", pi.name, bank_account="_Test Bank - _TC")
 	pe.reference_no = "Poore Simon's Oct 18"
 	pe.reference_date = "2018-10-28"
 	pe.paid_amount = 690
@@ -410,7 +352,7 @@ def add_vouchers(gl_account="_Test Bank - _TC"):
 	pe.submit()
 
 	si = create_sales_invoice(customer="Poore Simon's", qty=1, rate=3900)
-	pe = get_payment_entry("Sales Invoice", si.name, bank_account=gl_account)
+	pe = get_payment_entry("Sales Invoice", si.name, bank_account="_Test Bank - _TC")
 	pe.reference_no = "Poore Simon's Oct 18"
 	pe.reference_date = "2018-10-28"
 	pe.insert()
@@ -430,13 +372,19 @@ def add_vouchers(gl_account="_Test Bank - _TC"):
 
 	mode_of_payment = frappe.get_doc({"doctype": "Mode of Payment", "name": "Cash"})
 
-	if not frappe.db.get_value("Mode of Payment Account", {"company": "_Test Company", "parent": "Cash"}):
-		mode_of_payment.append("accounts", {"company": "_Test Company", "default_account": gl_account})
+	if not frappe.db.get_value(
+		"Mode of Payment Account", {"company": "_Test Company", "parent": "Cash"}
+	):
+		mode_of_payment.append(
+			"accounts", {"company": "_Test Company", "default_account": "_Test Bank - _TC"}
+		)
 		mode_of_payment.save()
 
 	si = create_sales_invoice(customer="Fayva", qty=1, rate=109080, do_not_save=1)
 	si.is_pos = 1
-	si.append("payments", {"mode_of_payment": "Cash", "account": gl_account, "amount": 109080})
+	si.append(
+		"payments", {"mode_of_payment": "Cash", "account": "_Test Bank - _TC", "amount": 109080}
+	)
 	si.insert()
 	si.submit()
 

erpnext/accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.js

@@ -1,100 +0,0 @@
-// Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on("Bisect Accounting Statements", {
-	onload(frm) {
-		frm.trigger("render_heatmap");
-	},
-	refresh(frm) {
-		frm.add_custom_button(__("Bisect Left"), () => {
-			frm.trigger("bisect_left");
-		});
-
-		frm.add_custom_button(__("Bisect Right"), () => {
-			frm.trigger("bisect_right");
-		});
-
-		frm.add_custom_button(__("Up"), () => {
-			frm.trigger("move_up");
-		});
-		frm.add_custom_button(__("Build Tree"), () => {
-			frm.trigger("build_tree");
-		});
-	},
-	render_heatmap(frm) {
-		let bisect_heatmap = frm.get_field("bisect_heatmap").$wrapper;
-		bisect_heatmap.addClass("bisect_heatmap_location");
-
-		// milliseconds in a day
-		let msiad = 24 * 60 * 60 * 1000;
-		let datapoints = {};
-		let fr_dt = new Date(frm.doc.from_date).getTime();
-		let to_dt = new Date(frm.doc.to_date).getTime();
-		let bisect_start = new Date(frm.doc.current_from_date).getTime();
-		let bisect_end = new Date(frm.doc.current_to_date).getTime();
-
-		for (let x = fr_dt; x <= to_dt; x += msiad) {
-			let epoch_in_seconds = x / 1000;
-			if (bisect_start <= x && x <= bisect_end) {
-				datapoints[epoch_in_seconds] = 1.0;
-			} else {
-				datapoints[epoch_in_seconds] = 0.0;
-			}
-		}
-
-		new frappe.Chart(".bisect_heatmap_location", {
-			type: "heatmap",
-			data: {
-				dataPoints: datapoints,
-				start: new Date(frm.doc.from_date),
-				end: new Date(frm.doc.to_date),
-			},
-			countLabel: "Bisecting",
-			discreteDomains: 1,
-		});
-	},
-	bisect_left(frm) {
-		frm.call({
-			doc: frm.doc,
-			method: "bisect_left",
-			freeze: true,
-			freeze_message: __("Bisecting Left ..."),
-			callback: (r) => {
-				frm.trigger("render_heatmap");
-			},
-		});
-	},
-	bisect_right(frm) {
-		frm.call({
-			doc: frm.doc,
-			freeze: true,
-			freeze_message: __("Bisecting Right ..."),
-			method: "bisect_right",
-			callback: (r) => {
-				frm.trigger("render_heatmap");
-			},
-		});
-	},
-	move_up(frm) {
-		frm.call({
-			doc: frm.doc,
-			freeze: true,
-			freeze_message: __("Moving up in tree ..."),
-			method: "move_up",
-			callback: (r) => {
-				frm.trigger("render_heatmap");
-			},
-		});
-	},
-	build_tree(frm) {
-		frm.call({
-			doc: frm.doc,
-			freeze: true,
-			freeze_message: __("Rebuilding BTree for period ..."),
-			method: "build_tree",
-			callback: (r) => {
-				frm.trigger("render_heatmap");
-			},
-		});
-	},
-});

erpnext/accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.json

@@ -1,194 +0,0 @@
-{
- "actions": [],
- "allow_rename": 1,
- "creation": "2023-09-15 21:28:28.054773",
- "default_view": "List",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "section_break_cvfg",
-  "company",
-  "column_break_hcam",
-  "from_date",
-  "column_break_qxbi",
-  "to_date",
-  "column_break_iwny",
-  "algorithm",
-  "section_break_8ph9",
-  "current_node",
-  "section_break_ngid",
-  "bisect_heatmap",
-  "section_break_hmsy",
-  "bisecting_from",
-  "current_from_date",
-  "column_break_uqyd",
-  "bisecting_to",
-  "current_to_date",
-  "section_break_hbyo",
-  "heading_cppb",
-  "p_l_summary",
-  "column_break_aivo",
-  "balance_sheet_summary",
-  "b_s_summary",
-  "column_break_gvwx",
-  "difference_heading",
-  "difference"
- ],
- "fields": [
-  {
-   "fieldname": "column_break_qxbi",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "from_date",
-   "fieldtype": "Datetime",
-   "label": "From Date"
-  },
-  {
-   "fieldname": "to_date",
-   "fieldtype": "Datetime",
-   "label": "To Date"
-  },
-  {
-   "default": "BFS",
-   "fieldname": "algorithm",
-   "fieldtype": "Select",
-   "label": "Algorithm",
-   "options": "BFS\nDFS"
-  },
-  {
-   "fieldname": "column_break_iwny",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "current_node",
-   "fieldtype": "Link",
-   "label": "Current Node",
-   "options": "Bisect Nodes"
-  },
-  {
-   "fieldname": "section_break_hmsy",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "current_from_date",
-   "fieldtype": "Datetime",
-   "read_only": 1
-  },
-  {
-   "fieldname": "current_to_date",
-   "fieldtype": "Datetime",
-   "read_only": 1
-  },
-  {
-   "fieldname": "column_break_uqyd",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "section_break_hbyo",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "p_l_summary",
-   "fieldtype": "Float",
-   "read_only": 1
-  },
-  {
-   "fieldname": "b_s_summary",
-   "fieldtype": "Float",
-   "read_only": 1
-  },
-  {
-   "fieldname": "difference",
-   "fieldtype": "Float",
-   "read_only": 1
-  },
-  {
-   "fieldname": "column_break_aivo",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "column_break_gvwx",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "company",
-   "fieldtype": "Link",
-   "label": "Company",
-   "options": "Company"
-  },
-  {
-   "fieldname": "column_break_hcam",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "section_break_ngid",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "section_break_8ph9",
-   "fieldtype": "Section Break",
-   "hidden": 1
-  },
-  {
-   "fieldname": "bisect_heatmap",
-   "fieldtype": "HTML",
-   "label": "Heatmap"
-  },
-  {
-   "fieldname": "heading_cppb",
-   "fieldtype": "Heading",
-   "label": "Profit and Loss Summary"
-  },
-  {
-   "fieldname": "balance_sheet_summary",
-   "fieldtype": "Heading",
-   "label": "Balance Sheet Summary"
-  },
-  {
-   "fieldname": "difference_heading",
-   "fieldtype": "Heading",
-   "label": "Difference"
-  },
-  {
-   "fieldname": "bisecting_from",
-   "fieldtype": "Heading",
-   "label": "Bisecting From"
-  },
-  {
-   "fieldname": "bisecting_to",
-   "fieldtype": "Heading",
-   "label": "Bisecting To"
-  },
-  {
-   "fieldname": "section_break_cvfg",
-   "fieldtype": "Section Break"
-  }
- ],
- "hide_toolbar": 1,
- "index_web_pages_for_search": 1,
- "issingle": 1,
- "links": [],
- "modified": "2023-12-01 16:49:54.073890",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Bisect Accounting Statements",
- "owner": "Administrator",
- "permissions": [
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "print": 1,
-   "read": 1,
-   "role": "Administrator",
-   "share": 1,
-   "write": 1
-  }
- ],
- "read_only": 1,
- "sort_field": "modified",
- "sort_order": "DESC",
- "states": []
-}

erpnext/accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.py

@@ -1,206 +0,0 @@
-# Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-import datetime
-from collections import deque
-from math import floor
-
-import frappe
-from dateutil.relativedelta import relativedelta
-from frappe import _
-from frappe.model.document import Document
-from frappe.utils import getdate
-from frappe.utils.data import guess_date_format
-
-
-class BisectAccountingStatements(Document):
-	def validate(self):
-		self.validate_dates()
-
-	def validate_dates(self):
-		if getdate(self.from_date) > getdate(self.to_date):
-			frappe.throw(
-				_("From Date: {0} cannot be greater than To date: {1}").format(
-					frappe.bold(self.from_date), frappe.bold(self.to_date)
-				)
-			)
-
-	def bfs(self, from_date: datetime, to_date: datetime):
-		# Make Root node
-		node = frappe.new_doc("Bisect Nodes")
-		node.root = None
-		node.period_from_date = from_date
-		node.period_to_date = to_date
-		node.insert()
-
-		period_queue = deque([node])
-		while period_queue:
-			cur_node = period_queue.popleft()
-			delta = cur_node.period_to_date - cur_node.period_from_date
-			if delta.days == 0:
-				continue
-			else:
-				cur_floor = floor(delta.days / 2)
-				next_to_date = cur_node.period_from_date + relativedelta(days=+cur_floor)
-				left_node = frappe.new_doc("Bisect Nodes")
-				left_node.period_from_date = cur_node.period_from_date
-				left_node.period_to_date = next_to_date
-				left_node.root = cur_node.name
-				left_node.generated = False
-				left_node.insert()
-				cur_node.left_child = left_node.name
-				period_queue.append(left_node)
-
-				next_from_date = cur_node.period_from_date + relativedelta(days=+(cur_floor + 1))
-				right_node = frappe.new_doc("Bisect Nodes")
-				right_node.period_from_date = next_from_date
-				right_node.period_to_date = cur_node.period_to_date
-				right_node.root = cur_node.name
-				right_node.generated = False
-				right_node.insert()
-				cur_node.right_child = right_node.name
-				period_queue.append(right_node)
-
-				cur_node.save()
-
-	def dfs(self, from_date: datetime, to_date: datetime):
-		# Make Root node
-		node = frappe.new_doc("Bisect Nodes")
-		node.root = None
-		node.period_from_date = from_date
-		node.period_to_date = to_date
-		node.insert()
-
-		period_stack = [node]
-		while period_stack:
-			cur_node = period_stack.pop()
-			delta = cur_node.period_to_date - cur_node.period_from_date
-			if delta.days == 0:
-				continue
-			else:
-				cur_floor = floor(delta.days / 2)
-				next_to_date = cur_node.period_from_date + relativedelta(days=+cur_floor)
-				left_node = frappe.new_doc("Bisect Nodes")
-				left_node.period_from_date = cur_node.period_from_date
-				left_node.period_to_date = next_to_date
-				left_node.root = cur_node.name
-				left_node.generated = False
-				left_node.insert()
-				cur_node.left_child = left_node.name
-				period_stack.append(left_node)
-
-				next_from_date = cur_node.period_from_date + relativedelta(days=+(cur_floor + 1))
-				right_node = frappe.new_doc("Bisect Nodes")
-				right_node.period_from_date = next_from_date
-				right_node.period_to_date = cur_node.period_to_date
-				right_node.root = cur_node.name
-				right_node.generated = False
-				right_node.insert()
-				cur_node.right_child = right_node.name
-				period_stack.append(right_node)
-
-				cur_node.save()
-
-	@frappe.whitelist()
-	def build_tree(self):
-		frappe.db.delete("Bisect Nodes")
-
-		# Convert str to datetime format
-		dt_format = guess_date_format(self.from_date)
-		from_date = datetime.datetime.strptime(self.from_date, dt_format)
-		to_date = datetime.datetime.strptime(self.to_date, dt_format)
-
-		if self.algorithm == "BFS":
-			self.bfs(from_date, to_date)
-
-		if self.algorithm == "DFS":
-			self.dfs(from_date, to_date)
-
-		# set root as current node
-		root = frappe.db.get_all("Bisect Nodes", filters={"root": ["is", "not set"]})[0]
-		self.get_report_summary()
-		self.current_node = root.name
-		self.current_from_date = self.from_date
-		self.current_to_date = self.to_date
-		self.save()
-
-	def get_report_summary(self):
-		filters = {
-			"company": self.company,
-			"filter_based_on": "Date Range",
-			"period_start_date": self.current_from_date,
-			"period_end_date": self.current_to_date,
-			"periodicity": "Yearly",
-		}
-		pl_summary = frappe.get_doc("Report", "Profit and Loss Statement")
-		self.p_l_summary = pl_summary.execute_script_report(filters=filters)[5]
-		bs_summary = frappe.get_doc("Report", "Balance Sheet")
-		self.b_s_summary = bs_summary.execute_script_report(filters=filters)[5]
-		self.difference = abs(self.p_l_summary - self.b_s_summary)
-
-	def update_node(self):
-		current_node = frappe.get_doc("Bisect Nodes", self.current_node)
-		current_node.balance_sheet_summary = self.b_s_summary
-		current_node.profit_loss_summary = self.p_l_summary
-		current_node.difference = self.difference
-		current_node.generated = True
-		current_node.save()
-
-	def current_node_has_summary_info(self):
-		"Assertion method"
-		return frappe.db.get_value("Bisect Nodes", self.current_node, "generated")
-
-	def fetch_summary_info_from_current_node(self):
-		current_node = frappe.get_doc("Bisect Nodes", self.current_node)
-		self.p_l_summary = current_node.balance_sheet_summary
-		self.b_s_summary = current_node.profit_loss_summary
-		self.difference = abs(self.p_l_summary - self.b_s_summary)
-
-	def fetch_or_calculate(self):
-		if self.current_node_has_summary_info():
-			self.fetch_summary_info_from_current_node()
-		else:
-			self.get_report_summary()
-			self.update_node()
-
-	@frappe.whitelist()
-	def bisect_left(self):
-		if self.current_node is not None:
-			cur_node = frappe.get_doc("Bisect Nodes", self.current_node)
-			if cur_node.left_child is not None:
-				lft_node = frappe.get_doc("Bisect Nodes", cur_node.left_child)
-				self.current_node = cur_node.left_child
-				self.current_from_date = lft_node.period_from_date
-				self.current_to_date = lft_node.period_to_date
-				self.fetch_or_calculate()
-				self.save()
-			else:
-				frappe.msgprint(_("No more children on Left"))
-
-	@frappe.whitelist()
-	def bisect_right(self):
-		if self.current_node is not None:
-			cur_node = frappe.get_doc("Bisect Nodes", self.current_node)
-			if cur_node.right_child is not None:
-				rgt_node = frappe.get_doc("Bisect Nodes", cur_node.right_child)
-				self.current_node = cur_node.right_child
-				self.current_from_date = rgt_node.period_from_date
-				self.current_to_date = rgt_node.period_to_date
-				self.fetch_or_calculate()
-				self.save()
-			else:
-				frappe.msgprint(_("No more children on Right"))
-
-	@frappe.whitelist()
-	def move_up(self):
-		if self.current_node is not None:
-			cur_node = frappe.get_doc("Bisect Nodes", self.current_node)
-			if cur_node.root is not None:
-				root = frappe.get_doc("Bisect Nodes", cur_node.root)
-				self.current_node = cur_node.root
-				self.current_from_date = root.period_from_date
-				self.current_to_date = root.period_to_date
-				self.fetch_or_calculate()
-				self.save()
-			else:
-				frappe.msgprint(_("Reached Root"))

erpnext/accounts/doctype/bisect_accounting_statements/test_bisect_accounting_statements.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 TestBisectAccountingStatements(FrappeTestCase):
-	pass

erpnext/accounts/doctype/bisect_nodes/bisect_nodes.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("Bisect Nodes", {
-// 	refresh(frm) {
-
-// 	},
-// });

erpnext/accounts/doctype/bisect_nodes/bisect_nodes.json

@@ -1,97 +0,0 @@
-{
- "actions": [],
- "autoname": "autoincrement",
- "creation": "2023-09-27 14:56:38.112462",
- "default_view": "List",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "root",
-  "left_child",
-  "right_child",
-  "period_from_date",
-  "period_to_date",
-  "difference",
-  "balance_sheet_summary",
-  "profit_loss_summary",
-  "generated"
- ],
- "fields": [
-  {
-   "fieldname": "root",
-   "fieldtype": "Link",
-   "label": "Root",
-   "options": "Bisect Nodes"
-  },
-  {
-   "fieldname": "left_child",
-   "fieldtype": "Link",
-   "label": "Left Child",
-   "options": "Bisect Nodes"
-  },
-  {
-   "fieldname": "right_child",
-   "fieldtype": "Link",
-   "label": "Right Child",
-   "options": "Bisect Nodes"
-  },
-  {
-   "fieldname": "period_from_date",
-   "fieldtype": "Datetime",
-   "label": "Period_from_date"
-  },
-  {
-   "fieldname": "period_to_date",
-   "fieldtype": "Datetime",
-   "label": "Period To Date"
-  },
-  {
-   "fieldname": "difference",
-   "fieldtype": "Float",
-   "label": "Difference"
-  },
-  {
-   "fieldname": "balance_sheet_summary",
-   "fieldtype": "Float",
-   "label": "Balance Sheet Summary"
-  },
-  {
-   "fieldname": "profit_loss_summary",
-   "fieldtype": "Float",
-   "label": "Profit and Loss Summary"
-  },
-  {
-   "default": "0",
-   "fieldname": "generated",
-   "fieldtype": "Check",
-   "label": "Generated"
-  }
- ],
- "index_web_pages_for_search": 1,
- "links": [],
- "modified": "2023-12-01 17:46:12.437996",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Bisect Nodes",
- "naming_rule": "Autoincrement",
- "owner": "Administrator",
- "permissions": [
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Administrator",
-   "share": 1,
-   "write": 1
-  }
- ],
- "read_only": 1,
- "sort_field": "modified",
- "sort_order": "DESC",
- "states": []
-}

erpnext/accounts/doctype/bisect_nodes/bisect_nodes.py

@@ -1,29 +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
-
-
-class BisectNodes(Document):
-	# begin: auto-generated types
-	# This code is auto-generated. Do not modify anything in this block.
-
-	from typing import TYPE_CHECKING
-
-	if TYPE_CHECKING:
-		from frappe.types import DF
-
-		balance_sheet_summary: DF.Float
-		difference: DF.Float
-		generated: DF.Check
-		left_child: DF.Link | None
-		name: DF.Int | None
-		period_from_date: DF.Datetime | None
-		period_to_date: DF.Datetime | None
-		profit_loss_summary: DF.Float
-		right_child: DF.Link | None
-		root: DF.Link | None
-	# end: auto-generated types
-
-	pass

erpnext/accounts/doctype/bisect_nodes/test_bisect_nodes.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 TestBisectNodes(FrappeTestCase):
-	pass

erpnext/accounts/doctype/budget/budget.js

@@ -2,48 +2,48 @@
 // For license information, please see license.txt
 frappe.provide("erpnext.accounts.dimensions");
 
-frappe.ui.form.on("Budget", {
-	onload: function (frm) {
-		frm.set_query("account", "accounts", function () {
+frappe.ui.form.on('Budget', {
+	onload: function(frm) {
+		frm.set_query("account", "accounts", function() {
 			return {
 				filters: {
 					company: frm.doc.company,
 					report_type: "Profit and Loss",
-					is_group: 0,
-				},
+					is_group: 0
+				}
 			};
 		});
 
-		frm.set_query("monthly_distribution", function () {
+		frm.set_query("monthly_distribution", function() {
 			return {
 				filters: {
-					fiscal_year: frm.doc.fiscal_year,
-				},
+					fiscal_year: frm.doc.fiscal_year
+				}
 			};
 		});
 
 		erpnext.accounts.dimensions.setup_dimension_filters(frm, frm.doctype);
 	},
 
-	refresh: function (frm) {
-		frm.trigger("toggle_reqd_fields");
+	refresh: function(frm) {
+		frm.trigger("toggle_reqd_fields")
 	},
 
-	budget_against: function (frm) {
-		frm.trigger("set_null_value");
-		frm.trigger("toggle_reqd_fields");
+	budget_against: function(frm) {
+		frm.trigger("set_null_value")
+		frm.trigger("toggle_reqd_fields")
 	},
 
-	set_null_value: function (frm) {
-		if (frm.doc.budget_against == "Cost Center") {
-			frm.set_value("project", null);
+	set_null_value: function(frm) {
+		if(frm.doc.budget_against == 'Cost Center') {
+			frm.set_value('project', null)
 		} else {
-			frm.set_value("cost_center", null);
+			frm.set_value('cost_center', null)
 		}
 	},
 
-	toggle_reqd_fields: function (frm) {
-		frm.toggle_reqd("cost_center", frm.doc.budget_against == "Cost Center");
-		frm.toggle_reqd("project", frm.doc.budget_against == "Project");
-	},
+	toggle_reqd_fields: function(frm) {
+		frm.toggle_reqd("cost_center", frm.doc.budget_against=="Cost Center");
+		frm.toggle_reqd("project", frm.doc.budget_against=="Project");
+	}
 });

erpnext/accounts/doctype/budget/budget.json

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

erpnext/accounts/doctype/budget/budget.py

@@ -5,6 +5,7 @@
 import frappe
 from frappe import _
 from frappe.model.document import Document
+from frappe.model.naming import make_autoname
 from frappe.utils import add_months, flt, fmt_money, get_last_day, getdate
 
 from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import (
@@ -22,6 +23,11 @@ class DuplicateBudgetError(frappe.ValidationError):
 
 
 class Budget(Document):
+	def autoname(self):
+		self.name = make_autoname(
+			self.get(frappe.scrub(self.budget_against)) + "/" + self.fiscal_year + "/.###"
+		)
+
 	def validate(self):
 		if not self.get(frappe.scrub(self.budget_against)):
 			frappe.throw(_("{0} is mandatory").format(self.budget_against))
@@ -40,11 +46,10 @@ class Budget(Document):
 			select
 				b.name, ba.account from `tabBudget` b, `tabBudget Account` ba
 			where
-				ba.parent = b.name and b.docstatus < 2 and b.company = {} and {}={} and
-				b.fiscal_year={} and b.name != {} and ba.account in ({}) """.format(
-				"%s", budget_against_field, "%s", "%s", "%s", ",".join(["%s"] * len(accounts))
-			),
-			(self.company, budget_against, self.fiscal_year, self.name, *tuple(accounts)),
+				ba.parent = b.name and b.docstatus < 2 and b.company = %s and %s=%s and
+				b.fiscal_year=%s and b.name != %s and ba.account in (%s) """
+			% ("%s", budget_against_field, "%s", "%s", "%s", ",".join(["%s"] * len(accounts))),
+			(self.company, budget_against, self.fiscal_year, self.name) + tuple(accounts),
 			as_dict=1,
 		)
 
@@ -67,14 +72,12 @@ class Budget(Document):
 				if account_details.is_group:
 					frappe.throw(_("Budget cannot be assigned against Group Account {0}").format(d.account))
 				elif account_details.company != self.company:
-					frappe.throw(
-						_("Account {0} does not belongs to company {1}").format(d.account, self.company)
-					)
+					frappe.throw(_("Account {0} does not belongs to company {1}").format(d.account, self.company))
 				elif account_details.report_type != "Profit and Loss":
 					frappe.throw(
-						_(
-							"Budget cannot be assigned against {0}, as it's not an Income or Expense account"
-						).format(d.account)
+						_("Budget cannot be assigned against {0}, as it's not an Income or Expense account").format(
+							d.account
+						)
 					)
 
 				if d.account in account_list:
@@ -106,14 +109,9 @@ class Budget(Document):
 		):
 			self.applicable_on_booking_actual_expenses = 1
 
-	def before_naming(self):
-		self.naming_series = f"{{{frappe.scrub(self.budget_against)}}}./.{self.fiscal_year}/.###"
 
-
-def validate_expense_against_budget(args, expense_amount=0):
+def validate_expense_against_budget(args):
 	args = frappe._dict(args)
-	if not frappe.get_all("Budget", limit=1):
-		return
 
 	if args.get("company") and not args.fiscal_year:
 		args.fiscal_year = get_fiscal_year(args.get("posting_date"), company=args.get("company"))[0]
@@ -121,9 +119,6 @@ def validate_expense_against_budget(args, expense_amount=0):
 			"Company", args.get("company"), "exception_budget_approver_role"
 		)
 
-	if not frappe.get_cached_value("Budget", {"fiscal_year": args.fiscal_year, "company": args.company}):  # nosec
-		return
-
 	if not args.account:
 		args.account = args.get("expense_account")
 
@@ -133,43 +128,36 @@ 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.get_cached_value("Account", args.account, "root_type") == "Expense")
+			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.get_cached_value(doctype, args.get(budget_against), ["lft", "rgt"])
-				condition = f"""and exists(select name from `tab{doctype}`
-					where lft<={lft} and rgt>={rgt} and name=b.{budget_against})"""  # nosec
+				lft, rgt = frappe.db.get_value(doctype, args.get(budget_against), ["lft", "rgt"])
+				condition = """and exists(select name from `tab%s`
+					where lft<=%s and rgt>=%s and name=b.%s)""" % (
+					doctype,
+					lft,
+					rgt,
+					budget_against,
+				)  # nosec
 				args.is_tree = True
 			else:
-				condition = f"and b.{budget_against}={frappe.db.escape(args.get(budget_against))}"
+				condition = "and b.%s=%s" % (budget_against, frappe.db.escape(args.get(budget_against)))
 				args.is_tree = False
 
 			args.budget_against_field = budget_against
 			args.budget_against_doctype = doctype
 
 			budget_records = frappe.db.sql(
-				f"""
+				"""
 				select
-					b.{budget_against} as budget_against, ba.budget_amount, b.monthly_distribution,
+					b.{budget_against_field} as budget_against, ba.budget_amount, b.monthly_distribution,
 					ifnull(b.applicable_on_material_request, 0) as for_material_request,
 					ifnull(applicable_on_purchase_order, 0) as for_purchase_order,
 					ifnull(applicable_on_booking_actual_expenses,0) as for_actual_expenses,
@@ -182,31 +170,22 @@ def validate_expense_against_budget(args, expense_amount=0):
 					b.name=ba.parent and b.fiscal_year=%s
 					and ba.account=%s and b.docstatus=1
 					{condition}
-			""",
+			""".format(
+					condition=condition, budget_against_field=budget_against
+				),
 				(args.fiscal_year, args.account),
 				as_dict=True,
 			)  # nosec
 
 			if budget_records:
-				validate_budget_records(args, budget_records, expense_amount)
+				validate_budget_records(args, budget_records)
 
 
-def validate_budget_records(args, budget_records, expense_amount):
+def validate_budget_records(args, budget_records):
 	for budget in budget_records:
 		if flt(budget.budget_amount):
+			amount = get_amount(args, budget)
 			yearly_action, monthly_action = get_actions(args, budget)
-			args["for_material_request"] = budget.for_material_request
-			args["for_purchase_order"] = budget.for_purchase_order
-
-			if yearly_action in ("Stop", "Warn"):
-				compare_expense_with_budget(
-					args,
-					flt(budget.budget_amount),
-					_("Annual"),
-					yearly_action,
-					budget.budget_against,
-					expense_amount,
-				)
 
 			if monthly_action in ["Stop", "Warn"]:
 				budget_amount = get_accumulated_monthly_budget(
@@ -216,136 +195,44 @@ def validate_budget_records(args, budget_records, expense_amount):
 				args["month_end_date"] = get_last_day(args.posting_date)
 
 				compare_expense_with_budget(
-					args,
-					budget_amount,
-					_("Accumulated Monthly"),
-					monthly_action,
-					budget.budget_against,
-					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):
-	args.actual_expense, args.requested_amount, args.ordered_amount = get_actual_expense(args), 0, 0
-	if not amount:
-		args.requested_amount, args.ordered_amount = get_requested_amount(args), get_ordered_amount(args)
-
-		if args.get("doctype") == "Material Request" and args.for_material_request:
-			amount = args.requested_amount + args.ordered_amount
-
-		elif args.get("doctype") == "Purchase Order" and args.for_purchase_order:
-			amount = args.ordered_amount
-
-	total_expense = args.actual_expense + amount
-
-	if total_expense > budget_amount:
-		if args.actual_expense > budget_amount:
-			error_tense = _("is already")
-			diff = args.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)),
 		)
 
-		msg += get_expense_breakup(args, currency, budget_against)
-
-		if frappe.flags.exception_approver_role and frappe.flags.exception_approver_role in frappe.get_roles(
-			frappe.session.user
+		if (
+			frappe.flags.exception_approver_role
+			and frappe.flags.exception_approver_role in frappe.get_roles(frappe.session.user)
 		):
 			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"))
-
-
-def get_expense_breakup(args, currency, budget_against):
-	msg = "<hr>Total Expenses booked through - <ul>"
-
-	common_filters = frappe._dict(
-		{
-			args.budget_against_field: budget_against,
-			"account": args.account,
-			"company": args.company,
-		}
-	)
-
-	msg += (
-		"<li>"
-		+ frappe.utils.get_link_to_report(
-			"General Ledger",
-			label="Actual Expenses",
-			filters=common_filters.copy().update(
-				{
-					"from_date": frappe.get_cached_value("Fiscal Year", args.fiscal_year, "year_start_date"),
-					"to_date": frappe.get_cached_value("Fiscal Year", args.fiscal_year, "year_end_date"),
-					"is_cancelled": 0,
-				}
-			),
-		)
-		+ " - "
-		+ frappe.bold(fmt_money(args.actual_expense, currency=currency))
-		+ "</li>"
-	)
-
-	msg += (
-		"<li>"
-		+ frappe.utils.get_link_to_report(
-			"Material Request",
-			label="Material Requests",
-			report_type="Report Builder",
-			doctype="Material Request",
-			filters=common_filters.copy().update(
-				{
-					"status": [["!=", "Stopped"]],
-					"docstatus": 1,
-					"material_request_type": "Purchase",
-					"schedule_date": [["fiscal year", "2023-2024"]],
-					"item_code": args.item_code,
-					"per_ordered": [["<", 100]],
-				}
-			),
-		)
-		+ " - "
-		+ frappe.bold(fmt_money(args.requested_amount, currency=currency))
-		+ "</li>"
-	)
-
-	msg += (
-		"<li>"
-		+ frappe.utils.get_link_to_report(
-			"Purchase Order",
-			label="Unbilled Orders",
-			report_type="Report Builder",
-			doctype="Purchase Order",
-			filters=common_filters.copy().update(
-				{
-					"status": [["!=", "Closed"]],
-					"docstatus": 1,
-					"transaction_date": [["fiscal year", "2023-2024"]],
-					"item_code": args.item_code,
-					"per_billed": [["<", 100]],
-				}
-			),
-		)
-		+ " - "
-		+ frappe.bold(fmt_money(args.ordered_amount, currency=currency))
-		+ "</li></ul>"
-	)
-
-	return msg
+			frappe.msgprint(msg, indicator="orange")
 
 
 def get_actions(args, budget):
@@ -363,15 +250,31 @@ def get_actions(args, budget):
 	return yearly_action, monthly_action
 
 
-def get_requested_amount(args):
+def get_amount(args, budget):
+	amount = 0
+
+	if args.get("doctype") == "Material Request" and budget.for_material_request:
+		amount = (
+			get_requested_amount(args, budget) + get_ordered_amount(args, budget) + get_actual_expense(args)
+		)
+
+	elif args.get("doctype") == "Purchase Order" and budget.for_purchase_order:
+		amount = get_ordered_amount(args, budget) + get_actual_expense(args)
+
+	return amount
+
+
+def get_requested_amount(args, budget):
 	item_code = args.get("item_code")
-	condition = get_other_condition(args, "Material Request")
+	condition = get_other_condition(args, budget, "Material Request")
 
 	data = frappe.db.sql(
 		""" select ifnull((sum(child.stock_qty - child.ordered_qty) * rate), 0) as amount
 		from `tabMaterial Request Item` child, `tabMaterial Request` parent where parent.name = child.parent and
-		child.item_code = %s and parent.docstatus = 1 and child.stock_qty > child.ordered_qty and {} and
-		parent.material_request_type = 'Purchase' and parent.status != 'Stopped'""".format(condition),
+		child.item_code = %s and parent.docstatus = 1 and child.stock_qty > child.ordered_qty and {0} and
+		parent.material_request_type = 'Purchase' and parent.status != 'Stopped'""".format(
+			condition
+		),
 		item_code,
 		as_list=1,
 	)
@@ -379,15 +282,17 @@ def get_requested_amount(args):
 	return data[0][0] if data else 0
 
 
-def get_ordered_amount(args):
+def get_ordered_amount(args, budget):
 	item_code = args.get("item_code")
-	condition = get_other_condition(args, "Purchase Order")
+	condition = get_other_condition(args, budget, "Purchase Order")
 
 	data = frappe.db.sql(
-		f""" select ifnull(sum(child.amount - child.billed_amt), 0) as amount
+		""" select ifnull(sum(child.amount - child.billed_amt), 0) as amount
 		from `tabPurchase Order Item` child, `tabPurchase Order` parent where
 		parent.name = child.parent and child.item_code = %s and parent.docstatus = 1 and child.amount > child.billed_amt
-		and parent.status != 'Closed' and {condition}""",
+		and parent.status != 'Closed' and {0}""".format(
+			condition
+		),
 		item_code,
 		as_list=1,
 	)
@@ -395,12 +300,12 @@ def get_ordered_amount(args):
 	return data[0][0] if data else 0
 
 
-def get_other_condition(args, for_doc):
+def get_other_condition(args, budget, for_doc):
 	condition = "expense_account = '%s'" % (args.expense_account)
 	budget_against_field = args.get("budget_against_field")
 
 	if budget_against_field and args.get(budget_against_field):
-		condition += f" and child.{budget_against_field} = '{args.get(budget_against_field)}'"
+		condition += " and child.%s = '%s'" % (budget_against_field, args.get(budget_against_field))
 
 	if args.get("fiscal_year"):
 		date_field = "schedule_date" if for_doc == "Material Request" else "transaction_date"
@@ -408,8 +313,12 @@ def get_other_condition(args, for_doc):
 			"Fiscal Year", args.get("fiscal_year"), ["year_start_date", "year_end_date"]
 		)
 
-		condition += f""" and parent.{date_field}
-			between '{start_date}' and '{end_date}' """
+		condition += """ and parent.%s
+			between '%s' and '%s' """ % (
+			date_field,
+			start_date,
+			end_date,
+		)
 
 	return condition
 
@@ -428,28 +337,32 @@ def get_actual_expense(args):
 
 		args.update(lft_rgt)
 
-		condition2 = f"""and exists(select name from `tab{args.budget_against_doctype}`
+		condition2 = """and exists(select name from `tab{doctype}`
 			where lft>=%(lft)s and rgt<=%(rgt)s
-			and name=gle.{budget_against_field})"""
+			and name=gle.{budget_against_field})""".format(
+			doctype=args.budget_against_doctype, budget_against_field=budget_against_field  # nosec
+		)
 	else:
-		condition2 = f"""and exists(select name from `tab{args.budget_against_doctype}`
-		where name=gle.{budget_against_field} and
-		gle.{budget_against_field} = %({budget_against_field})s)"""
+		condition2 = """and exists(select name from `tab{doctype}`
+		where name=gle.{budget_against} and
+		gle.{budget_against} = %({budget_against})s)""".format(
+			doctype=args.budget_against_doctype, budget_against=budget_against_field
+		)
 
 	amount = flt(
 		frappe.db.sql(
-			f"""
+			"""
 		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
 			and gle.docstatus=1
 			{condition2}
-	""",
+	""".format(
+				condition1=condition1, condition2=condition2
+			),
 			(args),
 		)[0][0]
 	)  # nosec
@@ -460,20 +373,13 @@ def get_actual_expense(args):
 def get_accumulated_monthly_budget(monthly_distribution, posting_date, fiscal_year, annual_budget):
 	distribution = {}
 	if monthly_distribution:
-		mdp = frappe.qb.DocType("Monthly Distribution Percentage")
-		md = frappe.qb.DocType("Monthly Distribution")
-
-		res = (
-			frappe.qb.from_(mdp)
-			.join(md)
-			.on(mdp.parent == md.name)
-			.select(mdp.month, mdp.percentage_allocation)
-			.where(md.fiscal_year == fiscal_year)
-			.where(md.name == monthly_distribution)
-			.run(as_dict=True)
-		)
-
-		for d in res:
+		for d in frappe.db.sql(
+			"""select mdp.month, mdp.percentage_allocation
+			from `tabMonthly Distribution Percentage` mdp, `tabMonthly Distribution` md
+			where mdp.parent=md.name and md.fiscal_year=%s""",
+			fiscal_year,
+			as_dict=1,
+		):
 			distribution.setdefault(d.month, d.percentage_allocation)
 
 	dt = frappe.db.get_value("Fiscal Year", fiscal_year, "year_start_date")