perf: Drop cost center index

This was only added to allow renaming for one user (?) can be added if
there's a more serious use case than that.

.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

.git-blame-ignore-revs

@@ -42,12 +42,3 @@ 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

.github/CONTRIBUTING.md

@@ -6,7 +6,7 @@ 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
 

.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

@@ -11,7 +11,7 @@ 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.
@@ -21,7 +21,7 @@ Please keep in mind that we get many many requests and we can't possibly work on
 
 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 
 
 -->

.github/helper/install.sh

@@ -66,7 +66,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/workflows/backport.yml

@@ -5,16 +5,13 @@ on:
       - closed
       - labeled
 
-permissions:
-  contents: read
-
 jobs:
   main:
     runs-on: ubuntu-latest
     timeout-minutes: 60
     steps:
       - name: Checkout Actions
-        uses: actions/checkout@v6
+        uses: actions/checkout@v2
         with:
           repository: "frappe/backport"
           path: ./actions

.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

@@ -21,14 +21,14 @@ jobs:
 
     steps:
         - name: Checkout
-          uses: actions/checkout@v6
+          uses: actions/checkout@v4
           with:
             ref: ${{ matrix.branch }}
 
         - name: Setup Python
-          uses: actions/setup-python@v6
+          uses: actions/setup-python@v5
           with:
-            python-version: "3.14"
+            python-version: "3.12"
 
         - name: Run script to update POT file
           run: |

.github/workflows/initiate_release.yml

@@ -2,10 +2,6 @@
 # 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
@@ -19,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: ["14", "15", "16"]
+        version: ["14", "15"]
 
     steps:
       - uses: octokit/request-action@v2.x

.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,21 +3,18 @@ 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
@@ -27,12 +24,12 @@ jobs:
     name: semgrep
     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: Download Semgrep rules

.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,28 +32,25 @@ jobs:
 
     steps:
       - name: Clone
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - 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@v5
         with:
-          python-version: |
-            3.11
-            3.13
-            3.14
+          python-version: '3.11'
 
       - name: Setup Node
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v4
         with:
-          node-version: 24
+          node-version: 18
           check-latest: true
 
       - name: Add to Hosts
@@ -88,7 +79,7 @@ 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
         id: yarn-cache
@@ -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,14 +126,15 @@ 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 14
+          update_to_version 15
 
           echo "Updating to latest version"
           git -C "apps/frappe" fetch --depth 1 upstream "${GITHUB_BASE_REF:-${GITHUB_REF##*/}}"

.github/workflows/patch_faux.yml

@@ -10,12 +10,6 @@ on:
       - "**.md"
       - "**.html"
       - "**.csv"
-      - 'crowdin.yml'
-      - '.coderabbit.yml'
-      - '.mergify.yml'
-
-permissions:
-  contents: read
 
 jobs:
   test:

.github/workflows/release.yml

@@ -2,23 +2,19 @@ name: Generate Semantic Release
 on:
   push:
     branches:
-      - version-16
-
-permissions:
-  contents: read
-
+      - version-13
 jobs:
   release:
     name: Release
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Entire Repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v2
         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

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

@@ -7,9 +7,6 @@ concurrency:
   group: server-individual-tests-develop-${{ github.event_name }}-${{ github.event.number || github.event_name == 'workflow_dispatch' && github.run_id || '' }}
   cancel-in-progress: false
 
-permissions:
-  contents: read
-
 jobs:
   discover:
     runs-on: ubuntu-latest
@@ -17,7 +14,7 @@ jobs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
     - name: Clone
-      uses: actions/checkout@v6
+      uses: actions/checkout@v4
     - id: set-matrix
       run: |
         # Use grep and find to get the list of test files
@@ -72,17 +69,17 @@ jobs:
 
     steps:
       - name: Clone
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Setup Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v5
         with:
-          python-version: '3.14'
+          python-version: '3.12'
 
       - name: Setup Node
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v4
         with:
-          node-version: 24
+          node-version: 18
           check-latest: true
 
       - name: Add to Hosts
@@ -111,7 +108,7 @@ 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
         id: yarn-cache

.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

@@ -7,15 +7,8 @@ on:
     paths:
       - "**.js"
       - "**.css"
-      - "**.svg"
       - "**.md"
       - "**.html"
-      - 'crowdin.yml'
-      - '.coderabbit.yml'
-      - '.mergify.yml'
-
-permissions:
-  contents: read
 
 jobs:
   test:

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

@@ -7,12 +7,8 @@ on:
     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 +25,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
@@ -63,25 +56,25 @@ jobs:
 
     steps:
       - name: Clone
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Setup Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v5
         with:
-          python-version: '3.14'
+          python-version: '3.12'
 
       - 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@v4
         with:
-          node-version: 24
+          node-version: 18
           check-latest: true
 
       - name: Add to Hosts
@@ -110,7 +103,7 @@ 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
         id: yarn-cache
@@ -129,9 +122,10 @@ jobs:
           FRAPPE_BRANCH: ${{ github.event.client_payload.sha || github.event.inputs.branch }}
 
       - name: Run Tests
-        run: 'cd ~/frappe-bench/ && bench --site test_site run-parallel-tests --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 ${{ strategy.job-total }} --build-number ${{ matrix.container }}'
         env:
           TYPE: server
+          CAPTURE_COVERAGE: ${{ github.event_name != 'pull_request' }}
 
 
       - name: Show bench output
@@ -140,6 +134,7 @@ jobs:
 
       - name: Upload coverage data
         uses: actions/upload-artifact@v4
+        if: github.event_name != 'pull_request'
         with:
           name: coverage-${{ matrix.container }}
           path: /home/runner/frappe-bench/sites/coverage.xml
@@ -148,9 +143,10 @@ jobs:
     name: Coverage Wrap Up
     needs: test
     runs-on: ubuntu-latest
+    if: ${{ github.event_name != 'pull_request' }}
     steps:
       - name: Clone
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Download artifacts
         uses: actions/download-artifact@v4

.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,25 +41,25 @@ jobs:
     steps:
 
       - name: Clone
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Setup Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v5
         with:
-          python-version: '3.14'
+          python-version: '3.12'
 
       - 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@v4
         with:
-          node-version: 24
+          node-version: 18
           check-latest: true
 
       - name: Add to Hosts
@@ -94,7 +88,7 @@ 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
         id: yarn-cache

.mergify.yml

@@ -50,15 +50,6 @@ pull_request_rules:
           - version-15-hotfix
         assignees:
           - "{{ author }}"
-  - name: backport to version-16-beta
-    conditions:
-      - label="backport version-16-beta"
-    actions:
-      backport:
-        branches:
-          - version-16-beta
-        assignees:
-          - "{{ author }}"
   - name: Automatic merge on CI success and review
     conditions:
       - status-success=linters

.pre-commit-config.yaml

@@ -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-16"],
+	"branches": ["version-13"],
 	"plugins": [
 		"@semantic-release/commit-analyzer", {
 			"preset": "angular",
@@ -21,4 +21,4 @@
 		],
 		"@semantic-release/github"
 	]
-}
+}

CODEOWNERS

@@ -8,16 +8,17 @@ erpnext/assets/                 @khushi8112
 erpnext/regional                @ruthra-kumar
 erpnext/selling                 @ruthra-kumar
 erpnext/support/                @ruthra-kumar
+pos*                            
 
-erpnext/buying/                 @rohitwaghchaure @mihir-kandoi
+erpnext/buying/                 @rohitwaghchaure
 erpnext/maintenance/            @rohitwaghchaure
-erpnext/manufacturing/          @rohitwaghchaure @mihir-kandoi
+erpnext/manufacturing/          @rohitwaghchaure
 erpnext/quality_management/     @rohitwaghchaure
-erpnext/stock/                  @rohitwaghchaure @mihir-kandoi
-erpnext/subcontracting          @mihir-kandoi
+erpnext/stock/                  @rohitwaghchaure
+erpnext/subcontracting          @rohitwaghchaure
 
-erpnext/controllers/            @ruthra-kumar @rohitwaghchaure @mihir-kandoi
+erpnext/controllers/            @ruthra-kumar @rohitwaghchaure
 erpnext/patches/                @ruthra-kumar
 
 .github/                        @ruthra-kumar
-pyproject.toml                  @ruthra-kumar
+pyproject.toml                  @akhilnarang

README.md

@@ -1,4 +1,3 @@
-
 <div align="center">
     <a href="https://frappe.io/erpnext">
 	<img src="./erpnext/public/images/v16/erpnext.svg" alt="ERPNext Logo" height="80px" width="80xp"/>
@@ -134,7 +133,7 @@ To setup the repository locally follow the steps mentioned below:
 
 1. [Frappe School](https://school.frappe.io) - 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 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.
 
 

erpnext/__init__.py

@@ -6,7 +6,7 @@ import frappe
 from frappe.model.document import Document
 from frappe.utils.user import is_website_user
 
-__version__ = "16.8.1"
+__version__ = "16.0.0-dev"
 
 
 def get_default_company(user=None):
@@ -57,7 +57,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 +77,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 = {}

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)

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

@@ -7,7 +7,6 @@ from frappe.utils import (
 	cint,
 	date_diff,
 	flt,
-	formatdate,
 	get_first_day,
 	get_last_day,
 	get_link_to_form,
@@ -47,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))
 
@@ -319,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,
@@ -450,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()
@@ -526,7 +526,7 @@ def make_gl_entries(
 			make_gl_entries(gl_entries, cancel=(doc.docstatus == 2), merge_entries=True)
 			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:

erpnext/accounts/doctype/account/account.json

@@ -21,7 +21,6 @@
   "account_currency",
   "column_break1",
   "parent_account",
-  "account_category",
   "account_type",
   "tax_rate",
   "freeze_account",
@@ -190,20 +189,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": "2025-08-02 06:26:44.657146",
+ "modified": "2025-01-22 10:40:35.766017",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Account",
@@ -258,7 +250,6 @@
    "write": 1
   }
  ],
- "row_format": "Dynamic",
  "search_fields": "account_number",
  "show_name_in_global_search": 1,
  "show_preview_popup": 1,
@@ -266,4 +257,4 @@
  "sort_order": "ASC",
  "states": [],
  "track_changes": 1
-}
+}

erpnext/accounts/doctype/account/account.py

@@ -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
@@ -93,10 +92,8 @@ 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"
-		)
-		if not role_allowed_for_frozen_entries or role_allowed_for_frozen_entries in frappe.get_roles():
+		frozen_accounts_modifier = frappe.db.get_single_value("Accounts Settings", "frozen_accounts_modifier")
+		if not frozen_accounts_modifier or frozen_accounts_modifier in frappe.get_roles():
 			self.set_onload("can_freeze_account", True)
 
 	def autoname(self):
@@ -111,7 +108,6 @@ class Account(NestedSet):
 		self.validate_parent_child_account_type()
 		self.validate_root_details()
 		self.validate_account_number()
-		self.validate_disabled()
 		self.validate_group_or_ledger()
 		self.set_root_and_report_type()
 		self.validate_mandatory()
@@ -171,7 +167,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:
@@ -214,7 +210,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 +252,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 +259,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,9 +302,7 @@ 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}):
@@ -639,7 +602,7 @@ def _ensure_idle_system():
 	# 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:
+	if frappe.flags.in_test:
 		return
 
 	last_gl_update = None
@@ -660,27 +623,3 @@ def _ensure_idle_system():
 			).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

@@ -70,7 +70,6 @@ frappe.treeview_settings["Account"] = {
 					args: {
 						accounts: accounts,
 						company: cur_tree.args.company,
-						include_default_fb_balances: true,
 					},
 				});
 
@@ -140,11 +139,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",
@@ -161,14 +155,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",
@@ -279,14 +265,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"),
 						}
 					)
@@ -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
@@ -233,7 +251,13 @@ def validate_bank_account(coa, bank_account):
 
 		def _get_account_names(account_master):
 			for account_name, child in account_master.items():
-				if account_name not in 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)
@@ -258,7 +282,15 @@ def build_tree_from_json(chart_template, chart_data=None, from_coa_importer=Fals
 		"""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:
@@ -276,16 +308,3 @@ def build_tree_from_json(chart_template, chart_data=None, from_coa_importer=Fals
 
 	_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/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/standard_chart_of_accounts.py

@@ -9,192 +9,103 @@ 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 Equipment"): {"account_type": "Fixed Asset"},
+				_("Electronic Equipment"): {"account_type": "Fixed Asset"},
+				_("Furniture and Fixtures"): {"account_type": "Fixed Asset"},
+				_("Office Equipment"): {"account_type": "Fixed Asset"},
+				_("Plants and Machineries"): {"account_type": "Fixed Asset"},
+				_("Buildings"): {"account_type": "Fixed Asset"},
+				_("Software"): {"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"): {},
+				_("Impairment"): {},
 			},
 			"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"},
+			_("Revaluation Surplus"): {"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 Equipment"): {"account_type": "Fixed Asset", "account_number": "1710"},
+				_("Electronic Equipment"): {"account_type": "Fixed Asset", "account_number": "1720"},
+				_("Furniture and Fixtures"): {"account_type": "Fixed Asset", "account_number": "1730"},
+				_("Office Equipment"): {"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"},
+				_("Software"): {"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",
 		},

erpnext/accounts/doctype/account/test_account.py

@@ -415,13 +415,15 @@ def create_account(**kwargs):
 		return account.name
 	else:
 		account = frappe.get_doc(
-			doctype="Account",
-			is_group=kwargs.get("is_group", 0),
-			account_name=kwargs.get("account_name"),
-			account_type=kwargs.get("account_type"),
-			parent_account=kwargs.get("parent_account"),
-			company=kwargs.get("company"),
-			account_currency=kwargs.get("account_currency"),
+			dict(
+				doctype="Account",
+				is_group=kwargs.get("is_group", 0),
+				account_name=kwargs.get("account_name"),
+				account_type=kwargs.get("account_type"),
+				parent_account=kwargs.get("parent_account"),
+				company=kwargs.get("company"),
+				account_currency=kwargs.get("account_currency"),
+			)
 		)
 
 		account.save()

erpnext/accounts/doctype/account_category/account_category.js

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

erpnext/accounts/doctype/account_category/account_category.json

@@ -1,71 +0,0 @@
-{
- "actions": [],
- "allow_rename": 1,
- "autoname": "field:account_category_name",
- "creation": "2025-08-02 06:22:31.835063",
- "doctype": "DocType",
- "engine": "InnoDB",
- "field_order": [
-  "account_category_name",
-  "description"
- ],
- "fields": [
-  {
-   "fieldname": "account_category_name",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Account Category Name",
-   "reqd": 1,
-   "unique": 1
-  },
-  {
-   "fieldname": "description",
-   "fieldtype": "Small Text",
-   "label": "Description"
-  }
- ],
- "grid_page_length": 50,
- "index_web_pages_for_search": 1,
- "links": [],
- "modified": "2025-10-15 03:19:47.171349",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Account Category",
- "naming_rule": "By fieldname",
- "owner": "Administrator",
- "permissions": [
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Accounts User",
-   "share": 1,
-   "write": 1
-  },
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Accounts Manager",
-   "share": 1,
-   "write": 1
-  },
-  {
-   "read": 1,
-   "role": "Auditor"
-  }
- ],
- "row_format": "Dynamic",
- "search_fields": "account_category_name, description",
- "sort_field": "creation",
- "sort_order": "DESC",
- "states": []
-}

erpnext/accounts/doctype/account_category/account_category.py

@@ -1,94 +0,0 @@
-# Copyright (c) 2025, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-import json
-import os
-
-import frappe
-from frappe import _
-from frappe.model.document import Document, bulk_insert
-
-DOCTYPE = "Account Category"
-
-
-class AccountCategory(Document):
-	# begin: auto-generated types
-	# This code is auto-generated. Do not modify anything in this block.
-
-	from typing import TYPE_CHECKING
-
-	if TYPE_CHECKING:
-		from frappe.types import DF
-
-		account_category_name: DF.Data
-		description: DF.SmallText | None
-	# end: auto-generated types
-
-	def after_rename(self, old_name, new_name, merge):
-		from erpnext.accounts.doctype.financial_report_template.financial_report_engine import (
-			FormulaFieldUpdater,
-		)
-
-		# get all template rows with this account category being used
-		row = frappe.qb.DocType("Financial Report Row")
-		rows = frappe._dict(
-			frappe.qb.from_(row)
-			.select(row.name, row.calculation_formula)
-			.where(row.calculation_formula.like(f"%{old_name}%"))
-			.run()
-		)
-
-		if not rows:
-			return
-
-		# Update formulas with new name
-		updater = FormulaFieldUpdater(
-			field_name="account_category",
-			value_mapping={old_name: new_name},
-			exclude_operators=["like", "not like"],
-		)
-
-		updated_formulas = updater.update_in_rows(rows)
-
-		if updated_formulas:
-			frappe.msgprint(
-				_("Updated {0} Financial Report Row(s) with new category name").format(len(updated_formulas))
-			)
-
-
-def import_account_categories(template_path: str):
-	categories_file = os.path.join(template_path, "account_categories.json")
-
-	if not os.path.exists(categories_file):
-		return
-
-	with open(categories_file) as f:
-		categories = json.load(f, object_hook=frappe._dict)
-
-	create_account_categories(categories)
-
-
-def create_account_categories(categories: list[dict]):
-	if not categories:
-		return
-
-	existing_categories = set(frappe.get_all(DOCTYPE, pluck="name"))
-	new_categories = []
-
-	for category_data in categories:
-		category_name = category_data.get("account_category_name")
-		if not category_name or category_name in existing_categories:
-			continue
-
-		doc = frappe.get_doc(
-			{
-				**category_data,
-				"doctype": DOCTYPE,
-				"name": category_name,
-			}
-		)
-
-		new_categories.append(doc)
-		existing_categories.add(category_name)
-
-	if new_categories:
-		bulk_insert(DOCTYPE, new_categories)

erpnext/accounts/doctype/account_category/test_account_category.py

@@ -1,20 +0,0 @@
-# Copyright (c) 2025, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-
-# import frappe
-from frappe.tests import IntegrationTestCase
-
-# On IntegrationTestCase, the doctype test records and all
-# link-field test record dependencies are recursively loaded
-# Use these module variables to add/remove to/from that list
-EXTRA_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
-IGNORE_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
-
-
-class IntegrationTestAccountCategory(IntegrationTestCase):
-	"""
-	Integration tests for AccountCategory.
-	Use this class for testing interactions between multiple components.
-	"""
-
-	pass

erpnext/accounts/doctype/account_closing_balance/account_closing_balance.json

@@ -11,9 +11,6 @@
   "cost_center",
   "debit",
   "credit",
-  "reporting_currency_exchange_rate",
-  "debit_in_reporting_currency",
-  "credit_in_reporting_currency",
   "account_currency",
   "debit_in_account_currency",
   "credit_in_account_currency",
@@ -127,30 +124,12 @@
    "fieldname": "is_period_closing_voucher_entry",
    "fieldtype": "Check",
    "label": "Is Period Closing Voucher Entry"
-  },
-  {
-   "fieldname": "debit_in_reporting_currency",
-   "fieldtype": "Currency",
-   "label": "Debit Amount in Reporting Currency",
-   "options": "Company:company:reporting_currency"
-  },
-  {
-   "fieldname": "credit_in_reporting_currency",
-   "fieldtype": "Currency",
-   "label": "Credit Amount in Reporting Currency",
-   "options": "Company:company:reporting_currency"
-  },
-  {
-   "fieldname": "reporting_currency_exchange_rate",
-   "fieldtype": "Float",
-   "label": "Reporting Currency Exchange Rate",
-   "precision": "9"
   }
  ],
  "icon": "fa fa-list",
  "in_create": 1,
  "links": [],
- "modified": "2025-08-22 19:13:50.400404",
+ "modified": "2024-03-27 13:05:56.710541",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Account Closing Balance",
@@ -179,8 +158,7 @@
    "role": "Auditor"
   }
  ],
- "row_format": "Dynamic",
  "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
-}
+}

erpnext/accounts/doctype/account_closing_balance/account_closing_balance.py

@@ -2,15 +2,12 @@
 # For license information, please see license.txt
 
 import frappe
-from frappe import _
 from frappe.model.document import Document
-from frappe.utils import cint, cstr, flt
+from frappe.utils import cint, cstr
 
 from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import (
 	get_accounting_dimensions,
 )
-from erpnext.exceptions import ReportingCurrencyExchangeNotFoundError
-from erpnext.setup.utils import get_exchange_rate
 
 
 class AccountClosingBalance(Document):
@@ -29,15 +26,12 @@ class AccountClosingBalance(Document):
 		cost_center: DF.Link | None
 		credit: DF.Currency
 		credit_in_account_currency: DF.Currency
-		credit_in_reporting_currency: DF.Currency
 		debit: DF.Currency
 		debit_in_account_currency: DF.Currency
-		debit_in_reporting_currency: DF.Currency
 		finance_book: DF.Link | None
 		is_period_closing_voucher_entry: DF.Check
 		period_closing_voucher: DF.Link | None
 		project: DF.Link | None
-		reporting_currency_exchange_rate: DF.Float
 	# end: auto-generated types
 
 	pass
@@ -61,7 +55,6 @@ def make_closing_entries(closing_entries, voucher_name, company, closing_date):
 				"closing_date": closing_date,
 			}
 		)
-		set_amount_in_reporting_currency(cle, company, closing_date)
 		cle.flags.ignore_permissions = True
 		cle.flags.ignore_links = True
 		cle.submit()
@@ -151,29 +144,3 @@ def get_previous_closing_entries(company, closing_date, accounting_dimensions):
 		entries = query.run(as_dict=1)
 
 	return entries
-
-
-def set_amount_in_reporting_currency(cle, company, closing_date):
-	default_currency, reporting_currency = frappe.get_cached_value(
-		"Company", company, ["default_currency", "reporting_currency"]
-	)
-
-	reporting_currency_exchange_rate = get_exchange_rate(default_currency, reporting_currency, closing_date)
-	if not reporting_currency_exchange_rate:
-		frappe.throw(
-			title=_("Reporting Currency Exchange Not Found"),
-			msg=_(
-				"Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually."
-			).format(default_currency, reporting_currency, closing_date),
-			exc=ReportingCurrencyExchangeNotFoundError,
-		)
-	debit_in_reporting_currency = flt(cle.get("debit", 0) * reporting_currency_exchange_rate)
-	credit_in_reporting_currency = flt(cle.get("credit", 0) * reporting_currency_exchange_rate)
-
-	cle.update(
-		{
-			"reporting_currency_exchange_rate": reporting_currency_exchange_rate,
-			"debit_in_reporting_currency": debit_in_reporting_currency,
-			"credit_in_reporting_currency": credit_in_reporting_currency,
-		}
-	)

erpnext/accounts/doctype/account_closing_balance/test_account_closing_balance.py

@@ -2,7 +2,16 @@
 # See license.txt
 
 # import frappe
-from frappe.tests import IntegrationTestCase
+from frappe.tests import IntegrationTestCase, UnitTestCase
+
+
+class UnitTestAccountClosingBalance(UnitTestCase):
+	"""
+	Unit tests for AccountClosingBalance.
+	Use this class for testing individual functions and methods.
+	"""
+
+	pass
 
 
 class TestAccountClosingBalance(IntegrationTestCase):

erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py

@@ -83,7 +83,7 @@ class AccountingDimension(Document):
 				frappe.throw(_("Company {0} is added more than once").format(frappe.bold(default.company)))
 
 	def after_insert(self):
-		if frappe.in_test:
+		if frappe.flags.in_test:
 			make_dimension_in_accounting_doctypes(doc=self)
 		else:
 			frappe.enqueue(
@@ -91,7 +91,7 @@ class AccountingDimension(Document):
 			)
 
 	def on_trash(self):
-		if frappe.in_test:
+		if frappe.flags.in_test:
 			delete_accounting_dimension(doc=self)
 		else:
 			frappe.enqueue(delete_accounting_dimension, doc=self, queue="long", enqueue_after_commit=True)
@@ -111,15 +111,17 @@ class AccountingDimension(Document):
 def make_dimension_in_accounting_doctypes(doc, doclist=None):
 	if not doclist:
 		doclist = get_doctypes_with_dimensions()
+
 	doc_count = len(get_accounting_dimensions())
 	count = 0
-	repostable_doctypes = get_allowed_types_from_settings(child_doc=True)
+	repostable_doctypes = get_allowed_types_from_settings()
 
 	for doctype in doclist:
 		if (doc_count + 1) % 2 == 0:
 			insert_after_field = "dimension_col_break"
 		else:
 			insert_after_field = "accounting_dimensions_section"
+
 		df = {
 			"fieldname": doc.fieldname,
 			"label": doc.label,
@@ -211,7 +213,7 @@ def delete_accounting_dimension(doc):
 
 @frappe.whitelist()
 def disable_dimension(doc):
-	if frappe.in_test:
+	if frappe.flags.in_test:
 		toggle_disabling(doc=doc)
 	else:
 		frappe.enqueue(toggle_disabling, doc=doc)
@@ -309,8 +311,8 @@ def get_dimensions(with_cost_center_and_project=False):
 	if with_cost_center_and_project:
 		dimension_filters.extend(
 			[
-				frappe._dict({"fieldname": "cost_center", "document_type": "Cost Center"}),
-				frappe._dict({"fieldname": "project", "document_type": "Project"}),
+				{"fieldname": "cost_center", "document_type": "Cost Center"},
+				{"fieldname": "project", "document_type": "Project"},
 			]
 		)
 

erpnext/accounts/doctype/accounting_dimension/test_accounting_dimension.py

@@ -58,10 +58,6 @@ class TestAccountingDimension(IntegrationTestCase):
 		self.assertEqual(gle1.get("department"), "_Test Department - _TC")
 
 	def test_mandatory(self):
-		location = frappe.get_doc("Accounting Dimension", "Location")
-		location.dimension_defaults[0].mandatory_for_bs = True
-		location.save()
-
 		si = create_sales_invoice(do_not_save=1)
 		si.append(
 			"items",
@@ -125,6 +121,7 @@ def create_dimension():
 				"company": "_Test Company",
 				"reference_document": "Location",
 				"default_dimension": "Block 1",
+				"mandatory_for_bs": 1,
 			},
 		)
 

erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json

@@ -7,7 +7,6 @@
  "engine": "InnoDB",
  "field_order": [
   "accounting_dimension",
-  "fieldname",
   "disabled",
   "column_break_2",
   "company",
@@ -91,17 +90,11 @@
    "fieldname": "apply_restriction_on_values",
    "fieldtype": "Check",
    "label": "Apply restriction on dimension values"
-  },
-  {
-   "fieldname": "fieldname",
-   "fieldtype": "Data",
-   "hidden": 1,
-   "label": "Fieldname"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2025-08-08 14:13:22.203011",
+ "modified": "2024-03-27 13:05:57.199186",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Accounting Dimension Filter",
@@ -146,9 +139,8 @@
   }
  ],
  "quick_entry": 1,
- "row_format": "Dynamic",
  "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
-}
+}

erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.py

@@ -17,16 +17,17 @@ class AccountingDimensionFilter(Document):
 		from frappe.types import DF
 
 		from erpnext.accounts.doctype.allowed_dimension.allowed_dimension import AllowedDimension
-		from erpnext.accounts.doctype.applicable_on_account.applicable_on_account import ApplicableOnAccount
+		from erpnext.accounts.doctype.applicable_on_account.applicable_on_account import (
+			ApplicableOnAccount,
+		)
 
-		accounting_dimension: DF.Literal[None]
+		accounting_dimension: DF.Literal
 		accounts: DF.Table[ApplicableOnAccount]
 		allow_or_restrict: DF.Literal["Allow", "Restrict"]
 		apply_restriction_on_values: DF.Check
 		company: DF.Link
 		dimensions: DF.Table[AllowedDimension]
 		disabled: DF.Check
-		fieldname: DF.Data | None
 	# end: auto-generated types
 
 	def before_save(self):
@@ -36,10 +37,6 @@ class AccountingDimensionFilter(Document):
 			self.set("dimensions", [])
 
 	def validate(self):
-		self.fieldname = frappe.db.get_value(
-			"Accounting Dimension", {"document_type": self.accounting_dimension}, "fieldname"
-		) or frappe.scrub(self.accounting_dimension)  # scrub to handle default accounting dimension
-
 		self.validate_applicable_accounts()
 
 	def validate_applicable_accounts(self):
@@ -74,7 +71,7 @@ def get_dimension_filter_map():
 			"""
 			SELECT
 				a.applicable_on_account, d.dimension_value, p.accounting_dimension,
-				p.allow_or_restrict, p.fieldname, a.is_mandatory
+				p.allow_or_restrict, a.is_mandatory
 			FROM
 				`tabApplicable On Account` a,
 				`tabAccounting Dimension Filter` p
@@ -89,6 +86,8 @@ def get_dimension_filter_map():
 		dimension_filter_map = {}
 
 		for f in filters:
+			f.fieldname = scrub(f.accounting_dimension)
+
 			build_map(
 				dimension_filter_map,
 				f.fieldname,

erpnext/accounts/doctype/accounting_period/accounting_period.json

@@ -11,8 +11,6 @@
   "end_date",
   "column_break_4",
   "company",
-  "disabled",
-  "exempted_role",
   "section_break_7",
   "closed_documents"
  ],
@@ -51,13 +49,6 @@
    "options": "Company",
    "reqd": 1
   },
