chore(release): Bumped to Version 15.28.2

## [15.28.2](https://github.com/frappe/erpnext/compare/v15.28.1...v15.28.2) (2024-06-29)

### Bug Fixes

* expense account from item group not fetched (backport [#41957](https://github.com/frappe/erpnext/issues/41957)) ([#41962](https://github.com/frappe/erpnext/issues/41962)) ([d310074](d310074222))

.coderabbit.yml

@@ -1,12 +0,0 @@
-reviews:
-  auto_review:
-    ignore_title_keywords:
-      - "sync translations"
-      - "update POT file"
-      - "style: "
-  review_status: false
-  poem: false
-  collapse_walkthrough: true
-  sequence_diagrams: false
-  changed_files_summary: false
-  high_level_summary: false

.editorconfig

@@ -18,4 +18,4 @@ max_line_length = 110
 [{*.json}]
 insert_final_newline = false
 indent_style = space
-indent_size = 1
+indent_size = 2

.git-blame-ignore-revs

@@ -30,24 +30,5 @@ b147b85e6ac19a9220cd1e2958a6ebd99373283a
 # bulk format python code with black
 baec607ff5905b1c67531096a9cf50ec7ff00a5d
 
-# bulk refactor with sourcery
-eb9ee3f79b94e594fc6dfa4f6514580e125eee8c
-
-# js formatting
-ec74a5e56617bbd76ac402451468fd4668af543d
-
-# ruff formatting
-a308792ee7fda18a681e9181f4fd00b36385bc23
-
-# noisy typing refactoring of get_item_details
-7b7211ac79c248a79ba8a999ff34e734d874c0ae
-d827ed21adc7b36047e247cbb0dc6388d048a7f9
-
-# `frappe.flags.in_test` => `frappe.in_test`
-7a482a69985c952de0e8193c9d4e086aee65ee6d
-
-# these commits actually changed something valuable
-# but they have a lot of whitespace changes that make blame noisy
-# PR: https://github.com/frappe/erpnext/pull/49816
-3ffd50c772735877b330d010c1058f623da8721d
-0e8f8677b8eb31e7834f72d1c6314d3c3f392ca6
+# ruff
+960ef14b7a68cfec9e309ec12845f521cb6a721c

.github/CONTRIBUTING.md

@@ -1,4 +1,4 @@
-### Introduction (for first timers)
+### Introduction (first timers)
 
 Thank you for your interest in raising an Issue with ERPNext. An Issue could mean a bug report or a request for a missing feature. By raising a bug report, you are contributing to the development of ERPNext and this is the first step of participating in the community. Bug reports are very helpful for developers as they quickly fix the issue before other users start facing it.
 
@@ -6,31 +6,31 @@ Feature requests are also a great way to take the product forward. New ideas can
 
 When you are raising an Issue, you should keep a few things in mind. Remember that the developer does not have access to your machine so you must give all the information you can while raising an Issue. If you are suggesting a feature, you should be very clear about what you want.
 
-The Issue list is not the right place to ask a question or start a general discussion. If you want to do that, then the right place is the forum [https://discuss.frappe.io](https://discuss.frappe.io/c/erpnext/6).
+The Issue list is not the right place to ask a question or start a general discussion. If you want to do that , then the right place is the forum [https://discuss.erpnext.com](https://discuss.erpnext.com).
 
 ### Reply and Closing Policy
 
-If your issue is not clear or does not meet the guidelines, then it will be closed. If it is closed, please supply the requested information and re-open it.
+If your issue is not clear or does not meet the guidelines, then it will be closed. If it is closed, please supply the information asked and re-open it.
 
 ### General Issue Guidelines
 
-1. **Search existing Issues:** Before raising an Issue, search if it has been raised before. Maybe add a 👍 or give additional help by creating a mockup if it is not already created.
-2. **Report each issue separately:** Don't club multiple, unrelated issues in one note.
-3. **Brief:** Please don't include long explanations. Use screenshots and bullet points instead of descriptive paragraphs.
+1. **Search existing Issues:** Before raising a Issue, search if it has been raised before. Maybe add a 👍 or give additional help by creating a mockup if it is not already created.
+1. **Report each issue separately:** Don't club multiple, unreleated issues in one note.
+1. **Brief:** Please don't include long explanations. Use screenshots and bullet points instead of descriptive paragraphs.
 
 ### Bug Report Guidelines
 
 1. **Steps to Reproduce:** The bug report must have a list of steps needed to reproduce a bug. If we cannot reproduce it, then we cannot solve it.
-2. **Version Number:** Please add the version number in your report. Often a bug is fixed in the latest version.
-3. **Clear Title:** Add a clear subject to your bug report like "Unable to submit Purchase Order without Basic Rate" instead of just "Cannot Submit".
-4. **Screenshots:** Screenshots are a great way of communicating issues. Try adding annotations or using LICEcap to take a screencast in `.gif` format.
+1. **Version Number:** Please add the version number in your report. Often a bug is fixed in the latest version
+1. **Clear Title:** Add a clear subject to your bug report like "Unable to submit Purchase Order without Basic Rate" instead of just "Cannot Submit"
+1. **Screenshots:** Screenshots are a great way of communicating issues. Try adding annotations or using LiceCAP to take a screencast in `gif`.
 
 ### Feature Request Guidelines
 
-1. **Clarity:** Clearly specify how you want the feature to behave. Don't just say "I would like multiple PDF formats", instead say "Ability to add multiple print formats for customers with different languages".
-2. **Solution:** Try to identify what the feature should look like.
-3. **Mockups:** Mockups are a great way to explain your requirement.
+1. **Clarity:** Clearly specify how do you want the feature to behave. Don't just say "I would like multiple PDF formats", say that "Ability to add multiple print formats for customers with different languages".
+1. **Solution:** Try and identify how the feature should look like.
+1. **Mockups:** Mockups are a great way to explain your requirement.
 
-### What if my issue is closed
+### What if my Issue is closed
 
 Don't worry, take the feedback, supply the correct information and re-open it!

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -9,7 +9,7 @@ body:
         Welcome to ERPNext issue tracker! Before creating an issue, please heed the following:
 
         1. This tracker should only be used to report bugs and request features / enhancements to ERPNext
-            - For questions and general support, checkout the [user manual](https://docs.erpnext.com/) or use [forum](https://discuss.frappe.io/c/erpnext/6)
+            - For questions and general support, checkout the [user manual](https://docs.erpnext.com/) or use [forum](https://discuss.erpnext.com)
             - For documentation issues, propose edit on [documentation site](https://docs.erpnext.com/) directly.
         2. When making a bug report, make sure you provide all required information. The easier it is for
            maintainers to reproduce, the faster it'll be fixed.
@@ -60,7 +60,7 @@ body:
       description: Share exact version number of Frappe and ERPNext you are using.
       placeholder: |
         Frappe version -
-        ERPNext version -
+        ERPNext Verion -
     validations:
       required: true
 

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
   - name: Community Forum
-    url: https://discuss.frappe.io/c/erpnext/6
+    url: https://discuss.erpnext.com/
     about: For general QnA, discussions and community help.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,6 +1,6 @@
 ---
 name: Feature request
-about: Suggest an idea or enhancement for ERPNext
+about: Suggest an idea to improve ERPNext
 title: ''
 labels: feature-request
 assignees: ''
@@ -11,27 +11,23 @@ assignees: ''
 Welcome to ERPNext issue tracker! Before creating an issue, please heed the following:
 
 1. This tracker should only be used to report bugs and request features / enhancements to ERPNext
-    - For questions and general support, checkout the manual https://docs.erpnext.com or use https://discuss.frappe.io/c/erpnext/6
+    - For questions and general support, checkout the manual https://erpnext.com/docs/user/manual/en or use https://discuss.erpnext.com
 2. Use the search function before creating a new issue. Duplicates will be closed and directed to
    the original discussion.
 3. When making a feature request, make sure to be as verbose as possible. The better you convey your message, the greater the drive to make it happen.
 
 
-Please keep in mind that we get many requests and we can't possibly work on all of them, we prioritize development based on the goals of the product and organization. Feature requests are still welcome as it helps us in research when we do decide to work on the requested feature. 
+Please keep in mind that we get many many requests and we can't possibly work on all of them, we prioritize development based on the goals of the product and organization. Feature requests are still welcome as it helps us in research when we do decide to work on the requested feature. 
 
-If you're in urgent need of a feature, please try the following channels to get paid developments done quickly:
+If you're in urgent need to a feature, please try the following channels to get paid developments done quickly:
 1. Certified ERPNext partners: https://erpnext.com/partners 
-2. Developer community on ERPNext forums: https://discuss.frappe.io/c/framework/5  
+2. Developer community on ERPNext forums: https://discuss.erpnext.com/c/developers/5 
 3. Telegram group for ERPNext/Frappe development work: https://t.me/erpnext_opps 
 
 -->
-## Before Submitting
-- [ ] I searched existing issues and confirmed this is not a duplicate
-- [ ] This is a feature request, not a bug or support question
-- [ ] For support: https://discuss.frappe.io/c/erpnext/6
 
 **Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. As a [role], I have to [painful task] because [missing feature].
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
 
 **Describe the solution you'd like**
 A clear and concise description of what you want to happen.
@@ -39,17 +35,5 @@ A clear and concise description of what you want to happen.
 **Describe alternatives you've considered**
 A clear and concise description of any alternative solutions or features you've considered.
 
-**Impact**
-<!-- Check one: -->
-- [ ] Blocks critical workflow — no viable workaround
-- [ ] Significant friction — workaround exists but is painful
-- [ ] Nice to have — minor improvement
-
 **Additional context**
 Add any other context or screenshots about the feature request here.
-
-**Environment**
-- ERPNext Version: <!-- Find this in Help > About, e.g. v15.12.0 -->
-- Frappe Version: <!-- Find this in Help > About, e.g. v15.10.0 -->
-- Deployment: <!-- Frappe Cloud / Self-hosted / ERPNext Cloud -->
-

.github/helper/documentation.py

@@ -1,7 +1,7 @@
 import sys
+import requests
 from urllib.parse import urlparse
 
-import requests
 
 WEBSITE_REPOS = [
 	"erpnext_com",
@@ -10,7 +10,6 @@ WEBSITE_REPOS = [
 
 DOCUMENTATION_DOMAINS = [
 	"docs.erpnext.com",
-	"docs.frappe.io",
 	"frappeframework.com",
 ]
 
@@ -37,7 +36,11 @@ def is_documentation_link(word: str) -> bool:
 
 
 def contains_documentation_link(body: str) -> bool:
-	return any(is_documentation_link(word) for line in body.splitlines() for word in line.split())
+	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]":
@@ -50,7 +53,12 @@ def check_pull_request(number: str) -> "tuple[int, str]":
 	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:
+	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):

.github/helper/install.sh

@@ -6,22 +6,15 @@ cd ~ || exit
 
 sudo apt update
 sudo apt remove mysql-server mysql-client
-sudo apt install libcups2-dev redis-server mariadb-client libmariadb-dev
+sudo apt install libcups2-dev redis-server mariadb-client-10.6
 
 pip install frappe-bench
 
 githubbranch=${GITHUB_BASE_REF:-${GITHUB_REF##*/}}
 frappeuser=${FRAPPE_USER:-"frappe"}
-frappecommitish=${FRAPPE_BRANCH:-$githubbranch}
-
-mkdir frappe
-pushd frappe
-git init
-git remote add origin "https://github.com/${frappeuser}/frappe"
-git fetch origin "${frappecommitish}" --depth 1
-git checkout FETCH_HEAD
-popd
+frappebranch=${FRAPPE_BRANCH:-$githubbranch}
 
+git clone "https://github.com/${frappeuser}/frappe" --branch "${frappebranch}" --depth 1
 bench init --skip-assets --frappe-path ~/frappe --python "$(which python)" frappe-bench
 
 mkdir ~/frappe-bench/sites/test_site
@@ -51,9 +44,13 @@ fi
 
 
 install_whktml() {
-    wget -O /tmp/wkhtmltox.deb https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-2/wkhtmltox_0.12.6.1-2.jammy_amd64.deb
-    sudo apt install /tmp/wkhtmltox.deb
-
+    if [ "$(lsb_release -rs)" = "22.04" ]; then
+        wget -O /tmp/wkhtmltox.deb https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-2/wkhtmltox_0.12.6.1-2.jammy_amd64.deb
+        sudo apt install /tmp/wkhtmltox.deb
+    else
+        echo "Please update this script to support wkhtmltopdf for $(lsb_release -ds)"
+        exit 1
+    fi
 }
 install_whktml &
 wkpid=$!
@@ -66,7 +63,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 develop
+bench get-app payments --branch ${githubbranch%"-hotfix"}
 bench get-app erpnext "${GITHUB_WORKSPACE}"
 
 if [ "$TYPE" == "server" ]; then bench setup requirements --dev; fi

.github/helper/site_config_mariadb.json

@@ -8,7 +8,6 @@
  "mail_login": "test@example.com",
  "mail_password": "test",
  "admin_password": "admin",
- "use_mysqlclient": 1,
  "root_login": "root",
  "root_password": "root",
  "host_name": "http://test_site:8000",

.github/helper/translation.py

@@ -1,68 +0,0 @@
-import re
-import sys
-
-errors_encounter = 0
-pattern = re.compile(
-	r"_\(([\"']{,3})(?P<message>((?!\1).)*)\1(\s*,\s*context\s*=\s*([\"'])(?P<py_context>((?!\5).)*)\5)*(\s*,(\s*?.*?\n*?)*(,\s*([\"'])(?P<js_context>((?!\11).)*)\11)*)*\)"
-)
-words_pattern = re.compile(r"_{1,2}\([\"'`]{1,3}.*?[a-zA-Z]")
-start_pattern = re.compile(r"_{1,2}\([f\"'`]{1,3}")
-f_string_pattern = re.compile(r"_\(f[\"']")
-starts_with_f_pattern = re.compile(r"_\(f")
-
-# skip first argument
-files = sys.argv[1:]
-files_to_scan = [_file for _file in files if _file.endswith((".py", ".js"))]
-
-for _file in files_to_scan:
-	with open(_file) as f:
-		print(f"Checking: {_file}")
-		file_lines = f.readlines()
-		for line_number, line in enumerate(file_lines, 1):
-			if "frappe-lint: disable-translate" in line:
-				continue
-
-			start_matches = start_pattern.search(line)
-			if start_matches:
-				starts_with_f = starts_with_f_pattern.search(line)
-
-				if starts_with_f:
-					has_f_string = f_string_pattern.search(line)
-					if has_f_string:
-						errors_encounter += 1
-						print(
-							f"\nF-strings are not supported for translations at line number {line_number}\n{line.strip()[:100]}"
-						)
-						continue
-					else:
-						continue
-
-				match = pattern.search(line)
-				error_found = False
-
-				if not match and line.endswith((",\n", "[\n")):
-					# concat remaining text to validate multiline pattern
-					line = "".join(file_lines[line_number - 1 :])
-					line = line[start_matches.start() + 1 :]
-					match = pattern.match(line)
-
-				if not match:
-					error_found = True
-					print(f"\nTranslation syntax error at line number {line_number}\n{line.strip()[:100]}")
-
-				if not error_found and not words_pattern.search(line):
-					error_found = True
-					print(
-						f"\nTranslation is useless because it has no words at line number {line_number}\n{line.strip()[:100]}"
-					)
-
-				if error_found:
-					errors_encounter += 1
-
-if errors_encounter > 0:
-	print(
-		'\nVisit "https://frappeframework.com/docs/user/en/translations" to learn about valid translation strings.'
-	)
-	sys.exit(1)
-else:
-	print("\nGood To Go!")

.github/helper/update_pot_file.sh

@@ -1,40 +0,0 @@
-#!/bin/bash
-set -e
-cd ~ || exit
-
-echo "Setting Up Bench..."
-
-pip install frappe-bench
-bench -v init frappe-bench --skip-assets --skip-redis-config-generation --python "$(which python)"
-cd ./frappe-bench || exit
-
-echo "Get ERPNext..."
-bench get-app --skip-assets erpnext "${GITHUB_WORKSPACE}"
-
-echo "Generating POT file..."
-bench generate-pot-file --app erpnext
-
-cd ./apps/erpnext || exit
-
-echo "Configuring git user..."
-git config user.email "developers@erpnext.com"
-git config user.name "frappe-pr-bot"
-
-echo "Setting the correct git remote..."
-# Here, the git remote is a local file path by default. Let's change it to the upstream repo.
-git remote set-url upstream https://github.com/frappe/erpnext.git
-
-echo "Creating a new branch..."
-isodate=$(date -u +"%Y-%m-%d")
-branch_name="pot_${BASE_BRANCH}_${isodate}"
-git checkout -b "${branch_name}"
-
-echo "Commiting changes..."
-git add erpnext/locale/main.pot
-git commit -m "chore: update POT file"
-
-gh auth setup-git
-git push -u upstream "${branch_name}"
-
-echo "Creating a PR..."
-gh pr create --fill --base "${BASE_BRANCH}" --head "${branch_name}" --reviewer ${PR_REVIEWER} -R frappe/erpnext

.github/release.yml

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

.github/stale.yml

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

.github/workflows/backport.yml

@@ -1,29 +0,0 @@
-name: Backport
-on:
-  pull_request_target:
-    types:
-      - closed
-      - labeled
-
-permissions:
-  contents: read
-
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    timeout-minutes: 60
-    steps:
-      - name: Checkout Actions
-        uses: actions/checkout@v6
-        with:
-          repository: "frappe/backport"
-          path: ./actions
-          ref: develop
-      - name: Install Actions
-        run: npm install --production --prefix ./actions
-      - name: Run backport
-        uses: ./actions/backport
-        with:
-          token: ${{secrets.RELEASE_TOKEN}}
-          labelsToAdd: "backport"
-          title: "{{originalTitle}}"

.github/workflows/docker-release.yml

@@ -2,10 +2,6 @@ name: Trigger Docker build on release
 on:
   release:
     types: [released]
-
-permissions:
-  contents: read
-
 jobs:
   curl:
     runs-on: ubuntu-latest

.github/workflows/docs-checker.yml

@@ -3,9 +3,6 @@ on:
   pull_request:
     types: [ opened, synchronize, reopened, edited ]
 
-permissions:
-  contents: read
-
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -13,12 +10,12 @@ jobs:
 
     steps:
       - name: 'Setup Environment'
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v2
         with:
           python-version: '3.10'
 
       - name: 'Clone repo'
-        uses: actions/checkout@v6
+        uses: actions/checkout@v2
 
       - name: Validate Docs
         env:

.github/workflows/generate-pot-file.yml

@@ -1,44 +0,0 @@
-# This workflow is agnostic to branches. Only maintain on develop branch.
-# To add/remove branches just modify the matrix.
-
-name: Regenerate POT file (translatable strings)
-on:
-  schedule:
-    # 9:30 UTC => 3 PM IST Sunday
-    - cron: "30 9 * * 0"
-  workflow_dispatch:
-
-jobs:
-  regenerate-pot-file:
-    name: Regenerate POT file
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        branch: ["develop", "version-16-hotfix"]
-    permissions:
-      contents: write
-
-    steps:
-        - name: Checkout
-          uses: actions/checkout@v6
-          with:
-            ref: ${{ matrix.branch }}
-
-        - name: Setup Python
-          uses: actions/setup-python@v6
-          with:
-            python-version: "3.14"
-
-        - name: Setup Node
-          uses: actions/setup-node@v6
-          with:
-            node-version: 24
-
-        - name: Run script to update POT file
-          run: |
-            bash ${GITHUB_WORKSPACE}/.github/helper/update_pot_file.sh
-          env:
-            GH_TOKEN: ${{ secrets.RELEASE_TOKEN }}
-            BASE_BRANCH: ${{ matrix.branch }}
-            PR_REVIEWER: barredterra # change to your GitHub username if you copied this file

.github/workflows/initiate_release.yml

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

.github/workflows/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/labeller.yml

@@ -3,10 +3,6 @@ on:
   pull_request_target:
     types: [opened, reopened]
 
-permissions:
-  issues: write
-  pull-requests: write
-
 jobs:
   triage:
     runs-on: ubuntu-latest

.github/workflows/linters.yml

@@ -3,38 +3,23 @@ name: Linters
 on:
   pull_request: { }
 
-permissions:
-  contents: read
-
 jobs:
 
   linters:
     name: linters
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v3
 
-      - name: Set up Python 3.14
-        uses: actions/setup-python@v6
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v4
         with:
-          python-version: '3.14'
+          python-version: '3.10'
           cache: pip
 
       - name: Install and Run Pre-commit
         uses: pre-commit/action@v3.0.0
 
-  semgrep:
-    name: semgrep
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-
-      - name: Set up Python 3.14
-        uses: actions/setup-python@v6
-        with:
-          python-version: '3.14'
-          cache: pip
-
       - name: Download Semgrep rules
         run: git clone --depth 1 https://github.com/frappe/semgrep-rules.git frappe-semgrep-rules
 
@@ -43,6 +28,3 @@ jobs:
 
       - name: Run Semgrep rules
         run: semgrep ci --config ./frappe-semgrep-rules/rules --config r/python.lang.correctness
-
-      - name: Semgrep for Test Correctness
-        run: semgrep ci --include=**/test_*.py --config ./semgrep/test-correctness.yml

.github/workflows/lock.yml

@@ -1,21 +0,0 @@
-name: 'Lock threads'
-
-on:
-  schedule:
-    - cron: '0 0 * * *'
-  workflow_dispatch:
-
-permissions:
-  issues: write
-  pull-requests: write
-
-
-jobs:
-  lock:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: dessant/lock-threads@v5
-        with:
-          github-token: ${{ github.token }}
-          issue-inactive-days: 14
-          pr-inactive-days: 14

.github/workflows/patch.yml

@@ -8,14 +8,8 @@ on:
       - '**.md'
       - '**.html'
       - '**.csv'
-      - 'crowdin.yml'
-      - '.coderabbit.yml'
-      - '.mergify.yml'
   workflow_dispatch:
 
-permissions:
-  contents: read
-
 concurrency:
   group: patch-develop-${{ github.event_name }}-${{ github.event.number || github.event_name == 'workflow_dispatch' && github.run_id || '' }}
   cancel-in-progress: true
@@ -29,7 +23,7 @@ jobs:
 
     services:
       mysql:
-        image: mariadb:11.8
+        image: mariadb:10.6
         env:
           MARIADB_ROOT_PASSWORD: 'root'
         ports:
@@ -38,35 +32,32 @@ jobs:
 
     steps:
       - name: Clone
-        uses: actions/checkout@v6
+        uses: actions/checkout@v2
 
       - name: Check for valid Python & Merge Conflicts
         run: |
-          python -m compileall -fq "${GITHUB_WORKSPACE}"
+          python -m compileall -f "${GITHUB_WORKSPACE}"
           if grep -lr --exclude-dir=node_modules "^<<<<<<< " "${GITHUB_WORKSPACE}"
               then echo "Found merge conflicts"
               exit 1
           fi
 
       - name: Setup Python
-        uses: actions/setup-python@v6
+        uses: "actions/setup-python@v4"
         with:
-          python-version: |
-            3.11
-            3.13
-            3.14
+          python-version: '3.10'
 
       - name: Setup Node
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v2
         with:
-          node-version: 24
+          node-version: 18
           check-latest: true
 
       - name: Add to Hosts
         run: echo "127.0.0.1 test_site" | sudo tee -a /etc/hosts
 
       - name: Cache pip
-        uses: actions/cache@v4
+        uses: actions/cache@v2
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/pyproject.toml') }}
@@ -75,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:
@@ -88,9 +79,9 @@ jobs:
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
-        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
+        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 }}
@@ -113,8 +104,8 @@ jobs:
           jq 'del(.install_apps)' ~/frappe-bench/sites/test_site/site_config.json > tmp.json
           mv tmp.json ~/frappe-bench/sites/test_site/site_config.json
 
-          wget https://frappe.io/files/erpnext-v14.sql.gz
-          bench --site test_site --force restore ~/frappe-bench/erpnext-v14.sql.gz
+          wget https://erpnext.com/files/v13-erpnext.sql.gz
+          bench --site test_site --force restore ~/frappe-bench/v13-erpnext.sql.gz
 
           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
@@ -135,19 +126,17 @@ jobs:
             # Resetup env and install apps
             pgrep honcho | xargs kill
             rm -rf ~/frappe-bench/env
-            bench -v setup env --python python$2
+            bench -v setup env
             bench pip install -e ./apps/erpnext
             bench start &>> ~/frappe-bench/bench_start.log &
 
             bench --site test_site migrate
           }
 
-          update_to_version 15 3.13
-          update_to_version 16 3.14
+          update_to_version 14
 
           echo "Updating to latest version"
-          git -C "apps/frappe" fetch --depth 1 upstream "${GITHUB_BASE_REF:-${GITHUB_REF##*/}}"
-          git -C "apps/frappe" checkout -q -f FETCH_HEAD
+          git -C "apps/frappe" checkout -q -f "${GITHUB_BASE_REF:-${GITHUB_REF##*/}}"
           git -C "apps/erpnext" checkout -q -f "$GITHUB_SHA"
 
           pgrep honcho | xargs kill

.github/workflows/patch_faux.yml

@@ -1,28 +0,0 @@
-# Tests are skipped for these files but github doesn't allow "passing" hence this is required.
-
-name: Skipped Patch Test
-
-on:
-  pull_request:
-    paths:
-      - "**.js"
-      - "**.css"
-      - "**.md"
-      - "**.html"
-      - "**.csv"
-      - 'crowdin.yml'
-      - '.coderabbit.yml'
-      - '.mergify.yml'
-
-permissions:
-  contents: read
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-
-    name: Patch Test
-
-    steps:
-      - name: Pass skipped tests unconditionally
-        run: "echo Skipped"

.github/workflows/release.yml

@@ -2,25 +2,23 @@ name: Generate Semantic Release
 on:
   push:
     branches:
-      - version-13
-
-permissions:
-  contents: read
-
+      - version-15
 jobs:
   release:
     name: Release
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Entire Repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           persist-credentials: false
+
       - name: Setup Node.js
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v2
         with:
           node-version: 20
+
       - name: Setup dependencies
         run: |
           npm install @semantic-release/git @semantic-release/exec --no-save

.github/workflows/release_notes.yml

@@ -29,11 +29,7 @@ jobs:
     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' \
-          | sed -E 's/by @mergify //'
-        )
+        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"
 

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

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

.github/workflows/semantic-commits.yml

@@ -15,11 +15,11 @@ jobs:
     name: Check Commit Titles
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 200
 
-      - uses: actions/setup-node@v6
+      - uses: actions/setup-node@v3
         with:
           node-version: 18
           check-latest: true

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

@@ -1,31 +0,0 @@
-# Tests are skipped for these files but github doesn't allow "passing" hence this is required.
-
-name: Skipped Tests
-
-on:
-  pull_request:
-    paths:
-      - "**.js"
-      - "**.css"
-      - "**.svg"
-      - "**.md"
-      - "**.html"
-      - 'crowdin.yml'
-      - '.coderabbit.yml'
-      - '.mergify.yml'
-
-permissions:
-  contents: read
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        container: [1, 2, 3, 4]
-
-    name: Python Unit Tests
-
-    steps:
-      - name: Pass skipped tests unconditionally
-        run: "echo Skipped"

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

@@ -1,18 +1,12 @@
 name: Server (Mariadb)
 
 on:
-  repository_dispatch:
-    types: [frappe-framework-change]
   pull_request:
     paths-ignore:
       - '**.js'
       - '**.css'
-      - '**.svg'
       - '**.md'
       - '**.html'
-      - 'crowdin.yml'
-      - '.coderabbit.yml'
-      - '.mergify.yml'
   schedule:
     # Run everday at midnight UTC / 5:30 IST
     - cron: "0 0 * * *"
@@ -29,9 +23,6 @@ on:
         required: false
         type: string
 
-permissions:
-  contents: read
-
 concurrency:
   group: server-mariadb-develop-${{ github.event_name }}-${{ github.event.number || github.event_name == 'workflow_dispatch' && github.run_id || '' }}
   cancel-in-progress: true
@@ -40,10 +31,6 @@ jobs:
   test:
     runs-on: ubuntu-latest
     timeout-minutes: 60
-    env:
-      TZ: 'Asia/Kolkata'
-      NODE_ENV: "production"
-      WITH_COVERAGE: ${{ github.event_name != 'pull_request' }}
 
     strategy:
       fail-fast: false
@@ -57,7 +44,6 @@ jobs:
       mysql:
         image: mariadb:10.6
         env:
-          TZ: 'Asia/Kolkata'
           MARIADB_ROOT_PASSWORD: 'root'
         ports:
           - 3306:3306
@@ -65,32 +51,32 @@ jobs:
 
     steps:
       - name: Clone
-        uses: actions/checkout@v6
+        uses: actions/checkout@v2
 
       - name: Setup Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v2
         with:
-          python-version: '3.14'
+          python-version: '3.11'
 
       - name: Check for valid Python & Merge Conflicts
         run: |
-          python -m compileall -fq "${GITHUB_WORKSPACE}"
+          python -m compileall -f "${GITHUB_WORKSPACE}"
           if grep -lr --exclude-dir=node_modules "^<<<<<<< " "${GITHUB_WORKSPACE}"
               then echo "Found merge conflicts"
               exit 1
           fi
 
       - name: Setup Node
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v2
         with:
-          node-version: 24
+          node-version: 18
           check-latest: true
 
       - name: Add to Hosts
         run: echo "127.0.0.1 test_site" | sudo tee -a /etc/hosts
 
       - name: Cache pip
-        uses: actions/cache@v4
+        uses: actions/cache@v2
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/pyproject.toml') }}
@@ -99,7 +85,7 @@ jobs:
             ${{ runner.os }}-
 
       - name: Cache node modules
-        uses: actions/cache@v4
+        uses: actions/cache@v2
         env:
           cache-name: cache-node-modules
         with:
@@ -112,9 +98,9 @@ jobs:
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
-        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
+        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 }}
@@ -128,39 +114,15 @@ jobs:
           DB: mariadb
           TYPE: server
           FRAPPE_USER: ${{ github.event.inputs.user }}
-          FRAPPE_BRANCH: ${{ github.event.client_payload.sha || github.event.inputs.branch }}
+          FRAPPE_BRANCH: ${{ github.event.inputs.branch }}
 
       - name: Run Tests
-        run: 'cd ~/frappe-bench/ && bench --site test_site run-parallel-tests --lightmode --app erpnext --total-builds ${{ strategy.job-total }} --build-number ${{ matrix.container }} --with-coverage'
+        run: 'cd ~/frappe-bench/ && bench --site test_site run-parallel-tests --app erpnext --total-builds 4 --build-number ${{ matrix.container }}'
         env:
           TYPE: server
-
+          CI_BUILD_ID: ${{ github.run_id }}
+          ORCHESTRATOR_URL: http://test-orchestrator.frappe.io
 
       - name: Show bench output
         if: ${{ always() }}
         run: cat ~/frappe-bench/bench_start.log || true
-
-      - name: Upload coverage data
-        uses: actions/upload-artifact@v4
-        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@v6
-
-      - name: Download artifacts
-        uses: actions/download-artifact@v4
-
-      - name: Upload coverage data
-        uses: codecov/codecov-action@v4
-        with:
-          name: MariaDB
-          token: ${{ secrets.CODECOV_TOKEN }}
-          fail_ci_if_error: true
-          verbose: true

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

@@ -6,18 +6,12 @@ on:
       - '**.js'
       - '**.md'
       - '**.html'
-      - 'crowdin.yml'
-      - '.coderabbit.yml'
-      - '.mergify.yml'
     types: [opened, labelled, synchronize, reopened]
 
 concurrency:
   group: server-postgres-develop-${{ github.event_name }}-${{ github.event.number || github.event_name == 'workflow_dispatch' && github.run_id || '' }}
   cancel-in-progress: true
 
-permissions:
-  contents: read
-
 jobs:
   test:
     if: ${{ contains(github.event.pull_request.labels.*.name, 'postgres') }}
@@ -47,32 +41,32 @@ jobs:
     steps:
 
       - name: Clone
-        uses: actions/checkout@v6
+        uses: actions/checkout@v2
 
       - name: Setup Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v2
         with:
-          python-version: '3.14'
+          python-version: '3.10'
 
       - name: Check for valid Python & Merge Conflicts
         run: |
-          python -m compileall -fq "${GITHUB_WORKSPACE}"
+          python -m compileall -f "${GITHUB_WORKSPACE}"
           if grep -lr --exclude-dir=node_modules "^<<<<<<< " "${GITHUB_WORKSPACE}"
               then echo "Found merge conflicts"
               exit 1
           fi
 
       - name: Setup Node
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v2
         with:
-          node-version: 24
+          node-version: 18
           check-latest: true
 
       - name: Add to Hosts
         run: echo "127.0.0.1 test_site" | sudo tee -a /etc/hosts
 
       - name: Cache pip
-        uses: actions/cache@v4
+        uses: actions/cache@v2
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/pyproject.toml') }}
@@ -81,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:
@@ -94,9 +88,9 @@ jobs:
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
-        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
+        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 }}

.gitignore

@@ -2,6 +2,7 @@
 *.py~
 .DS_Store
 conf.py
+locale
 latest_updates.json
 .wnf-lang-status
 *.egg-info
@@ -14,8 +15,5 @@ __pycache__
 *~
 .idea/
 .vscode/
-.helix/
 node_modules/
-.backportrc.json
-# Aider AI Chat
-.aider*
+.backportrc.json

.mergify.yml

@@ -2,27 +2,38 @@ pull_request_rules:
   - name: Auto-close PRs on stable branch
     conditions:
       - and:
-          - and:
-              - author!=surajshetty3416
-              - author!=gavindsouza
-              - author!=rohitwaghchaure
-              - author!=nabinhait
-              - author!=ankush
-              - author!=deepeshgarg007
-              - author!=frappe-pr-bot
-              - author!=mergify[bot]
-          - or:
-              - base=version-13
-              - base=version-12
-              - base=version-14
-              - base=version-15
-              - base=version-16
+        - and:
+          - author!=surajshetty3416
+          - author!=gavindsouza
+          - author!=rohitwaghchaure
+          - author!=nabinhait
+          - author!=ankush
+          - author!=deepeshgarg007
+          - author!=frappe-pr-bot
+          - author!=mergify[bot]
+
+        - or:
+          - base=version-13
+          - base=version-12
+          - base=version-14
+          - base=version-15
     actions:
       close:
       comment:
-        message: |
-          @{{author}}, thanks for the contribution, but we do not accept pull requests on a stable branch. Please raise PR on an appropriate hotfix branch.
-          https://github.com/frappe/erpnext/wiki/Pull-Request-Checklist#which-branch
+          message: |
+            @{{author}}, thanks for the contribution, but we do not accept pull requests on a stable branch. Please raise PR on an appropriate hotfix branch.
+            https://github.com/frappe/erpnext/wiki/Pull-Request-Checklist#which-branch
+
+  - name: Auto-close PRs on pre-release branch
+    conditions:
+      - base=version-13-pre-release
+    actions:
+      close:
+      comment:
+          message: |
+            @{{author}}, pre-release branch is not maintained anymore. Releases are directly done by merging hotfix branch to stable branches.
+
+
   - name: backport to develop
     conditions:
       - label="backport develop"
@@ -32,6 +43,7 @@ pull_request_rules:
           - develop
         assignees:
           - "{{ author }}"
+
   - name: backport to version-14-hotfix
     conditions:
       - label="backport version-14-hotfix"
@@ -41,24 +53,57 @@ pull_request_rules:
           - version-14-hotfix
         assignees:
           - "{{ author }}"
-  - name: backport to version-15-hotfix
+
+  - name: backport to version-14-pre-release
     conditions:
-      - label="backport version-15-hotfix"
+      - label="backport version-14-pre-release"
     actions:
       backport:
         branches:
-          - version-15-hotfix
+          - version-14-pre-release
         assignees:
           - "{{ author }}"
-  - name: backport to version-16-hotfix
+
+  - name: backport to version-13-hotfix
     conditions:
-      - label="backport version-16-hotfix"
+      - label="backport version-13-hotfix"
     actions:
       backport:
         branches:
-          - version-16-hotfix
+          - version-13-hotfix
         assignees:
           - "{{ author }}"
+
+  - name: backport to version-13-pre-release
+    conditions:
+      - label="backport version-13-pre-release"
+    actions:
+      backport:
+        branches:
+          - version-13-pre-release
+        assignees:
+          - "{{ author }}"
+
+  - name: backport to version-12-hotfix
+    conditions:
+      - label="backport version-12-hotfix"
+    actions:
+      backport:
+        branches:
+          - version-12-hotfix
+        assignees:
+          - "{{ author }}"
+
+  - name: backport to version-12-pre-release
+    conditions:
+      - label="backport version-12-pre-release"
+    actions:
+      backport:
+        branches:
+          - version-12-pre-release
+        assignees:
+          - "{{ author }}"
+
   - name: Automatic merge on CI success and review
     conditions:
       - status-success=linters
@@ -89,6 +134,6 @@ pull_request_rules:
       merge:
         method: squash
         commit_message_template: |
-          {{ title }} (#{{ number }})
+            {{ title }} (#{{ number }})
 
-          {{ body }}
+            {{ body }}

.pre-commit-config.yaml

@@ -1,5 +1,5 @@
 exclude: 'node_modules|.git'
-default_stages: [pre-commit]
+default_stages: [commit]
 fail_fast: false
 
 
@@ -32,6 +32,8 @@ repos:
                 cypress/.*|
                 .*node_modules.*|
                 .*boilerplate.*|
+                erpnext/public/js/controllers/.*|
+                erpnext/templates/pages/order.js|
                 erpnext/templates/includes/.*
             )$
 

.releaserc

@@ -1,5 +1,5 @@
 {
-	"branches": ["version-13"],
+	"branches": ["version-15"],
 	"plugins": [
 		"@semantic-release/commit-analyzer", {
 			"preset": "angular",
@@ -21,4 +21,4 @@
 		],
 		"@semantic-release/github"
 	]
-}
+}

CODEOWNERS

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

README.md

@@ -1,185 +1,89 @@
-
 <div align="center">
-    <a href="https://frappe.io/erpnext">
-	<img src="./erpnext/public/images/v16/erpnext.svg" alt="ERPNext Logo" height="80px" width="80px"/>
+    <a href="https://erpnext.com">
+        <img src="https://raw.githubusercontent.com/frappe/erpnext/develop/erpnext/public/images/erpnext-logo.png" height="128">
     </a>
     <h2>ERPNext</h2>
-    <div align="center">
-        <p>Powerful, Intuitive and Open-Source ERP</p>
-    </div>
+    <p align="center">
+        <p>ERP made simple</p>
+    </p>
 
-[![Learn on Frappe School](https://img.shields.io/badge/Frappe%20School-Learn%20ERPNext-blue?style=flat-square)](https://frappe.school)<br><br>
-[![CI](https://github.com/frappe/erpnext/actions/workflows/server-tests-mariadb.yml/badge.svg?event=schedule)](https://github.com/frappe/erpnext/actions/workflows/server-tests-mariadb.yml)
+[![CI](https://github.com/frappe/erpnext/actions/workflows/server-tests.yml/badge.svg?branch=develop)](https://github.com/frappe/erpnext/actions/workflows/server-tests.yml)
+[![UI](https://github.com/erpnext/erpnext_ui_tests/actions/workflows/ui-tests.yml/badge.svg?branch=develop&event=schedule)](https://github.com/erpnext/erpnext_ui_tests/actions/workflows/ui-tests.yml)
+[![Open Source Helpers](https://www.codetriage.com/frappe/erpnext/badges/users.svg)](https://www.codetriage.com/frappe/erpnext)
+[![codecov](https://codecov.io/gh/frappe/erpnext/branch/develop/graph/badge.svg?token=0TwvyUg3I5)](https://codecov.io/gh/frappe/erpnext)
 [![docker pulls](https://img.shields.io/docker/pulls/frappe/erpnext-worker.svg)](https://hub.docker.com/r/frappe/erpnext-worker)
 
+[https://erpnext.com](https://erpnext.com)
+
 </div>
 
-<div align="center">
-	<img src="./erpnext/public/images/v16/hero_image.png" alt="ERPNext Hero Image"/>
+ERPNext as a monolith includes the following areas for managing businesses:
+
+1. [Accounting](https://erpnext.com/open-source-accounting)
+1. [Warehouse Management](https://erpnext.com/distribution/warehouse-management-system)
+1. [CRM](https://erpnext.com/open-source-crm)
+1. [Sales](https://erpnext.com/open-source-sales-purchase)
+1. [Purchase](https://erpnext.com/open-source-sales-purchase)
+1. [HRMS](https://erpnext.com/open-source-hrms)
+1. [Project Management](https://erpnext.com/open-source-projects)
+1. [Support](https://erpnext.com/open-source-help-desk-software)
+1. [Asset Management](https://erpnext.com/open-source-asset-management-software)
+1. [Quality Management](https://erpnext.com/docs/user/manual/en/quality-management)
+1. [Manufacturing](https://erpnext.com/open-source-manufacturing-erp-software)
+1. [Website Management](https://erpnext.com/open-source-website-builder-software)
+1. [Customize ERPNext](https://erpnext.com/docs/user/manual/en/customize-erpnext)
+1. [And More](https://erpnext.com/docs/user/manual/en/)
+
+ERPNext is built on the [Frappe Framework](https://github.com/frappe/frappe), a full-stack web app framework built with Python & JavaScript.
+
+## Installation
+
+<div align="center" style="max-height: 40px;">
+    <a href="https://frappecloud.com/erpnext/signup">
+        <img src=".github/try-on-f-cloud-button.svg" height="40">
+    </a>
+    <a href="https://labs.play-with-docker.com/?stack=https://raw.githubusercontent.com/frappe/frappe_docker/main/pwd.yml">
+      <img src="https://raw.githubusercontent.com/play-with-docker/stacks/master/assets/images/button.png" alt="Try in PWD" height="37"/>
+    </a>
 </div>
 
-<div align="center">
-	<a href="https://erpnext-demo.frappe.cloud/api/method/erpnext_demo.erpnext_demo.auth.login_demo">Live Demo</a>
-	-
-	<a href="https://frappe.io/erpnext">Website</a>
-	-
-	<a href="https://docs.frappe.io/erpnext/">Documentation</a>
-</div>
+> Login for the PWD site: (username: Administrator, password: admin)
 
-## ERPNext
+### Containerized Installation
 
-100% Open-Source ERP System to help you run your business.
+Use docker to deploy ERPNext in production or for development of [Frappe](https://github.com/frappe/frappe) apps. See https://github.com/frappe/frappe_docker for more details.
 
-### Motivation
-
-Running a business is a complex task - handling invoices, tracking stock, managing personnel, and other daily operations. In a market where software is sold separately to manage each of these tasks, ERPNext does all of the above and more, for free.
-
-### Key Features
-
-- **Accounting**: All the tools you need to manage cash flow in one place, right from recording transactions to summarizing and analyzing financial reports.
-- **Order Management**: Track inventory levels, replenish stock, and manage sales orders, customers, suppliers, shipments, deliverables, and order fulfillment.
-- **Manufacturing**: Simplifies the production cycle, helps track material consumption, exhibits capacity planning, handles subcontracting, and more!
-- **Asset Management**: From purchase to disposal, IT infrastructure to equipment. Covers every branch of your organization, all in one centralized system.
-- **Projects**: Deliver both internal and external projects on time, budget and profitability. Track tasks, timesheets, and issues by project.
-
-<details open>
-
-<summary>More</summary>
-	<img src="https://erpnext.com/files/v16_bom.png"/>
-	<img src="https://erpnext.com/files/v16_stock_summary.png"/>
-	<img src="https://erpnext.com/files/v16_job_card.png"/>
-	<img src="https://erpnext.com/files/v16_tasks.png"/>
-</details>
-
-### Under the Hood
-
-- [**Frappe Framework**](https://github.com/frappe/frappe): A full-stack web application framework written in Python and JavaScript. The framework provides a robust foundation for building web applications, including a database abstraction layer, user authentication, and a REST API.
-
-- [**Frappe UI**](https://github.com/frappe/frappe-ui): A Vue-based UI library, to provide a modern user interface. The Frappe UI library provides a variety of components that can be used to build single-page applications on top of the Frappe Framework.
-
-## Production Setup
-
-### Managed Hosting
-
-You can try [Frappe Cloud](https://frappecloud.com), a simple, user-friendly, and sophisticated [open-source](https://github.com/frappe/press) platform to host Frappe applications reliably and securely.
-
-It handles installation, setup, upgrades, monitoring, maintenance, and support of your Frappe deployments. It is a fully featured developer platform with an ability to manage and control multiple Frappe deployments.
-
-<div>
-	<a href="https://erpnext-demo.frappe.cloud/app/home" target="_blank" rel="noopener noreferrer">
-		<picture>
-			<source media="(prefers-color-scheme: dark)" srcset="https://frappe.io/files/try-on-fc-white.png">
-			<img src="https://frappe.io/files/try-on-fc-black.png" alt="Try on Frappe Cloud" height="28" />
-		</picture>
-	</a>
-</div>
-
-
-### Self-Hosted
-#### Docker
-
-See [Frappe Docker Documentation](https://github.com/frappe/frappe_docker) for full documentation & FAQ on Docker setup
-
-#### Prerequisites
-
-- [Docker](https://docs.docker.com/get-docker/)
-- [Docker Compose v2](https://docs.docker.com/compose/)
-- [git](https://docs.github.com/en/get-started/getting-started-with-git/set-up-git)
-
-> For Docker basics and best practices refer to Docker's [documentation](https://docs.docker.com)
-
-#### Demo setup
-
-The fastest way to try ERPNext is to play in a pre-configured sandbox, in your browser, click the button below:
-
-<a href="https://labs.play-with-docker.com/?stack=https://raw.githubusercontent.com/frappe/frappe_docker/main/pwd.yml">
-  <img src="https://raw.githubusercontent.com/play-with-docker/stacks/master/assets/images/button.png" alt="Try in PWD"/>
-</a>
-
-### Try on your environment
-
-> **⚠️ Disposable demo only**
->
-> **This setup is intended for quick evaluation. Expect to throw the environment away.** You will not be able to install custom apps to this setup. For production deployments, custom configurations, and detailed explanations, see the full documentation.
-
-First clone the repo:
-
-```sh
-git clone https://github.com/frappe/frappe_docker
-cd frappe_docker
-```
-
-Then run:
-
-```sh
-docker compose -f pwd.yml up -d
-```
-Wait for a couple of minutes for ERPNext site to be created or check the `create-site` container logs before opening browser on port `8080`. (username: `Administrator`, password: `admin`)
-
-See [Frappe Docker](https://github.com/frappe/frappe_docker/blob/main/docs/01-getting-started/03-arm64.md) for ARM based docker setup
-
-
-## Development Setup
 ### Manual Install
 
 The Easy Way: our install script for bench will install all dependencies (e.g. MariaDB). See https://github.com/frappe/bench for more details.
 
-New passwords will be created for the ERPNext "Administrator" user, the MariaDB root user, and the Frappe user (the script displays the passwords and saves them to ~/frappe_passwords.txt).
+New passwords will be created for the ERPNext "Administrator" user, the MariaDB root user, and the frappe user (the script displays the passwords and saves them to ~/frappe_passwords.txt).
 
 
-### Local
+## Learning and community
 
-To setup the repository locally follow the steps mentioned below:
-
-1. Setup bench by following the [Installation Steps](https://frappeframework.com/docs/user/en/installation) and start the server
-   ```
-   bench start
-   ```
-
-2. In a separate terminal window, run the following commands:
-   ```
-   # Create a new site
-   bench new-site erpnext.localhost
-   ```
-
-3. Get the ERPNext app and install it
-   ```
-   # Get the ERPNext app
-   bench get-app https://github.com/frappe/erpnext
-
-   # Install the app
-   bench --site erpnext.localhost install-app erpnext
-   ```
-
-4. Open the URL `http://erpnext.localhost:8000/app` in your browser, you should see the app running
-
-## Learning and Community
-
-1. [Frappe School](https://school.frappe.io) - Learn Frappe Framework and ERPNext from the various courses by the maintainers or from the community.
+1. [Frappe School](https://frappe.school) - Learn Frappe Framework and ERPNext from the various courses by the maintainers or from the community.
 2. [Official documentation](https://docs.erpnext.com/) - Extensive documentation for ERPNext.
-3. [Discussion Forum](https://discuss.frappe.io/c/erpnext/6) - Engage with the community of ERPNext users and service providers.
+3. [Discussion Forum](https://discuss.erpnext.com/) - Engage with community of ERPNext users and service providers.
 4. [Telegram Group](https://erpnext_public.t.me) - Get instant help from huge community of users.
 
 
 ## Contributing
 
 1. [Issue Guidelines](https://github.com/frappe/erpnext/wiki/Issue-Guidelines)
-2. [Report Security Vulnerabilities](https://erpnext.com/security)
-3. [Pull Request Requirements](https://github.com/frappe/erpnext/wiki/Contribution-Guidelines)
-4. [Translations](https://crowdin.com/project/frappe)
+1. [Report Security Vulnerabilities](https://erpnext.com/security)
+1. [Pull Request Requirements](https://github.com/frappe/erpnext/wiki/Contribution-Guidelines)
+1. [Translations](https://translate.erpnext.com)
 
 
+## License
+
+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).
-
-<br />
-<br />
-<div align="center" style="padding-top: 0.75rem;">
-	<a href="https://frappe.io" target="_blank">
-		<picture>
-			<source media="(prefers-color-scheme: dark)" srcset="https://frappe.io/files/Frappe-white.png">
-			<img src="https://frappe.io/files/Frappe-black.png" alt="Frappe Technologies" height="28"/>
-		</picture>
-	</a>
-</div>

SECURITY.md

@@ -1,7 +1,7 @@
 # Security Policy
 
-The ERPNext team and community take security issues seriously. To report a security issue, please go through the information mentioned [here](https://frappe.io/security).
+The ERPNext team and community take security issues seriously. To report a security issue, fill out the form at [https://erpnext.com/security/report](https://erpnext.com/security/report).
 
-You can help us make ERPNext and all its users more secure by following the [Reporting guidelines](https://frappe.io/security).
+You can help us make ERPNext and all it's users more secure by following the [Reporting guidelines](https://erpnext.com/security).
 
-We appreciate your efforts to responsibly disclose your findings. We'll endeavor to respond quickly, and will keep you updated throughout the process.
+We appreciate your efforts to responsibly disclose your findings. We'll endeavor to respond quickly, and will keep you updated throughout the process.

TRADEMARK_POLICY.md

@@ -18,9 +18,8 @@ We will grant permission to use the ERPNext name and logo for projects that meet
 
 - The primary purpose of your project is to promote the spread and improvement of the ERPNext software.
 - Your project is non-commercial in nature (it can make money to cover its costs or contribute to non-profit entities, but it cannot be run as a for-profit project or business).
-- Your project neither promotes nor is associated with entities that currently fail to comply with the GPL license under which ERPNext is distributed.
-
-If your project meets these criteria, you will be permitted to use the ERPNext name and logo to promote your project in any way you see fit with one exception: Please do not use ERPNext as part of a domain name.
+Your project neither promotes nor is associated with entities that currently fail to comply with the GPL license under which ERPNext is distributed.
+- If your project meets these criteria, you will be permitted to use the ERPNext name and logo to promote your project in any way you see fit with one exception: Please do not use ERPNext as part of a domain name.
 
 Use of the ERPNext name and logo is additionally allowed in the following situations:
 

babel_extractors.csv

@@ -1,3 +0,0 @@
-**/setup/setup_wizard/data/uom_data.json,erpnext.gettext.extractors.uom_data.extract
-**/setup/doctype/incoterm/incoterms.csv,erpnext.gettext.extractors.incoterms.extract
-**/setup/setup_wizard/data/*.txt,erpnext.gettext.extractors.lines_from_txt_file.extract

crowdin.yml

@@ -1,14 +0,0 @@
-files:
-  - source: /erpnext/locale/main.pot
-    translation: /erpnext/locale/%two_letters_code%.po
-pull_request_title: "fix: sync translations from crowdin"
-pull_request_labels:
-  - translation
-  - skip-release-notes
-pull_request_reviewers:
-  - barredterra # change to your GitHub username if you copied this file
-commit_message: "fix: %language% translations"
-append_commit_message: false
-languages_mapping:
-  two_letters_code:
-    pt-BR: pt_BR

erpnext/__init__.py

@@ -1,12 +1,9 @@
 import functools
 import inspect
-from typing import TypeVar
 
 import frappe
-from frappe.model.document import Document
-from frappe.utils.user import is_website_user
 
-__version__ = "17.0.0-dev"
+__version__ = "15.28.2"
 
 
 def get_default_company(user=None):
@@ -57,7 +54,7 @@ def get_company_currency(company):
 
 def set_perpetual_inventory(enable=1, company=None):
 	if not company:
-		company = "_Test Company" if frappe.in_test else get_default_company()
+		company = "_Test Company" if frappe.flags.in_test else get_default_company()
 
 	company = frappe.get_doc("Company", company)
 	company.enable_perpetual_inventory = enable
@@ -77,7 +74,7 @@ def encode_company_abbr(name, company=None, abbr=None):
 
 def is_perpetual_inventory_enabled(company):
 	if not company:
-		company = "_Test Company" if frappe.in_test else get_default_company()
+		company = "_Test Company" if frappe.flags.in_test else get_default_company()
 
 	if not hasattr(frappe.local, "enable_perpetual_inventory"):
 		frappe.local.enable_perpetual_inventory = {}
@@ -152,44 +149,3 @@ def allow_regional(fn):
 		return frappe.get_attr(overrides[function_path][-1])(*args, **kwargs)
 
 	return caller
-
-
-def check_app_permission():
-	if frappe.session.user == "Administrator":
-		return True
-
-	if is_website_user():
-		return False
-
-	return True
-
-
-T = TypeVar("T")
-
-
-def normalize_ctx_input(T: type) -> callable:
-	"""
-	Normalizes the first argument (ctx) of the decorated function by:
-	- Converting Document objects to dictionaries
-	- Parsing JSON strings
-	- Casting the result to the specified type T
-	"""
-
-	def decorator(func: callable):
-		# conserve annotations for frappe.utils.typing_validations
-		@functools.wraps(func, assigned=(a for a in functools.WRAPPER_ASSIGNMENTS if a != "__annotations__"))
-		def wrapper(ctx: T | Document | dict | str, *args, **kwargs):
-			if isinstance(ctx, Document):
-				ctx = T(**ctx.as_dict())
-			elif isinstance(ctx, dict):
-				ctx = T(**ctx)
-			else:
-				ctx = T(**frappe.parse_json(ctx))
-
-			return func(ctx, *args, **kwargs)
-
-		# set annotations from function
-		wrapper.__annotations__.update({k: v for k, v in func.__annotations__.items() if k != "ctx"})
-		return wrapper
-
-	return decorator

erpnext/accounts/accounts_dashboard/payments/payments.json

@@ -1,50 +0,0 @@
-{
- "cards": [
-  {
-   "card": "Total Outgoing Bills"
-  },
-  {
-   "card": "Total Incoming Bills"
-  },
-  {
-   "card": "Total Incoming Payment"
-  },
-  {
-   "card": "Total Outgoing Payment"
-  }
- ],
- "charts": [
-  {
-   "chart": "Incoming Bills (Purchase Invoice)",
-   "width": "Half"
-  },
-  {
-   "chart": "Outgoing Bills (Sales Invoice)",
-   "width": "Half"
-  },
-  {
-   "chart": "Accounts Receivable Ageing",
-   "width": "Half"
-  },
-  {
-   "chart": "Accounts Payable Ageing",
-   "width": "Half"
-  },
-  {
-   "chart": "Bank Balance",
-   "width": "Full"
-  }
- ],
- "creation": "2026-01-26 21:25:12.793893",
- "dashboard_name": "Payments",
- "docstatus": 0,
- "doctype": "Dashboard",
- "idx": 0,
- "is_default": 0,
- "is_standard": 1,
- "modified": "2026-01-26 21:25:12.793893",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Payments",
- "owner": "Administrator"
-}

erpnext/accounts/custom/address.py

@@ -10,10 +10,8 @@ from frappe.contacts.doctype.address.address import (
 class ERPNextAddress(Address):
 	def validate(self):
 		self.validate_reference()
-		self.update_company_address()
-
-		if hasattr(super(), "validate"):
-			super().validate()
+		self.update_compnay_address()
+		super().validate()
 
 	def link_address(self):
 		"""Link address based on owner"""
@@ -22,7 +20,7 @@ class ERPNextAddress(Address):
 
 		return super().link_address()
 
-	def update_company_address(self):
+	def update_compnay_address(self):
 		for link in self.get("links"):
 			if link.link_doctype == "Company":
 				self.is_your_company_address = 1
@@ -40,10 +38,6 @@ class ERPNextAddress(Address):
 		"""
 		After Address is updated, update the related 'Primary Address' on Customer.
 		"""
-
-		if hasattr(super(), "on_update"):
-			super().on_update()
-
 		address_display = get_address_display(self.as_dict())
 		filters = {"customer_primary_address": self.name}
 		customers = frappe.db.get_all("Customer", filters=filters, as_list=True)
@@ -52,7 +46,7 @@ class ERPNextAddress(Address):
 
 
 @frappe.whitelist()
-def get_shipping_address(company: str, address: str | None = None):
+def get_shipping_address(company, address=None):
 	filters = [
 		["Dynamic Link", "link_doctype", "=", "Company"],
 		["Dynamic Link", "link_name", "=", company],

erpnext/accounts/dashboard_chart/bank_balance/bank_balance.json

@@ -9,20 +9,18 @@
  "idx": 0,
  "is_public": 1,
  "is_standard": 1,
- "last_synced_on": "2026-01-02 13:01:24.037552",
- "modified": "2026-01-02 13:04:57.850305",
+ "last_synced_on": "2020-07-22 12:19:59.879476",
+ "modified": "2020-07-22 12:21:48.780513",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Bank Balance",
  "number_of_groups": 0,
  "owner": "Administrator",
- "roles": [],
- "show_values_over_chart": 1,
  "source": "Account Balance Timeline",
- "time_interval": "Monthly",
- "timeseries": 1,
+ "time_interval": "Quarterly",
+ "timeseries": 0,
  "timespan": "Last Year",
  "type": "Line",
  "use_report_chart": 0,
  "y_axis": []
-}
+}

erpnext/accounts/dashboard_chart/profit_and_loss/profit_and_loss.json

@@ -1,7 +1,7 @@
 {
  "chart_name": "Profit and Loss",
  "chart_type": "Report",
- "creation": "2025-04-01 20:38:16.986176",
+ "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()\"}",
@@ -9,7 +9,7 @@
  "idx": 0,
  "is_public": 1,
  "is_standard": 1,
- "modified": "2025-12-19 12:37:31.673782",
+ "modified": "2023-07-19 13:08:56.470390",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Profit and Loss",
@@ -17,9 +17,8 @@
  "owner": "Administrator",
  "report_name": "Profit and Loss Statement",
  "roles": [],
- "show_values_over_chart": 1,
  "timeseries": 0,
- "type": "Line",
+ "type": "Bar",
  "use_report_chart": 1,
  "y_axis": []
-}
+}

erpnext/accounts/dashboard_chart_source/account_balance_timeline/account_balance_timeline.js

@@ -17,15 +17,6 @@ frappe.dashboards.chart_sources["Account Balance Timeline"] = {
 			fieldtype: "Link",
 			options: "Account",
 			reqd: 1,
-			default: locals[":Company"][frappe.defaults.get_user_default("Company")]["default_bank_account"],
-			get_query: () => {
-				return {
-					filters: {
-						account_type: "Bank",
-						is_group: 0,
-					},
-				};
-			},
 		},
 	],
 };

erpnext/accounts/dashboard_chart_source/account_balance_timeline/account_balance_timeline.py

@@ -4,7 +4,7 @@
 
 import frappe
 from frappe import _
-from frappe.utils import add_to_date, formatdate, getdate, nowdate
+from frappe.utils import add_to_date, formatdate, get_link_to_form, getdate, nowdate
 from frappe.utils.dashboard import cache_source
 from frappe.utils.dateutils import get_from_date_from_timespan, get_period_ending
 from frappe.utils.nestedset import get_descendants_of
@@ -13,15 +13,15 @@ from frappe.utils.nestedset import get_descendants_of
 @frappe.whitelist()
 @cache_source
 def get(
-	chart_name: str | None = None,
-	chart: str | dict | None = None,
-	no_cache: bool | None = None,
-	filters: str | dict | None = None,
-	from_date: str | None = None,
-	to_date: str | None = None,
-	timespan: str | None = None,
-	time_interval: str | None = None,
-	heatmap_year: str | None = None,
+	chart_name=None,
+	chart=None,
+	no_cache=None,
+	filters=None,
+	from_date=None,
+	to_date=None,
+	timespan=None,
+	time_interval=None,
+	heatmap_year=None,
 ):
 	if chart_name:
 		chart = frappe.get_doc("Dashboard Chart", chart_name)
@@ -37,14 +37,21 @@ def get(
 	filters = frappe.parse_json(filters) or frappe.parse_json(chart.filters_json)
 
 	account = filters.get("account")
-	company = filters.get("company")
+	filters.get("company")
 
-	if not company and not account:
-		frappe.throw(_("Company and account filters not set!"))
-	if not company:
-		frappe.throw(_("Company filter not set!"))
-	if not account:
-		frappe.throw(_("Account filter not set!"))
+	if not account and chart_name:
+		frappe.throw(
+			_("Account is not set for the dashboard chart {0}").format(
+				get_link_to_form("Dashboard Chart", chart_name)
+			)
+		)
+
+	if not frappe.db.exists("Account", account) and chart_name:
+		frappe.throw(
+			_("Account {0} does not exists in the dashboard chart {1}").format(
+				account, get_link_to_form("Dashboard Chart", chart_name)
+			)
+		)
 
 	if not to_date:
 		to_date = nowdate()

erpnext/accounts/deferred_revenue.py

@@ -46,8 +46,7 @@ def validate_service_stop_date(doc):
 		if (
 			old_stop_dates
 			and old_stop_dates.get(item.name)
-			and item.service_stop_date
-			and getdate(item.service_stop_date) != getdate(old_stop_dates.get(item.name))
+			and item.service_stop_date != old_stop_dates.get(item.name)
 		):
 			frappe.throw(_("Cannot change Service Stop Date for item in row {0}").format(item.idx))
 
@@ -59,7 +58,7 @@ def build_conditions(process_type, account, company):
 	)
 
 	if account:
-		conditions += f"AND {deferred_account}={frappe.db.escape(account)}"
+		conditions += f"AND {deferred_account}='{account}'"
 	elif company:
 		conditions += f"AND p.company = {frappe.db.escape(company)}"
 
@@ -221,7 +220,7 @@ def calculate_monthly_amount(
 			if amount + already_booked_amount_in_account_currency > item.net_amount:
 				amount = item.net_amount - already_booked_amount_in_account_currency
 
-		if get_first_day(start_date) != start_date or get_last_day(end_date) != end_date:
+		if not (get_first_day(start_date) == start_date and get_last_day(end_date) == end_date):
 			partial_month = flt(date_diff(end_date, start_date)) / flt(
 				date_diff(get_last_day(end_date), get_first_day(start_date))
 			)
@@ -318,7 +317,7 @@ 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"
 
-	accounts_frozen_upto = frappe.db.get_value("Company", doc.company, "accounts_frozen_till_date")
+	accounts_frozen_upto = frappe.db.get_single_value("Accounts Settings", "acc_frozen_upto")
 
 	def _book_deferred_revenue_or_expense(
 		item,
@@ -449,12 +448,14 @@ def process_deferred_accounting(posting_date=None):
 	for company in companies:
 		for record_type in ("Income", "Expense"):
 			doc = frappe.get_doc(
-				doctype="Process Deferred Accounting",
-				company=company.name,
-				posting_date=posting_date,
-				start_date=start_date,
-				end_date=end_date,
-				type=record_type,
+				dict(
+					doctype="Process Deferred Accounting",
+					company=company.name,
+					posting_date=posting_date,
+					start_date=start_date,
+					end_date=end_date,
+					type=record_type,
+				)
 			)
 
 			doc.insert()
@@ -523,10 +524,9 @@ def make_gl_entries(
 	if gl_entries:
 		try:
 			make_gl_entries(gl_entries, cancel=(doc.docstatus == 2), merge_entries=True)
-			if not frappe.in_test:
-				frappe.db.commit()
+			frappe.db.commit()
 		except Exception as e:
-			if frappe.in_test:
+			if frappe.flags.in_test:
 				doc.log_error(f"Error while processing deferred accounting for Invoice {doc.name}")
 				raise e
 			else:
@@ -606,8 +606,7 @@ def book_revenue_via_journal_entry(
 		if submit:
 			journal_entry.submit()
 
-		if not frappe.in_test:
-			frappe.db.commit()
+		frappe.db.commit()
 	except Exception:
 		frappe.db.rollback()
 		doc.log_error(f"Error while processing deferred accounting for Invoice {doc.name}")

erpnext/accounts/doctype/account/account.js

@@ -5,7 +5,8 @@ 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) {
 			return {
 				filters: {
@@ -14,18 +15,7 @@ frappe.ui.form.on("Account", {
 				},
 			};
 		});
-
-		frm.set_query("account_category", function () {
-			if (!frm.doc.root_type) return;
-
-			return {
-				filters: {
-					root_type: ["in", [frm.doc.root_type, ""]],
-				},
-			};
-		});
 	},
-
 	refresh: function (frm) {
 		frm.toggle_display("account_name", frm.is_new());
 
@@ -68,20 +58,12 @@ frappe.ui.form.on("Account", {
 			}
 		}
 	},
-
 	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");
 		}
 	},
-
-	root_type: function (frm) {
-		if (frm.doc.account_category) {
-			frm.set_value("account_category", "");
-		}
-	},
-
 	add_toolbar_buttons: function (frm) {
 		frm.add_custom_button(
 			__("Chart of Accounts"),

erpnext/accounts/doctype/account/account.json

@@ -3,7 +3,6 @@
  "allow_copy": 1,
  "allow_import": 1,
  "creation": "2013-01-30 12:49:46",
- "default_view": "Tree",
  "description": "Heads (or groups) against which Accounting Entries are made and balances are maintained.",
  "doctype": "DocType",
  "document_type": "Setup",
@@ -21,7 +20,6 @@
   "account_currency",
   "column_break1",
   "parent_account",
-  "account_category",
   "account_type",
   "tax_rate",
   "freeze_account",
@@ -66,8 +64,6 @@
    "label": "Is Group"
   },
   {
-   "fetch_from": "parent_account.company",
-   "fetch_if_empty": 1,
    "fieldname": "company",
    "fieldtype": "Link",
    "in_standard_filter": 1,
@@ -110,7 +106,6 @@
    "fieldname": "parent_account",
    "fieldtype": "Link",
    "ignore_user_permissions": 1,
-   "in_preview": 1,
    "label": "Parent Account",
    "oldfieldname": "parent_account",
    "oldfieldtype": "Link",
@@ -126,14 +121,13 @@
    "label": "Account Type",
    "oldfieldname": "account_type",
    "oldfieldtype": "Select",
-   "options": "\nAccumulated Depreciation\nAsset Received But Not Billed\nBank\nCash\nChargeable\nCapital Work in Progress\nCost of Goods Sold\nCurrent Asset\nCurrent Liability\nDepreciation\nDirect Expense\nDirect Income\nEquity\nExpense Account\nExpenses Included In Asset Valuation\nExpenses Included In Valuation\nFixed Asset\nIncome Account\nIndirect Expense\nIndirect Income\nLiability\nPayable\nReceivable\nRound Off\nRound Off for Opening\nStock\nStock Adjustment\nStock Received But Not Billed\nService Received But Not Billed\nTax\nTemporary",
-   "search_index": 1
+   "options": "\nAccumulated Depreciation\nAsset Received But Not Billed\nBank\nCash\nChargeable\nCapital Work in Progress\nCost of Goods Sold\nCurrent Asset\nCurrent Liability\nDepreciation\nDirect Expense\nDirect Income\nEquity\nExpense Account\nExpenses Included In Asset Valuation\nExpenses Included In Valuation\nFixed Asset\nIncome Account\nIndirect Expense\nIndirect Income\nLiability\nPayable\nReceivable\nRound Off\nStock\nStock Adjustment\nStock Received But Not Billed\nService Received But Not Billed\nTax\nTemporary"
   },
   {
    "description": "Rate at which this tax is applied",
    "fieldname": "tax_rate",
    "fieldtype": "Float",
-   "label": "Tax Rate",
+   "label": "Rate",
    "oldfieldname": "tax_rate",
    "oldfieldtype": "Currency"
   },
@@ -190,20 +184,13 @@
    "fieldname": "disabled",
    "fieldtype": "Check",
    "label": "Disable"
-  },
-  {
-   "description": "Used with Financial Report Template",
-   "fieldname": "account_category",
-   "fieldtype": "Link",
-   "label": "Account Category",
-   "options": "Account Category"
   }
  ],
  "icon": "fa fa-money",
  "idx": 1,
  "is_tree": 1,
  "links": [],
- "modified": "2026-04-14 18:14:42.202065",
+ "modified": "2023-07-20 18:18:44.405723",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Account",
@@ -256,22 +243,12 @@
    "role": "Accounts Manager",
    "share": 1,
    "write": 1
-  },
-  {
-   "role": "HR User",
-   "select": 1
-  },
-  {
-   "role": "HR Manager",
-   "select": 1
   }
  ],
- "row_format": "Dynamic",
  "search_fields": "account_number",
  "show_name_in_global_search": 1,
- "show_preview_popup": 1,
- "sort_field": "creation",
+ "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
@@ -31,7 +31,6 @@ class Account(NestedSet):
 	if TYPE_CHECKING:
 		from frappe.types import DF
 
-		account_category: DF.Link | None
 		account_currency: DF.Link | None
 		account_name: DF.Data
 		account_number: DF.Data | None
@@ -61,7 +60,6 @@ class Account(NestedSet):
 			"Payable",
 			"Receivable",
 			"Round Off",
-			"Round Off for Opening",
 			"Stock",
 			"Stock Adjustment",
 			"Stock Received But Not Billed",
@@ -93,10 +91,10 @@ class Account(NestedSet):
 			super().on_update()
 
 	def onload(self):
-		role_allowed_for_frozen_entries = frappe.db.get_value(
-			"Company", self.company, "role_allowed_for_frozen_entries"
+		frozen_accounts_modifier = frappe.db.get_value(
+			"Accounts Settings", "Accounts Settings", "frozen_accounts_modifier"
 		)
-		if not role_allowed_for_frozen_entries or role_allowed_for_frozen_entries in frappe.get_roles():
+		if not frozen_accounts_modifier or frozen_accounts_modifier in frappe.get_roles():
 			self.set_onload("can_freeze_account", True)
 
 	def autoname(self):
@@ -105,13 +103,14 @@ class Account(NestedSet):
 		self.name = get_autoname_with_number(self.account_number, self.account_name, self.company)
 
 	def validate(self):
+		from erpnext.accounts.utils import validate_field_number
+
 		if frappe.local.flags.allow_unverified_charts:
 			return
 		self.validate_parent()
 		self.validate_parent_child_account_type()
 		self.validate_root_details()
-		self.validate_account_number()
-		self.validate_disabled()
+		validate_field_number("Account", self.name, self.account_number, self.company, "account_number")
 		self.validate_group_or_ledger()
 		self.set_root_and_report_type()
 		self.validate_mandatory()
@@ -171,7 +170,7 @@ class Account(NestedSet):
 			if par.root_type:
 				self.root_type = par.root_type
 
-		if cint(self.is_group):
+		if self.is_group:
 			db_value = self.get_doc_before_save()
 			if db_value:
 				if self.report_type != db_value.report_type:
@@ -203,7 +202,7 @@ class Account(NestedSet):
 				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.bold("Account Type"), doc_before_save.account_type, doc_before_save.account_type
 				)
 				frappe.msgprint(msg)
 				self.add_comment("Comment", msg)
@@ -214,7 +213,7 @@ class Account(NestedSet):
 		if doc_before_save and not doc_before_save.parent_account:
 			throw(_("Root cannot be edited."), RootNotEditable)
 
-		if not self.parent_account and not cint(self.is_group):
+		if not self.parent_account and not self.is_group:
 			throw(_("The root account {0} must be a group").format(frappe.bold(self.name)))
 
 	def validate_root_company_and_sync_account_to_children(self):
@@ -256,14 +255,6 @@ class Account(NestedSet):
 
 			self.create_account_for_child_company(parent_acc_name_map, descendants, parent_acc_name)
 
-	def validate_disabled(self):
-		doc_before_save = self.get_doc_before_save()
-		if not doc_before_save or cint(doc_before_save.disabled) == cint(self.disabled):
-			return
-
-		if cint(self.disabled):
-			self.validate_default_accounts_in_company()
-
 	def validate_group_or_ledger(self):
 		doc_before_save = self.get_doc_before_save()
 		if not doc_before_save or cint(doc_before_save.is_group) == cint(self.is_group):
@@ -271,44 +262,21 @@ class Account(NestedSet):
 
 		if self.check_gle_exists():
 			throw(_("Account with existing transaction cannot be converted to ledger"))
-		elif cint(self.is_group):
+		elif self.is_group:
 			if self.account_type and not self.flags.exclude_account_type_check:
 				throw(_("Cannot covert to Group because Account Type is selected."))
-			self.validate_default_accounts_in_company()
 		elif self.check_if_child_exists():
 			throw(_("Account with child nodes cannot be set as ledger"))
 
-	def validate_default_accounts_in_company(self):
-		default_account_fields = get_company_default_account_fields()
-
-		company_default_accounts = frappe.db.get_value(
-			"Company", self.company, list(default_account_fields.keys()), as_dict=1
-		)
-
-		msg = _("Account {0} cannot be disabled as it is already set as {1} for {2}.")
-
-		if not self.disabled:
-			msg = _("Account {0} cannot be converted to Group as it is already set as {1} for {2}.")
-
-		for d in default_account_fields:
-			if company_default_accounts.get(d) == self.name:
-				throw(
-					msg.format(
-						frappe.bold(self.name),
-						frappe.bold(default_account_fields.get(d)),
-						frappe.bold(self.company),
-					)
-				)
-
 	def validate_frozen_accounts_modifier(self):
 		doc_before_save = self.get_doc_before_save()
 		if not doc_before_save or doc_before_save.freeze_account == self.freeze_account:
 			return
 
-		role_allowed_for_frozen_entries = frappe.get_cached_value(
-			"Company", self.company, "role_allowed_for_frozen_entries"
+		frozen_accounts_modifier = frappe.get_cached_value(
+			"Accounts Settings", "Accounts Settings", "frozen_accounts_modifier"
 		)
-		if not role_allowed_for_frozen_entries or role_allowed_for_frozen_entries not in frappe.get_roles():
+		if not frozen_accounts_modifier or frozen_accounts_modifier not in frappe.get_roles():
 			throw(_("You are not authorized to set Frozen value"))
 
 	def validate_balance_must_be_debit_or_credit(self):
@@ -337,30 +305,12 @@ class Account(NestedSet):
 			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, "is_cancelled": 0}, "account_currency"
-		)
+		gl_currency = frappe.db.get_value("GL Entry", {"account": self.name}, "account_currency")
 
 		if gl_currency and self.account_currency != gl_currency:
 			if frappe.db.get_value("GL Entry", {"account": self.name}):
 				frappe.throw(_("Currency can not be changed after making entries using some other currency"))
 
-	def validate_account_number(self, account_number=None):
-		if not account_number:
-			account_number = self.account_number
-
-		if account_number:
-			account_with_same_number = frappe.db.get_value(
-				"Account",
-				{"account_number": account_number, "company": self.company, "name": ["!=", self.name]},
-			)
-			if account_with_same_number:
-				frappe.throw(
-					_("Account Number {0} already used in account {1}").format(
-						account_number, account_with_same_number
-					)
-				)
-
 	def create_account_for_child_company(self, parent_acc_name_map, descendants, parent_acc_name):
 		for company in descendants:
 			company_bold = frappe.bold(company)
@@ -471,7 +421,7 @@ class Account(NestedSet):
 
 @frappe.whitelist()
 @frappe.validate_and_sanitize_search_inputs
-def get_parent_account(doctype: str, txt: str, searchfield: str, start: int, page_len: int, filters: dict):
+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 = {}
@@ -514,11 +464,21 @@ def get_account_autoname(account_number, account_name, company):
 	return " - ".join(parts)
 
 
+def validate_account_number(name, account_number, company):
+	if account_number:
+		account_with_same_number = frappe.db.get_value(
+			"Account", {"account_number": account_number, "company": company, "name": ["!=", name]}
+		)
+		if account_with_same_number:
+			frappe.throw(
+				_("Account Number {0} already used in account {1}").format(
+					account_number, account_with_same_number
+				)
+			)
+
+
 @frappe.whitelist()
-def update_account_number(
-	name: str, account_name: str, account_number: str | None = None, from_descendant: bool = False
-):
-	_ensure_idle_system()
+def update_account_number(name, account_name, account_number=None, from_descendant=False):
 	account = frappe.get_cached_doc("Account", name)
 	if not account:
 		return
@@ -539,7 +499,7 @@ def update_account_number(
 				"name",
 			)
 
-			if old_name and not from_descendant:
+			if old_name:
 				# same account in parent company exists
 				allow_child_account_creation = _("Allow Account Creation Against Child Company")
 
@@ -557,7 +517,7 @@ def update_account_number(
 
 				frappe.throw(message, title=_("Rename Not Allowed"))
 
-	account.validate_account_number(account_number)
+	validate_account_number(name, account_number, account.company)
 	if account_number:
 		frappe.db.set_value("Account", name, "account_number", account_number.strip())
 	else:
@@ -579,8 +539,7 @@ def update_account_number(
 
 
 @frappe.whitelist()
-def merge_account(old: str, new: str):
-	_ensure_idle_system()
+def merge_account(old, new):
 	# Validate properties before merging
 	new_account = frappe.get_cached_doc("Account", new)
 	old_account = frappe.get_cached_doc("Account", old)
@@ -616,7 +575,7 @@ def merge_account(old: str, new: str):
 
 
 @frappe.whitelist()
-def get_root_company(company: str):
+def get_root_company(company):
 	# return the topmost company in the hierarchy
 	ancestors = get_ancestors_of("Company", company, "lft asc")
 	return [ancestors[0]] if ancestors else []
@@ -634,55 +593,3 @@ def sync_update_account_number_in_child(
 
 	for d in frappe.db.get_values("Account", filters=filters, fieldname=["company", "name"], as_dict=True):
 		update_account_number(d["name"], account_name, account_number, from_descendant=True)
-
-
-def _ensure_idle_system():
-	# Don't allow renaming if accounting entries are actively being updated, there are two main reasons:
-	# 1. Correctness: It's next to impossible to ensure that renamed account is not being used *right now*.
-	# 2. Performance: Renaming requires locking out many tables entirely and severely degrades performance.
-
-	if frappe.in_test:
-		return
-
-	last_gl_update = None
-	try:
-		# We also lock inserts to GL entry table with for_update here.
-		last_gl_update = frappe.db.get_value("GL Entry", {}, "modified", for_update=True, wait=False)
-	except frappe.QueryTimeoutError:
-		# wait=False fails immediately if there's an active transaction.
-		last_gl_update = add_to_date(None, seconds=-1)
-
-	if not last_gl_update:
-		return
-
-	if last_gl_update > add_to_date(None, minutes=-5):
-		frappe.throw(
-			_(
-				"Last GL Entry update was done {}. This operation is not allowed while system is actively being used. Please wait for 5 minutes before retrying."
-			).format(pretty_date(last_gl_update)),
-			title=_("System In Use"),
-		)
-
-
-def get_company_default_account_fields():
-	return {
-		"default_bank_account": "Default Bank Account",
-		"default_cash_account": "Default Cash Account",
-		"default_receivable_account": "Default Receivable Account",
-		"default_payable_account": "Default Payable Account",
-		"default_expense_account": "Default Expense Account",
-		"default_income_account": "Default Income Account",
-		"stock_received_but_not_billed": "Stock Received But Not Billed Account",
-		"stock_adjustment_account": "Stock Adjustment Account",
-		"write_off_account": "Write Off Account",
-		"default_discount_account": "Default Payment Discount Account",
-		"unrealized_profit_loss_account": "Unrealized Profit / Loss Account",
-		"exchange_gain_loss_account": "Exchange Gain / Loss Account",
-		"unrealized_exchange_gain_loss_account": "Unrealized Exchange Gain / Loss Account",
-		"round_off_account": "Round Off Account",
-		"default_deferred_revenue_account": "Default Deferred Revenue Account",
-		"default_deferred_expense_account": "Default Deferred Expense Account",
-		"accumulated_depreciation_account": "Accumulated Depreciation Account",
-		"depreciation_expense_account": "Depreciation Expense Account",
-		"disposal_account": "Gain/Loss Account on Asset Disposal",
-	}

erpnext/accounts/doctype/account/account_tree.js

@@ -10,7 +10,6 @@ frappe.treeview_settings["Account"] = {
 			fieldtype: "Select",
 			options: erpnext.utils.get_tree_options("company"),
 			label: __("Company"),
-			render_on_toolbar: true,
 			default: erpnext.utils.get_tree_default("company"),
 			on_change: function () {
 				var me = frappe.treeview_settings["Account"].treeview;
@@ -52,55 +51,59 @@ frappe.treeview_settings["Account"] = {
 	],
 	root_label: "Accounts",
 	get_tree_nodes: "erpnext.accounts.utils.get_children",
-	on_node_render: function (node, deep) {
-		const render_balances = () => {
-			for (let account of cur_tree.account_balance_data) {
-				const node = cur_tree.nodes && cur_tree.nodes[account.value];
-				if (!node || node.is_root) continue;
-
-				// show Dr if positive since balance is calculated as debit - credit else show Cr
-				const balance = account.balance_in_account_currency || account.balance;
-				const dr_or_cr = balance > 0 ? __("Dr") : __("Cr");
-				const format = (value, currency) => format_currency(Math.abs(value), currency);
-
-				if (account.balance !== undefined) {
-					node.parent && node.parent.find(".balance-area").remove();
-					$(
-						'<span class="balance-area pull-right">' +
-							(account.account_currency != account.company_currency
-								? format(account.balance_in_account_currency, account.account_currency) +
-								  " / "
-								: "") +
-							format(account.balance, account.company_currency) +
-							" " +
-							dr_or_cr +
-							"</span>"
-					).insertBefore(node.$ul);
-				}
-			}
-		};
-
+	on_get_node: function (nodes, deep = false) {
 		if (frappe.boot.user.can_read.indexOf("GL Entry") == -1) return;
-		if (!cur_tree.account_balance_data) {
-			frappe.db.get_single_value("Accounts Settings", "show_balance_in_coa").then((value) => {
-				if (value) {
-					frappe.call({
-						method: "erpnext.accounts.utils.get_account_balances_coa",
-						args: {
-							company: cur_tree.args.company,
-							include_default_fb_balances: true,
-						},
-						callback: function (r) {
-							if (!r.message || r.message.length === 0) return;
-							cur_tree.account_balance_data = r.message || [];
-							render_balances();
-						},
-					});
-				}
-			});
+
+		let accounts = [];
+		if (deep) {
+			// in case of `get_all_nodes`
+			accounts = nodes.reduce((acc, node) => [...acc, ...node.data], []);
 		} else {
-			render_balances();
+			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,
+					},
+				});
+
+				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;
+
+						// 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: [
@@ -135,11 +138,6 @@ frappe.treeview_settings["Account"] = {
 			description: __(
 				"Further accounts can be made under Groups, but entries can be made against non-Groups"
 			),
-			onchange: function () {
-				if (!this.value) {
-					this.layout.set_value("root_type", "");
-				}
-			},
 		},
 		{
 			fieldtype: "Select",
@@ -156,14 +154,6 @@ frappe.treeview_settings["Account"] = {
 				.options,
 			description: __("Optional. This setting will be used to filter in various transactions."),
 		},
-		{
-			fieldtype: "Link",
-			fieldname: "account_category",
-			label: __("Account Category"),
-			options: frappe.get_meta("Account").fields.filter((d) => d.fieldname == "account_category")[0]
-				.options,
-			description: __("Optional. Used with Financial Report Template"),
-		},
 		{
 			fieldtype: "Float",
 			fieldname: "tax_rate",
@@ -192,9 +182,7 @@ frappe.treeview_settings["Account"] = {
 			function () {
 				frappe.set_route("Tree", "Cost Center", { company: get_company() });
 			},
-			__("View"),
-			"default",
-			true
+			__("View")
 		);
 
 		treeview.page.add_inner_button(
@@ -202,12 +190,31 @@ frappe.treeview_settings["Account"] = {
 			function () {
 				frappe.set_route("Form", "Opening Invoice Creation Tool", { company: get_company() });
 			},
-			__("View"),
-			"default",
-			true
+			__("View")
 		);
 
-		treeview.page.add_divider_to_button_group(__("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")
+		);
 
 		// financial statements
 		for (let report of [
@@ -224,28 +231,25 @@ frappe.treeview_settings["Account"] = {
 				function () {
 					frappe.set_route("query-report", report, { company: get_company() });
 				},
-				__("View")
+				__("Financial Statements")
 			);
 		}
 	},
 	post_render: function (treeview) {
 		frappe.treeview_settings["Account"].treeview["tree"] = treeview.tree;
-		if (treeview.can_create) {
-			treeview.page.set_primary_action(
-				__("New"),
-				function () {
-					let root_company = treeview.page.fields_dict.root_company.get_value();
-					if (root_company) {
-						frappe.throw(__("Please add the account to root level Company - {0}"), [
-							root_company,
-						]);
-					} else {
-						treeview.new_node();
-					}
-				},
-				"add"
-			);
-		}
+		treeview.page.set_primary_action(
+			__("New"),
+			function () {
+				let root_company = treeview.page.fields_dict.root_company.get_value();
+
+				if (root_company) {
+					frappe.throw(__("Please add the account to root level Company - {0}"), [root_company]);
+				} else {
+					treeview.new_node();
+				}
+			},
+			"add"
+		);
 	},
 	toolbar: [
 		{
@@ -274,14 +278,12 @@ frappe.treeview_settings["Account"] = {
 			label: __("View Ledger"),
 			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(),
 				};
-				if (node.parent_label) {
-					frappe.route_options["account"] = node.label;
-				}
 				frappe.set_route("query-report", "General Ledger");
 			},
 			btnClass: "hidden-xs",

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

@@ -18,12 +18,19 @@ def create_charts(
 		accounts = []
 
 		def _import_accounts(children, parent, root_type, root_account=False):
-			nonlocal custom_chart
 			for account_name, child in children.items():
 				if root_account:
 					root_type = child.get("root_type")
 
-				if account_name not in get_chart_metadata_fields():
+				if account_name not in [
+					"account_name",
+					"account_number",
+					"account_type",
+					"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
@@ -47,10 +54,8 @@ def create_charts(
 							"report_type": report_type,
 							"account_number": account_number,
 							"account_type": child.get("account_type"),
-							"account_category": child.get("account_category"),
 							"account_currency": child.get("account_currency")
-							if custom_chart
-							else frappe.get_cached_value("Company", company, "default_currency"),
+							or frappe.get_cached_value("Company", company, "default_currency"),
 							"tax_rate": child.get("tax_rate"),
 						}
 					)
@@ -70,7 +75,7 @@ def create_charts(
 		# after all accounts are already inserted.
 		frappe.local.flags.ignore_update_nsm = True
 		_import_accounts(chart, None, None, root_account=True)
-		rebuild_tree("Account")
+		rebuild_tree("Account", "parent_account")
 		frappe.local.flags.ignore_update_nsm = False
 
 
@@ -90,7 +95,20 @@ def add_suffix_if_duplicate(account_name, account_number, accounts):
 def identify_is_group(child):
 	if child.get("is_group"):
 		is_group = child.get("is_group")
-	elif len(set(child.keys()) - set(get_chart_metadata_fields())):
+	elif len(
+		set(child.keys())
+		- set(
+			[
+				"account_name",
+				"account_type",
+				"root_type",
+				"is_group",
+				"tax_rate",
+				"account_number",
+				"account_currency",
+			]
+		)
+	):
 		is_group = 1
 	else:
 		is_group = 0
@@ -98,8 +116,7 @@ def identify_is_group(child):
 	return is_group
 
 
-@frappe.whitelist()
-def get_chart(chart_template: str | None, existing_company: str | None = None):
+def get_chart(chart_template, existing_company=None):
 	chart = {}
 	if existing_company:
 		return get_account_tree_from_existing_company(existing_company)
@@ -132,7 +149,7 @@ def get_chart(chart_template: str | None, existing_company: str | None = None):
 
 
 @frappe.whitelist()
-def get_charts_for_country(country: str, with_standard: bool = False):
+def get_charts_for_country(country, with_standard=False):
 	charts = []
 
 	def _get_chart_name(content):
@@ -215,8 +232,6 @@ def build_account_tree(tree, parent, all_accounts):
 			tree[child.account_name]["account_type"] = child.account_type
 		if child.tax_rate:
 			tree[child.account_name]["tax_rate"] = child.tax_rate
-		if child.account_currency:
-			tree[child.account_name]["account_currency"] = child.account_currency
 		if not parent:
 			tree[child.account_name]["root_type"] = child.root_type
 
@@ -225,7 +240,7 @@ def build_account_tree(tree, parent, all_accounts):
 
 
 @frappe.whitelist()
-def validate_bank_account(coa: str, bank_account: str):
+def validate_bank_account(coa, bank_account):
 	accounts = []
 	chart = get_chart(coa)
 
@@ -233,7 +248,13 @@ def validate_bank_account(coa: str, bank_account: str):
 
 		def _get_account_names(account_master):
 			for account_name, child in account_master.items():
-				if account_name not in get_chart_metadata_fields():
+				if account_name not in [
+					"account_number",
+					"account_type",
+					"root_type",
+					"is_group",
+					"tax_rate",
+				]:
 					accounts.append(account_name)
 
 					_get_account_names(child)
@@ -244,9 +265,7 @@ def validate_bank_account(coa: str, bank_account: str):
 
 
 @frappe.whitelist()
-def build_tree_from_json(
-	chart_template: str, chart_data: dict | None = None, from_coa_importer: bool = False
-):
+def build_tree_from_json(chart_template, chart_data=None, from_coa_importer=False):
 	"""get chart template from its folder and parse the json to be rendered as tree"""
 	chart = chart_data or get_chart(chart_template)
 
@@ -260,7 +279,15 @@ def build_tree_from_json(
 		"""recursively called to form a parent-child based list of dict from chart template"""
 		for account_name, child in children.items():
 			account = {}
-			if account_name in get_chart_metadata_fields():
+			if account_name in [
+				"account_name",
+				"account_number",
+				"account_type",
+				"root_type",
+				"is_group",
+				"tax_rate",
+				"account_currency",
+			]:
 				continue
 
 			if from_coa_importer:
@@ -278,16 +305,3 @@ def build_tree_from_json(
 
 	_import_accounts(chart, None)
 	return accounts
-
-
-def get_chart_metadata_fields():
-	return [
-		"account_name",
-		"account_number",
-		"account_type",
-		"account_category",
-		"root_type",
-		"is_group",
-		"tax_rate",
-		"account_currency",
-	]

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

@@ -1,817 +0,0 @@
-{
-	"country_code": "au",
-	"name": "Australia - Chart of Accounts with Account Numbers",
-	"tree": {
-		"Assets": {
-			"Current Assets": {
-				"Cash On Hand": {
-					"Cash On Hand": {
-						"account_number": "11010",
-						"account_type": "Cash"
-					},
-					"account_number": "110",
-					"is_group": 1
-				},
-				"Cash at Bank": {
-					"Every Day Bank Account": {
-						"account_number": "11510",
-						"account_type": "Bank"
-					},
-					"Business Savings Account": {
-						"account_number": "11520"
-					},
-					"Business Term Deposit": {
-						"account_number": "11530"
-					},
-					"account_number": "115",
-					"is_group": 1
-				},
-				"Trade Receivables": {
-					"Trade Debtors": {
-						"account_number": "12010",
-						"account_type": "Receivable"
-					},
-					"Provision for Doubtful Debts": {
-						"account_number": "12020"
-					},
-					"Sundry Debtors": {
-						"account_number": "12030"
-					},
-					"Debtor Refund": {
-						"account_number": "12040"
-					},
-					"account_number": "120",
-					"is_group": 1
-				},
-				"Inventory": {
-					"Stock On Hand": {
-						"account_number": "13010",
-						"account_type": "Stock"
-					},
-					"WIP - Work In Progress - Manufacturing": {
-						"account_number": "13020"
-					},
-					"account_number": "130",
-					"is_group": 1
-				},
-				"Prepayments": {
-					"Prepayments": {
-						"account_number": "14010"
-					},
-					"Provisional Tax Paid": {
-						"account_number": "14020"
-					},
-					"account_number": "140",
-					"is_group": 1
-				},
-				"account_number": "11",
-				"is_group": 1
-			},
-			"Non Current Assets": {
-				"Plant & Equipment": {
-					"Plant & Equipment": {
-						"account_number": "16010",
-						"account_type": "Fixed Asset"
-					},
-					"Accumulated Depreciation Plant & Equipment": {
-						"account_number": "16020",
-						"account_type": "Accumulated Depreciation"
-					},
-					"account_number": "160",
-					"is_group": 1
-				},
-				"Motor Vehicle": {
-					"Motor Vehicle": {
-						"account_number": "16110",
-						"account_type": "Fixed Asset"
-					},
-					"Accumulated Depreciation Motor Vehicle": {
-						"account_number": "16120",
-						"account_type": "Accumulated Depreciation"
-					},
-					"account_number": "161",
-					"is_group": 1
-				},
-				"Office Equipment": {
-					"Office Furniture & Equipment": {
-						"account_number": "16210",
-						"account_type": "Fixed Asset"
-					},
-					"Accumulated Depreciation Office Furniture & Equipment": {
-						"account_number": "16220",
-						"account_type": "Accumulated Depreciation"
-					},
-					"account_number": "162",
-					"is_group": 1
-				},
-				"Computer Equipment": {
-					"Computer Equipment": {
-						"account_number": "16310",
-						"account_type": "Fixed Asset"
-					},
-					"Accumulated Depreciation Computer Equipment": {
-						"account_number": "16320",
-						"account_type": "Accumulated Depreciation"
-					},
-					"account_number": "163",
-					"is_group": 1
-				},
-				"Building": {
-					"Buildings": {
-						"account_number": "16410",
-						"account_type": "Fixed Asset"
-					},
-					"Accumulated Depreciation Buildings": {
-						"account_number": "16420",
-						"account_type": "Accumulated Depreciation"
-					},
-					"CWIP - Construction Work In Progress": {
-						"account_number": "16430",
-						"account_type": "Capital Work in Progress"
-					},
-					"Accumulated Depreciation - Others": {
-						"account_number": "16440",
-						"account_type": "Accumulated Depreciation"
-					},
-					"account_number": "164",
-					"is_group": 1
-				},
-				"Related Party": {
-					"Loan to Party 1": {
-						"account_number": "17010"
-					},
-					"account_number": "170",
-					"is_group": 1
-				},
-				"Investments & Unlisted Entities": {
-					"Investment - Entity 1": {
-						"account_number": "17510"
-					},
-					"account_number": "175",
-					"is_group": 1
-				},
-				"Intagible Assets": {
-					"Goodwill": {
-						"account_number": "18010"
-					},
-					"Opening Balance Temporary ": {
-						"account_number": "18090",
-						"account_type": "Temporary"
-					},
-					"account_number": "180",
-					"is_group": 1
-				},
-				"account_number": "16",
-				"is_group": 1
-			},
-			"account_number": "1",
-			"root_type": "Asset"
-		},
-		"Liabilities": {
-			"Current Liabilities": {
-				"Trade Payables - Current": {
-					"Trade Creditors": {
-						"account_number": "21010",
-						"account_type": "Payable"
-					},
-					"Goods Received Not Invoiced": {
-						"account_number": "21050",
-						"account_type": "Stock Received But Not Billed"
-					},
-					"Service Received Not Invoiced": {
-						"account_number": "21060"
-					},
-					"Asset Received Not Invoiced": {
-						"account_number": "21070",
-						"account_type": "Asset Received But Not Billed"
-					},
-					"account_number": "210",
-					"is_group": 1
-				},
-				"Other Payables - Current": {
-					"Accrued Expenses": {
-						"account_number": "21510"
-					},
-					"Payroll - Wages Clearing": {
-						"account_number": "21550"
-					},
-					"Payroll - Superannuation Deductions": {
-						"account_number": "21555"
-					},
-					"Payroll - Misc Deductions": {
-						"account_number": "21560"
-					},
-					"Payroll - Withholding Tax Payable": {
-						"account_number": "21565"
-					},
-					"account_number": "215",
-					"is_group": 1
-				},
-				"GST": {
-					"GST Payments to ATO": {
-						"account_number": "22030"
-					},
-					"Provision for PAYG Tax": {
-						"account_number": "22040"
-					},
-					"account_number": "220",
-					"account_type": "Tax",
-					"is_group": 1
-				},
-				"Interest & Non Bearing Liabilities - Current": {
-					"Credit Card - VISA": {
-						"account_number": "22510"
-					},
-					"account_number": "225",
-					"is_group": 1
-				},
-				"Bank Overdraft": {
-					"Bank Overdraft  Cash at Bank": {
-						"account_number": "23010"
-					},
-					"account_number": "230",
-					"is_group": 1
-				},
-				"Trade Finance": {
-					"Trade Finance": {
-						"account_number": "23510"
-					},
-					"account_number": "235",
-					"is_group": 1
-				},
-				"Lease Liabilities": {
-					"Finance Lease - Current": {
-						"account_number": "24010"
-					},
-					"account_number": "240",
-					"is_group": 1
-				},
-				"Provisions": {
-					"Provision for Long Service Leave": {
-						"account_number": "24510"
-					},
-					"Provision for Holiday Pay": {
-						"account_number": "24520"
-					},
-					"account_number": "245",
-					"is_group": 1
-				},
-				"account_number": "21",
-				"is_group": 1
-			},
-			"Non Current Liabilities": {
-				"Trade & Other Payables - Non Current": {
-					"Loan Account - Party 1": {
-						"account_number": "25010"
-					},
-					"account_number": "250",
-					"is_group": 1
-				},
-				"Interest & Non Bearing Liabilities - Non Current": {
-					"Non Current Liability - Director Loan": {
-						"account_number": "25510"
-					},
-					"account_number": "255",
-					"is_group": 1
-				},
-				"Bank Loans - Non Current": {
-					"Bank Loan 1 - Non Current": {
-						"account_number": "26010"
-					},
-					"account_number": "260",
-					"is_group": 1
-				},
-				"Lease Liabilities - Non Current": {
-					"Finance Lease - Non Current": {
-						"account_number": "27010"
-					},
-					"account_number": "270",
-					"is_group": 1
-				},
-				"Provisions - Non Current": {
-					"Provision for Long Service Leave": {
-						"account_number": "27510"
-					},
-					"Provision for Holiday Pay": {
-						"account_number": "27520"
-					},
-					"account_number": "275",
-					"is_group": 1
-				},
-				"account_number": "25",
-				"is_group": 1
-			},
-			"account_number": "2",
-			"root_type": "Liability"
-		},
-		"Equity": {
-			"Equity": {
-				"Owner's/Shareholder's Equity": {
-					"Owner's/Shareholders Capital": {
-						"account_number": "31010",
-						"account_type": "Equity"
-					},
-					"Owner's/Shareholders Drawings": {
-						"account_number": "31020",
-						"account_type": "Equity"
-					},
-					"account_number": "310",
-					"is_group": 1
-				},
-				"Earnings": {
-					"Current Year Earnings": {
-						"account_number": "35010",
-						"account_type": "Equity"
-					},
-					"Retained Earnings": {
-						"account_number": "35020",
-						"account_type": "Equity"
-					},
-					"account_number": "350",
-					"is_group": 1
-				},
-				"account_number": "31",
-				"is_group": 1
-			},
-			"account_number": "3",
-			"root_type": "Equity"
-		},
-		"Revenue": {
-			"Revenue": {
-				"Sales Revenue": {
-					"Sales Income": {
-						"account_number": "41010",
-						"account_type": "Income Account"
-					},
-					"Freight Income": {
-						"account_number": "41020",
-						"account_type": "Income Account"
-					},
-					"Other Income": {
-						"account_number": "41030",
-						"account_type": "Income Account"
-					},
-					"Service Income": {
-						"account_number": "41040",
-						"account_type": "Income Account"
-					},
-					"account_number": "410",
-					"is_group": 1
-				},
-				"Other Revenue": {
-					"Commission Received": {
-						"account_number": "42010"
-					},
-					"Discounts Received": {
-						"account_number": "42020"
-					},
-					"Interest received": {
-						"account_number": "42030"
-					},
-					"Profit/Loss on Sales of Assets": {
-						"account_number": "42040"
-					},
-					"Rent Received": {
-						"account_number": "42050"
-					},
-					"Sundry Income": {
-						"account_number": "42060"
-					},
-					"account_number": "420",
-					"is_group": 1
-				},
-				"account_number": "41",
-				"is_group": 1
-			},
-			"account_number": "4",
-			"root_type": "Income"
-		},
-		"Cost of Goods": {
-			"Cost of Goods": {
-				"Cost of Goods Sold": {
-					"Cost of Goods Sold": {
-						"account_number": "51010",
-						"account_type": "Cost of Goods Sold"
-					},
-					"Freight Expenses (sales related)": {
-						"account_number": "51020"
-					},
-					"Discounts Given": {
-						"account_number": "51030"
-					},
-					"Subcontracting Charges": {
-						"account_number": "51040"
-					},
-					"account_number": "510",
-					"is_group": 1
-				},
-				"Other COGS": {
-					"Purchases - Miscellaneous": {
-						"account_number": "52010"
-					},
-					"Duty & Customs Fees": {
-						"account_number": "52020",
-						"account_type": "Tax"
-					},
-					"Freight Inwards": {
-						"account_number": "52030",
-						"account_type": "Chargeable"
-					},
-					"Stock Adjustment": {
-						"account_number": "52040",
-						"account_type": "Stock Adjustment"
-					},
-					"Stock Wirte Off": {
-						"account_number": "52050",
-						"account_type": "Stock Adjustment"
-					},
-					"Stock Valuation Expenses": {
-						"account_number": "52060",
-						"account_type": "Expenses Included In Valuation"
-					},
-					"Asset Valuation Expenses": {
-						"account_number": "52070",
-						"account_type": "Expenses Included In Asset Valuation"
-					},
-					"account_number": "520",
-					"is_group": 1
-				},
-				"account_number": "51",
-				"is_group": 1
-			},
-			"account_number": "5",
-			"root_type": "Expense"
-		},
-		"Expenses": {
-			"Fixed Expenses": {
-				"Payroll & Related Expenses": {
-					"Salaries & Wages": {
-						"account_number": "61010"
-					},
-					"Superannuation": {
-						"account_number": "61015"
-					},
-					"Staff Amenities - GST Paid": {
-						"account_number": "61020"
-					},
-					"Staff Amenities - GST Free": {
-						"account_number": "61025"
-					},
-					"Staff Recruitment": {
-						"account_number": "61030"
-					},
-					"Staff Training": {
-						"account_number": "61035"
-					},
-					"Fringe Benefits Tax": {
-						"account_number": "61040"
-					},
-					"Payroll Tax": {
-						"account_number": "61045"
-					},
-					"Workers Compensation": {
-						"account_number": "61050"
-					},
-					"Long Service Leave": {
-						"account_number": "61060"
-					},
-					"Mileage Reimbursement": {
-						"account_number": "61070"
-					},
-					"Overtime": {
-						"account_number": "61080"
-					},
-					"Worksafe Insurance": {
-						"account_number": "61090"
-					},
-					"account_number": "610",
-					"is_group": 1
-				},
-				"Depreciation Expenses": {
-					"Depreciation - Plant & Equipment": {
-						"account_number": "62010",
-						"account_type": "Depreciation"
-					},
-					"Depreciation - Motor Vehicle": {
-						"account_number": "62020",
-						"account_type": "Depreciation"
-					},
-					"Depreciation - Office Equipment": {
-						"account_number": "62030",
-						"account_type": "Depreciation"
-					},
-					"Depreciation - Computer Equipment": {
-						"account_number": "62040",
-						"account_type": "Depreciation"
-					},
-					"Depreciation - Building": {
-						"account_number": "62050",
-						"account_type": "Depreciation"
-					},
-					"Depreciation - Others": {
-						"account_number": "62510",
-						"account_type": "Depreciation"
-					},
-					"account_number": "620",
-					"is_group": 1
-				},
-				"account_number": "61",
-				"is_group": 1
-			},
-			"Accrued Expenses": {
-				"Accrued Expenses": {
-					"Accrued Expenses - Salaries & Wages": {
-						"account_number": "63010"
-					},
-					"Accrued Expenses - Interest": {
-						"account_number": "63020"
-					},
-					"account_number": "630",
-					"is_group": 1
-				},
-				"account_number": "63",
-				"is_group": 1
-			},
-			"Operating Expenses": {
-				"General and Administrative Expenses": {
-					"Low Value Assets less than $300": {
-						"account_number": "64010"
-					},
-					"Office Supplies": {
-						"account_number": "64020"
-					},
-					"Postage & Courier": {
-						"account_number": "64025"
-					},
-					"Printing & Stationery": {
-						"account_number": "64030"
-					},
-					"Registration Fees / Filing Fees": {
-						"account_number": "64040"
-					},
-					"Travel & Accommodation - Local": {
-						"account_number": "64050"
-					},
-					"Travel & Accommodation - Overseas": {
-						"account_number": "64060"
-					},
-					"Relocation Costs": {
-						"account_number": "64070"
-					},
-					"Hire Charges": {
-						"account_number": "64080"
-					},
-					"Repairs & Maintenance": {
-						"account_number": "64210"
-					},
-					"Cleaning Expenses": {
-						"account_number": "64215"
-					},
-					"Uniforms": {
-						"account_number": "64220"
-					},
-					"Security": {
-						"account_number": "64225"
-					},
-					"Subscriptions & Licences": {
-						"account_number": "64510"
-					},
-					"Software Expenses": {
-						"account_number": "64515"
-					},
-					"Marketing Expenses": {
-						"account_number": "64520"
-					},
-					"Advertising Expenses": {
-						"account_number": "64525"
-					},
-					"Website Hosting & Domain Expenses": {
-						"account_number": "64530"
-					},
-					"Computer Repairs / Supplies": {
-						"account_number": "64540"
-					},
-					"Conferences": {
-						"account_number": "64550"
-					},
-					"Consultancy /Contract Services": {
-						"account_number": "64560"
-					},
-					"Training Services": {
-						"account_number": "64570"
-					},
-					"Workshop Supplies": {
-						"account_number": "64580"
-					},
-					"Consumables": {
-						"account_number": "64585"
-					},
-					"Entertainment Expenses - Deductible": {
-						"account_number": "64810"
-					},
-					"Entertainment Expenses - Non Deductible": {
-						"account_number": "64820"
-					},
-					"Amortisation Of Goodwill": {
-						"account_number": "64910"
-					},
-					"General / Miscellaneous Expenses": {
-						"account_number": "64915",
-						"account_type": "Chargeable"
-					},
-					"Donations": {
-						"account_number": "64920"
-					},
-					"Client Gifts": {
-						"account_number": "64930"
-					},
-					"Employee Gifts": {
-						"account_number": "64935"
-					},
-					"account_number": "640",
-					"is_group": 1
-				},
-				"Occupancy Expenses": {
-					"Rental Expenses": {
-						"account_number": "65010"
-					},
-					"Property Insurance": {
-						"account_number": "65020"
-					},
-					"Electricity Expenses": {
-						"account_number": "65030"
-					},
-					"Water Rates": {
-						"account_number": "65040"
-					},
-					"Gas Expenses": {
-						"account_number": "65050"
-					},
-					"Property Taxes": {
-						"account_number": "65060"
-					},
-					"Rates": {
-						"account_number": "65070"
-					},
-					"account_number": "650",
-					"is_group": 1
-				},
-				"Communication & Vehicle Expenses": {
-					"Internet Expenses": {
-						"account_number": "66010"
-					},
-					"Mobile Telephone": {
-						"account_number": "66020"
-					},
-					"Telephone Expenses": {
-						"account_number": "66030"
-					},
-					"Motor Vehicle - Fuel Expenses": {
-						"account_number": "66040"
-					},
-					"Motor Vehicle - Parking & Tolls": {
-						"account_number": "66050"
-					},
-					"Motor Vehicle - Registration & Insurance": {
-						"account_number": "66060"
-					},
-					"Motor Vehicle - Service & Repairs": {
-						"account_number": "66070"
-					},
-					"Taxi": {
-						"account_number": "66080"
-					},
-					"account_number": "660",
-					"is_group": 1
-				},
-				"account_number": "64",
-				"is_group": 1
-			},
-			"Non-Operating Expenses": {
-				"Finance Costs": {
-					"Interest - Bank Loans": {
-						"account_number": "67010"
-					},
-					"Interest - Finance Leases": {
-						"account_number": "67020"
-					},
-					"Interest  - Other Loans": {
-						"account_number": "67025"
-					},
-					"Insurance": {
-						"account_number": "67030"
-					},
-					"Bank Charges": {
-						"account_number": "67050"
-					},
-					"Rounding off": {
-						"account_number": "67055",
-						"account_type": "Round Off"
-					},
-					"Audit Fees": {
-						"account_number": "67060"
-					},
-					"Accounting Fees": {
-						"account_number": "67070"
-					},
-					"Legal Fees": {
-						"account_number": "67080"
-					},
-					"Management Fees": {
-						"account_number": "67090"
-					},
-					"account_number": "670",
-					"is_group": 1
-				},
-				"Other Costs": {
-					"Doubtful Debts": {
-						"account_number": "67510"
-					},
-					"Fines": {
-						"account_number": "67520"
-					},
-					"Debt Collection": {
-						"account_number": "67530"
-					},
-					"Bad Debts": {
-						"account_number": "67540"
-					},
-					"account_number": "675",
-					"is_group": 1
-				},
-				"account_number": "67",
-				"is_group": 1
-			},
-			"Variable Expenses": {
-				"Variable Expenses": {
-					"Bonus & Commissions Paid": {
-						"account_number": "68010"
-					},
-					"Bonus & Commissions To be Paid": {
-						"account_number": "68020"
-					},
-					"Warranty Claims": {
-						"account_number": "68030"
-					},
-					"account_number": "680",
-					"is_group": 1
-				},
-				"account_number": "68",
-				"is_group": 1
-			},
-			"account_number": "6",
-			"root_type": "Expense"
-		},
-		"Other Income": {
-			"Other Income": {
-				"Interest Income": {
-					"Interest Income": {
-						"account_number": "71010"
-					},
-					"account_number": "710",
-					"is_group": 1
-				},
-				"Asset Disposal Income": {
-					"Gain on Asset Disposal": {
-						"account_number": "73010"
-					},
-					"account_number": "730",
-					"is_group": 1
-				},
-				"account_number": "71",
-				"is_group": 1
-			},
-			"account_number": "7",
-			"root_type": "Income"
-		},
-		"Other Expenses": {
-			"Other Expenses": {
-				"Income Tax Expenses": {
-					"Income Tax Expenses": {
-						"account_number": "81010"
-					},
-					"account_number": "810",
-					"is_group": 1
-				},
-				"Foreign Exchange Gain/Loss": {
-					"Exchange Loss/Gain - Realized": {
-						"account_number": "82010"
-					},
-					"account_number": "820",
-					"is_group": 1
-				},
-				"Asset Disposal Expenses": {
-					"Loss on Asset Disposal": {
-						"account_number": "83010"
-					},
-					"account_number": "830",
-					"is_group": 1
-				},
-				"account_number": "81",
-				"is_group": 1
-			},
-			"account_number": "8",
-			"root_type": "Expense"
-		}
-	}
-}

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

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

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

@@ -1653,4 +1653,4 @@
       }
     }
   }
-}
+}

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

@@ -33,17 +33,6 @@
                         }, 
                         "account_number": "1151.000"
                     }, 
-                    "Pajak Dibayar di Muka": {
-                        "PPN Masukan": {
-                            "account_number": "1152.001",
-                            "account_type": "Tax"
-                        },
-                        "PPh 23 Dibayar di Muka": {
-                            "account_number": "1152.002",
-                            "account_type": "Tax"
-                        },
-                        "account_number": "1152.000"
-                    },
                     "account_number": "1150.000"
                 }, 
                 "Kas": {
@@ -107,9 +96,8 @@
                         "account_number": "1132.000"
                     }, 
                     "account_number": "1130.000"
-                },
+                }, 
                 "account_number": "1100.000"
-                
             }, 
             "Aktiva Tetap": {
                 "Aktiva": {
@@ -569,10 +557,6 @@
                     "Hutang Pajak": {
                         "account_number": "2141.000", 
                         "account_type": "Payable"
-                    },
-                    "PPN Keluaran": {
-                        "account_number": "2142.000", 
-                        "account_type": "Tax"
                     }, 
                     "account_number": "2140.000"
                 }, 

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

@@ -6,83 +6,64 @@
             "Current Assets": {
                 "Accounts Receivable": {
                     "Debtors": {
-                        "account_type": "Receivable",
-                        "account_category": "Trade Receivables"
+                        "account_type": "Receivable"
                     }
                 },
                 "Bank Accounts": {
                     "account_type": "Bank",
-                    "is_group": 1,
-                    "account_category": "Cash and Cash Equivalents"
+                    "is_group": 1
                 },
                 "Cash In Hand": {
                     "Cash": {
-                        "account_type": "Cash",
-                        "account_category": "Cash and Cash Equivalents"
+                        "account_type": "Cash"
                     },
-                    "account_type": "Cash",
-                    "account_category": "Cash and Cash Equivalents"
+                    "account_type": "Cash"
                 },
                 "Loans and Advances (Assets)": {
-                    "is_group": 1,
-                    "account_category": "Other Receivables"
+                    "is_group": 1
                 },
                 "Securities and Deposits": {
-                    "Earnest Money": {
-                        "account_category": "Other Current Assets"
-                    }
+                    "Earnest Money": {}
                 },
                 "Stock Assets": {
                     "Stock In Hand": {
-                        "account_type": "Stock",
-                        "account_category": "Stock Assets"
+                        "account_type": "Stock"
                     },
-                    "account_type": "Stock",
-                    "account_category": "Stock Assets"
+                    "account_type": "Stock"
                 },
                 "Tax Assets": {
-                    "is_group": 1,
-                    "account_category": "Other Current Assets"
+                    "is_group": 1
                 }
             },
             "Fixed Assets": {
-                "Capital Equipment": {
-                    "account_type": "Fixed Asset",
-                    "account_category": "Tangible Assets"
+                "Capital Equipments": {
+                    "account_type": "Fixed Asset"
                 },
-                "Electronic Equipment": {
-                    "account_type": "Fixed Asset",
-                    "account_category": "Tangible Assets"
+                "Electronic Equipments": {
+                    "account_type": "Fixed Asset"
                 },
-                "Furniture and Fixtures": {
-                    "account_type": "Fixed Asset",
-                    "account_category": "Tangible Assets"
+                "Furnitures and Fixtures": {
+                    "account_type": "Fixed Asset"
                 },
-                "Office Equipment": {
-                    "account_type": "Fixed Asset",
-                    "account_category": "Tangible Assets"
+                "Office Equipments": {
+                    "account_type": "Fixed Asset"
                 },
                 "Plants and Machineries": {
-                    "account_type": "Fixed Asset",
-                    "account_category": "Tangible Assets"
+                    "account_type": "Fixed Asset"
                 },
                 "Buildings": {
-                    "account_type": "Fixed Asset",
-                    "account_category": "Tangible Assets"
+                    "account_type": "Fixed Asset"
                 },
                 "Accumulated Depreciations": {
-                    "account_type": "Accumulated Depreciation",
-                    "account_category": "Tangible Assets"
+                    "account_type": "Accumulated Depreciation"
                 }
             },
             "Investments": {
-                "is_group": 1,
-                "account_category": "Long-term Investments"
+                "is_group": 1
             },
             "Temporary Accounts": {
                 "Temporary Opening": {
-                    "account_type": "Temporary",
-                    "account_category": "Other Non-current Assets"
+                    "account_type": "Temporary"
                 }
             },
             "root_type": "Asset"
@@ -91,103 +72,54 @@
             "Direct Expenses": {
                 "Stock Expenses": {
                     "Cost of Goods Sold": {
-                        "account_type": "Cost of Goods Sold",
-                        "account_category": "Cost of Goods Sold"
+                        "account_type": "Cost of Goods Sold"
                     },
                     "Expenses Included In Valuation": {
-                        "account_type": "Expenses Included In Valuation",
-                        "account_category": "Other Direct Costs"
+                        "account_type": "Expenses Included In Valuation"
                     },
                     "Stock Adjustment": {
-                        "account_type": "Stock Adjustment",
-                        "account_category": "Other Direct Costs"
+                        "account_type": "Stock Adjustment"
                     }
                 }
             },
             "Indirect Expenses": {
-                "Administrative Expenses": {
-                    "account_category": "Operating Expenses"
-                },
-                "Commission on Sales": {
-                    "account_category": "Operating Expenses"
-                },
+                "Administrative Expenses": {},
+                "Commission on Sales": {},
                 "Depreciation": {
-                    "account_type": "Depreciation",
-                    "account_category": "Operating Expenses"
-                },
-                "Entertainment Expenses": {
-                    "account_category": "Operating Expenses"
+                    "account_type": "Depreciation"
                 },
+                "Entertainment Expenses": {},
                 "Freight and Forwarding Charges": {
-                    "account_type": "Chargeable",
-                    "account_category": "Operating Expenses"
-                },
-                "Legal Expenses": {
-                    "account_category": "Operating Expenses"
-                },
-                "Marketing Expenses": {
-                    "account_type": "Chargeable",
-                    "account_category": "Operating Expenses"
-                },
-                "Miscellaneous Expenses": {
-                    "account_type": "Chargeable",
-                    "account_category": "Operating Expenses"
-                },
-                "Office Maintenance Expenses": {
-                    "account_category": "Operating Expenses"
-                },
-                "Office Rent": {
-                    "account_category": "Operating Expenses"
-                },
-                "Postal Expenses": {
-                    "account_category": "Operating Expenses"
-                },
-                "Print and Stationery": {
-                    "account_category": "Operating Expenses"
+                    "account_type": "Chargeable"
                 },
+                "Legal Expenses": {},
+                "Marketing Expenses": {},
+                "Miscellaneous Expenses": {},
+                "Office Maintenance Expenses": {},
+                "Office Rent": {},
+                "Postal Expenses": {},
+                "Print and Stationary": {},
                 "Rounded Off": {
-                    "account_type": "Round Off",
-                    "account_category": "Operating Expenses"
+                    "account_type": "Round Off"
                 },
-                "Salary": {
-                    "account_category": "Operating Expenses"
-                },
-                "Sales Expenses": {
-                    "account_category": "Operating Expenses"
-                },
-                "Telephone Expenses": {
-                    "account_category": "Operating Expenses"
-                },
-                "Travel Expenses": {
-                    "account_category": "Operating Expenses"
-                },
-                "Utility Expenses": {
-                    "account_category": "Operating Expenses"
-                },
-                "Write Off": {
-                    "account_category": "Operating Expenses"
-                },
-                "Exchange Gain/Loss": {
-                    "account_category": "Operating Expenses"
-                },
-                "Gain/Loss on Asset Disposal": {
-                    "account_category": "Other Operating Income"
-                },
-                "Impairment": {
-                    "account_category": "Operating Expenses"
-                }
+                "Salary": {},
+                "Sales Expenses": {},
+                "Telephone Expenses": {},
+                "Travel Expenses": {},
+                "Utility Expenses": {},
+                "Write Off": {},
+                "Exchange Gain/Loss": {},
+                "Gain/Loss on Asset Disposal": {}
             },
             "root_type": "Expense"
         },
         "Income": {
             "Direct Income": {
                 "Sales": {
-                    "account_type": "Income Account",
-                    "account_category": "Revenue from Operations"
+                    "account_type": "Income Account"
                 },
                 "Service": {
-                    "account_type": "Income Account",
-                    "account_category": "Revenue from Operations"
+                    "account_type": "Income Account"
                 },
                 "account_type": "Income Account"
             },
@@ -199,51 +131,30 @@
         },
         "Source of Funds (Liabilities)": {
             "Capital Account": {
-                "Reserves and Surplus": {
-                    "account_category": "Reserves and Surplus"
-                },
-                "Shareholders Funds": {
-                    "account_category": "Share Capital"
-                },
-                "Revaluation Surplus": {
-                    "account_category": "Reserves and Surplus"
-                }
+                "Reserves and Surplus": {},
+                "Shareholders Funds": {}
             },
             "Current Liabilities": {
                 "Accounts Payable": {
                     "Creditors": {
-                        "account_type": "Payable",
-                        "account_category": "Trade Payables"
+                        "account_type": "Payable"
                     },
-                    "Payroll Payable": {
-                        "account_category": "Other Payables"
-                    }
+                    "Payroll Payable": {}
                 },
                 "Stock Liabilities": {
                     "Stock Received But Not Billed": {
-                        "account_type": "Stock Received But Not Billed",
-                        "account_category": "Trade Payables"
+                        "account_type": "Stock Received But Not Billed"
                     }
                 },
                 "Duties and Taxes": {
                     "TDS": {
-                        "account_type": "Tax",
-                        "account_category": "Current Tax Liabilities"
-                    },
-                    "account_type": "Tax",
-                    "is_group": 1,
-                    "account_category": "Current Tax Liabilities"
+                        "account_type": "Tax"
+                    }
                 },
                 "Loans (Liabilities)": {
-                    "Secured Loans": {
-                        "account_category": "Long-term Borrowings"
-                    },
-                    "Unsecured Loans": {
-                        "account_category": "Long-term Borrowings"
-                    },
-                    "Bank Overdraft Account": {
-                        "account_category": "Short-term Borrowings"
-                    }
+                    "Secured Loans": {},
+                    "Unsecured Loans": {},
+                    "Bank Overdraft Account": {}
                 }
             },
             "root_type": "Liability"

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

@@ -1,6 +1,6 @@
 {
     "country_code": "ni", 
-    "name": "Nicaragua - Catálogo de Cuentas", 
+    "name": "Nicaragua - Catalogo de Cuentas", 
     "tree": {
         "Activo": {
             "Activo Corriente": {
@@ -491,4 +491,4 @@
             "root_type": "Liability"
         }
     }
-}
+}

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

@@ -9,192 +9,101 @@ def get():
 	return {
 		_("Application of Funds (Assets)"): {
 			_("Current Assets"): {
-				_("Accounts Receivable"): {
-					_("Debtors"): {"account_type": "Receivable", "account_category": "Trade Receivables"}
-				},
-				_("Bank Accounts"): {
-					"account_type": "Bank",
-					"is_group": 1,
-					"account_category": "Cash and Cash Equivalents",
-				},
-				_("Cash In Hand"): {
-					_("Cash"): {"account_type": "Cash", "account_category": "Cash and Cash Equivalents"},
-					"account_type": "Cash",
-					"account_category": "Cash and Cash Equivalents",
-				},
+				_("Accounts Receivable"): {_("Debtors"): {"account_type": "Receivable"}},
+				_("Bank Accounts"): {"account_type": "Bank", "is_group": 1},
+				_("Cash In Hand"): {_("Cash"): {"account_type": "Cash"}, "account_type": "Cash"},
 				_("Loans and Advances (Assets)"): {
-					_("Employee Advances"): {
-						"account_type": "Payable",
-						"account_category": "Other Receivables",
-					},
+					_("Employee Advances"): {},
 				},
-				_("Securities and Deposits"): {
-					_("Earnest Money"): {"account_category": "Other Current Assets"}
-				},
-				_("Prepaid Expenses"): {"account_category": "Other Current Assets"},
-				_("Short-term Investments"): {"account_category": "Short-term Investments"},
+				_("Securities and Deposits"): {_("Earnest Money"): {}},
 				_("Stock Assets"): {
-					_("Stock In Hand"): {"account_type": "Stock", "account_category": "Stock Assets"},
+					_("Stock In Hand"): {"account_type": "Stock"},
 					"account_type": "Stock",
-					"account_category": "Stock Assets",
 				},
-				_("Tax Assets"): {"is_group": 1, "account_category": "Other Current Assets"},
+				_("Tax Assets"): {"is_group": 1},
 			},
 			_("Fixed Assets"): {
-				_("Capital Equipment"): {
-					"account_type": "Fixed Asset",
-					"account_category": "Tangible Assets",
-				},
-				_("Electronic Equipment"): {
-					"account_type": "Fixed Asset",
-					"account_category": "Tangible Assets",
-				},
-				_("Furniture and Fixtures"): {
-					"account_type": "Fixed Asset",
-					"account_category": "Tangible Assets",
-				},
-				_("Office Equipment"): {"account_type": "Fixed Asset", "account_category": "Tangible Assets"},
-				_("Plants and Machineries"): {
-					"account_type": "Fixed Asset",
-					"account_category": "Tangible Assets",
-				},
-				_("Buildings"): {"account_type": "Fixed Asset", "account_category": "Tangible Assets"},
-				_("Software"): {"account_type": "Fixed Asset", "account_category": "Intangible Assets"},
-				_("Accumulated Depreciation"): {
-					"account_type": "Accumulated Depreciation",
-					"account_category": "Tangible Assets",
-				},
+				_("Capital Equipments"): {"account_type": "Fixed Asset"},
+				_("Electronic Equipments"): {"account_type": "Fixed Asset"},
+				_("Furnitures and Fixtures"): {"account_type": "Fixed Asset"},
+				_("Office Equipments"): {"account_type": "Fixed Asset"},
+				_("Plants and Machineries"): {"account_type": "Fixed Asset"},
+				_("Buildings"): {"account_type": "Fixed Asset"},
+				_("Softwares"): {"account_type": "Fixed Asset"},
+				_("Accumulated Depreciation"): {"account_type": "Accumulated Depreciation"},
 				_("CWIP Account"): {
 					"account_type": "Capital Work in Progress",
-					"account_category": "Tangible Assets",
 				},
 			},
-			_("Investments"): {"is_group": 1, "account_category": "Long-term Investments"},
-			_("Temporary Accounts"): {
-				_("Temporary Opening"): {
-					"account_type": "Temporary",
-					"account_category": "Other Non-current Assets",
-				}
-			},
+			_("Investments"): {"is_group": 1},
+			_("Temporary Accounts"): {_("Temporary Opening"): {"account_type": "Temporary"}},
 			"root_type": "Asset",
 		},
 		_("Expenses"): {
 			_("Direct Expenses"): {
 				_("Stock Expenses"): {
-					_("Cost of Goods Sold"): {
-						"account_type": "Cost of Goods Sold",
-						"account_category": "Cost of Goods Sold",
-					},
+					_("Cost of Goods Sold"): {"account_type": "Cost of Goods Sold"},
 					_("Expenses Included In Asset Valuation"): {
-						"account_type": "Expenses Included In Asset Valuation",
-						"account_category": "Other Direct Costs",
-					},
-					_("Expenses Included In Valuation"): {
-						"account_type": "Expenses Included In Valuation",
-						"account_category": "Other Direct Costs",
-					},
-					_("Stock Adjustment"): {
-						"account_type": "Stock Adjustment",
-						"account_category": "Other Direct Costs",
+						"account_type": "Expenses Included In Asset Valuation"
 					},
+					_("Expenses Included In Valuation"): {"account_type": "Expenses Included In Valuation"},
+					_("Stock Adjustment"): {"account_type": "Stock Adjustment"},
 				},
 			},
 			_("Indirect Expenses"): {
-				_("Administrative Expenses"): {"account_category": "Operating Expenses"},
-				_("Commission on Sales"): {"account_category": "Operating Expenses"},
-				_("Depreciation"): {"account_type": "Depreciation", "account_category": "Operating Expenses"},
-				_("Entertainment Expenses"): {"account_category": "Operating Expenses"},
-				_("Freight and Forwarding Charges"): {
-					"account_type": "Chargeable",
-					"account_category": "Operating Expenses",
-				},
-				_("Legal Expenses"): {"account_category": "Operating Expenses"},
-				_("Marketing Expenses"): {
-					"account_type": "Chargeable",
-					"account_category": "Operating Expenses",
-				},
-				_("Miscellaneous Expenses"): {
-					"account_type": "Chargeable",
-					"account_category": "Operating Expenses",
-				},
-				_("Office Maintenance Expenses"): {"account_category": "Operating Expenses"},
-				_("Office Rent"): {"account_category": "Operating Expenses"},
-				_("Postal Expenses"): {"account_category": "Operating Expenses"},
-				_("Print and Stationery"): {"account_category": "Operating Expenses"},
-				_("Round Off"): {"account_type": "Round Off", "account_category": "Operating Expenses"},
-				_("Salary"): {"account_category": "Operating Expenses"},
-				_("Sales Expenses"): {"account_category": "Operating Expenses"},
-				_("Telephone Expenses"): {"account_category": "Operating Expenses"},
-				_("Travel Expenses"): {"account_category": "Operating Expenses"},
-				_("Utility Expenses"): {"account_category": "Operating Expenses"},
-				_("Write Off"): {"account_category": "Operating Expenses"},
-				_("Exchange Gain/Loss"): {"account_category": "Operating Expenses"},
-				_("Interest Expense"): {"account_category": "Finance Costs"},
-				_("Bank Charges"): {"account_category": "Finance Costs"},
-				_("Gain/Loss on Asset Disposal"): {"account_category": "Other Operating Income"},
-				_("Impairment"): {"account_category": "Operating Expenses"},
-				_("Tax Expense"): {"account_category": "Tax Expense"},
+				_("Administrative Expenses"): {},
+				_("Commission on Sales"): {},
+				_("Depreciation"): {"account_type": "Depreciation"},
+				_("Entertainment Expenses"): {},
+				_("Freight and Forwarding Charges"): {"account_type": "Chargeable"},
+				_("Legal Expenses"): {},
+				_("Marketing Expenses"): {"account_type": "Chargeable"},
+				_("Miscellaneous Expenses"): {"account_type": "Chargeable"},
+				_("Office Maintenance Expenses"): {},
+				_("Office Rent"): {},
+				_("Postal Expenses"): {},
+				_("Print and Stationery"): {},
+				_("Round Off"): {"account_type": "Round Off"},
+				_("Salary"): {},
+				_("Sales Expenses"): {},
+				_("Telephone Expenses"): {},
+				_("Travel Expenses"): {},
+				_("Utility Expenses"): {},
+				_("Write Off"): {},
+				_("Exchange Gain/Loss"): {},
+				_("Gain/Loss on Asset Disposal"): {},
 			},
 			"root_type": "Expense",
 		},
 		_("Income"): {
-			_("Direct Income"): {
-				_("Sales"): {"account_category": "Revenue from Operations"},
-				_("Service"): {"account_category": "Revenue from Operations"},
-			},
-			_("Indirect Income"): {
-				_("Interest Income"): {"account_category": "Investment Income"},
-				_("Interest on Fixed Deposits"): {"account_category": "Investment Income"},
-				"is_group": 1,
-			},
+			_("Direct Income"): {_("Sales"): {}, _("Service"): {}},
+			_("Indirect Income"): {"is_group": 1},
 			"root_type": "Income",
 		},
 		_("Source of Funds (Liabilities)"): {
 			_("Current Liabilities"): {
 				_("Accounts Payable"): {
-					_("Creditors"): {"account_type": "Payable", "account_category": "Trade Payables"},
-					_("Payroll Payable"): {"account_category": "Other Payables"},
+					_("Creditors"): {"account_type": "Payable"},
+					_("Payroll Payable"): {},
 				},
-				_("Accrued Expenses"): {"account_category": "Other Current Liabilities"},
-				_("Customer Advances"): {"account_category": "Other Current Liabilities"},
 				_("Stock Liabilities"): {
-					_("Stock Received But Not Billed"): {
-						"account_type": "Stock Received But Not Billed",
-						"account_category": "Trade Payables",
-					},
-					_("Asset Received But Not Billed"): {
-						"account_type": "Asset Received But Not Billed",
-						"account_category": "Trade Payables",
-					},
+					_("Stock Received But Not Billed"): {"account_type": "Stock Received But Not Billed"},
+					_("Asset Received But Not Billed"): {"account_type": "Asset Received But Not Billed"},
 				},
-				_("Duties and Taxes"): {
-					"account_type": "Tax",
-					"is_group": 1,
-					"account_category": "Current Tax Liabilities",
-				},
-				_("Short-term Provisions"): {"account_category": "Short-term Provisions"},
+				_("Duties and Taxes"): {"account_type": "Tax", "is_group": 1},
 				_("Loans (Liabilities)"): {
-					_("Secured Loans"): {"account_category": "Long-term Borrowings"},
-					_("Unsecured Loans"): {"account_category": "Long-term Borrowings"},
-					_("Bank Overdraft Account"): {"account_category": "Short-term Borrowings"},
+					_("Secured Loans"): {},
+					_("Unsecured Loans"): {},
+					_("Bank Overdraft Account"): {},
 				},
 			},
-			_("Non-Current Liabilities"): {
-				_("Long-term Provisions"): {"account_category": "Long-term Provisions"},
-				_("Employee Benefits Obligation"): {"account_category": "Other Non-current Liabilities"},
-				"is_group": 1,
-			},
 			"root_type": "Liability",
 		},
 		_("Equity"): {
-			_("Capital Stock"): {"account_type": "Equity", "account_category": "Share Capital"},
-			_("Dividends Paid"): {"account_type": "Equity", "account_category": "Reserves and Surplus"},
-			_("Opening Balance Equity"): {
-				"account_type": "Equity",
-				"account_category": "Reserves and Surplus",
-			},
-			_("Retained Earnings"): {"account_type": "Equity", "account_category": "Reserves and Surplus"},
-			_("Revaluation Surplus"): {"account_type": "Equity", "account_category": "Reserves and Surplus"},
+			_("Capital Stock"): {"account_type": "Equity"},
+			_("Dividends Paid"): {"account_type": "Equity"},
+			_("Opening Balance Equity"): {"account_type": "Equity"},
+			_("Retained Earnings"): {"account_type": "Equity"},
 			"root_type": "Equity",
 		},
 	}

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

@@ -10,128 +10,49 @@ def get():
 		_("Application of Funds (Assets)"): {
 			_("Current Assets"): {
 				_("Accounts Receivable"): {
-					_("Debtors"): {
-						"account_type": "Receivable",
-						"account_number": "1310",
-						"account_category": "Trade Receivables",
-					},
+					_("Debtors"): {"account_type": "Receivable", "account_number": "1310"},
 					"account_number": "1300",
 				},
-				_("Bank Accounts"): {
-					"account_type": "Bank",
-					"is_group": 1,
-					"account_number": "1200",
-					"account_category": "Cash and Cash Equivalents",
-				},
+				_("Bank Accounts"): {"account_type": "Bank", "is_group": 1, "account_number": "1200"},
 				_("Cash In Hand"): {
-					_("Cash"): {
-						"account_type": "Cash",
-						"account_number": "1110",
-						"account_category": "Cash and Cash Equivalents",
-					},
+					_("Cash"): {"account_type": "Cash", "account_number": "1110"},
 					"account_type": "Cash",
 					"account_number": "1100",
-					"account_category": "Cash and Cash Equivalents",
 				},
 				_("Loans and Advances (Assets)"): {
-					_("Employee Advances"): {
-						"account_number": "1610",
-						"account_type": "Payable",
-						"account_category": "Other Receivables",
-					},
+					_("Employee Advances"): {"account_number": "1610"},
 					"account_number": "1600",
 				},
 				_("Securities and Deposits"): {
-					_("Earnest Money"): {
-						"account_number": "1651",
-						"account_category": "Other Current Assets",
-					},
+					_("Earnest Money"): {"account_number": "1651"},
 					"account_number": "1650",
 				},
-				_("Prepaid Expenses"): {
-					"account_number": "1660",
-					"account_category": "Other Current Assets",
-				},
-				_("Short-term Investments"): {
-					"account_number": "1670",
-					"account_category": "Short-term Investments",
-				},
 				_("Stock Assets"): {
-					_("Stock In Hand"): {
-						"account_type": "Stock",
-						"account_number": "1410",
-						"account_category": "Stock Assets",
-					},
+					_("Stock In Hand"): {"account_type": "Stock", "account_number": "1410"},
 					"account_type": "Stock",
 					"account_number": "1400",
-					"account_category": "Stock Assets",
-				},
-				_("Tax Assets"): {
-					"is_group": 1,
-					"account_number": "1500",
-					"account_category": "Other Current Assets",
 				},
+				_("Tax Assets"): {"is_group": 1, "account_number": "1500"},
 				"account_number": "1100-1600",
 			},
 			_("Fixed Assets"): {
-				_("Capital Equipment"): {
-					"account_type": "Fixed Asset",
-					"account_number": "1710",
-					"account_category": "Tangible Assets",
-				},
-				_("Electronic Equipment"): {
-					"account_type": "Fixed Asset",
-					"account_number": "1720",
-					"account_category": "Tangible Assets",
-				},
-				_("Furniture and Fixtures"): {
-					"account_type": "Fixed Asset",
-					"account_number": "1730",
-					"account_category": "Tangible Assets",
-				},
-				_("Office Equipment"): {
-					"account_type": "Fixed Asset",
-					"account_number": "1740",
-					"account_category": "Tangible Assets",
-				},
-				_("Plants and Machineries"): {
-					"account_type": "Fixed Asset",
-					"account_number": "1750",
-					"account_category": "Tangible Assets",
-				},
-				_("Buildings"): {
-					"account_type": "Fixed Asset",
-					"account_number": "1760",
-					"account_category": "Tangible Assets",
-				},
-				_("Software"): {
-					"account_type": "Fixed Asset",
-					"account_number": "1770",
-					"account_category": "Intangible Assets",
-				},
+				_("Capital Equipments"): {"account_type": "Fixed Asset", "account_number": "1710"},
+				_("Electronic Equipments"): {"account_type": "Fixed Asset", "account_number": "1720"},
+				_("Furnitures and Fixtures"): {"account_type": "Fixed Asset", "account_number": "1730"},
+				_("Office Equipments"): {"account_type": "Fixed Asset", "account_number": "1740"},
+				_("Plants and Machineries"): {"account_type": "Fixed Asset", "account_number": "1750"},
+				_("Buildings"): {"account_type": "Fixed Asset", "account_number": "1760"},
+				_("Softwares"): {"account_type": "Fixed Asset", "account_number": "1770"},
 				_("Accumulated Depreciation"): {
 					"account_type": "Accumulated Depreciation",
 					"account_number": "1780",
-					"account_category": "Tangible Assets",
-				},
-				_("CWIP Account"): {
-					"account_type": "Capital Work in Progress",
-					"account_number": "1790",
-					"account_category": "Tangible Assets",
 				},
+				_("CWIP Account"): {"account_type": "Capital Work in Progress", "account_number": "1790"},
 				"account_number": "1700",
 			},
-			_("Investments"): {
-				"is_group": 1,
-				"account_number": "1800",
-				"account_category": "Long-term Investments",
-			},
+			_("Investments"): {"is_group": 1, "account_number": "1800"},
 			_("Temporary Accounts"): {
-				_("Temporary Opening"): {
-					"account_type": "Temporary",
-					"account_number": "1910",
-					"account_category": "Other Non-current Assets",
-				},
+				_("Temporary Opening"): {"account_type": "Temporary", "account_number": "1910"},
 				"account_number": "1900",
 			},
 			"root_type": "Asset",
@@ -140,94 +61,42 @@ def get():
 		_("Expenses"): {
 			_("Direct Expenses"): {
 				_("Stock Expenses"): {
-					_("Cost of Goods Sold"): {
-						"account_type": "Cost of Goods Sold",
-						"account_number": "5111",
-						"account_category": "Cost of Goods Sold",
-					},
+					_("Cost of Goods Sold"): {"account_type": "Cost of Goods Sold", "account_number": "5111"},
 					_("Expenses Included In Asset Valuation"): {
 						"account_type": "Expenses Included In Asset Valuation",
 						"account_number": "5112",
-						"account_category": "Other Direct Costs",
 					},
 					_("Expenses Included In Valuation"): {
 						"account_type": "Expenses Included In Valuation",
 						"account_number": "5118",
-						"account_category": "Other Direct Costs",
-					},
-					_("Stock Adjustment"): {
-						"account_type": "Stock Adjustment",
-						"account_number": "5119",
-						"account_category": "Other Direct Costs",
 					},
+					_("Stock Adjustment"): {"account_type": "Stock Adjustment", "account_number": "5119"},
 					"account_number": "5110",
 				},
 				"account_number": "5100",
 			},
 			_("Indirect Expenses"): {
-				_("Administrative Expenses"): {
-					"account_number": "5201",
-					"account_category": "Operating Expenses",
-				},
-				_("Commission on Sales"): {
-					"account_number": "5202",
-					"account_category": "Operating Expenses",
-				},
-				_("Depreciation"): {
-					"account_type": "Depreciation",
-					"account_number": "5203",
-					"account_category": "Operating Expenses",
-				},
-				_("Entertainment Expenses"): {
-					"account_number": "5204",
-					"account_category": "Operating Expenses",
-				},
-				_("Freight and Forwarding Charges"): {
-					"account_type": "Chargeable",
-					"account_number": "5205",
-					"account_category": "Operating Expenses",
-				},
-				_("Legal Expenses"): {"account_number": "5206", "account_category": "Operating Expenses"},
-				_("Marketing Expenses"): {
-					"account_type": "Chargeable",
-					"account_number": "5207",
-					"account_category": "Operating Expenses",
-				},
-				_("Office Maintenance Expenses"): {
-					"account_number": "5208",
-					"account_category": "Operating Expenses",
-				},
-				_("Office Rent"): {"account_number": "5209", "account_category": "Operating Expenses"},
-				_("Postal Expenses"): {"account_number": "5210", "account_category": "Operating Expenses"},
-				_("Print and Stationery"): {
-					"account_number": "5211",
-					"account_category": "Operating Expenses",
-				},
-				_("Round Off"): {
-					"account_type": "Round Off",
-					"account_number": "5212",
-					"account_category": "Operating Expenses",
-				},
-				_("Salary"): {"account_number": "5213", "account_category": "Operating Expenses"},
-				_("Sales Expenses"): {"account_number": "5214", "account_category": "Operating Expenses"},
-				_("Telephone Expenses"): {"account_number": "5215", "account_category": "Operating Expenses"},
-				_("Travel Expenses"): {"account_number": "5216", "account_category": "Operating Expenses"},
-				_("Utility Expenses"): {"account_number": "5217", "account_category": "Operating Expenses"},
-				_("Write Off"): {"account_number": "5218", "account_category": "Operating Expenses"},
-				_("Exchange Gain/Loss"): {"account_number": "5219", "account_category": "Operating Expenses"},
-				_("Interest Expense"): {"account_number": "5220", "account_category": "Finance Costs"},
-				_("Bank Charges"): {"account_number": "5221", "account_category": "Finance Costs"},
-				_("Gain/Loss on Asset Disposal"): {
-					"account_number": "5222",
-					"account_category": "Other Operating Income",
-				},
-				_("Miscellaneous Expenses"): {
-					"account_type": "Chargeable",
-					"account_number": "5223",
-					"account_category": "Operating Expenses",
-				},
-				_("Impairment"): {"account_number": "5224", "account_category": "Operating Expenses"},
-				_("Tax Expense"): {"account_number": "5225", "account_category": "Tax Expense"},
+				_("Administrative Expenses"): {"account_number": "5201"},
+				_("Commission on Sales"): {"account_number": "5202"},
+				_("Depreciation"): {"account_type": "Depreciation", "account_number": "5203"},
+				_("Entertainment Expenses"): {"account_number": "5204"},
+				_("Freight and Forwarding Charges"): {"account_type": "Chargeable", "account_number": "5205"},
+				_("Legal Expenses"): {"account_number": "5206"},
+				_("Marketing Expenses"): {"account_type": "Chargeable", "account_number": "5207"},
+				_("Office Maintenance Expenses"): {"account_number": "5208"},
+				_("Office Rent"): {"account_number": "5209"},
+				_("Postal Expenses"): {"account_number": "5210"},
+				_("Print and Stationery"): {"account_number": "5211"},
+				_("Round Off"): {"account_type": "Round Off", "account_number": "5212"},
+				_("Salary"): {"account_number": "5213"},
+				_("Sales Expenses"): {"account_number": "5214"},
+				_("Telephone Expenses"): {"account_number": "5215"},
+				_("Travel Expenses"): {"account_number": "5216"},
+				_("Utility Expenses"): {"account_number": "5217"},
+				_("Write Off"): {"account_number": "5218"},
+				_("Exchange Gain/Loss"): {"account_number": "5219"},
+				_("Gain/Loss on Asset Disposal"): {"account_number": "5220"},
+				_("Miscellaneous Expenses"): {"account_type": "Chargeable", "account_number": "5221"},
 				"account_number": "5200",
 			},
 			"root_type": "Expense",
@@ -235,126 +104,54 @@ def get():
 		},
 		_("Income"): {
 			_("Direct Income"): {
-				_("Sales"): {"account_number": "4110", "account_category": "Revenue from Operations"},
-				_("Service"): {"account_number": "4120", "account_category": "Revenue from Operations"},
+				_("Sales"): {"account_number": "4110"},
+				_("Service"): {"account_number": "4120"},
 				"account_number": "4100",
 			},
-			_("Indirect Income"): {
-				_("Interest Income"): {"account_number": "4210", "account_category": "Investment Income"},
-				_("Interest on Fixed Deposits"): {
-					"account_number": "4220",
-					"account_category": "Investment Income",
-				},
-				"is_group": 1,
-				"account_number": "4200",
-			},
+			_("Indirect Income"): {"is_group": 1, "account_number": "4200"},
 			"root_type": "Income",
 			"account_number": "4000",
 		},
 		_("Source of Funds (Liabilities)"): {
 			_("Current Liabilities"): {
 				_("Accounts Payable"): {
-					_("Creditors"): {
-						"account_type": "Payable",
-						"account_number": "2110",
-						"account_category": "Trade Payables",
-					},
-					_("Payroll Payable"): {"account_number": "2120", "account_category": "Other Payables"},
+					_("Creditors"): {"account_type": "Payable", "account_number": "2110"},
+					_("Payroll Payable"): {"account_number": "2120"},
 					"account_number": "2100",
 				},
-				_("Accrued Expenses"): {
-					"account_number": "2150",
-					"account_category": "Other Current Liabilities",
-				},
-				_("Customer Advances"): {
-					"account_number": "2160",
-					"account_category": "Other Current Liabilities",
-				},
 				_("Stock Liabilities"): {
 					_("Stock Received But Not Billed"): {
 						"account_type": "Stock Received But Not Billed",
 						"account_number": "2210",
-						"account_category": "Trade Payables",
 					},
 					_("Asset Received But Not Billed"): {
 						"account_type": "Asset Received But Not Billed",
 						"account_number": "2211",
-						"account_category": "Trade Payables",
 					},
 					"account_number": "2200",
 				},
 				_("Duties and Taxes"): {
-					_("TDS Payable"): {
-						"account_number": "2310",
-						"account_category": "Current Tax Liabilities",
-					},
+					_("TDS Payable"): {"account_number": "2310"},
 					"account_type": "Tax",
 					"is_group": 1,
 					"account_number": "2300",
-					"account_category": "Current Tax Liabilities",
-				},
-				_("Short-term Provisions"): {
-					"account_number": "2350",
-					"account_category": "Short-term Provisions",
 				},
 				_("Loans (Liabilities)"): {
-					_("Secured Loans"): {
-						"account_number": "2410",
-						"account_category": "Long-term Borrowings",
-					},
-					_("Unsecured Loans"): {
-						"account_number": "2420",
-						"account_category": "Long-term Borrowings",
-					},
-					_("Bank Overdraft Account"): {
-						"account_number": "2430",
-						"account_category": "Short-term Borrowings",
-					},
+					_("Secured Loans"): {"account_number": "2410"},
+					_("Unsecured Loans"): {"account_number": "2420"},
+					_("Bank Overdraft Account"): {"account_number": "2430"},
 					"account_number": "2400",
 				},
 				"account_number": "2100-2400",
 			},
-			_("Non-Current Liabilities"): {
-				_("Long-term Provisions"): {
-					"account_number": "2510",
-					"account_category": "Long-term Provisions",
-				},
-				_("Employee Benefits Obligation"): {
-					"account_number": "2520",
-					"account_category": "Other Non-current Liabilities",
-				},
-				"is_group": 1,
-				"account_number": "2500",
-			},
 			"root_type": "Liability",
 			"account_number": "2000",
 		},
 		_("Equity"): {
-			_("Capital Stock"): {
-				"account_type": "Equity",
-				"account_number": "3100",
-				"account_category": "Share Capital",
-			},
-			_("Dividends Paid"): {
-				"account_type": "Equity",
-				"account_number": "3200",
-				"account_category": "Reserves and Surplus",
-			},
-			_("Opening Balance Equity"): {
-				"account_type": "Equity",
-				"account_number": "3300",
-				"account_category": "Reserves and Surplus",
-			},
-			_("Retained Earnings"): {
-				"account_type": "Equity",
-				"account_number": "3400",
-				"account_category": "Reserves and Surplus",
-			},
-			_("Revaluation Surplus"): {
-				"account_type": "Equity",
-				"account_number": "3500",
-				"account_category": "Reserves and Surplus",
-			},
+			_("Capital Stock"): {"account_type": "Equity", "account_number": "3100"},
+			_("Dividends Paid"): {"account_type": "Equity", "account_number": "3200"},
+			_("Opening Balance Equity"): {"account_type": "Equity", "account_number": "3300"},
+			_("Retained Earnings"): {"account_type": "Equity", "account_number": "3400"},
 			"root_type": "Equity",
 			"account_number": "3000",
 		},