-  {
-   "default": "0",
-   "fieldname": "disabled",
-   "fieldtype": "Check",
-   "in_list_view": 1,
-   "label": "Disabled"
-  },
   {
    "fieldname": "section_break_7",
    "fieldtype": "Section Break"
@@ -68,22 +59,13 @@
    "label": "Closed Documents",
    "options": "Closed Document",
    "reqd": 1
-  },
-  {
-   "description": "Role allowed to bypass period restrictions.",
-   "fieldname": "exempted_role",
-   "fieldtype": "Link",
-   "label": "Exempted Role",
-   "link_filters": "[[\"Role\",\"disabled\",\"=\",0]]",
-   "options": "Role"
   }
  ],
  "links": [],
- "modified": "2025-12-01 16:53:44.631299",
+ "modified": "2024-03-27 13:05:57.388109",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Accounting Period",
- "naming_rule": "By fieldname",
  "owner": "Administrator",
  "permissions": [
   {
@@ -123,9 +105,8 @@
    "write": 1
   }
  ],
- "row_format": "Dynamic",
  "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
-}
+}

erpnext/accounts/doctype/accounting_period/accounting_period.py

@@ -28,9 +28,7 @@ class AccountingPeriod(Document):
 
 		closed_documents: DF.Table[ClosedDocument]
 		company: DF.Link
-		disabled: DF.Check
 		end_date: DF.Date
-		exempted_role: DF.Link | None
 		period_name: DF.Data
 		start_date: DF.Date
 	# end: auto-generated types
@@ -114,11 +112,10 @@ def validate_accounting_period_on_doc_save(doc, method=None):
 	accounting_period = (
 		frappe.qb.from_(ap)
 		.from_(cd)
-		.select(ap.name, ap.exempted_role)
+		.select(ap.name)
 		.where(
 			(ap.name == cd.parent)
 			& (ap.company == doc.company)
-			& (ap.disabled == 0)
 			& (cd.closed == 1)
 			& (cd.document_type == doc.doctype)
 			& (date >= ap.start_date)
@@ -127,11 +124,6 @@ def validate_accounting_period_on_doc_save(doc, method=None):
 	).run(as_dict=1)
 
 	if accounting_period:
-		if (
-			accounting_period[0].get("exempted_role")
-			and accounting_period[0].get("exempted_role") in frappe.get_roles()
-		):
-			return
 		frappe.throw(
 			_("You cannot create a {0} within the closed Accounting Period {1}").format(
 				doc.doctype, frappe.bold(accounting_period[0]["name"])

erpnext/accounts/doctype/accounting_period/test_accounting_period.py

@@ -37,59 +37,6 @@ class TestAccountingPeriod(IntegrationTestCase):
 		doc = create_sales_invoice(do_not_save=1, cost_center="_Test Company - _TC", warehouse="Stores - _TC")
 		self.assertRaises(ClosedAccountingPeriod, doc.save)
 
-	def test_accounting_period_exempted_role(self):
-		# Create Accounting Period with exempted role
-		ap = create_accounting_period(
-			period_name="Test Accounting Period Exempted",
-			exempted_role="Accounts Manager",
-			start_date="2025-12-01",
-			end_date="2025-12-31",
-		)
-		ap.save()
-
-		# Create users
-		users = frappe.get_all("User", filters={"email": ["like", "test%"]}, limit=1)
-		user = None
-
-		if users[0].name:
-			user = frappe.get_doc("User", users[0].name)
-		else:
-			user = frappe.get_doc(
-				{
-					"doctype": "User",
-					"email": "test1@example.com",
-					"first_name": "Test1",
-				}
-			)
-			user.insert()
-
-		user.roles = []
-		user.append("roles", {"role": "Accounts User"})
-
-		# ---- Non-exempted user should FAIL ----
-		user.save(ignore_permissions=True)
-		frappe.clear_cache(user=user.name)
-
-		frappe.set_user(user.name)
-		posting_date = "2025-12-11"
-		doc = create_sales_invoice(
-			do_not_save=1,
-			posting_date=posting_date,
-		)
-
-		with self.assertRaises(frappe.ValidationError):
-			doc.submit()
-
-		# ---- Exempted role should PASS ----
-		user.append("roles", {"role": "Accounts Manager"})
-		user.save(ignore_permissions=True)
-		frappe.clear_cache(user=user.name)
-
-		doc = create_sales_invoice(do_not_save=1, posting_date=posting_date)
-
-		doc.submit()  # Should not raise
-		self.assertEqual(doc.docstatus, 1)
-
 	def tearDown(self):
 		for d in frappe.get_all("Accounting Period"):
 			frappe.delete_doc("Accounting Period", d.name)
@@ -104,6 +51,5 @@ def create_accounting_period(**args):
 	accounting_period.company = args.company or "_Test Company"
 	accounting_period.period_name = args.period_name or "_Test_Period_Name_1"
 	accounting_period.append("closed_documents", {"document_type": "Sales Invoice", "closed": 1})
-	accounting_period.exempted_role = args.exempted_role or ""
 
 	return accounting_period

erpnext/accounts/doctype/accounts_settings/accounts_settings.js

@@ -22,32 +22,4 @@ frappe.ui.form.on("Accounts Settings", {
 			}
 		);
 	},
-
-	add_taxes_from_taxes_and_charges_template(frm) {
-		toggle_tax_settings(frm, "add_taxes_from_taxes_and_charges_template");
-	},
-
-	add_taxes_from_item_tax_template(frm) {
-		toggle_tax_settings(frm, "add_taxes_from_item_tax_template");
-	},
-
-	drop_ar_procedures: function (frm) {
-		frm.call({
-			doc: frm.doc,
-			method: "drop_ar_sql_procedures",
-			callback: function (r) {
-				frappe.show_alert(__("Procedures dropped"), 5);
-			},
-		});
-	},
 });
-
-function toggle_tax_settings(frm, field_name) {
-	if (frm.doc[field_name]) {
-		const other_field =
-			field_name === "add_taxes_from_item_tax_template"
-				? "add_taxes_from_taxes_and_charges_template"
-				: "add_taxes_from_item_tax_template";
-		frm.set_value(other_field, 0);
-	}
-}

erpnext/accounts/doctype/accounts_settings/accounts_settings.json

@@ -19,11 +19,6 @@
   "column_break_17",
   "enable_common_party_accounting",
   "allow_multi_currency_invoices_against_single_party_account",
-  "confirm_before_resetting_posting_date",
-  "analytics_section",
-  "enable_accounting_dimensions",
-  "column_break_vtnr",
-  "enable_discounts_and_margin",
   "journals_section",
   "merge_similar_account_heads",
   "deferred_accounting_settings_section",
@@ -36,7 +31,6 @@
   "determine_address_tax_category_from",
   "column_break_19",
   "add_taxes_from_item_tax_template",
-  "add_taxes_from_taxes_and_charges_template",
   "book_tax_discount_loss",
   "round_row_wise_tax",
   "print_settings",
@@ -44,27 +38,16 @@
   "show_taxes_as_table_in_print",
   "column_break_12",
   "show_payment_schedule_in_print",
-  "item_price_settings_section",
-  "maintain_same_internal_transaction_rate",
-  "fetch_valuation_rate_for_internal_transaction",
-  "column_break_feyo",
-  "maintain_same_rate_action",
-  "role_to_override_stop_action",
   "currency_exchange_section",
   "allow_stale",
-  "allow_pegged_currencies_exchange_rates",
   "column_break_yuug",
   "stale_days",
-  "payments_tab",
   "section_break_jpd0",
   "auto_reconcile_payments",
   "auto_reconciliation_job_trigger",
   "reconciliation_queue_size",
   "column_break_resa",
   "exchange_gain_loss_posting_date",
-  "payment_options_section",
-  "enable_loyalty_point_program",
-  "column_break_ctam",
   "invoicing_settings_tab",
   "accounts_transactions_settings_section",
   "over_billing_allowance",
@@ -72,41 +55,50 @@
   "role_allowed_to_over_bill",
   "credit_controller",
   "make_payment_via_journal_entry",
+  "pos_tab",
+  "pos_setting_section",
+  "post_change_gl_entries",
   "assets_tab",
   "asset_settings_section",
   "calculate_depr_using_total_days",
   "column_break_gjcc",
   "book_asset_depreciation_entry_automatically",
-  "role_to_notify_on_depreciation_failure",
   "closing_settings_tab",
   "period_closing_settings_section",
+  "acc_frozen_upto",
   "ignore_account_closing_balance",
-  "use_legacy_controller_for_pcv",
   "column_break_25",
+  "frozen_accounts_modifier",
+  "tab_break_dpet",
+  "show_balance_in_coa",
+  "banking_tab",
+  "enable_party_matching",
+  "enable_fuzzy_matching",
   "reports_tab",
   "remarks_section",
   "general_ledger_remarks_length",
+  "ignore_is_opening_check_for_reporting",
   "column_break_lvjk",
   "receivable_payable_remarks_length",
-  "accounts_receivable_payable_tuning_section",
-  "receivable_payable_fetch_method",
-  "default_ageing_range",
-  "column_break_ntmi",
-  "drop_ar_procedures",
-  "legacy_section",
-  "ignore_is_opening_check_for_reporting",
-  "tab_break_dpet",
-  "chart_of_accounts_section",
-  "show_balance_in_coa",
-  "banking_section",
-  "enable_party_matching",
-  "enable_fuzzy_matching",
-  "payment_request_section",
-  "create_pr_in_draft_status",
-  "budget_section",
-  "use_legacy_budget_controller"
+  "payment_request_settings",
+  "create_pr_in_draft_status"
  ],
  "fields": [
+  {
+   "description": "Accounting entries are frozen up to this date. Nobody can create or modify entries except users with the role specified below",
+   "fieldname": "acc_frozen_upto",
+   "fieldtype": "Date",
+   "in_list_view": 1,
+   "label": "Accounts Frozen Till Date"
+  },
+  {
+   "description": "Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts",
+   "fieldname": "frozen_accounts_modifier",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Role Allowed to Set Frozen Accounts and Edit Frozen Entries",
+   "options": "Role"
+  },
   {
    "default": "Billing Address",
    "description": "Address used to determine Tax Category in transactions",
@@ -287,9 +279,16 @@
    "fieldname": "column_break_19",
    "fieldtype": "Column Break"
   },
+  {
+   "default": "1",
+   "description": "If enabled, ledger entries will be posted for change amount in POS transactions",
+   "fieldname": "post_change_gl_entries",
+   "fieldtype": "Check",
+   "label": "Create Ledger Entries for Change Amount"
+  },
   {
    "default": "0",
-   "description": "Learn about <a href=\"https://docs.frappe.io/erpnext/user/manual/en/common_party_accounting\" rel=\"noopener noreferrer\">Common Party</a>",
+   "description": "Learn about <a href=\"https://docs.erpnext.com/docs/v13/user/manual/en/accounts/articles/common_party_accounting#:~:text=Common%20Party%20Accounting%20in%20ERPNext,Invoice%20against%20a%20primary%20Supplier.\">Common Party</a>",
    "fieldname": "enable_common_party_accounting",
    "fieldtype": "Check",
    "label": "Enable Common Party Accounting"
@@ -327,6 +326,11 @@
    "fieldtype": "Tab Break",
    "label": "Accounts Closing"
   },
+  {
+   "fieldname": "pos_setting_section",
+   "fieldtype": "Section Break",
+   "label": "POS Setting"
+  },
   {
    "fieldname": "invoice_and_billing_tab",
    "fieldtype": "Tab Break",
@@ -341,6 +345,11 @@
    "fieldname": "column_break_17",
    "fieldtype": "Column Break"
   },
+  {
+   "fieldname": "pos_tab",
+   "fieldtype": "Tab Break",
+   "label": "POS"
+  },
   {
    "default": "0",
    "description": "Enabling this will allow creation of multi-currency invoices against single party account in company currency",
@@ -351,7 +360,7 @@
   {
    "fieldname": "tab_break_dpet",
    "fieldtype": "Tab Break",
-   "label": "Others"
+   "label": "Chart Of Accounts"
   },
   {
    "default": "1",
@@ -395,6 +404,11 @@
    "fieldtype": "Check",
    "label": "Show Taxes as Table in Print"
   },
+  {
+   "fieldname": "banking_tab",
+   "fieldtype": "Tab Break",
+   "label": "Banking"
+  },
   {
    "default": "0",
    "description": "Auto match and set the Party in Bank Transactions",
@@ -470,9 +484,14 @@
    "fieldtype": "Check",
    "label": "Calculate daily depreciation using total days in depreciation period"
   },
+  {
+   "description": "Payment Request created from Sales Order or Purchase Order will be in Draft status. When disabled document will be in unsaved state.",
+   "fieldname": "payment_request_settings",
+   "fieldtype": "Tab Break",
+   "label": "Payment Request"
+  },
   {
    "default": "1",
-   "description": "Payment Requests made from Sales / Purchase Invoice will be put in Draft explicitly",
    "fieldname": "create_pr_in_draft_status",
    "fieldtype": "Check",
    "label": "Create in Draft Status"
@@ -513,191 +532,14 @@
    "fieldtype": "Select",
    "label": "Posting Date Inheritance for Exchange Gain / Loss",
    "options": "Invoice\nPayment\nReconciliation Date"
-  },
-  {
-   "default": "Buffered Cursor",
-   "fieldname": "receivable_payable_fetch_method",
-   "fieldtype": "Select",
-   "label": "Data Fetch Method",
-   "options": "Buffered Cursor\nUnBuffered Cursor\nRaw SQL"
-  },
-  {
-   "fieldname": "accounts_receivable_payable_tuning_section",
-   "fieldtype": "Section Break",
-   "label": "Accounts Receivable / Payable Tuning"
-  },
-  {
-   "fieldname": "legacy_section",
-   "fieldtype": "Section Break",
-   "label": "Legacy Fields"
-  },
-  {
-   "default": "0",
-   "fieldname": "maintain_same_internal_transaction_rate",
-   "fieldtype": "Check",
-   "label": "Maintain Same Rate Throughout Internal Transaction"
-  },
-  {
-   "default": "Stop",
-   "depends_on": "maintain_same_internal_transaction_rate",
-   "fieldname": "maintain_same_rate_action",
-   "fieldtype": "Select",
-   "label": "Action if Same Rate is Not Maintained Throughout  Internal Transaction",
-   "mandatory_depends_on": "maintain_same_internal_transaction_rate",
-   "options": "Stop\nWarn"
-  },
-  {
-   "depends_on": "eval: doc.maintain_same_internal_transaction_rate && doc.maintain_same_rate_action == 'Stop'",
-   "fieldname": "role_to_override_stop_action",
-   "fieldtype": "Link",
-   "label": "Role Allowed to Override Stop Action",
-   "options": "Role"
-  },
-  {
-   "default": "1",
-   "description": "If enabled, user will be alerted before resetting posting date to current date in relevant transactions",
-   "fieldname": "confirm_before_resetting_posting_date",
-   "fieldtype": "Check",
-   "label": "Confirm before resetting posting date"
-  },
-  {
-   "fieldname": "item_price_settings_section",
-   "fieldtype": "Section Break",
-   "label": "Item Price Settings"
-  },
-  {
-   "fieldname": "column_break_feyo",
-   "fieldtype": "Column Break"
-  },
-  {
-   "default": "0",
-   "description": "System will do an implicit conversion using the pegged currency. <br>\nEx: Instead of AED -&gt; INR, system will do AED -&gt; USD -&gt; INR using the pegged exchange rate of AED against USD.",
-   "documentation_url": "/app/pegged-currencies/Pegged Currencies",
-   "fieldname": "allow_pegged_currencies_exchange_rates",
-   "fieldtype": "Check",
-   "label": "Allow Implicit Pegged Currency Conversion"
-  },
-  {
-   "default": "0",
-   "description": "If no taxes are set, and Taxes and Charges Template is selected, the system will automatically apply the taxes from the chosen template.",
-   "fieldname": "add_taxes_from_taxes_and_charges_template",
-   "fieldtype": "Check",
-   "label": "Automatically Add Taxes from Taxes and Charges Template"
-  },
-  {
-   "fieldname": "column_break_ntmi",
-   "fieldtype": "Column Break"
-  },
-  {
-   "depends_on": "eval:doc.receivable_payable_fetch_method == \"Raw SQL\"",
-   "description": "Drops existing SQL Procedures and Function setup by Accounts Receivable report",
-   "fieldname": "drop_ar_procedures",
-   "fieldtype": "Button",
-   "label": "Drop Procedures"
-  },
-  {
-   "default": "0",
-   "fieldname": "fetch_valuation_rate_for_internal_transaction",
-   "fieldtype": "Check",
-   "label": "Fetch Valuation Rate for Internal Transaction"
-  },
-  {
-   "default": "0",
-   "fieldname": "use_legacy_budget_controller",
-   "fieldtype": "Check",
-   "label": "Use Legacy Budget Controller"
-  },
-  {
-   "default": "1",
-   "fieldname": "use_legacy_controller_for_pcv",
-   "fieldtype": "Check",
-   "label": "Use Legacy Controller For Period Closing Voucher"
-  },
-  {
-   "description": "Users with this role will be notified if the asset depreciation gets failed",
-   "fieldname": "role_to_notify_on_depreciation_failure",
-   "fieldtype": "Link",
-   "label": "Role to Notify on Depreciation Failure",
-   "options": "Role"
-  },
-  {
-   "default": "30, 60, 90, 120",
-   "fieldname": "default_ageing_range",
-   "fieldtype": "Data",
-   "label": "Default Ageing Range"
-  },
-  {
-   "fieldname": "chart_of_accounts_section",
-   "fieldtype": "Section Break",
-   "label": "Chart Of Accounts"
-  },
-  {
-   "fieldname": "banking_section",
-   "fieldtype": "Section Break",
-   "label": "Banking"
-  },
-  {
-   "fieldname": "payment_request_section",
-   "fieldtype": "Section Break",
-   "label": "Payment Request"
-  },
-  {
-   "fieldname": "budget_section",
-   "fieldtype": "Section Break",
-   "label": "Budget"
-  },
-  {
-   "fieldname": "analytics_section",
-   "fieldtype": "Section Break",
-   "label": "Analytical Accounting"
-  },
-  {
-   "fieldname": "column_break_vtnr",
-   "fieldtype": "Column Break"
-  },
-  {
-   "default": "0",
-   "description": "Apply discounts and margins on products",
-   "fieldname": "enable_discounts_and_margin",
-   "fieldtype": "Check",
-   "label": "Enable Discounts and Margin"
-  },
-  {
-   "fieldname": "payments_tab",
-   "fieldtype": "Tab Break",
-   "label": "Payments"
-  },
-  {
-   "fieldname": "payment_options_section",
-   "fieldtype": "Section Break",
-   "label": "Payment Options"
-  },
-  {
-   "default": "0",
-   "fieldname": "enable_loyalty_point_program",
-   "fieldtype": "Check",
-   "label": "Enable Loyalty Point Program"
-  },
-  {
-   "fieldname": "column_break_ctam",
-   "fieldtype": "Column Break"
-  },
-  {
-   "default": "0",
-   "description": "Enable cost center, projects and other custom accounting dimensions",
-   "fieldname": "enable_accounting_dimensions",
-   "fieldtype": "Check",
-   "label": "Enable Accounting Dimensions"
   }
  ],
- "grid_page_length": 50,
- "hide_toolbar": 0,
  "icon": "icon-cog",
  "idx": 1,
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2026-02-04 17:15:38.609327",
+ "modified": "2025-01-23 13:15:44.077853",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Accounts Settings",
@@ -722,9 +564,8 @@
   }
  ],
  "quick_entry": 1,
- "row_format": "Dynamic",
  "sort_field": "creation",
  "sort_order": "ASC",
  "states": [],
  "track_changes": 1
-}
+}

erpnext/accounts/doctype/accounts_settings/accounts_settings.py

@@ -11,28 +11,7 @@ from frappe.model.document import Document
 from frappe.utils import cint
 
 from erpnext.accounts.utils import sync_auto_reconcile_config
-
-SELLING_DOCTYPES = [
-	"Sales Invoice",
-	"Sales Order",
-	"Delivery Note",
-	"Quotation",
-	"Sales Invoice Item",
-	"Sales Order Item",
-	"Delivery Note Item",
-	"Quotation Item",
-	"POS Invoice",
-	"POS Invoice Item",
-]
-
-BUYING_DOCTYPES = [
-	"Purchase Invoice",
-	"Purchase Order",
-	"Purchase Receipt",
-	"Purchase Invoice Item",
-	"Purchase Order Item",
-	"Purchase Receipt Item",
-]
+from erpnext.stock.utils import check_pending_reposting
 
 
 class AccountsSettings(Document):
@@ -44,10 +23,9 @@ class AccountsSettings(Document):
 	if TYPE_CHECKING:
 		from frappe.types import DF
 
+		acc_frozen_upto: DF.Date | None
 		add_taxes_from_item_tax_template: DF.Check
-		add_taxes_from_taxes_and_charges_template: DF.Check
 		allow_multi_currency_invoices_against_single_party_account: DF.Check
-		allow_pegged_currencies_exchange_rates: DF.Check
 		allow_stale: DF.Check
 		auto_reconcile_payments: DF.Check
 		auto_reconciliation_job_trigger: DF.Int
@@ -59,35 +37,26 @@ class AccountsSettings(Document):
 		book_tax_discount_loss: DF.Check
 		calculate_depr_using_total_days: DF.Check
 		check_supplier_invoice_uniqueness: DF.Check
-		confirm_before_resetting_posting_date: DF.Check
 		create_pr_in_draft_status: DF.Check
 		credit_controller: DF.Link | None
-		default_ageing_range: DF.Data | None
 		delete_linked_ledger_entries: DF.Check
 		determine_address_tax_category_from: DF.Literal["Billing Address", "Shipping Address"]
-		enable_accounting_dimensions: DF.Check
 		enable_common_party_accounting: DF.Check
-		enable_discounts_and_margin: DF.Check
 		enable_fuzzy_matching: DF.Check
 		enable_immutable_ledger: DF.Check
-		enable_loyalty_point_program: DF.Check
 		enable_party_matching: DF.Check
 		exchange_gain_loss_posting_date: DF.Literal["Invoice", "Payment", "Reconciliation Date"]
-		fetch_valuation_rate_for_internal_transaction: DF.Check
+		frozen_accounts_modifier: DF.Link | None
 		general_ledger_remarks_length: DF.Int
 		ignore_account_closing_balance: DF.Check
 		ignore_is_opening_check_for_reporting: DF.Check
-		maintain_same_internal_transaction_rate: DF.Check
-		maintain_same_rate_action: DF.Literal["Stop", "Warn"]
 		make_payment_via_journal_entry: DF.Check
 		merge_similar_account_heads: DF.Check
 		over_billing_allowance: DF.Currency
-		receivable_payable_fetch_method: DF.Literal["Buffered Cursor", "UnBuffered Cursor", "Raw SQL"]
+		post_change_gl_entries: DF.Check
 		receivable_payable_remarks_length: DF.Int
 		reconciliation_queue_size: DF.Int
 		role_allowed_to_over_bill: DF.Link | None
-		role_to_notify_on_depreciation_failure: DF.Link | None
-		role_to_override_stop_action: DF.Link | None
 		round_row_wise_tax: DF.Check
 		show_balance_in_coa: DF.Check
 		show_inclusive_tax_in_print: DF.Check
@@ -97,12 +66,9 @@ class AccountsSettings(Document):
 		submit_journal_entries: DF.Check
 		unlink_advance_payment_on_cancelation_of_order: DF.Check
 		unlink_payment_on_cancellation_of_invoice: DF.Check
-		use_legacy_budget_controller: DF.Check
-		use_legacy_controller_for_pcv: DF.Check
 	# end: auto-generated types
 
 	def validate(self):
-		self.validate_auto_tax_settings()
 		old_doc = self.get_doc_before_save()
 		clear_cache = False
 
@@ -123,17 +89,8 @@ class AccountsSettings(Document):
 		if old_doc.show_payment_schedule_in_print != self.show_payment_schedule_in_print:
 			self.enable_payment_schedule_in_print()
 
-		if old_doc.enable_accounting_dimensions != self.enable_accounting_dimensions:
-			toggle_accounting_dimension_sections(not self.enable_accounting_dimensions)
-			clear_cache = True
-
-		if old_doc.enable_discounts_and_margin != self.enable_discounts_and_margin:
-			toggle_sales_discount_section(not self.enable_discounts_and_margin)
-			clear_cache = True
-
-		if old_doc.enable_loyalty_point_program != self.enable_loyalty_point_program:
-			toggle_loyalty_point_program_section(not self.enable_loyalty_point_program)
-			clear_cache = True
+		if old_doc.acc_frozen_upto != self.acc_frozen_upto:
+			self.validate_pending_reposts()
 
 		if clear_cache:
 			frappe.clear_cache()
@@ -161,6 +118,10 @@ class AccountsSettings(Document):
 				validate_fields_for_doctype=False,
 			)
 
+	def validate_pending_reposts(self):
+		if self.acc_frozen_upto:
+			check_pending_reposting(self.acc_frozen_upto)
+
 	def validate_and_sync_auto_reconcile_config(self):
 		if self.has_value_changed("auto_reconciliation_job_trigger"):
 			if (
@@ -174,53 +135,3 @@ class AccountsSettings(Document):
 		if self.has_value_changed("reconciliation_queue_size"):
 			if cint(self.reconciliation_queue_size) < 5 or cint(self.reconciliation_queue_size) > 100:
 				frappe.throw(_("Queue Size should be between 5 and 100"))
-
-	def validate_auto_tax_settings(self):
-		if self.add_taxes_from_item_tax_template and self.add_taxes_from_taxes_and_charges_template:
-			frappe.throw(
-				_("You cannot enable both the settings '{0}' and '{1}'.").format(
-					frappe.bold(_(self.meta.get_label("add_taxes_from_item_tax_template"))),
-					frappe.bold(_(self.meta.get_label("add_taxes_from_taxes_and_charges_template"))),
-				),
-				title=_("Auto Tax Settings Error"),
-			)
-
-	@frappe.whitelist()
-	def drop_ar_sql_procedures(self):
-		from erpnext.accounts.report.accounts_receivable.accounts_receivable import InitSQLProceduresForAR
-
-		frappe.db.sql(f"drop procedure if exists {InitSQLProceduresForAR.init_procedure_name}")
-		frappe.db.sql(f"drop procedure if exists {InitSQLProceduresForAR.allocate_procedure_name}")
-
-
-def toggle_accounting_dimension_sections(hide):
-	accounting_dimension_doctypes = frappe.get_hooks("accounting_dimension_doctypes")
-	for doctype in accounting_dimension_doctypes:
-		create_property_setter_for_hiding_field(doctype, "accounting_dimensions_section", hide)
-
-
-def toggle_sales_discount_section(hide):
-	for doctype in SELLING_DOCTYPES + BUYING_DOCTYPES:
-		meta = frappe.get_meta(doctype)
-		if meta.has_field("additional_discount_section"):
-			create_property_setter_for_hiding_field(doctype, "additional_discount_section", hide)
-		if meta.has_field("discount_and_margin"):
-			create_property_setter_for_hiding_field(doctype, "discount_and_margin", hide)
-
-
-def toggle_loyalty_point_program_section(hide):
-	for doctype in SELLING_DOCTYPES:
-		meta = frappe.get_meta(doctype)
-		if meta.has_field("loyalty_points_redemption"):
-			create_property_setter_for_hiding_field(doctype, "loyalty_points_redemption", hide)
-
-
-def create_property_setter_for_hiding_field(doctype, field_name, hide):
-	make_property_setter(
-		doctype,
-		field_name,
-		"hidden",
-		hide,
-		"Check",
-		validate_fields_for_doctype=False,
-	)

erpnext/accounts/doctype/accounts_settings/regional/united_states.js

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

erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.js

@@ -1,9 +1,8 @@
 // Copyright (c) 2024, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on("Advance Payment Ledger Entry", {
-	refresh(frm) {
-		frm.set_currency_labels(["amount"], frm.doc.currency);
-		frm.set_currency_labels(["base_amount"], erpnext.get_currency(frm.doc.company));
-	},
-});
+// frappe.ui.form.on("Advance Payment Ledger Entry", {
+// 	refresh(frm) {
+
+// 	},
+// });

erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json

@@ -10,12 +10,9 @@
   "voucher_no",
   "against_voucher_type",
   "against_voucher_no",
-  "currency",
-  "exchange_rate",
   "amount",
-  "base_amount",
-  "event",
-  "delinked"
+  "currency",
+  "event"
  ],
  "fields": [
   {
@@ -50,7 +47,6 @@
    "fieldname": "amount",
    "fieldtype": "Currency",
    "label": "Amount",
-   "options": "currency",
    "read_only": 1
   },
   {
@@ -72,36 +68,12 @@
    "label": "Company",
    "options": "Company",
    "read_only": 1
-  },
-  {
-   "default": "0",
-   "fieldname": "delinked",
-   "fieldtype": "Check",
-   "label": "DeLinked",
-   "read_only": 1
-  },
-  {
-   "depends_on": "base_amount",
-   "fieldname": "base_amount",
-   "fieldtype": "Currency",
-   "label": "Amount (Company Currency)",
-   "options": "Company:company:default_currency",
-   "read_only": 1
-  },
-  {
-   "depends_on": "exchange_rate",
-   "fieldname": "exchange_rate",
-   "fieldtype": "Float",
-   "label": "Exchange Rate",
-   "precision": "9",
-   "read_only": 1
   }
  ],
- "grid_page_length": 50,
  "in_create": 1,
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2025-11-13 12:45:03.014555",
+ "modified": "2024-11-05 10:31:28.736671",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Advance Payment Ledger Entry",
@@ -135,8 +107,7 @@
    "share": 1
   }
  ],
- "row_format": "Dynamic",
  "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
-}
+}

erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.py

@@ -1,11 +1,9 @@
 # Copyright (c) 2024, Frappe Technologies Pvt. Ltd. and contributors
 # For license information, please see license.txt
 
-import frappe
+# import frappe
 from frappe.model.document import Document
 
-from erpnext.accounts.utils import get_advance_payment_doctypes, update_voucher_outstanding
-
 
 class AdvancePaymentLedgerEntry(Document):
 	# begin: auto-generated types
@@ -19,32 +17,11 @@ class AdvancePaymentLedgerEntry(Document):
 		against_voucher_no: DF.DynamicLink | None
 		against_voucher_type: DF.Link | None
 		amount: DF.Currency
-		base_amount: DF.Currency
 		company: DF.Link | None
 		currency: DF.Link | None
-		delinked: DF.Check
 		event: DF.Data | None
-		exchange_rate: DF.Float
 		voucher_no: DF.DynamicLink | None
 		voucher_type: DF.Link | None
 	# end: auto-generated types
 
-	def on_update(self):
-		if (
-			self.against_voucher_type in get_advance_payment_doctypes()
-			and self.flags.update_outstanding == "Yes"
-			and not frappe.flags.is_reverse_depr_entry
-		):
-			update_voucher_outstanding(self.against_voucher_type, self.against_voucher_no, None, None, None)
-
-
-def on_doctype_update():
-	frappe.db.add_index(
-		"Advance Payment Ledger Entry",
-		["against_voucher_type", "against_voucher_no"],
-	)
-
-	frappe.db.add_index(
-		"Advance Payment Ledger Entry",
-		["voucher_type", "voucher_no"],
-	)
+	pass

erpnext/accounts/doctype/advance_payment_ledger_entry/test_advance_payment_ledger_entry.py

@@ -2,7 +2,7 @@
 # See license.txt
 
 import frappe
-from frappe.tests import IntegrationTestCase
+from frappe.tests import IntegrationTestCase, UnitTestCase
 from frappe.utils import nowdate, today
 
 from erpnext.accounts.doctype.payment_entry.test_payment_entry import get_payment_entry

erpnext/accounts/doctype/advance_tax/advance_tax.json

@@ -0,0 +1,57 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "creation": "2021-11-25 10:24:39.836195",
+ "doctype": "DocType",
+ "engine": "InnoDB",
+ "field_order": [
+  "reference_type",
+  "reference_name",
+  "reference_detail",
+  "account_head",
+  "allocated_amount"
+ ],
+ "fields": [
+  {
+   "fieldname": "reference_type",
+   "fieldtype": "Link",
+   "label": "Reference Type",
+   "options": "DocType"
+  },
+  {
+   "fieldname": "reference_name",
+   "fieldtype": "Dynamic Link",
+   "label": "Reference Name",
+   "options": "reference_type"
+  },
+  {
+   "fieldname": "reference_detail",
+   "fieldtype": "Data",
+   "label": "Reference Detail"
+  },
+  {
+   "fieldname": "account_head",
+   "fieldtype": "Link",
+   "label": "Account Head",
+   "options": "Account"
+  },
+  {
+   "fieldname": "allocated_amount",
+   "fieldtype": "Currency",
+   "label": "Allocated Amount",
+   "options": "party_account_currency"
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2024-03-27 13:05:58.308002",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Advance Tax",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
+}

erpnext/accounts/doctype/advance_tax/advance_tax.py

@@ -1,11 +1,11 @@
-# Copyright (c) 2025, Frappe Technologies Pvt. Ltd. and contributors
+# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and contributors
 # For license information, please see license.txt
 
 # import frappe
 from frappe.model.document import Document
 
 
-class PaymentReference(Document):
+class AdvanceTax(Document):
 	# begin: auto-generated types
 	# This code is auto-generated. Do not modify anything in this block.
 
@@ -14,14 +14,14 @@ class PaymentReference(Document):
 	if TYPE_CHECKING:
 		from frappe.types import DF
 
-		amount: DF.Currency
-		description: DF.SmallText | None
-		due_date: DF.Date | None
+		account_head: DF.Link | None
+		allocated_amount: DF.Currency
 		parent: DF.Data
 		parentfield: DF.Data
 		parenttype: DF.Data
-		payment_schedule: DF.Link | None
-		payment_term: DF.Link | None
+		reference_detail: DF.Data | None
+		reference_name: DF.DynamicLink | None
+		reference_type: DF.Link | None
 	# end: auto-generated types
 
 	pass

erpnext/accounts/doctype/advance_taxes_and_charges/advance_taxes_and_charges.json

@@ -14,11 +14,9 @@
   "description",
   "included_in_paid_amount",
   "set_by_item_tax_template",
-  "is_tax_withholding_account",
   "accounting_dimensions_section",
   "cost_center",
   "dimension_col_break",
-  "project",
   "section_break_8",
   "rate",
   "section_break_9",
@@ -26,6 +24,7 @@
   "net_amount",
   "tax_amount",
   "total",
+  "allocated_amount",
   "column_break_13",
   "base_tax_amount",
   "base_net_amount",
@@ -96,13 +95,6 @@
    "fieldname": "dimension_col_break",
    "fieldtype": "Column Break"
   },
-  {
-   "allow_on_submit": 1,
-   "fieldname": "project",
-   "fieldtype": "Link",
-   "label": "Project",
-   "options": "Project"
-  },
   {
    "fieldname": "section_break_8",
    "fieldtype": "Section Break"
@@ -172,6 +164,12 @@
    "fieldtype": "Check",
    "label": "Considered In Paid Amount"
   },
+  {
+   "fieldname": "allocated_amount",
+   "fieldtype": "Currency",
+   "label": "Allocated Amount",
+   "options": "currency"
+  },
   {
    "fetch_from": "account_head.account_currency",
    "fieldname": "currency",
@@ -207,26 +205,18 @@
    "print_hide": 1,
    "read_only": 1,
    "report_hide": 1
-  },
-  {
-   "default": "0",
-   "fieldname": "is_tax_withholding_account",
-   "fieldtype": "Check",
-   "label": "Is Tax Withholding Account",
-   "read_only": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2025-12-15 06:42:18.707671",
+ "modified": "2024-11-22 19:16:22.346267",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Advance Taxes and Charges",
  "owner": "Administrator",
  "permissions": [],
- "row_format": "Dynamic",
  "sort_field": "creation",
  "sort_order": "ASC",
  "states": []
-}
+}

erpnext/accounts/doctype/advance_taxes_and_charges/advance_taxes_and_charges.py

@@ -17,6 +17,7 @@ class AdvanceTaxesandCharges(Document):
 
 		account_head: DF.Link
 		add_deduct_tax: DF.Literal["Add", "Deduct"]
+		allocated_amount: DF.Currency
 		base_net_amount: DF.Currency
 		base_tax_amount: DF.Currency
 		base_total: DF.Currency
@@ -27,12 +28,10 @@ class AdvanceTaxesandCharges(Document):
 		currency: DF.Link | None
 		description: DF.SmallText
 		included_in_paid_amount: DF.Check
-		is_tax_withholding_account: DF.Check
 		net_amount: DF.Currency
 		parent: DF.Data
 		parentfield: DF.Data
 		parenttype: DF.Data
-		project: DF.Link | None
 		rate: DF.Float
 		row_id: DF.Data | None
 		set_by_item_tax_template: DF.Check

erpnext/accounts/doctype/bank/bank.js

@@ -3,6 +3,9 @@
 frappe.provide("erpnext.integrations");
 
 frappe.ui.form.on("Bank", {
+	onload: function (frm) {
+		add_fields_to_mapping_table(frm);
+	},
 	refresh: function (frm) {
 		add_fields_to_mapping_table(frm);
 		frm.toggle_display(["address_html", "contact_html"], !frm.doc.__islocal);
@@ -34,11 +37,11 @@ let add_fields_to_mapping_table = function (frm) {
 		});
 	});
 
-	const grid = frm.fields_dict.bank_transaction_mapping?.grid;
-
-	if (grid) {
-		grid.update_docfield_property("bank_transaction_field", "options", options);
-	}
+	frm.fields_dict.bank_transaction_mapping.grid.update_docfield_property(
+		"bank_transaction_field",
+		"options",
+		options
+	);
 };
 
 erpnext.integrations.refreshPlaidLink = class refreshPlaidLink {
@@ -113,7 +116,7 @@ erpnext.integrations.refreshPlaidLink = class refreshPlaidLink {
 				"There was an issue connecting to Plaid's authentication server. Check browser console for more information"
 			)
 		);
-		console.error(error);
+		console.log(error);
 	}
 
 	plaid_success(token, response) {

erpnext/accounts/doctype/bank_account/bank_account.js

@@ -42,4 +42,8 @@ frappe.ui.form.on("Bank Account", {
 			});
 		}
 	},
+
+	is_company_account: function (frm) {
+		frm.set_df_property("account", "reqd", frm.doc.is_company_account);
+	},
 });

erpnext/accounts/doctype/bank_account/bank_account.json

@@ -52,7 +52,6 @@
    "fieldtype": "Link",
    "in_list_view": 1,
    "label": "Company Account",
-   "mandatory_depends_on": "is_company_account",
    "options": "Account"
   },
   {
@@ -99,7 +98,6 @@
    "in_list_view": 1,
    "in_standard_filter": 1,
    "label": "Company",
-   "mandatory_depends_on": "is_company_account",
    "options": "Company"
   },
   {
@@ -134,8 +132,7 @@
    "fieldtype": "Data",
    "in_list_view": 1,
    "label": "IBAN",
-   "length": 34,
-   "options": "IBAN"
+   "length": 30
   },
   {
    "fieldname": "column_break_12",
@@ -211,7 +208,6 @@
    "label": "Disabled"
   }
  ],
- "grid_page_length": 50,
  "links": [
   {
    "group": "Transactions",
@@ -254,7 +250,7 @@
    "link_fieldname": "default_bank_account"
   }
  ],
- "modified": "2026-01-20 00:46:16.633364",
+ "modified": "2024-10-30 09:41:14.113414",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Bank Account",
@@ -286,10 +282,9 @@
    "write": 1
   }
  ],
- "row_format": "Dynamic",
  "search_fields": "bank,account",
  "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
-}
+}

erpnext/accounts/doctype/bank_account/bank_account.py

@@ -51,29 +51,55 @@ class BankAccount(Document):
 		delete_contact_and_address("Bank Account", self.name)
 
 	def validate(self):
-		self.validate_is_company_account()
+		self.validate_company()
+		self.validate_iban()
+		self.validate_account()
 		self.update_default_bank_account()
 
-	def validate_is_company_account(self):
-		if self.is_company_account:
-			if not self.company:
-				frappe.throw(_("Company is mandatory for company account"))
-
-			if not self.account:
-				frappe.throw(_("Company Account is mandatory"))
-
-			self.validate_account()
-
 	def validate_account(self):
-		if accounts := frappe.db.get_all(
-			"Bank Account", filters={"account": self.account, "name": ["!=", self.name]}, as_list=1
-		):
-			frappe.throw(
-				_("'{0}' account is already used by {1}. Use another account.").format(
-					frappe.bold(self.account),
-					frappe.bold(comma_and([get_link_to_form(self.doctype, x[0]) for x in accounts])),
+		if self.account:
+			if accounts := frappe.db.get_all(
+				"Bank Account", filters={"account": self.account, "name": ["!=", self.name]}, as_list=1
+			):
+				frappe.throw(
+					_("'{0}' account is already used by {1}. Use another account.").format(
+						frappe.bold(self.account),
+						frappe.bold(comma_and([get_link_to_form(self.doctype, x[0]) for x in accounts])),
+					)
 				)
-			)
+
+	def validate_company(self):
+		if self.is_company_account and not self.company:
+			frappe.throw(_("Company is mandatory for company account"))
+
+	def validate_iban(self):
+		"""
+		Algorithm: https://en.wikipedia.org/wiki/International_Bank_Account_Number#Validating_the_IBAN
+		"""
+		# IBAN field is optional
+		if not self.iban:
+			return
+
+		def encode_char(c):
+			# Position in the alphabet (A=1, B=2, ...) plus nine
+			return str(9 + ord(c) - 64)
+
+		# remove whitespaces, upper case to get the right number from ord()
+		iban = "".join(self.iban.split(" ")).upper()
+
+		# Move country code and checksum from the start to the end
+		flipped = iban[4:] + iban[:4]
+
+		# Encode characters as numbers
+		encoded = [encode_char(c) if ord(c) >= 65 and ord(c) <= 90 else c for c in flipped]
+
+		try:
+			to_check = int("".join(encoded))
+		except ValueError:
+			frappe.throw(_("IBAN is not valid"))
+
+		if to_check % 97 != 1:
+			frappe.throw(_("IBAN is not valid"))
 
 	def update_default_bank_account(self):
 		if self.is_default and not self.disabled:
@@ -83,7 +109,6 @@ class BankAccount(Document):
 					"party_type": self.party_type,
 					"party": self.party,
 					"is_company_account": self.is_company_account,
-					"company": self.company,
 					"is_default": 1,
 					"disabled": 0,
 				},
@@ -92,6 +117,15 @@ class BankAccount(Document):
 			)
 
 
+@frappe.whitelist()
+def make_bank_account(doctype, docname):
+	doc = frappe.new_doc("Bank Account")
+	doc.party_type = doctype
+	doc.party = docname
+
+	return doc
+
+
 def get_party_bank_account(party_type, party):
 	return frappe.db.get_value(
 		"Bank Account",

erpnext/accounts/doctype/bank_account/test_bank_account.py

@@ -8,4 +8,38 @@ from frappe.tests import IntegrationTestCase
 
 
 class TestBankAccount(IntegrationTestCase):
-	pass
+	def test_validate_iban(self):
+		valid_ibans = [
+			"GB82 WEST 1234 5698 7654 32",
+			"DE91 1000 0000 0123 4567 89",
+			"FR76 3000 6000 0112 3456 7890 189",
+		]
+
+		invalid_ibans = [
+			# wrong checksum (3rd place)
+			"GB72 WEST 1234 5698 7654 32",
+			"DE81 1000 0000 0123 4567 89",
+			"FR66 3000 6000 0112 3456 7890 189",
+		]
+
+		bank_account = frappe.get_doc({"doctype": "Bank Account"})
+
+		try:
+			bank_account.validate_iban()
+		except AttributeError:
+			msg = "BankAccount.validate_iban() failed for empty IBAN"
+			self.fail(msg=msg)
+
+		for iban in valid_ibans:
+			bank_account.iban = iban
+			try:
+				bank_account.validate_iban()
+			except ValidationError:
+				msg = f"BankAccount.validate_iban() failed for valid IBAN {iban}"
+				self.fail(msg=msg)
+
+		for not_iban in invalid_ibans:
+			bank_account.iban = not_iban
+			msg = f"BankAccount.validate_iban() accepted invalid IBAN {not_iban}"
+			with self.assertRaises(ValidationError, msg=msg):
+				bank_account.validate_iban()

erpnext/accounts/doctype/bank_clearance/bank_clearance.py

@@ -89,92 +89,46 @@ class BankClearance(Document):
 
 	@frappe.whitelist()
 	def update_clearance_date(self):
-		invalid_document = []
-		invalid_cheque_date = []
-		entries_to_update = []
-
-		def validate_entry(d):
-			is_valid = True
-			if not d.payment_document:
-				invalid_document.append(str(d.idx))
-				is_valid = False
-
-			if d.clearance_date and d.cheque_date and getdate(d.clearance_date) < getdate(d.cheque_date):
-				invalid_cheque_date.append(str(d.idx))
-				is_valid = False
-
-			return is_valid
-
+		clearance_date_updated = False
 		for d in self.get("payment_entries"):
-			if validate_entry(d) and (d.clearance_date or self.include_reconciled_entries):
+			if d.clearance_date:
+				if not d.payment_document:
+					frappe.throw(_("Row #{0}: Payment document is required to complete the transaction"))
+
+				if d.cheque_date and getdate(d.clearance_date) < getdate(d.cheque_date):
+					frappe.throw(
+						_("Row #{0}: For {1} Clearance date {2} cannot be before Cheque Date {3}").format(
+							d.idx,
+							get_link_to_form(d.payment_document, d.payment_entry),
+							d.clearance_date,
+							d.cheque_date,
+						)
+					)
+
+			if d.clearance_date or self.include_reconciled_entries:
 				if not d.clearance_date:
 					d.clearance_date = None
 
-				entries_to_update.append(d)
-
-		if invalid_document or invalid_cheque_date:
-			msg = _("<p>Please correct the following row(s):</p><ul>")
-			if invalid_document:
-				msg += _("<li>Payment document required for row(s): {0}</li>").format(
-					", ".join(invalid_document)
-				)
-
-			if invalid_cheque_date:
-				msg += _("<li>Clearance date must be after cheque date for row(s): {0}</li>").format(
-					", ".join(invalid_cheque_date)
-				)
-
-			msg += "</ul>"
-			msgprint(_(msg))
-			return
-
-		if not entries_to_update:
-			msgprint(_("Clearance Date not mentioned"))
-			return
-
-		for d in entries_to_update:
-			if d.payment_document == "Sales Invoice":
-				old_clearance_date = frappe.db.get_value(
-					"Sales Invoice Payment",
-					{
-						"parent": d.payment_entry,
-						"account": self.account,
-						"amount": [">", 0],
-					},
-					"clearance_date",
-				)
-				if d.clearance_date or old_clearance_date:
+				if d.payment_document == "Sales Invoice":
 					frappe.db.set_value(
 						"Sales Invoice Payment",
 						{"parent": d.payment_entry, "account": self.get("account"), "amount": [">", 0]},
 						"clearance_date",
 						d.clearance_date,
 					)
-					sales_invoice = frappe.get_lazy_doc("Sales Invoice", d.payment_entry)
-					sales_invoice.add_comment(
-						"Comment",
-						_("Clearance date changed from {0} to {1} via Bank Clearance Tool").format(
-							old_clearance_date, d.clearance_date
-						),
-					)
 
-			else:
-				payment_entry = frappe.get_lazy_doc(d.payment_document, d.payment_entry)
-				old_clearance_date = payment_entry.clearance_date
-
-				if d.clearance_date or old_clearance_date:
+				else:
 					# using db_set to trigger notification
+					payment_entry = frappe.get_doc(d.payment_document, d.payment_entry)
 					payment_entry.db_set("clearance_date", d.clearance_date)
 
-					payment_entry.add_comment(
-						"Comment",
-						_("Clearance date changed from {0} to {1} via Bank Clearance Tool").format(
-							old_clearance_date, d.clearance_date
-						),
-					)
+				clearance_date_updated = True
 
-		self.get_payment_entries()
-		msgprint(_("Clearance Date updated"))
+		if clearance_date_updated:
+			self.get_payment_entries()
+			msgprint(_("Clearance Date updated"))
+		else:
+			msgprint(_("Clearance Date not mentioned"))
 
 
 def get_payment_entries_for_bank_clearance(
@@ -183,10 +137,8 @@ def get_payment_entries_for_bank_clearance(
 	entries = []
 
 	condition = ""
-	pe_condition = ""
 	if not include_reconciled_entries:
 		condition = "and (clearance_date IS NULL or clearance_date='0000-00-00')"
-		pe_condition = "and (pe.clearance_date IS NULL or pe.clearance_date='0000-00-00')"
 
 	journal_entries = frappe.db.sql(
 		f"""
@@ -211,20 +163,19 @@ def get_payment_entries_for_bank_clearance(
 	payment_entries = frappe.db.sql(
 		f"""
 			select
-				"Payment Entry" as payment_document, pe.name as payment_entry,
-				pe.reference_no as cheque_number, pe.reference_date as cheque_date,
-				if(pe.paid_from=%(account)s, pe.paid_amount + if(pe.payment_type = 'Pay' and c.default_currency = pe.paid_from_account_currency, pe.base_total_taxes_and_charges, pe.total_taxes_and_charges) , 0) as credit,
-				if(pe.paid_from=%(account)s, 0, pe.received_amount + pe.total_taxes_and_charges) as debit,
-				pe.posting_date, ifnull(pe.party,if(pe.paid_from=%(account)s,pe.paid_to,pe.paid_from)) as against_account, pe.clearance_date,
-				if(pe.paid_to=%(account)s, pe.paid_to_account_currency, pe.paid_from_account_currency) as account_currency
-			from `tabPayment Entry` as pe
-			join `tabCompany` c on c.name = pe.company
+				"Payment Entry" as payment_document, name as payment_entry,
+				reference_no as cheque_number, reference_date as cheque_date,
+				if(paid_from=%(account)s, paid_amount + total_taxes_and_charges, 0) as credit,
+				if(paid_from=%(account)s, 0, received_amount + total_taxes_and_charges) as debit,
+				posting_date, ifnull(party,if(paid_from=%(account)s,paid_to,paid_from)) as against_account, clearance_date,
+				if(paid_to=%(account)s, paid_to_account_currency, paid_from_account_currency) as account_currency
+			from `tabPayment Entry`
 			where
-				(pe.paid_from=%(account)s or pe.paid_to=%(account)s) and pe.docstatus=1
-				and pe.posting_date >= %(from)s and pe.posting_date <= %(to)s
-				{pe_condition}
+				(paid_from=%(account)s or paid_to=%(account)s) and docstatus=1
+				and posting_date >= %(from)s and posting_date <= %(to)s
+				{condition}
 			order by
-				pe.posting_date ASC, pe.name DESC
+				posting_date ASC, name DESC
 		""",
 		{
 			"account": account,

erpnext/accounts/doctype/bank_clearance/test_bank_clearance.py

@@ -7,9 +7,6 @@ from frappe.tests import IntegrationTestCase
 from frappe.utils import add_months, getdate
 
 from erpnext.accounts.doctype.cost_center.test_cost_center import create_cost_center
-from erpnext.accounts.doctype.mode_of_payment.test_mode_of_payment import (
-	set_default_account_for_mode_of_payment,
-)
 from erpnext.accounts.doctype.payment_entry.test_payment_entry import get_payment_entry
 from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make_purchase_invoice
 from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
@@ -146,7 +143,7 @@ def make_payment_entry():
 
 	supplier = create_supplier(supplier_name="_Test Supplier")
 	pi = make_purchase_invoice(
-		supplier=supplier.name,
+		supplier=supplier,
 		supplier_warehouse="_Test Warehouse - _TC",
 		expense_account="Cost of Goods Sold - _TC",
 		uom="Nos",
@@ -175,13 +172,11 @@ def make_pos_sales_invoice():
 
 	customer = make_customer(customer="_Test Customer")
 
-	mode_of_payment = frappe.get_doc("Mode of Payment", "Wire Transfer")
-
-	set_default_account_for_mode_of_payment(mode_of_payment, "_Test Company", "_Test Bank Clearance - _TC")
-
 	si = create_sales_invoice(customer=customer, item="_Test Item", is_pos=1, qty=1, rate=1000, do_not_save=1)
 	si.set("payments", [])
-	si.append("payments", {"mode_of_payment": "Wire Transfer", "amount": 1000})
+	si.append(
+		"payments", {"mode_of_payment": "Cash", "account": "_Test Bank Clearance - _TC", "amount": 1000}
+	)
 	si.insert()
 	si.submit()
 

erpnext/accounts/doctype/bank_clearance_detail/bank_clearance_detail.json

@@ -30,7 +30,8 @@
    "label": "Payment Entry",
    "oldfieldname": "voucher_id",
    "oldfieldtype": "Link",
-   "options": "payment_document"
+   "options": "payment_document",
+   "width": "50"
   },
   {
    "columns": 2,
@@ -68,7 +69,7 @@
    "read_only": 1
   },
   {
-   "columns": 1,
+   "columns": 2,
    "fieldname": "cheque_number",
    "fieldtype": "Data",
    "in_list_view": 1,
@@ -78,10 +79,8 @@
    "read_only": 1
   },
   {
-   "columns": 2,
    "fieldname": "cheque_date",
    "fieldtype": "Date",
-   "in_list_view": 1,
    "label": "Cheque Date",
    "oldfieldname": "cheque_date",
    "oldfieldtype": "Date",
@@ -97,19 +96,17 @@
    "oldfieldtype": "Date"
   }
  ],
- "grid_page_length": 50,
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2025-12-17 14:33:45.913311",
+ "modified": "2024-03-27 13:06:37.609319",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Bank Clearance Detail",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "row_format": "Dynamic",
  "sort_field": "creation",
  "sort_order": "ASC",
  "states": []
-}
+}

erpnext/accounts/doctype/bank_guarantee/bank_guarantee.js

@@ -9,6 +9,13 @@ cur_frm.add_fetch("bank", "swift_number", "swift_number");
 
 frappe.ui.form.on("Bank Guarantee", {
 	setup: function (frm) {
+		frm.set_query("bank", function () {
+			return {
+				filters: {
+					company: frm.doc.company,
+				},
+			};
+		});
 		frm.set_query("bank_account", function () {
 			return {
 				filters: {

erpnext/accounts/doctype/bank_guarantee/bank_guarantee.json

@@ -146,7 +146,6 @@
    "fieldname": "iban",
    "fieldtype": "Data",
    "label": "IBAN",
-   "options": "IBAN",
    "read_only": 1
   },
   {
@@ -215,10 +214,9 @@
    "read_only": 1
   }
  ],
- "grid_page_length": 50,
  "is_submittable": 1,
  "links": [],
- "modified": "2025-08-29 11:52:33.550847",
+ "modified": "2024-03-27 13:06:37.731207",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Bank Guarantee",
@@ -252,10 +250,9 @@
   }
  ],
  "quick_entry": 1,
- "row_format": "Dynamic",
  "search_fields": "customer",
  "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "title_field": "customer"
-}
+}

erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py

@@ -9,7 +9,7 @@ from frappe import _
 from frappe.model.document import Document
 from frappe.query_builder.custom import ConstantColumn
 from frappe.query_builder.functions import Sum
-from frappe.utils import cint, create_batch, flt
+from frappe.utils import cint, flt
 
 from erpnext import get_default_cost_center
 from erpnext.accounts.doctype.bank_transaction.bank_transaction import get_total_allocated_amount
@@ -304,7 +304,6 @@ def create_payment_entry_bts(
 	project=None,
 	cost_center=None,
 	allow_edit=None,
-	company_bank_account=None,
 ):
 	# Create a new payment entry based on the bank transaction
 	bank_transaction = frappe.db.get_values(
@@ -346,9 +345,6 @@ def create_payment_entry_bts(
 	pe.project = project
 	pe.cost_center = cost_center
 
-	if company_bank_account:
-		pe.bank_account = company_bank_account
-
 	pe.validate()
 
 	if allow_edit:
@@ -381,17 +377,16 @@ def auto_reconcile_vouchers(
 	bank_transactions = get_bank_transactions(bank_account)
 
 	if len(bank_transactions) > 10:
-		for bank_transaction_batch in create_batch(bank_transactions, 1000):
-			frappe.enqueue(
-				method="erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.start_auto_reconcile",
-				queue="long",
-				bank_transactions=bank_transaction_batch,
-				from_date=from_date,
-				to_date=to_date,
-				filter_by_reference_date=filter_by_reference_date,
-				from_reference_date=from_reference_date,
-				to_reference_date=to_reference_date,
-			)
+		frappe.enqueue(
+			method="erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.start_auto_reconcile",
+			queue="long",
+			bank_transactions=bank_transactions,
+			from_date=from_date,
+			to_date=to_date,
+			filter_by_reference_date=filter_by_reference_date,
+			from_reference_date=from_reference_date,
+			to_reference_date=to_reference_date,
+		)
 		frappe.msgprint(_("Auto Reconciliation has started in the background"))
 	else:
 		start_auto_reconcile(
@@ -413,7 +408,7 @@ def start_auto_reconcile(
 	for transaction in bank_transactions:
 		linked_payments = get_linked_payments(
 			transaction.name,
-			["payment_entry", "journal_entry", "sales_invoice"],
+			["payment_entry", "journal_entry"],
 			from_date,
 			to_date,
 			filter_by_reference_date,
@@ -670,7 +665,7 @@ def get_matching_queries(
 		queries.append(query)
 
 	if transaction.deposit > 0.0 and "sales_invoice" in document_types:
-		query = get_si_matching_query(exact_match, currency, common_filters, transaction)
+		query = get_si_matching_query(exact_match, currency, common_filters)
 		queries.append(query)
 
 	if transaction.withdrawal > 0.0:
@@ -858,14 +853,11 @@ def get_je_matching_query(
 	return query
 
 
-def get_si_matching_query(exact_match, currency, common_filters, transaction):
+def get_si_matching_query(exact_match, currency, common_filters):
 	# get matching sales invoice query
 	si = frappe.qb.DocType("Sales Invoice")
 	sip = frappe.qb.DocType("Sales Invoice Payment")
 
-	ref_condition = sip.reference_no == transaction.reference_number
-	ref_rank = frappe.qb.terms.Case().when(ref_condition, 1).else_(0)
-
 	amount_equality = sip.amount == common_filters.amount
 	amount_rank = frappe.qb.terms.Case().when(amount_equality, 1).else_(0)
 	amount_condition = amount_equality if exact_match else sip.amount > 0.0
@@ -878,11 +870,11 @@ def get_si_matching_query(exact_match, currency, common_filters, transaction):
 		.join(si)
 		.on(sip.parent == si.name)
 		.select(
-			(ref_rank + party_rank + amount_rank + 1).as_("rank"),
+			(party_rank + amount_rank + 1).as_("rank"),
 			ConstantColumn("Sales Invoice").as_("doctype"),
 			si.name,
 			sip.amount.as_("paid_amount"),
-			sip.reference_no,
+			ConstantColumn("").as_("reference_no"),
 			ConstantColumn("").as_("reference_date"),
 			si.customer.as_("party"),
 			ConstantColumn("Customer").as_("party_type"),
@@ -896,9 +888,6 @@ def get_si_matching_query(exact_match, currency, common_filters, transaction):
 		.where(si.currency == currency)
 	)
 
-	if frappe.flags.auto_reconcile_vouchers is True:
-		query = query.where(ref_condition)
-
 	return query
 
 

erpnext/accounts/doctype/bank_reconciliation_tool/test_bank_reconciliation_tool.py

@@ -40,7 +40,7 @@ class TestBankReconciliationTool(AccountsTestMixin, IntegrationTestCase):
 				{
 					"doctype": "Bank Account",
 					"account_name": "HDFC _current_",
-					"bank": bank.name,
+					"bank": bank,
 					"is_company_account": True,
 					"account": self.bank,  # account from Chart of Accounts
 				}

erpnext/accounts/doctype/bank_statement_import/bank_statement_import.js

@@ -70,7 +70,7 @@ frappe.ui.form.on("Bank Statement Import", {
 
 		frm.get_field("import_file").df.options = {
 			restrictions: {
-				allowed_file_types: [".csv", ".xls", ".xlsx", ".TXT", ".txt"],
+				allowed_file_types: [".csv", ".xls", ".xlsx"],
 			},
 		};
 
@@ -81,7 +81,6 @@ frappe.ui.form.on("Bank Statement Import", {
 
 	refresh(frm) {
 		frm.page.hide_icon_group();
-		frm.trigger("toggle_mt940_note");
 		frm.trigger("update_indicators");
 		frm.trigger("import_file");
 		frm.trigger("show_import_log");
@@ -193,24 +192,6 @@ frappe.ui.form.on("Bank Statement Import", {
 		});
 	},
 
-	import_mt940_fromat(frm) {
-		frm.trigger("toggle_mt940_note");
-		frm.save();
-	},
-
-	toggle_mt940_note(frm) {
-		if (!frm.doc.import_mt940_fromat) {
-			frm.set_df_property("custom_delimiters", "hidden", 0);
-			frm.set_df_property("google_sheets_url", "hidden", 0);
-			frm.set_df_property("html_5", "hidden", 0);
-		} else {
-			frm.set_df_property("custom_delimiters", "hidden", 1);
-			frm.set_df_property("google_sheets_url", "hidden", 1);
-			frm.set_df_property("html_5", "hidden", 1);
-		}
-		frm.set_value("import_mt940_fromat", frm.doc.import_mt940_fromat);
-	},
-
 	show_report_error_button(frm) {
 		if (frm.doc.status === "Error") {
 			frappe.db
@@ -252,7 +233,7 @@ frappe.ui.form.on("Bank Statement Import", {
 
 		open_url_post(method, {
 			doctype: "Bank Transaction",
-			export_records: "blank_template",
+			export_records: "5_records",
 			export_fields: {
 				"Bank Transaction": [
 					"date",
@@ -309,45 +290,23 @@ frappe.ui.form.on("Bank Statement Import", {
 			.html(__("Loading import file..."))
 			.appendTo(frm.get_field("import_preview").$wrapper);
 
-		frappe.run_serially([
-			// Convert MT940 to CSV if .txt file
-			() => {
-				if (frm.doc.import_file && frm.doc.import_file.toLowerCase().endsWith(".txt")) {
-					return frm
-						.call({
-							method: "convert_mt940_to_csv",
-							args: {
-								data_import: frm.doc.name,
-								mt940_file_path: frm.doc.import_file,
-							},
-						})
-						.then((r) => {
-							const file_url = r.message;
-							frm.set_value("import_file", file_url);
-							frm.save();
-						});
-				}
+		frm.call({
+			method: "get_preview_from_template",
+			args: {
+				data_import: frm.doc.name,
+				import_file: frm.doc.import_file,
+				google_sheets_url: frm.doc.google_sheets_url,
 			},
-			() => {
-				frm.call({
-					method: "get_preview_from_template",
-					args: {
-						data_import: frm.doc.name,
-						import_file: frm.doc.import_file,
-						google_sheets_url: frm.doc.google_sheets_url,
-					},
-					error_handlers: {
-						TimestampMismatchError() {
-							// ignore this error
-						},
-					},
-				}).then((r) => {
-					let preview_data = r.message;
-					frm.events.show_import_preview(frm, preview_data);
-					frm.events.show_import_warnings(frm, preview_data);
-				});
+			error_handlers: {
+				TimestampMismatchError() {
+					// ignore this error
+				},
 			},
-		]);
+		}).then((r) => {
+			let preview_data = r.message;
+			frm.events.show_import_preview(frm, preview_data);
+			frm.events.show_import_warnings(frm, preview_data);
+		});
 	},
 	// method: 'frappe.core.doctype.data_import.data_import.get_preview_from_template',
 

erpnext/accounts/doctype/bank_statement_import/bank_statement_import.json

@@ -11,7 +11,6 @@
   "bank_account",
   "bank",
   "column_break_4",
-  "import_mt940_fromat",
   "custom_delimiters",
   "delimiter_options",
   "google_sheets_url",
@@ -21,7 +20,6 @@
   "download_template",
   "status",
   "template_options",
-  "use_csv_sniffer",
   "import_warnings_section",
   "template_warnings",
   "import_warnings",
@@ -209,28 +207,14 @@
    "fieldname": "delimiter_options",
    "fieldtype": "Data",
    "label": "Delimiter options"
-  },
-  {
-   "default": "0",
-   "fieldname": "use_csv_sniffer",
-   "fieldtype": "Check",
-   "hidden": 1,
-   "label": "Use CSV Sniffer"
-  },
-  {
-   "default": "0",
-   "fieldname": "import_mt940_fromat",
-   "fieldtype": "Check",
-   "label": "Import MT940 Fromat"
   }
  ],
  "hide_toolbar": 1,
  "links": [],
- "modified": "2025-06-11 02:23:22.159961",
+ "modified": "2024-06-25 17:32:07.658250",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Bank Statement Import",
- "naming_rule": "Expression",
  "owner": "Administrator",
  "permissions": [
   {
@@ -246,9 +230,8 @@
    "write": 1
   }
  ],
- "row_format": "Dynamic",
  "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
-}
+}

erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py

@@ -3,20 +3,15 @@
 
 
 import csv
-import io
 import json
 import re
-from datetime import date, datetime
 
 import frappe
-import mt940
 import openpyxl
 from frappe import _
 from frappe.core.doctype.data_import.data_import import DataImport
 from frappe.core.doctype.data_import.importer import Importer, ImportFile
-from frappe.query_builder.functions import Count
 from frappe.utils.background_jobs import enqueue
-from frappe.utils.file_manager import get_file, save_file
 from frappe.utils.xlsxutils import ILLEGAL_CHARACTERS_RE, handle_html
 from openpyxl.styles import Font
 from openpyxl.utils import get_column_letter
@@ -40,7 +35,6 @@ class BankStatementImport(DataImport):
 		delimiter_options: DF.Data | None
 		google_sheets_url: DF.Data | None
 		import_file: DF.Attach | None
-		import_mt940_fromat: DF.Check
 		import_type: DF.Literal["", "Insert New Records", "Update Existing Records"]
 		mute_emails: DF.Check
 		reference_doctype: DF.Link
@@ -49,7 +43,6 @@ class BankStatementImport(DataImport):
 		submit_after_import: DF.Check
 		template_options: DF.Code | None
 		template_warnings: DF.Code | None
-		use_csv_sniffer: DF.Check
 	# end: auto-generated types
 
 	def __init__(self, *args, **kwargs):
@@ -72,9 +65,8 @@ class BankStatementImport(DataImport):
 
 			self.template_warnings = ""
 
-		if self.import_file and not self.import_file.lower().endswith(".txt"):
-			self.validate_import_file()
-			self.validate_google_sheets_url()
+		self.validate_import_file()
+		self.validate_google_sheets_url()
 
 	def start_import(self):
 		preview = frappe.get_doc("Bank Statement Import", self.name).get_preview_from_template(
@@ -87,7 +79,7 @@ class BankStatementImport(DataImport):
 		from frappe.utils.background_jobs import is_job_enqueued
 		from frappe.utils.scheduler import is_scheduler_inactive
 
-		run_now = frappe.in_test or frappe.conf.developer_mode
+		run_now = frappe.flags.in_test or frappe.conf.developer_mode
 		if is_scheduler_inactive() and not run_now:
 			frappe.throw(_("Scheduler is inactive. Cannot import data."), title=_("Scheduler Inactive"))
 
@@ -112,102 +104,6 @@ class BankStatementImport(DataImport):
 		return None
 
 
-def preprocess_mt940_content(content: str) -> str:
-	"""Preprocess MT940 content to fix statement number format issues.
-
-	The MT940 standard expects statement numbers to be maximum 5 digits,
-	but some banks provide longer statement numbers that cause parsing errors.
-	This function truncates statement numbers longer than 5 digits to the last 5 digits.
-	"""
-	# Fast-path: bail if no :28C: tag exists
-	if ":28C:" not in content:
-		return content
-
-	# Match :28C: at start of line, capture digits and optional /seq, preserve whitespace
-	pattern = re.compile(r"(?m)^(:28C:)(\d{6,})(/\d+)?(\s*)$")
-
-	def replace_statement_number(match):
-		prefix = match.group(1)  # ':28C:'
-		statement_num = match.group(2)  # The statement number
-		sequence_part = match.group(3) or ""  # The sequence part like '/1'
-		trailing_space = match.group(4) or ""  # Preserve trailing whitespace
-
-		# If statement number is longer than 5 digits, truncate to last 5 digits
-		if len(statement_num) > 5:
-			statement_num = statement_num[-5:]
-
-		return prefix + statement_num + sequence_part + trailing_space
-
-	# Apply the replacement
-	processed_content = pattern.sub(replace_statement_number, content)
-	return processed_content
-
-
-@frappe.whitelist()
-def convert_mt940_to_csv(data_import, mt940_file_path):
-	doc = frappe.get_doc("Bank Statement Import", data_import)
-
-	_file_doc, content = get_file(mt940_file_path)
-
-	is_mt940 = is_mt940_format(content)
-	if not is_mt940:
-		frappe.throw(_("The uploaded file does not appear to be in valid MT940 format."))
-
-	if is_mt940 and not doc.import_mt940_fromat:
-		frappe.throw(_("MT940 file detected. Please enable 'Import MT940 Format' to proceed."))
-
-	try:
-		# Preprocess MT940 content to fix statement number format issues
-		processed_content = preprocess_mt940_content(content)
-		transactions = mt940.parse(processed_content)
-	except Exception as e:
-		frappe.throw(_("Failed to parse MT940 format. Error: {0}").format(str(e)))
-
-	if not transactions:
-		frappe.throw(_("Parsed file is not in valid MT940 format or contains no transactions."))
-
-	# Use in-memory file buffer instead of writing to temp file
-	csv_buffer = io.StringIO()
-	writer = csv.writer(csv_buffer)
-
-	headers = ["Date", "Deposit", "Withdrawal", "Description", "Reference Number", "Bank Account", "Currency"]
-	writer.writerow(headers)
-
-	for txn in transactions:
-		txn_date = getattr(txn, "date", None)
-		raw_date = txn.data.get("date", "")
-
-		if txn_date:
-			date_str = txn_date.strftime("%Y-%m-%d")
-		elif isinstance(raw_date, date | datetime):
-			date_str = raw_date.strftime("%Y-%m-%d")
-		else:
-			date_str = str(raw_date)
-
-		raw_amount = str(txn.data.get("amount", ""))
-		parts = raw_amount.strip().split()
-		amount_value = float(parts[0]) if parts else 0.0
-
-		deposit = amount_value if amount_value > 0 else ""
-		withdrawal = abs(amount_value) if amount_value < 0 else ""
-		description = txn.data.get("extra_details") or ""
-		reference = txn.data.get("transaction_reference") or ""
-		currency = txn.data.get("currency", "")
-
-		writer.writerow([date_str, deposit, withdrawal, description, reference, doc.bank_account, currency])
-
-	# Prepare in-memory CSV for upload
-	csv_content = csv_buffer.getvalue().encode("utf-8")
-	csv_buffer.close()
-
-	filename = f"{frappe.utils.now_datetime().strftime('%Y%m%d%H%M%S')}_converted_mt940.csv"
-
-	# Save to File Manager
-	saved_file = save_file(filename, csv_content, doc.doctype, doc.name, is_private=True, df="import_file")
-
-	return saved_file.file_url
-
-
 @frappe.whitelist()
 def get_preview_from_template(data_import, import_file=None, google_sheets_url=None):
 	return frappe.get_doc("Bank Statement Import", data_import).get_preview_from_template(
@@ -232,12 +128,6 @@ def download_import_log(data_import_name):
 	return frappe.get_doc("Bank Statement Import", data_import_name).download_import_log()
 
 
-def is_mt940_format(content: str) -> bool:
-	"""Check if the content has key MT940 tags"""
-	required_tags = [":20:", ":25:", ":28C:", ":61:"]
-	return all(tag in content for tag in required_tags)
-
-
 def parse_data_from_template(raw_data):
 	data = []
 
@@ -284,7 +174,6 @@ def start_import(data_import, bank_account, import_file_path, google_sheets_url,
 
 
 def update_mapping_db(bank, template_options):
-	"""Update bank transaction mapping database with template options."""
 	bank = frappe.get_doc("Bank", bank)
 	for d in bank.bank_transaction_mapping:
 		d.delete()
@@ -296,7 +185,6 @@ def update_mapping_db(bank, template_options):
 
 
 def add_bank_account(data, bank_account):
-	"""Add bank account information to data rows."""
 	bank_account_loc = None
 	if "Bank Account" not in data[0]:
 		data[0].append("Bank Account")
@@ -313,7 +201,6 @@ def add_bank_account(data, bank_account):
 
 
 def write_files(import_file, data):
-	"""Write processed data to CSV or Excel files."""
 	full_file_path = import_file.file_doc.get_full_path()
 	parts = import_file.file_doc.get_extension()
 	extension = parts[1]
@@ -323,12 +210,11 @@ def write_files(import_file, data):
 		with open(full_file_path, "w", newline="") as file:
 			writer = csv.writer(file)
 			writer.writerows(data)
-	elif extension in ("xlsx", "xls"):
+	elif extension == "xlsx" or "xls":
 		write_xlsx(data, "trans", file_path=full_file_path)
 
 
 def write_xlsx(data, sheet_name, wb=None, column_widths=None, file_path=None):
-	"""Write data to Excel file with formatting."""
 	# from xlsx utils with changes
 	column_widths = column_widths or []
 	if wb is None:
@@ -372,7 +258,7 @@ def get_import_status(docname):
 
 	logs = frappe.get_all(
 		"Data Import Log",
-		fields=[{"COUNT": "*", "as": "count"}, "success"],
+		fields=["count(*) as count", "success"],
 		filters={"data_import": docname},
 		group_by="success",
 	)
@@ -393,7 +279,7 @@ def get_import_status(docname):
 
 @frappe.whitelist()
 def get_import_logs(docname: str):
-	frappe.has_permission("Bank Statement Import", throw=True)
+	frappe.has_permission("Bank Statement Import")
 
 	return frappe.get_all(
 		"Data Import Log",

erpnext/accounts/doctype/bank_statement_import/test_bank_statement_import.py

@@ -1,209 +1,10 @@
 # Copyright (c) 2020, Frappe Technologies and Contributors
 # See license.txt
-
+# import frappe
 import unittest
 
-from erpnext.accounts.doctype.bank_statement_import.bank_statement_import import (
-	is_mt940_format,
-	preprocess_mt940_content,
-)
+from frappe.tests import IntegrationTestCase
 
 
-class TestBankStatementImport(unittest.TestCase):
-	"""Unit tests for Bank Statement Import functions"""
-
-	def test_preprocess_mt940_content_with_long_statement_number(self):
-		"""Test that statement numbers longer than 5 digits are truncated to last 5 digits"""
-		# Test case with 6-digit statement number (167619 -> 67619)
-		mt940_content = ":28C:167619/1"
-		expected_content = ":28C:67619/1"
-		result = preprocess_mt940_content(mt940_content)
-		self.assertEqual(result, expected_content)
-
-	def test_preprocess_mt940_content_with_normal_statement_number(self):
-		"""Test that statement numbers with 5 or fewer digits are unchanged"""
-		# Test case with 5-digit statement number (should remain unchanged)
-		mt940_content = ":28C:12345/1"
-		result = preprocess_mt940_content(mt940_content)
-		self.assertEqual(result, mt940_content)  # Should be unchanged
-
-		# Test case with 4-digit statement number (should remain unchanged)
-		mt940_content = ":28C:1234/1"
-		result = preprocess_mt940_content(mt940_content)
-		self.assertEqual(result, mt940_content)  # Should be unchanged
-
-	def test_preprocess_mt940_content_without_sequence_number(self):
-		"""Test statement number truncation without sequence number"""
-		# Test case with long statement number but no sequence (no /1)
-		mt940_content = ":28C:987654321"
-		expected_content = ":28C:54321"
-		result = preprocess_mt940_content(mt940_content)
-		self.assertEqual(result, expected_content)
-
-	def test_preprocess_mt940_content_multiple_occurrences(self):
-		"""Test multiple statement numbers in the same content"""
-		mt940_content = """:28C:167619/1
-:28C:987654/2"""
-		expected_content = """:28C:67619/1
-:28C:87654/2"""
-		result = preprocess_mt940_content(mt940_content)
-		self.assertEqual(result, expected_content)
-
-	def test_preprocess_mt940_content_edge_cases(self):
-		"""Test edge cases like empty content and content without :28C: tags"""
-		# Test empty content
-		self.assertEqual(preprocess_mt940_content(""), "")
-
-		# Test content without :28C: tags
-		content_without_28c = """:20:STARTUMSE
-:25:12345678901234567890
-:60F:C031002EUR0,00"""
-		result = preprocess_mt940_content(content_without_28c)
-		self.assertEqual(result, content_without_28c)  # Should be unchanged
-
-	def test_preprocess_mt940_content_with_full_mt940_document(self):
-		"""Test preprocessing with complete MT940 document"""
-		mt940_content = """:20:STARTUMSE
-:25:12345678901234567890
-:28C:167619/1
-:60F:C031002EUR0,00
-:61:0310021002DR123,45NMSCNONREF//8327000090031789
-:86:806?20EREF+NONREF?21MREF+M180031?22CRED+DE98ZZZ09999999999
-:62F:C031002EUR-123,45
--"""
-		expected_content = """:20:STARTUMSE
-:25:12345678901234567890
-:28C:67619/1
-:60F:C031002EUR0,00
-:61:0310021002DR123,45NMSCNONREF//8327000090031789
-:86:806?20EREF+NONREF?21MREF+M180031?22CRED+DE98ZZZ09999999999
-:62F:C031002EUR-123,45
--"""
-		result = preprocess_mt940_content(mt940_content)
-		self.assertEqual(result, expected_content)
-
-	def test_is_mt940_format_detection(self):
-		"""Test MT940 format detection function"""
-		# Valid MT940 content with all required tags
-		valid_mt940 = """:20:STARTUMSE
-:25:12345678901234567890
-:28C:167619/1
-:60F:C031002EUR0,00
-:61:0310021002DR123,45NMSCNONREF//8327000090031789"""
-		self.assertTrue(is_mt940_format(valid_mt940))
-
-		# Invalid MT940 content (CSV format)
-		invalid_mt940 = """Date,Description,Amount
-2023-01-01,Test Transaction,100.00
-2023-01-02,Another Transaction,-50.00"""
-		self.assertFalse(is_mt940_format(invalid_mt940))
-
-		# Partially valid MT940 (missing some required tags)
-		partial_mt940 = """:20:STARTUMSE
-:25:12345678901234567890
-:60F:C031002EUR0,00"""
-		self.assertFalse(is_mt940_format(partial_mt940))
-
-		# Empty content
-		self.assertFalse(is_mt940_format(""))
-
-	def test_preprocess_mt940_content_boundary_conditions(self):
-		"""Test boundary conditions for statement number length"""
-		# Test exactly 6 digits (should be truncated)
-		mt940_content = ":28C:123456/1"
-		expected_content = ":28C:23456/1"
-		result = preprocess_mt940_content(mt940_content)
-		self.assertEqual(result, expected_content)
-
-		# Test exactly 5 digits (should remain unchanged)
-		mt940_content = ":28C:12345/1"
-		result = preprocess_mt940_content(mt940_content)
-		self.assertEqual(result, mt940_content)
-
-		# Test very long statement number
-		mt940_content = ":28C:123456789012345/1"
-		expected_content = ":28C:12345/1"  # Last 5 digits
-		result = preprocess_mt940_content(mt940_content)
-		self.assertEqual(result, expected_content)
-
-	def test_preprocess_mt940_content_real_world_case(self):
-		"""Test with real-world MT940 content that was failing in production"""
-		# This is based on actual MT940 content that was causing parsing errors (sanitized)
-		mt940_content = """{1:F0112345678901X0000000000}{2:I94012345678901XN}{4:
-:20:STMTREF167619
-:25:1234567890
-:28C:167619/1
-:60F:C250622USD0,00
-:61:2507170717C100000,00NMSCNOREF
-:86:BY EXAMPLE INST 123456/03-07-25/TESTBANK/CITY
-:61:2507240724C1,00NMSCNEFTINW-1234567890
-:86:NEFT TEST123456789 EXAMPLE MERCHANT SERVICES
-:61:2507310731D305,62NMSCTBMS-1234567890
-:86:Chrg: Debit Card Annual Fee 1234 for 2025
-:61:2508030803D1066,00NMSC123456789
-:86:PCD/1234/EXAMPLE DOMAIN/01234567890123/23:27
-:61:2508060806D2000,00NMSCUPI-123456789
-:86:UPI/TEST USER/123456789/PaidViaTestApp
-:61:2508140814D5000,00NMSCUPI-123456789
-:86:UPI/TEST USER/123456789/PaidViaTestApp
-:61:2509190919D900,00NMSCUPI-123456789
-:86:UPI/EXAMPLE MERCHANT/123456789/Pay
-:61:2509190919D2606,00NMSCUPI-123456789
-:86:UPI/JOHN DOE/123456789/PaidViaTestApp
-:62F:C250922USD88123,38
--}"""
-
-		# Expected result with statement number 167619 truncated to 67619
-		expected_content = """{1:F0112345678901X0000000000}{2:I94012345678901XN}{4:
-:20:STMTREF167619
-:25:1234567890
-:28C:67619/1
-:60F:C250622USD0,00
-:61:2507170717C100000,00NMSCNOREF
-:86:BY EXAMPLE INST 123456/03-07-25/TESTBANK/CITY
-:61:2507240724C1,00NMSCNEFTINW-1234567890
-:86:NEFT TEST123456789 EXAMPLE MERCHANT SERVICES
-:61:2507310731D305,62NMSCTBMS-1234567890
-:86:Chrg: Debit Card Annual Fee 1234 for 2025
-:61:2508030803D1066,00NMSC123456789
-:86:PCD/1234/EXAMPLE DOMAIN/01234567890123/23:27
-:61:2508060806D2000,00NMSCUPI-123456789
-:86:UPI/TEST USER/123456789/PaidViaTestApp
-:61:2508140814D5000,00NMSCUPI-123456789
-:86:UPI/TEST USER/123456789/PaidViaTestApp
-:61:2509190919D900,00NMSCUPI-123456789
-:86:UPI/EXAMPLE MERCHANT/123456789/Pay
-:61:2509190919D2606,00NMSCUPI-123456789
-:86:UPI/JOHN DOE/123456789/PaidViaTestApp
-:62F:C250922USD88123,38
--}"""
-
-		result = preprocess_mt940_content(mt940_content)
-		self.assertEqual(result, expected_content)
-
-		# Verify that the problematic statement number was actually changed
-		self.assertIn(":28C:67619/1", result)
-		self.assertNotIn(":28C:167619/1", result)
-
-		# Verify that other content remains unchanged
-		self.assertIn(":20:STMTREF167619", result)  # Reference should remain unchanged
-		self.assertIn("UPI/TEST USER/123456789/PaidViaTestApp", result)
-
-	def test_preprocess_mt940_content_whitespace_variants(self):
-		"""Test handling of whitespace and different line endings"""
-		# Test with trailing spaces
-		mt940_content = ":28C:167619/1   \n"
-		expected_content = ":28C:67619/1   \n"
-		result = preprocess_mt940_content(mt940_content)
-		self.assertEqual(result, expected_content)
-
-		# Test with Windows line endings (CRLF)
-		mt940_content = ":28C:167619/1\r\n"
-		expected_content = ":28C:67619/1\r\n"
-		result = preprocess_mt940_content(mt940_content)
-		self.assertEqual(result, expected_content)
-
-		# Test with leading spaces (should not match as it's not line start)
-		mt940_content = "   :28C:167619/1\n"
-		result = preprocess_mt940_content(mt940_content)
-		self.assertEqual(result, mt940_content)  # Should remain unchanged
+class TestBankStatementImport(IntegrationTestCase):
+	pass

erpnext/accounts/doctype/bank_transaction/auto_match_party.py

@@ -1,7 +1,6 @@
 import frappe
 from frappe.utils import flt
 from rapidfuzz import fuzz, process
-from rapidfuzz.utils import default_process
 
 
 class AutoMatchParty:
@@ -26,7 +25,7 @@ class AutoMatchParty:
 			deposit=self.deposit,
 		).match()
 
-		fuzzy_matching_enabled = frappe.get_single_value("Accounts Settings", "enable_fuzzy_matching")
+		fuzzy_matching_enabled = frappe.db.get_single_value("Accounts Settings", "enable_fuzzy_matching")
 		if not result and fuzzy_matching_enabled:
 			result = AutoMatchbyPartyNameDescription(
 				bank_party_name=self.bank_party_name, description=self.description, deposit=self.deposit
@@ -133,7 +132,6 @@ class AutoMatchbyPartyNameDescription:
 			query=self.get(field),
 			choices={row.get("name"): row.get("party_name") for row in names},
 			scorer=fuzz.token_set_ratio,
-			processor=default_process,
 		)
 		party_name, skip = self.process_fuzzy_result(result)
 

erpnext/accounts/doctype/bank_transaction/bank_transaction.json

@@ -38,16 +38,14 @@
   "column_break_3czf",
   "bank_party_name",
   "bank_party_account_number",
-  "bank_party_iban",
-  "extended_bank_statement_section",
-  "included_fee",
-  "excluded_fee"
+  "bank_party_iban"
  ],
  "fields": [
   {
    "default": "ACC-BTN-.YYYY.-",
    "fieldname": "naming_series",
    "fieldtype": "Select",
+   "hidden": 1,
    "label": "Series",
    "no_copy": 1,
    "options": "ACC-BTN-.YYYY.-",
@@ -119,14 +117,15 @@
   {
    "allow_on_submit": 1,
    "fieldname": "reference_number",
-   "fieldtype": "Small Text",
+   "fieldtype": "Data",
    "label": "Reference Number"
   },
   {
    "fieldname": "transaction_id",
    "fieldtype": "Data",
    "label": "Transaction ID",
-   "read_only": 1
+   "read_only": 1,
+   "unique": 1
   },
   {
    "allow_on_submit": 1,
@@ -225,8 +224,7 @@
   {
    "fieldname": "bank_party_iban",
    "fieldtype": "Data",
-   "label": "Party IBAN (Bank Statement)",
-   "options": "IBAN"
+   "label": "Party IBAN (Bank Statement)"
   },
   {
    "fieldname": "bank_party_account_number",
@@ -236,32 +234,11 @@
   {
    "fieldname": "column_break_oufv",
    "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "extended_bank_statement_section",
-   "fieldtype": "Section Break",
-   "label": "Extended Bank Statement"
-  },
-  {
-   "fieldname": "included_fee",
-   "fieldtype": "Currency",
-   "label": "Included Fee",
-   "non_negative": 1,
-   "options": "currency"
-  },
-  {
-   "description": "On save, the Excluded Fee will be converted to an Included Fee.",
-   "fieldname": "excluded_fee",
-   "fieldtype": "Currency",
-   "label": "Excluded Fee",
-   "non_negative": 1,
-   "options": "currency"
   }
  ],
- "grid_page_length": 50,
  "is_submittable": 1,
  "links": [],
- "modified": "2025-12-07 20:49:18.600757",
+ "modified": "2023-11-18 18:32:47.203694",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Bank Transaction",
@@ -310,10 +287,9 @@
    "write": 1
   }
  ],
- "row_format": "Dynamic",
  "sort_field": "date",
  "sort_order": "DESC",
  "states": [],
  "title_field": "bank_account",
  "track_changes": 1
-}
+}

erpnext/accounts/doctype/bank_transaction/bank_transaction.py

@@ -32,13 +32,11 @@ class BankTransaction(Document):
 		date: DF.Date | None
 		deposit: DF.Currency
 		description: DF.SmallText | None
-		excluded_fee: DF.Currency
-		included_fee: DF.Currency
 		naming_series: DF.Literal["ACC-BTN-.YYYY.-"]
 		party: DF.DynamicLink | None
 		party_type: DF.Link | None
 		payment_entries: DF.Table[BankTransactionPayments]
-		reference_number: DF.SmallText | None
+		reference_number: DF.Data | None
 		status: DF.Literal["", "Pending", "Settled", "Unreconciled", "Reconciled", "Cancelled"]
 		transaction_id: DF.Data | None
 		transaction_type: DF.Data | None
@@ -47,14 +45,9 @@ class BankTransaction(Document):
 	# end: auto-generated types
 
 	def before_validate(self):
-		self.handle_excluded_fee()
 		self.update_allocated_amount()
 
-	def on_discard(self):
-		self.db_set("status", "Cancelled")
-
 	def validate(self):
-		self.validate_included_fee()
 		self.validate_duplicate_references()
 		self.validate_currency()
 
@@ -128,7 +121,7 @@ class BankTransaction(Document):
 		self.allocate_payment_entries()
 		self.set_status()
 
-		if frappe.get_single_value("Accounts Settings", "enable_party_matching"):
+		if frappe.db.get_single_value("Accounts Settings", "enable_party_matching"):
 			self.auto_set_party()
 
 	def before_update_after_submit(self):
@@ -139,8 +132,6 @@ class BankTransaction(Document):
 		self.set_status()
 
 	def on_cancel(self):
-		self.ignore_linked_doctypes = ["GL Entry"]
-
 		for payment_entry in self.payment_entries:
 			self.delink_payment_entry(payment_entry)
 
@@ -316,40 +307,6 @@ class BankTransaction(Document):
 
 		self.party_type, self.party = result
 
-	def validate_included_fee(self):
-		"""
-		The included_fee is only handled for withdrawals. An included_fee for a deposit, is not credited to the account and is
-		therefore outside of the deposit value and can be larger than the deposit itself.
-		"""
-
-		if self.included_fee and self.withdrawal:
-			if self.included_fee > self.withdrawal:
-				frappe.throw(_("Included fee is bigger than the withdrawal itself."))
-
-	def handle_excluded_fee(self):
-		# Include the excluded fee on validate to handle all further processing the same
-		excluded_fee = flt(self.excluded_fee)
-		if excluded_fee <= 0:
-			return
-
-		# Suppress a negative deposit (aka withdrawal), likely not intendend
-		if flt(self.deposit) > 0 and (flt(self.deposit) - excluded_fee) < 0:
-			frappe.throw(_("The Excluded Fee is bigger than the Deposit it is deducted from."))
-
-		# Enforce directionality
-		if flt(self.deposit) > 0 and flt(self.withdrawal) > 0:
-			frappe.throw(
-				_("Only one of Deposit or Withdrawal should be non-zero when applying an Excluded Fee.")
-			)
-
-		if flt(self.deposit) > 0:
-			self.deposit = flt(self.deposit) - excluded_fee
-		# A fee applied to deposit and withdrawal equal 0 become a withdrawal
-		elif flt(self.withdrawal) >= 0:
-			self.withdrawal = flt(self.withdrawal) + excluded_fee
-		self.included_fee = flt(self.included_fee) + excluded_fee
-		self.excluded_fee = 0
-
 
 @frappe.whitelist()
 def get_doctypes_for_bank_reconciliation():
@@ -375,12 +332,11 @@ def get_clearance_details(transaction, payment_entry, bt_allocations, gl_entries
 			("unallocated_amount", "bank_account"),
 			as_dict=True,
 		)
-		bt_bank_account = frappe.db.get_value("Bank Account", bt.bank_account, "account")
 
-		if bt_bank_account != gl_bank_account:
+		if bt.bank_account != gl_bank_account:
 			frappe.throw(
 				_("Bank Account {} in Bank Transaction {} is not matching with Bank Account {}").format(
-					bt_bank_account, payment_entry.payment_entry, gl_bank_account
+					bt.bank_account, payment_entry.payment_entry, gl_bank_account
 				)
 			)
 

erpnext/accounts/doctype/bank_transaction/test_auto_match_party.py

@@ -2,13 +2,19 @@
 # License: GNU General Public License v3. See license.txt
 
 import frappe
-from frappe.tests import IntegrationTestCase
+from frappe.tests import IntegrationTestCase, UnitTestCase
 from frappe.utils import nowdate
 
 from erpnext.accounts.doctype.bank_transaction.test_bank_transaction import create_bank_account
 
-IBAN_1 = "DE02000000003716541159"
-IBAN_2 = "DE02500105170137075030"
+
+class UnitTestBankTransaction(UnitTestCase):
+	"""
+	Unit tests for BankTransaction.
+	Use this class for testing individual functions and methods.
+	"""
+
+	pass
 
 
 class TestAutoMatchParty(IntegrationTestCase):
@@ -25,24 +31,24 @@ class TestAutoMatchParty(IntegrationTestCase):
 		frappe.db.set_single_value("Accounts Settings", "enable_fuzzy_matching", 0)
 
 	def test_match_by_account_number(self):
-		create_supplier_for_match(account_no=IBAN_1[11:])
+		create_supplier_for_match(account_no="000000003716541159")
 		doc = create_bank_transaction(
 			withdrawal=1200,
 			transaction_id="562213b0ca1bf838dab8f2c6a39bbc3b",
-			account_no=IBAN_1[11:],
-			iban=IBAN_1,
+			account_no="000000003716541159",
+			iban="DE02000000003716541159",
 		)
 
 		self.assertEqual(doc.party_type, "Supplier")
 		self.assertEqual(doc.party, "John Doe & Co.")
 
 	def test_match_by_iban(self):
-		create_supplier_for_match(iban=IBAN_1)
+		create_supplier_for_match(iban="DE02000000003716541159")
 		doc = create_bank_transaction(
 			withdrawal=1200,
 			transaction_id="c5455a224602afaa51592a9d9250600d",
-			account_no=IBAN_1[11:],
-			iban=IBAN_1,
+			account_no="000000003716541159",
+			iban="DE02000000003716541159",
 		)
 
 		self.assertEqual(doc.party_type, "Supplier")
@@ -54,7 +60,7 @@ class TestAutoMatchParty(IntegrationTestCase):
 			withdrawal=1200,
 			transaction_id="1f6f661f347ff7b1ea588665f473adb1",
 			party_name="Ella Jackson",
-			iban=IBAN_2,
+			iban="DE04000000003716545346",
 		)
 		self.assertEqual(doc.party_type, "Supplier")
 		self.assertEqual(doc.party, "Jackson Ella W.")

erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py

@@ -6,15 +6,12 @@ import json
 import frappe
 from frappe import utils
 from frappe.model.docstatus import DocStatus
-from frappe.tests import IntegrationTestCase
+from frappe.tests import IntegrationTestCase, UnitTestCase
 
 from erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool import (
 	get_linked_payments,
 	reconcile_vouchers,
 )
-from erpnext.accounts.doctype.mode_of_payment.test_mode_of_payment import (
-	set_default_account_for_mode_of_payment,
-)
 from erpnext.accounts.doctype.payment_entry.test_payment_entry import get_payment_entry
 from erpnext.accounts.doctype.pos_profile.test_pos_profile import make_pos_profile
 from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make_purchase_invoice
@@ -24,6 +21,15 @@ from erpnext.tests.utils import if_lending_app_installed
 EXTRA_TEST_RECORD_DEPENDENCIES = ["Item", "Cost Center"]
 
 
+class UnitTestBankTransaction(UnitTestCase):
+	"""
+	Unit tests for BankTransaction.
+	Use this class for testing individual functions and methods.
+	"""
+
+	pass
+
+
 class TestBankTransaction(IntegrationTestCase):
 	def setUp(self):
 		make_pos_profile()
@@ -424,13 +430,15 @@ def add_vouchers(gl_account="_Test Bank - _TC"):
 	except frappe.DuplicateEntryError:
 		pass
 
-	mode_of_payment = frappe.get_doc({"doctype": "Mode of Payment", "name": "Wire Transfer"})
+	mode_of_payment = frappe.get_doc({"doctype": "Mode of Payment", "name": "Cash"})
 
-	set_default_account_for_mode_of_payment(mode_of_payment, "_Test Company", gl_account)
+	if not frappe.db.get_value("Mode of Payment Account", {"company": "_Test Company", "parent": "Cash"}):
+		mode_of_payment.append("accounts", {"company": "_Test Company", "default_account": gl_account})
+		mode_of_payment.save()
 
 	si = create_sales_invoice(customer="Fayva", qty=1, rate=109080, do_not_save=1)
 	si.is_pos = 1
-	si.append("payments", {"mode_of_payment": "Wire Transfer", "amount": 109080})
+	si.append("payments", {"mode_of_payment": "Cash", "account": gl_account, "amount": 109080})
 	si.insert()
 	si.submit()
 

erpnext/accounts/doctype/bank_transaction/test_bank_transaction_fees.py

@@ -1,133 +0,0 @@
-# Copyright (c) 2025, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-
-import frappe
-from frappe.tests import UnitTestCase
-
-
-class TestBankTransactionFees(UnitTestCase):
-	def test_included_fee_throws(self):
-		"""A fee that's part of a withdrawal cannot be bigger than the
-		withdrawal itself."""
-		bt = frappe.new_doc("Bank Transaction")
-		bt.withdrawal = 100
-		bt.included_fee = 101
-
-		self.assertRaises(frappe.ValidationError, bt.validate_included_fee)
-
-	def test_included_fee_allows_equal(self):
-		"""A fee that's part of a withdrawal may be equal to the withdrawal
-		amount (only the fee was deducted from the account)."""
-		bt = frappe.new_doc("Bank Transaction")
-		bt.withdrawal = 100
-		bt.included_fee = 100
-
-		bt.validate_included_fee()
-
-	def test_included_fee_allows_for_deposit(self):
-		"""For deposits, a fee may be recorded separately without limiting the
-		received amount."""
-		bt = frappe.new_doc("Bank Transaction")
-		bt.deposit = 10
-		bt.included_fee = 999
-
-		bt.validate_included_fee()
-
-	def test_excluded_fee_noop_when_zero(self):
-		"""When there is no excluded fee to apply, the amounts should remain
-		unchanged."""
-		bt = frappe.new_doc("Bank Transaction")
-		bt.deposit = 100
-		bt.withdrawal = 0
-		bt.included_fee = 5
-		bt.excluded_fee = 0
-
-		bt.handle_excluded_fee()
-
-		self.assertEqual(bt.deposit, 100)
-		self.assertEqual(bt.withdrawal, 0)
-		self.assertEqual(bt.included_fee, 5)
-		self.assertEqual(bt.excluded_fee, 0)
-
-	def test_excluded_fee_throws_when_exceeds_deposit(self):
-		"""A fee deducted from an incoming payment must not exceed the incoming
-		amount (else it would be a withdrawal, a conversion we don't support)."""
-		bt = frappe.new_doc("Bank Transaction")
-		bt.deposit = 10
-		bt.excluded_fee = 11
-
-		self.assertRaises(frappe.ValidationError, bt.handle_excluded_fee)
-
-	def test_excluded_fee_throws_when_both_deposit_and_withdrawal_are_set(self):
-		"""A transaction must be either incoming or outgoing when applying a
-		fee, not both."""
-		bt = frappe.new_doc("Bank Transaction")
-		bt.deposit = 10
-		bt.withdrawal = 10
-		bt.excluded_fee = 1
-
-		self.assertRaises(frappe.ValidationError, bt.handle_excluded_fee)
-
-	def test_excluded_fee_deducts_from_deposit(self):
-		"""When a fee is deducted from an incoming payment, the net received
-		amount decreases and the fee is tracked as included."""
-		bt = frappe.new_doc("Bank Transaction")
-		bt.deposit = 100
-		bt.withdrawal = 0
-		bt.included_fee = 2
-		bt.excluded_fee = 5
-
-		bt.handle_excluded_fee()
-
-		self.assertEqual(bt.deposit, 95)
-		self.assertEqual(bt.withdrawal, 0)
-		self.assertEqual(bt.included_fee, 7)
-		self.assertEqual(bt.excluded_fee, 0)
-
-	def test_excluded_fee_can_reduce_an_incoming_payment_to_zero(self):
-		"""A separately-deducted fee may reduce an incoming payment to zero,
-		while still tracking the fee."""
-		bt = frappe.new_doc("Bank Transaction")
-		bt.deposit = 5
-		bt.withdrawal = 0
-		bt.included_fee = 0
-		bt.excluded_fee = 5
-
-		bt.handle_excluded_fee()
-
-		self.assertEqual(bt.deposit, 0)
-		self.assertEqual(bt.withdrawal, 0)
-		self.assertEqual(bt.included_fee, 5)
-		self.assertEqual(bt.excluded_fee, 0)
-
-	def test_excluded_fee_increases_outgoing_payment(self):
-		"""When a separately-deducted fee is provided for an outgoing payment,
-		the total money leaving increases and the fee is tracked."""
-		bt = frappe.new_doc("Bank Transaction")
-		bt.deposit = 0
-		bt.withdrawal = 100
-		bt.included_fee = 2
-		bt.excluded_fee = 5
-
-		bt.handle_excluded_fee()
-
-		self.assertEqual(bt.deposit, 0)
-		self.assertEqual(bt.withdrawal, 105)
-		self.assertEqual(bt.included_fee, 7)
-		self.assertEqual(bt.excluded_fee, 0)
-
-	def test_excluded_fee_turns_zero_amount_into_withdrawal(self):
-		"""If only an excluded fee is provided, it should be treated as an
-		outgoing payment and the fee is then tracked as included."""
-		bt = frappe.new_doc("Bank Transaction")
-		bt.deposit = 0
-		bt.withdrawal = 0
-		bt.included_fee = 0
-		bt.excluded_fee = 5
-
-		bt.handle_excluded_fee()
-
-		self.assertEqual(bt.deposit, 0)
-		self.assertEqual(bt.withdrawal, 5)
-		self.assertEqual(bt.included_fee, 5)
-		self.assertEqual(bt.excluded_fee, 0)

erpnext/accounts/doctype/bisect_accounting_statements/test_bisect_accounting_statements.py

@@ -2,7 +2,16 @@
 # See license.txt
 
 # import frappe
-from frappe.tests import IntegrationTestCase
+from frappe.tests import IntegrationTestCase, UnitTestCase
+
+
+class UnitTestBisectAccountingStatements(UnitTestCase):
+	"""
+	Unit tests for BisectAccountingStatements.
+	Use this class for testing individual functions and methods.
+	"""
+
+	pass
 
 
 class TestBisectAccountingStatements(IntegrationTestCase):

erpnext/accounts/doctype/bisect_nodes/test_bisect_nodes.py

@@ -2,7 +2,16 @@
 # See license.txt
 
 # import frappe
-from frappe.tests import IntegrationTestCase
+from frappe.tests import IntegrationTestCase, UnitTestCase
+
+
+class UnitTestBisectNodes(UnitTestCase):
+	"""
+	Unit tests for BisectNodes.
+	Use this class for testing individual functions and methods.
+	"""
+
+	pass
 
 
 class TestBisectNodes(IntegrationTestCase):

erpnext/accounts/doctype/budget/budget.js

@@ -4,6 +4,16 @@ frappe.provide("erpnext.accounts.dimensions");
 
 frappe.ui.form.on("Budget", {
 	onload: function (frm) {
+		frm.set_query("account", "accounts", function () {
+			return {
+				filters: {
+					company: frm.doc.company,
+					report_type: "Profit and Loss",
+					is_group: 0,
+				},
+			};
+		});
+
 		frm.set_query("monthly_distribution", function () {
 			return {
 				filters: {
@@ -12,37 +22,11 @@ frappe.ui.form.on("Budget", {
 			};
 		});
 
-		frm.set_query("account", function () {
-			return {
-				filters: {
-					is_group: 0,
-					company: frm.doc.company,
-				},
-			};
-		});
-
 		erpnext.accounts.dimensions.setup_dimension_filters(frm, frm.doctype);
-		frappe.db.get_single_value("Accounts Settings", "use_legacy_budget_controller").then((value) => {
-			if (value) {
-				frm.get_field("control_action_for_cumulative_expense_section").hide();
-			}
-		});
 	},
 
-	refresh: async function (frm) {
+	refresh: function (frm) {
 		frm.trigger("toggle_reqd_fields");
-
-		if (!frm.doc.__islocal && frm.doc.docstatus == 1) {
-			frm.add_custom_button(
-				__("Revise Budget"),
-				function () {
-					frm.events.revise_budget_action(frm);
-				},
-				__("Actions")
-			);
-		}
-
-		toggle_distribution_fields(frm);
 	},
 
 	budget_against: function (frm) {
@@ -50,20 +34,6 @@ frappe.ui.form.on("Budget", {
 		frm.trigger("toggle_reqd_fields");
 	},
 
-	budget_amount(frm) {
-		if (frm.doc.budget_distribution?.length) {
-			frm.doc.budget_distribution.forEach((row) => {
-				row.amount = flt((row.percent / 100) * frm.doc.budget_amount, 2);
-			});
-			set_total_budget_amount(frm);
-			frm.refresh_field("budget_distribution");
-		}
-	},
-
-	distribute_equally: function (frm) {
-		toggle_distribution_fields(frm);
-	},
-
 	set_null_value: function (frm) {
 		if (frm.doc.budget_against == "Cost Center") {
 			frm.set_value("project", null);
@@ -76,68 +46,4 @@ frappe.ui.form.on("Budget", {
 		frm.toggle_reqd("cost_center", frm.doc.budget_against == "Cost Center");
 		frm.toggle_reqd("project", frm.doc.budget_against == "Project");
 	},
-
-	revise_budget_action: function (frm) {
-		frappe.confirm(
-			__(
-				"Are you sure you want to revise this budget? The current budget will be cancelled and a new draft will be created."
-			),
-			function () {
-				frappe.call({
-					method: "erpnext.accounts.doctype.budget.budget.revise_budget",
-					args: { budget_name: frm.doc.name },
-					callback: function (r) {
-						if (r.message) {
-							frappe.msgprint(__("New revised budget created successfully"));
-							frappe.set_route("Form", "Budget", r.message);
-						}
-					},
-				});
-			},
-			function () {
-				frappe.msgprint(__("Revision cancelled"));
-			}
-		);
-	},
 });
-
-frappe.ui.form.on("Budget Distribution", {
-	amount(frm, cdt, cdn) {
-		let row = frappe.get_doc(cdt, cdn);
-		if (frm.doc.budget_amount) {
-			row.percent = flt((row.amount / frm.doc.budget_amount) * 100, 2);
-
-			set_total_budget_amount(frm);
-			frm.refresh_field("budget_distribution");
-		}
-	},
-	percent(frm, cdt, cdn) {
-		let row = frappe.get_doc(cdt, cdn);
-		if (frm.doc.budget_amount) {
-			row.amount = flt((row.percent / 100) * frm.doc.budget_amount, 2);
-
-			set_total_budget_amount(frm);
-			frm.refresh_field("budget_distribution");
-		}
-	},
-});
-
-function set_total_budget_amount(frm) {
-	let total = 0;
-
-	(frm.doc.budget_distribution || []).forEach((row) => {
-		total += flt(row.amount);
-	});
-
-	frm.set_value("budget_distribution_total", total);
-}
-
-function toggle_distribution_fields(frm) {
-	const grid = frm.fields_dict.budget_distribution.grid;
-
-	["amount", "percent"].forEach((field) => {
-		grid.update_docfield_property(field, "read_only", frm.doc.distribute_equally);
-	});
-
-	grid.refresh();
-}

erpnext/accounts/doctype/budget/budget.json

@@ -7,28 +7,15 @@
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
-  "naming_series",
   "budget_against",
   "company",
   "cost_center",
+  "naming_series",
   "project",
-  "account",
+  "fiscal_year",
   "column_break_3",
+  "monthly_distribution",
   "amended_from",
-  "from_fiscal_year",
-  "to_fiscal_year",
-  "budget_start_date",
-  "budget_end_date",
-  "distribution_frequency",
-  "budget_amount",
-  "section_break_nwug",
-  "distribute_equally",
-  "section_break_fpdt",
-  "budget_distribution",
-  "section_break_wkqb",
-  "column_break_paum",
-  "column_break_nwor",
-  "budget_distribution_total",
   "section_break_6",
   "applicable_on_material_request",
   "action_if_annual_budget_exceeded_on_mr",
@@ -41,12 +28,8 @@
   "applicable_on_booking_actual_expenses",
   "action_if_annual_budget_exceeded",
   "action_if_accumulated_monthly_budget_exceeded",
-  "control_action_for_cumulative_expense_section",
-  "applicable_on_cumulative_expense",
-  "action_if_annual_exceeded_on_cumulative_expense",
-  "action_if_accumulated_monthly_exceeded_on_cumulative_expense",
-  "section_break_kkan",
-  "revision_of"
+  "section_break_21",
+  "accounts"
  ],
  "fields": [
   {
@@ -57,7 +40,6 @@
    "in_standard_filter": 1,
    "label": "Budget Against",
    "options": "\nCost Center\nProject",
-   "read_only_depends_on": "eval: doc.revision_of",
    "reqd": 1
   },
   {
@@ -67,7 +49,6 @@
    "in_standard_filter": 1,
    "label": "Company",
    "options": "Company",
-   "read_only_depends_on": "eval: doc.revision_of",
    "reqd": 1
   },
   {
@@ -77,8 +58,7 @@
    "in_global_search": 1,
    "in_standard_filter": 1,
    "label": "Cost Center",
-   "options": "Cost Center",
-   "read_only_depends_on": "eval: doc.revision_of"
+   "options": "Cost Center"
   },
   {
    "depends_on": "eval:doc.budget_against == 'Project'",
@@ -86,13 +66,28 @@
    "fieldtype": "Link",
    "in_standard_filter": 1,
    "label": "Project",
-   "options": "Project",
-   "read_only_depends_on": "eval: doc.revision_of"
+   "options": "Project"
+  },
+  {
+   "fieldname": "fiscal_year",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Fiscal Year",
+   "options": "Fiscal Year",
+   "reqd": 1
   },
   {
    "fieldname": "column_break_3",
    "fieldtype": "Column Break"
   },
+  {
+   "depends_on": "eval:in_list([\"Stop\", \"Warn\"], doc.action_if_accumulated_monthly_budget_exceeded_on_po || doc.action_if_accumulated_monthly_budget_exceeded_on_mr || doc.action_if_accumulated_monthly_budget_exceeded_on_actual)",
+   "fieldname": "monthly_distribution",
+   "fieldtype": "Link",
+   "label": "Monthly Distribution",
+   "options": "Monthly Distribution"
+  },
   {
    "fieldname": "amended_from",
    "fieldtype": "Link",
@@ -188,152 +183,31 @@
    "options": "\nStop\nWarn\nIgnore"
   },
   {
-   "default": "BUDGET-.########",
+   "fieldname": "section_break_21",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "accounts",
+   "fieldtype": "Table",
+   "label": "Budget Accounts",
+   "options": "Budget Account",
+   "reqd": 1
+  },
+  {
    "fieldname": "naming_series",
-   "fieldtype": "Select",
+   "fieldtype": "Data",
+   "hidden": 1,
    "label": "Series",
    "no_copy": 1,
-   "options": "BUDGET-.########",
    "print_hide": 1,
-   "reqd": 1,
+   "read_only": 1,
    "set_only_once": 1
-  },
-  {
-   "fieldname": "control_action_for_cumulative_expense_section",
-   "fieldtype": "Section Break",
-   "label": "Control Action for Cumulative Expense"
-  },
-  {
-   "default": "0",
-   "description": "(Purchase Order + Material Request + Actual Expense)",
-   "fieldname": "applicable_on_cumulative_expense",
-   "fieldtype": "Check",
-   "label": "Applicable on Cumulative Expense"
-  },
-  {
-   "depends_on": "eval:doc.applicable_on_cumulative_expense == 1",
-   "fieldname": "action_if_annual_exceeded_on_cumulative_expense",
-   "fieldtype": "Select",
-   "label": "Action if Anual Budget Exceeded on Cumulative Expense",
-   "options": "\nStop\nWarn\nIgnore"
-  },
-  {
-   "depends_on": "eval:doc.applicable_on_cumulative_expense == 1",
-   "fieldname": "action_if_accumulated_monthly_exceeded_on_cumulative_expense",
-   "fieldtype": "Select",
-   "label": "Action if Accumulative Monthly Budget Exceeded on Cumulative Expense",
-   "options": "\nStop\nWarn\nIgnore"
-  },
-  {
-   "fieldname": "section_break_fpdt",
-   "fieldtype": "Section Break",
-   "hide_border": 1
-  },
-  {
-   "fieldname": "budget_distribution",
-   "fieldtype": "Table",
-   "label": "Budget Distribution",
-   "options": "Budget Distribution"
-  },
-  {
-   "fieldname": "account",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Account",
-   "options": "Account",
-   "read_only_depends_on": "eval: doc.revision_of",
-   "reqd": 1
-  },
-  {
-   "fieldname": "budget_amount",
-   "fieldtype": "Currency",
-   "label": "Budget Amount",
-   "reqd": 1
-  },
-  {
-   "fieldname": "section_break_kkan",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "revision_of",
-   "fieldtype": "Data",
-   "label": "Revision Of",
-   "no_copy": 1,
-   "read_only": 1
-  },
-  {
-   "default": "1",
-   "fieldname": "distribute_equally",
-   "fieldtype": "Check",
-   "label": "Distribute Equally"
-  },
-  {
-   "fieldname": "section_break_nwug",
-   "fieldtype": "Section Break",
-   "hide_border": 1
-  },
-  {
-   "fieldname": "from_fiscal_year",
-   "fieldtype": "Link",
-   "label": "From Fiscal Year",
-   "options": "Fiscal Year",
-   "read_only_depends_on": "eval: doc.revision_of",
-   "reqd": 1
-  },
-  {
-   "fieldname": "to_fiscal_year",
-   "fieldtype": "Link",
-   "label": "To Fiscal Year",
-   "options": "Fiscal Year",
-   "read_only_depends_on": "eval: doc.revision_of",
-   "reqd": 1
-  },
-  {
-   "fieldname": "budget_start_date",
-   "fieldtype": "Date",
-   "hidden": 1,
-   "label": "Budget Start Date"
-  },
-  {
-   "fieldname": "budget_end_date",
-   "fieldtype": "Date",
-   "hidden": 1,
-   "label": "Budget End Date"
-  },
-  {
-   "default": "Monthly",
-   "fieldname": "distribution_frequency",
-   "fieldtype": "Select",
-   "label": "Distribution Frequency",
-   "options": "Monthly\nQuarterly\nHalf-Yearly\nYearly",
-   "read_only_depends_on": "eval: doc.revision_of",
-   "reqd": 1
-  },
-  {
-   "fieldname": "section_break_wkqb",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "column_break_paum",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "column_break_nwor",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "budget_distribution_total",
-   "fieldtype": "Currency",
-   "label": "Budget Distribution Total",
-   "no_copy": 1,
-   "read_only": 1
   }
  ],
- "grid_page_length": 50,
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2025-12-10 02:35:01.197613",
+ "modified": "2024-03-27 13:06:42.675933",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Budget",
@@ -357,9 +231,8 @@
    "write": 1
   }
  ],
- "row_format": "Dynamic",
  "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
-}
+}

erpnext/accounts/doctype/budget/test_budget.py

@@ -3,39 +3,22 @@
 import unittest
 
 import frappe
-from frappe.client import submit
-from frappe.utils import add_days, flt, get_first_day, get_last_day, getdate, now_datetime, nowdate
+from frappe.tests import IntegrationTestCase
+from frappe.utils import now_datetime, nowdate
 
-from erpnext.accounts.doctype.budget.budget import (
-	BudgetError,
-	get_accumulated_monthly_budget,
-	get_actual_expense,
-	revise_budget,
-)
+from erpnext.accounts.doctype.budget.budget import BudgetError, get_actual_expense
 from erpnext.accounts.doctype.journal_entry.test_journal_entry import make_journal_entry
 from erpnext.accounts.utils import get_fiscal_year
 from erpnext.buying.doctype.purchase_order.test_purchase_order import create_purchase_order
-from erpnext.tests.utils import ERPNextTestSuite
+
+EXTRA_TEST_RECORD_DEPENDENCIES = ["Monthly Distribution"]
 
 
-class TestBudget(ERPNextTestSuite):
-	@classmethod
-	def setUpClass(cls):
-		super().setUpClass()
-		cls.make_monthly_distribution()
-		cls.make_projects()
-
-	def setUp(self):
-		frappe.db.set_single_value("Accounts Settings", "use_legacy_budget_controller", False)
-		self.company = "_Test Company"
-		self.fiscal_year = frappe.db.get_value("Fiscal Year", {}, "name")
-		self.account = "_Test Account Cost for Goods Sold - _TC"
-		self.cost_center = "_Test Cost Center - _TC"
-
+class TestBudget(IntegrationTestCase):
 	def test_monthly_budget_crossed_ignore(self):
 		set_total_expense_zero(nowdate(), "cost_center")
 
-		budget = make_budget(budget_against="Cost Center", do_not_save=False, submit_budget=True)
+		budget = make_budget(budget_against="Cost Center")
 
 		jv = make_journal_entry(
 			"_Test Account Cost for Goods Sold - _TC",
@@ -56,18 +39,14 @@ class TestBudget(ERPNextTestSuite):
 	def test_monthly_budget_crossed_stop1(self):
 		set_total_expense_zero(nowdate(), "cost_center")
 
-		budget = make_budget(budget_against="Cost Center", do_not_save=False, submit_budget=True)
+		budget = make_budget(budget_against="Cost Center")
 
 		frappe.db.set_value("Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop")
 
-		accumulated_limit = get_accumulated_monthly_budget(
-			budget.name,
-			nowdate(),
-		)
 		jv = make_journal_entry(
 			"_Test Account Cost for Goods Sold - _TC",
 			"_Test Bank - _TC",
-			accumulated_limit + 1,
+			40000,
 			"_Test Cost Center - _TC",
 			posting_date=nowdate(),
 		)
@@ -80,15 +59,14 @@ class TestBudget(ERPNextTestSuite):
 	def test_exception_approver_role(self):
 		set_total_expense_zero(nowdate(), "cost_center")
 
-		budget = make_budget(budget_against="Cost Center", do_not_save=False, submit_budget=True)
+		budget = make_budget(budget_against="Cost Center")
 
 		frappe.db.set_value("Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop")
 
-		accumulated_limit = get_accumulated_monthly_budget(budget.name, nowdate())
 		jv = make_journal_entry(
 			"_Test Account Cost for Goods Sold - _TC",
 			"_Test Bank - _TC",
-			accumulated_limit + 1,
+			40000,
 			"_Test Cost Center - _TC",
 			posting_date=nowdate(),
 		)
@@ -112,16 +90,12 @@ class TestBudget(ERPNextTestSuite):
 			applicable_on_purchase_order=1,
 			action_if_accumulated_monthly_budget_exceeded_on_mr="Stop",
 			budget_against="Cost Center",
-			do_not_save=False,
-			submit_budget=True,
 		)
 
+		fiscal_year = get_fiscal_year(nowdate())[0]
 		frappe.db.set_value("Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop")
+		frappe.db.set_value("Budget", budget.name, "fiscal_year", fiscal_year)
 
-		accumulated_limit = get_accumulated_monthly_budget(
-			budget.name,
-			nowdate(),
-		)
 		mr = frappe.get_doc(
 			{
 				"doctype": "Material Request",
@@ -135,7 +109,7 @@ class TestBudget(ERPNextTestSuite):
 						"uom": "_Test UOM",
 						"warehouse": "_Test Warehouse - _TC",
 						"schedule_date": nowdate(),
-						"rate": accumulated_limit + 1,
+						"rate": 100000,
 						"expense_account": "_Test Account Cost for Goods Sold - _TC",
 						"cost_center": "_Test Cost Center - _TC",
 					}
@@ -149,26 +123,19 @@ class TestBudget(ERPNextTestSuite):
 
 		budget.load_from_db()
 		budget.cancel()
-		mr.cancel()
 
 	def test_monthly_budget_crossed_for_po(self):
 		budget = make_budget(
 			applicable_on_purchase_order=1,
 			action_if_accumulated_monthly_budget_exceeded_on_po="Stop",
 			budget_against="Cost Center",
-			do_not_save=False,
-			submit_budget=True,
 		)
 
+		fiscal_year = get_fiscal_year(nowdate())[0]
 		frappe.db.set_value("Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop")
+		frappe.db.set_value("Budget", budget.name, "fiscal_year", fiscal_year)
 
-		accumulated_limit = get_accumulated_monthly_budget(
-			budget.name,
-			nowdate(),
-		)
-		po = create_purchase_order(
-			transaction_date=nowdate(), qty=1, rate=accumulated_limit + 1, do_not_submit=True
-		)
+		po = create_purchase_order(transaction_date=nowdate(), do_not_submit=True)
 
 		po.set_missing_values()
 
@@ -181,19 +148,16 @@ class TestBudget(ERPNextTestSuite):
 	def test_monthly_budget_crossed_stop2(self):
 		set_total_expense_zero(nowdate(), "project")
 
-		budget = make_budget(budget_against="Project", do_not_save=False, submit_budget=True)
+		budget = make_budget(budget_against="Project")
 
 		frappe.db.set_value("Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop")
 
 		project = frappe.get_value("Project", {"project_name": "_Test Project"})
-		accumulated_limit = get_accumulated_monthly_budget(
-			budget.name,
-			nowdate(),
-		)
+
 		jv = make_journal_entry(
 			"_Test Account Cost for Goods Sold - _TC",
 			"_Test Bank - _TC",
-			accumulated_limit + 1,
+			40000,
 			"_Test Cost Center - _TC",
 			project=project,
 			posting_date=nowdate(),
@@ -207,7 +171,7 @@ class TestBudget(ERPNextTestSuite):
 	def test_yearly_budget_crossed_stop1(self):
 		set_total_expense_zero(nowdate(), "cost_center")
 
-		budget = make_budget(budget_against="Cost Center", do_not_save=False, submit_budget=True)
+		budget = make_budget(budget_against="Cost Center")
 
 		jv = make_journal_entry(
 			"_Test Account Cost for Goods Sold - _TC",
@@ -224,7 +188,7 @@ class TestBudget(ERPNextTestSuite):
 	def test_yearly_budget_crossed_stop2(self):
 		set_total_expense_zero(nowdate(), "project")
 
-		budget = make_budget(budget_against="Project", do_not_save=False, submit_budget=True)
+		budget = make_budget(budget_against="Project")
 
 		project = frappe.get_value("Project", {"project_name": "_Test Project"})
 
@@ -244,7 +208,7 @@ class TestBudget(ERPNextTestSuite):
 	def test_monthly_budget_on_cancellation1(self):
 		set_total_expense_zero(nowdate(), "cost_center")
 
-		budget = make_budget(budget_against="Cost Center", do_not_save=False, submit_budget=True)
+		budget = make_budget(budget_against="Cost Center")
 		month = now_datetime().month
 		if month > 9:
 			month = 9
@@ -273,7 +237,7 @@ class TestBudget(ERPNextTestSuite):
 	def test_monthly_budget_on_cancellation2(self):
 		set_total_expense_zero(nowdate(), "project")
 
-		budget = make_budget(budget_against="Project", do_not_save=False, submit_budget=True)
+		budget = make_budget(budget_against="Project")
 		month = now_datetime().month
 		if month > 9:
 			month = 9
@@ -305,22 +269,13 @@ class TestBudget(ERPNextTestSuite):
 		set_total_expense_zero(nowdate(), "cost_center")
 		set_total_expense_zero(nowdate(), "cost_center", "_Test Cost Center 2 - _TC")
 
-		budget = make_budget(
-			budget_against="Cost Center",
-			cost_center="_Test Company - _TC",
-			do_not_save=False,
-			submit_budget=True,
-		)
+		budget = make_budget(budget_against="Cost Center", cost_center="_Test Company - _TC")
 		frappe.db.set_value("Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop")
 
-		accumulated_limit = get_accumulated_monthly_budget(
-			budget.name,
-			nowdate(),
-		)
 		jv = make_journal_entry(
 			"_Test Account Cost for Goods Sold - _TC",
 			"_Test Bank - _TC",
-			accumulated_limit + 1,
+			40000,
 			"_Test Cost Center 2 - _TC",
 			posting_date=nowdate(),
 		)
@@ -344,19 +299,13 @@ class TestBudget(ERPNextTestSuite):
 				}
 			).insert(ignore_permissions=True)
 
-		budget = make_budget(
-			budget_against="Cost Center", cost_center=cost_center, do_not_save=False, submit_budget=True
-		)
+		budget = make_budget(budget_against="Cost Center", cost_center=cost_center)
 		frappe.db.set_value("Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop")
 
-		accumulated_limit = get_accumulated_monthly_budget(
-			budget.name,
-			nowdate(),
-		)
 		jv = make_journal_entry(
 			"_Test Account Cost for Goods Sold - _TC",
 			"_Test Bank - _TC",
-			accumulated_limit + 1,
+			40000,
 			cost_center,
 			posting_date=nowdate(),
 		)
@@ -388,12 +337,7 @@ class TestBudget(ERPNextTestSuite):
 			{"Sub Budget Cost Center 1 - _TC": 60, "Sub Budget Cost Center 2 - _TC": 40},
 		)
 
-		make_budget(
-			budget_against="Cost Center",
-			cost_center="Main Budget Cost Center 1 - _TC",
-			do_not_save=False,
-			submit_budget=True,
-		)
+		make_budget(budget_against="Cost Center", cost_center="Main Budget Cost Center 1 - _TC")
 
 		jv = make_journal_entry(
 			"_Test Account Cost for Goods Sold - _TC",
@@ -405,206 +349,6 @@ class TestBudget(ERPNextTestSuite):
 
 		self.assertRaises(BudgetError, jv.submit)
 
-	def test_action_for_cumulative_limit(self):
-		set_total_expense_zero(nowdate(), "cost_center")
-
-		budget = make_budget(
-			budget_against="Cost Center",
-			applicable_on_cumulative_expense=True,
-			do_not_save=False,
-			submit_budget=True,
-		)
-
-		accumulated_limit = get_accumulated_monthly_budget(budget.name, nowdate())
-
-		jv = make_journal_entry(
-			"_Test Account Cost for Goods Sold - _TC",
-			"_Test Bank - _TC",
-			accumulated_limit - 1,
-			"_Test Cost Center - _TC",
-			posting_date=nowdate(),
-		)
-		jv.submit()
-
-		frappe.db.set_value(
-			"Budget", budget.name, "action_if_accumulated_monthly_exceeded_on_cumulative_expense", "Stop"
-		)
-		po = create_purchase_order(
-			transaction_date=nowdate(), qty=1, rate=accumulated_limit + 1, do_not_submit=True
-		)
-		po.set_missing_values()
-
-		self.assertRaises(BudgetError, po.submit)
-
-		frappe.db.set_value(
-			"Budget", budget.name, "action_if_accumulated_monthly_exceeded_on_cumulative_expense", "Ignore"
-		)
-		po.submit()
-
-		budget.load_from_db()
-		budget.cancel()
-		po.cancel()
-		jv.cancel()
-
-	def test_fiscal_year_validation(self):
-		frappe.get_doc(
-			{
-				"doctype": "Fiscal Year",
-				"year": "2100",
-				"year_start_date": "2100-04-01",
-				"year_end_date": "2101-03-31",
-				"companies": [{"company": "_Test Company"}],
-			}
-		).insert(ignore_permissions=True)
-
-		budget = make_budget(
-			budget_against="Cost Center",
-			from_fiscal_year="2100",
-			to_fiscal_year="2099",
-			do_not_save=True,
-			submit_budget=False,
-		)
-
-		with self.assertRaises(frappe.ValidationError):
-			budget.save()
-
-	def test_total_distribution_equals_budget(self):
-		budget = make_budget(
-			budget_against="Cost Center",
-			applicable_on_cumulative_expense=True,
-			distribute_equally=0,
-			budget_amount=12000,
-			do_not_save=False,
-			submit_budget=False,
-		)
-
-		for row in budget.budget_distribution:
-			row.amount = 2000
-
-		with self.assertRaises(frappe.ValidationError):
-			budget.save()
-
-	def test_evenly_distribute_budget(self):
-		budget = make_budget(
-			budget_against="Cost Center", budget_amount=120000, do_not_save=False, submit_budget=True
-		)
-
-		total = sum([d.amount for d in budget.budget_distribution])
-		self.assertEqual(flt(total), 120000)
-		self.assertTrue(all(d.amount == 10000 for d in budget.budget_distribution))
-
-	def test_create_revised_budget(self):
-		budget = make_budget(
-			budget_against="Cost Center", budget_amount=120000, do_not_save=False, submit_budget=True
-		)
-
-		revised_name = revise_budget(budget.name)
-
-		revised_budget = frappe.get_doc("Budget", revised_name)
-		self.assertNotEqual(budget.name, revised_budget.name)
-		self.assertEqual(revised_budget.budget_against, budget.budget_against)
-		self.assertEqual(revised_budget.budget_amount, budget.budget_amount)
-
-		old_budget = frappe.get_doc("Budget", budget.name)
-		self.assertEqual(old_budget.docstatus, 2)
-
-	def test_revision_preserves_distribution(self):
-		set_total_expense_zero(nowdate(), "cost_center", "_Test Cost Center - _TC")
-		budget = make_budget(
-			budget_against="Cost Center", budget_amount=120000, do_not_save=False, submit_budget=True
-		)
-
-		revised_name = revise_budget(budget.name)
-		revised_budget = frappe.get_doc("Budget", revised_name)
-
-		self.assertGreater(len(revised_budget.budget_distribution), 0)
-
-		total = sum(row.amount for row in revised_budget.budget_distribution)
-		self.assertEqual(total, revised_budget.budget_amount)
-
-	def test_manual_budget_amount_total(self):
-		budget = make_budget(
-			budget_against="Cost Center",
-			distribute_equally=0,
-			budget_amount=30000,
-			budget_start_date="2025-04-01",
-			budget_end_date="2025-06-30",
-			do_not_save=False,
-			submit_budget=False,
-		)
-
-		budget.budget_distribution = []
-
-		for row in [
-			{"start_date": "2025-04-01", "end_date": "2025-04-30", "amount": 10000, "percent": 33.33},
-			{"start_date": "2025-05-01", "end_date": "2025-05-31", "amount": 15000, "percent": 50.00},
-			{"start_date": "2025-06-01", "end_date": "2025-06-30", "amount": 5000, "percent": 16.67},
-		]:
-			budget.append("budget_distribution", row)
-
-		budget.save()
-
-		total_child_amount = sum(row.amount for row in budget.budget_distribution)
-
-		self.assertEqual(total_child_amount, budget.budget_amount)
-
-	def test_fiscal_year_company_mismatch(self):
-		budget = make_budget(budget_against="Cost Center", do_not_save=True, submit_budget=False)
-
-		fy = frappe.get_doc(
-			{
-				"doctype": "Fiscal Year",
-				"year": "2099",
-				"year_start_date": "2099-04-01",
-				"year_end_date": "2100-03-31",
-				"companies": [{"company": "_Test Company 2"}],
-			}
-		).insert(ignore_permissions=True)
-
-		budget.from_fiscal_year = fy.name
-		budget.to_fiscal_year = fy.name
-		budget.company = "_Test Company"
-
-		with self.assertRaises(frappe.ValidationError):
-			budget.save()
-
-	def test_manual_distribution_total_equals_budget_amount(self):
-		budget = make_budget(
-			budget_against="Cost Center",
-			cost_center="_Test Cost Center - _TC",
-			distribute_equally=0,
-			budget_amount=12000,
-			do_not_save=False,
-			submit_budget=False,
-		)
-
-		for d in budget.budget_distribution:
-			d.amount = 2000
-
-		with self.assertRaises(frappe.ValidationError):
-			budget.save()
-
-	def test_duplicate_budget_validation(self):
-		budget = make_budget(
-			budget_against="Cost Center",
-			distribute_equally=1,
-			budget_amount=15000,
-			do_not_save=False,
-			submit_budget=True,
-		)
-
-		new_budget = frappe.new_doc("Budget")
-		new_budget.company = "_Test Company"
-		new_budget.from_fiscal_year = budget.from_fiscal_year
-		new_budget.to_fiscal_year = new_budget.from_fiscal_year
-		new_budget.budget_against = "Cost Center"
-		new_budget.cost_center = "_Test Cost Center - _TC"
-		new_budget.account = "_Test Account Cost for Goods Sold - _TC"
-		new_budget.budget_amount = 10000
-
-		with self.assertRaises(frappe.ValidationError):
-			new_budget.insert()
-
 
 def set_total_expense_zero(posting_date, budget_against_field=None, budget_against_CC=None):
 	if budget_against_field == "project":
@@ -613,32 +357,21 @@ def set_total_expense_zero(posting_date, budget_against_field=None, budget_again
 		budget_against = budget_against_CC or "_Test Cost Center - _TC"
 
 	fiscal_year = get_fiscal_year(nowdate())[0]
-	fiscal_year_start_date, fiscal_year_end_date = get_fiscal_year(nowdate())[1:3]
 
 	args = frappe._dict(
 		{
 			"account": "_Test Account Cost for Goods Sold - _TC",
 			"cost_center": "_Test Cost Center - _TC",
-			"month_end_date": posting_date,
+			"monthly_end_date": posting_date,
 			"company": "_Test Company",
-			"from_fiscal_year": fiscal_year,
-			"to_fiscal_year": fiscal_year,
+			"fiscal_year": fiscal_year,
 			"budget_against_field": budget_against_field,
-			"budget_start_date": fiscal_year_start_date,
-			"budget_end_date": fiscal_year_end_date,
 		}
 	)
 
 	if not args.get(budget_against_field):
 		args[budget_against_field] = budget_against
 
-	args.budget_against_doctype = frappe.unscrub(budget_against_field)
-
-	if frappe.get_cached_value("DocType", args.budget_against_doctype, "is_tree"):
-		args.is_tree = True
-	else:
-		args.is_tree = False
-
 	existing_expense = get_actual_expense(args)
 
 	if existing_expense:
@@ -668,33 +401,18 @@ def make_budget(**args):
 
 	budget_against = args.budget_against
 	cost_center = args.cost_center
+
 	fiscal_year = get_fiscal_year(nowdate())[0]
 
 	if budget_against == "Project":
-		project = frappe.get_value("Project", {"project_name": "_Test Project"})
-		budget_list = frappe.get_all(
-			"Budget",
-			filters={
-				"project": project,
-				"account": "_Test Account Cost for Goods Sold - _TC",
-			},
-			pluck="name",
-		)
+		project_name = "{}%".format("_Test Project/" + fiscal_year)
+		budget_list = frappe.get_all("Budget", fields=["name"], filters={"name": ("like", project_name)})
 	else:
-		budget_list = frappe.get_all(
-			"Budget",
-			filters={
-				"cost_center": cost_center or "_Test Cost Center - _TC",
-				"account": "_Test Account Cost for Goods Sold - _TC",
-			},
-			pluck="name",
-		)
-
-	for name in budget_list:
-		doc = frappe.get_doc("Budget", name)
-		if doc.docstatus == 1:
-			doc.cancel()
-		frappe.delete_doc("Budget", name, force=True, ignore_missing=True)
+		cost_center_name = "{}%".format(cost_center or "_Test Cost Center - _TC/" + fiscal_year)
+		budget_list = frappe.get_all("Budget", fields=["name"], filters={"name": ("like", cost_center_name)})
+	for d in budget_list:
+		frappe.db.sql("delete from `tabBudget` where name = %(name)s", d)
+		frappe.db.sql("delete from `tabBudget Account` where parent = %(name)s", d)
 
 	budget = frappe.new_doc("Budget")
 
@@ -703,18 +421,17 @@ def make_budget(**args):
 	else:
 		budget.cost_center = cost_center or "_Test Cost Center - _TC"
 
-	budget.from_fiscal_year = args.from_fiscal_year or fiscal_year
-	budget.to_fiscal_year = args.to_fiscal_year or fiscal_year
+	monthly_distribution = frappe.get_doc("Monthly Distribution", "_Test Distribution")
+	monthly_distribution.fiscal_year = fiscal_year
+
+	budget.fiscal_year = fiscal_year
+	budget.monthly_distribution = "_Test Distribution"
 	budget.company = "_Test Company"
-	budget.account = "_Test Account Cost for Goods Sold - _TC"
-	budget.budget_amount = args.budget_amount or 200000
 	budget.applicable_on_booking_actual_expenses = 1
 	budget.action_if_annual_budget_exceeded = "Stop"
 	budget.action_if_accumulated_monthly_budget_exceeded = "Ignore"
 	budget.budget_against = budget_against
-
-	budget.distribution_frequency = "Monthly"
-	budget.distribute_equally = args.get("distribute_equally", 1)
+	budget.append("accounts", {"account": "_Test Account Cost for Goods Sold - _TC", "budget_amount": 200000})
 
 	if args.applicable_on_material_request:
 		budget.applicable_on_material_request = 1
@@ -730,22 +447,7 @@ def make_budget(**args):
 			args.action_if_accumulated_monthly_budget_exceeded_on_po or "Warn"
 		)
 
-	if args.applicable_on_cumulative_expense:
-		budget.applicable_on_cumulative_expense = 1
-		budget.action_if_annual_exceeded_on_cumulative_expense = (
-			args.action_if_annual_exceeded_on_cumulative_expense or "Warn"
-		)
-		budget.action_if_accumulated_monthly_exceeded_on_cumulative_expense = (
-			args.action_if_accumulated_monthly_exceeded_on_cumulative_expense or "Warn"
-		)
-
-	if not args.do_not_save:
-		try:
-			budget.insert(ignore_if_duplicate=True)
-		except frappe.DuplicateEntryError:
-			pass
-
-	if args.submit_budget:
-		budget.submit()
+	budget.insert()
+	budget.submit()
 
 	return budget