test: marginal min order qty overage raises a toast

A minimum order qty defined in stock UOM often has no exact
representation in the purchase UOM, so the smallest valid order slightly
exceeds the minimum. Surface that overage on the Purchase Order with a
toast on first save when an item's ordered stock qty is above its
minimum by less than one purchase-UOM step, so the buyer sees the
marginal increase before sending the order. Sub-precision dust stays
silent.

.github/POSTGRES_COMPATIBILITY.md

@@ -60,13 +60,10 @@ Flag a changed query that uses any of these:
   check_field, True)`, `doc.db_set(field, False)`, or `frappe.qb.update(dt).set(check_field, True)`
   emit `SET col = true`, which PostgreSQL rejects on a `smallint`/`Check` column
   (`column is of type smallint but expression is of type boolean`). Pass `1`/`0`.
-- **A direct `.like()`/`.ilike()` on a pypika field (or raw `LIKE`) on a NON-text column** — `idx`,
-  `docstatus`, a date, etc. frappe maps `.like()` → `ILIKE`, and PostgreSQL has no `bigint ILIKE text`
-  operator (`operator does not exist: bigint ~~* unknown`). Cast the column to text first —
-  **`Cast_(col, "varchar")`**, not `Cast(col, "char")` (see below). MariaDB coerces the int
-  implicitly, so the cast is a no-op there. A `["like", …]` filter passed to `get_all`/`get_list`/
-  `qb.get_query`/`reportview` needs no cast: the framework casts non-text fields itself
-  (frappe/frappe#42449).
+- **`.like()`/`.ilike()` (or raw `LIKE`) on a NON-text column** — `idx`, `docstatus`, a date, etc.
+  frappe maps `.like()` → `ILIKE`, and PostgreSQL has no `bigint ILIKE text` operator (`operator
+  does not exist: bigint ~~* unknown`). Cast the column to text first — **`Cast_(col, "varchar")`**,
+  not `Cast(col, "char")` (see below). MariaDB coerces the int implicitly, so the cast is a no-op there.
 - **`CAST(… AS CHAR)` / `Cast(x, "char")`** — on PostgreSQL bare `CHAR` is `character(1)`, so
   `CAST(12 AS CHAR)` → `'1'` (silently truncates multi-digit values); MariaDB gives the full string.
   Use `VARCHAR` / `Cast_(x, "varchar")`.
@@ -195,9 +192,8 @@ pick a bound for a stated reason, and cover the varying-group case with a test.
 These are auto-handled by the framework and are **not** breaks:
 
 - **`.like()` / `["like", …]`** already renders as `ILIKE` on PostgreSQL — not a
-  case-sensitivity bug. A `["like", …]` filter on a **non-text** field is also cast to text by
-  the framework. *(Exception: a direct `.like()` on a **non-text** pypika field — `idx`,
-  `docstatus` — is a hard break, `bigint ILIKE`; see §1.)*
+  case-sensitivity bug. *(Exception: `.like()` on a **non-text** column — `idx`, `docstatus` —
+  is a hard break, `bigint ILIKE`; see §1.)*
 - **Raw `ifnull(...)`** inside `frappe.db.sql()` is rewritten to `coalesce(...)` on all engines.
 - **Backticks**, **`LOCATE`**, **`REGEXP`** / **`.regexp()`** in raw SQL are auto-translated on
   PostgreSQL (`REGEXP` → `~*`). **But `RLIKE` / `.rlike()` is NOT translated** — that one is a

.github/helper/install.sh

@@ -4,36 +4,6 @@ set -e
 
 cd ~ || exit
 
-# Authenticate git against github.com with the job token: anonymous git-over-HTTPS from the
-# runners gets throttled to a 401, which kills whichever clone is in flight — the frappe fetch
-# below, or payments under `bench get-app`. See the PR description.
-#
-# A credential helper rather than a url.insteadOf rewrite, because `git clone` PERSISTS a
-# rewritten URL into the new repo's .git/config: an insteadOf would leave the token sitting in
-# apps/payments/.git/config on the runner. A helper is consulted only when github.com actually
-# challenges, and leaves the stored remote URL untouched. Passing it through GIT_CONFIG_* keeps
-# the token out of ~/.gitconfig too, and child processes inherit it (bench shells out to git).
-ci_github_token=${CI_GITHUB_TOKEN:-${GITHUB_TOKEN:-}}
-if [ -n "$ci_github_token" ]; then
-    export CI_GITHUB_TOKEN="$ci_github_token"
-    export GIT_CONFIG_COUNT=3
-    # Reset first: git runs EVERY configured helper and calls `store` on them after a successful
-    # auth, so a `credential.helper=store` inherited from the image's gitconfig would write the
-    # token to ~/.git-credentials. An empty value clears the list before ours is added.
-    export GIT_CONFIG_KEY_0="credential.helper"
-    export GIT_CONFIG_VALUE_0=""
-    export GIT_CONFIG_KEY_1="credential.https://github.com.username"
-    export GIT_CONFIG_VALUE_1="x-access-token"
-    export GIT_CONFIG_KEY_2="credential.https://github.com.helper"
-    # Single-quoted: $CI_GITHUB_TOKEN is expanded by the shell git runs the helper in, so the
-    # token is read from the environment at call time and never stored anywhere. Answering only
-    # `get` makes the helper inert for git's `store`/`erase` calls.
-    export GIT_CONFIG_VALUE_2='!f() { test "$1" = get && echo "password=$CI_GITHUB_TOKEN"; }; f'
-fi
-
-# Whatever happens, never sit on a credential prompt: fail fast and legibly instead.
-export GIT_TERMINAL_PROMPT=0
-
 githubbranch=${GITHUB_BASE_REF:-${GITHUB_REF##*/}}
 frappeuser=${FRAPPE_USER:-"frappe"}
 frappecommitish=${FRAPPE_BRANCH:-}
@@ -218,7 +188,7 @@ restore_warm_bench() {
         # Phase 1 already fetched ~/frappe to the exact live develop SHA. Fetch that commit
         # straight from it (bench init names the remote 'upstream', not 'origin', and points
         # it at this local clone — so a plain `git fetch origin` does not work).
-        git fetch --no-tags --update-shallow "$HOME/frappe" HEAD || exit 1
+        git fetch --no-tags "$HOME/frappe" HEAD || exit 1
         git checkout --force FETCH_HEAD || exit 1
     ); then
         echo "Fast-forward to ${frappe_sha} failed; falling back to full init"

.github/workflows/crowdin-actions-download-translations.yml

@@ -1,51 +0,0 @@
-name: Download translations from Crowdin
-
-on:
-  schedule:
-    - cron: "0 4 * * 1"
-  workflow_dispatch:
-
-concurrency:
-  group: crowdin-download
-  cancel-in-progress: false
-
-permissions:
-  contents: read
-
-jobs:
-  download-translations:
-    name: Download translations into ${{ matrix.branch }}
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        branch: ["develop", "version-16-hotfix"]
-
-    steps:
-      - name: Checkout ${{ matrix.branch }}
-        uses: actions/checkout@v6
-        with:
-          ref: ${{ matrix.branch }}
-          fetch-depth: 0
-          persist-credentials: false
-
-      - name: Download translations and open PR
-        uses: crowdin/github-action@8f01d54f70f1713ee3f09d82c2bbb2daeac28689 # v2.17.1
-        with:
-          config: crowdin.yml
-          upload_sources: false
-          upload_translations: false
-          download_translations: true
-          crowdin_branch_name: "[frappe.erpnext] ${{ matrix.branch }}"
-          skip_ref_checkout: true
-          localization_branch_name: l10n_crowdin_${{ matrix.branch }}
-          create_pull_request: true
-          pull_request_base_branch_name: ${{ matrix.branch }}
-          commit_message: "fix: sync translations from crowdin"
-          pull_request_title: "fix: sync translations from crowdin (${{ matrix.branch }})"
-          pull_request_labels: "translation, skip-release-notes"
-          pull_request_reviewers: barredterra
-        env:
-          GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
-          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
-          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}

.github/workflows/crowdin-actions-update-main-pot.yml

@@ -1,54 +0,0 @@
-name: Upload main.pot to Crowdin
-
-on:
-  push:
-    branches:
-      - develop
-      - version-16-hotfix
-    paths:
-      - "erpnext/locale/main.pot"
-  workflow_dispatch:
-
-concurrency:
-  group: crowdin-upload-${{ github.ref_name }}
-  cancel-in-progress: true
-
-permissions:
-  contents: read
-
-jobs:
-  upload-sources:
-    name: Upload sources from ${{ github.ref_name }}
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout ${{ github.ref_name }}
-        uses: actions/checkout@v6
-
-      - name: Restore Crowdin cache
-        uses: actions/cache/restore@v6
-        with:
-          path: .crowdin
-          key: crowdin-${{ github.ref_name }}
-          restore-keys: crowdin-${{ github.ref_name }}-
-
-      - name: Upload main.pot to Crowdin
-        uses: crowdin/github-action@8f01d54f70f1713ee3f09d82c2bbb2daeac28689 # v2.17.1
-        with:
-          config: crowdin.yml
-          upload_sources: true
-          upload_translations: false
-          download_translations: false
-          create_pull_request: false
-          crowdin_branch_name: "[frappe.erpnext] ${{ github.ref_name }}"
-          upload_sources_args: "--cache"
-        env:
-          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
-          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
-
-      - name: Save Crowdin cache
-        uses: actions/cache/save@v6
-        if: always()
-        with:
-          path: .crowdin
-          key: crowdin-${{ github.ref_name }}-${{ github.run_id }}

.github/workflows/notify-support-on-release.yml

@@ -1,45 +0,0 @@
-name: Notify Support on PR release
-
-on:
-  issue_comment:
-    types: [created]
-
-permissions: {}
-
-jobs:
-  notify-support:
-    if: >-
-      github.event.issue.pull_request
-      && github.event.comment.user.id == 28699486
-      && contains(github.event.comment.body, 'This PR is included in version')
-    runs-on: ubuntu-latest
-    timeout-minutes: 2
-
-    steps:
-      - name: Notify support.frappe.io
-        env:
-          COMMENT_ID: ${{ github.event.comment.id }}
-          PR_NUMBER: ${{ github.event.issue.number }}
-          REPOSITORY: ${{ github.repository }}
-          SUPPORT_FRAPPE_AUTH: ${{ secrets.SUPPORT_FRAPPE_AUTH }}
-        run: |
-          payload="$(
-            jq -n \
-              --arg repository "$REPOSITORY" \
-              --argjson pr_number "$PR_NUMBER" \
-              --argjson comment_id "$COMMENT_ID" \
-              '{
-                repository: $repository,
-                pr_number: $pr_number,
-                comment_id: $comment_id
-              }'
-          )"
-
-          curl --fail-with-body \
-            --retry 3 \
-            --retry-all-errors \
-            --request POST \
-            --header "Authorization: $SUPPORT_FRAPPE_AUTH" \
-            --header "Content-Type: application/json" \
-            --data "$payload" \
-            "https://support.frappe.io/api/method/notify_pr_release"

.github/workflows/patch.yml

@@ -121,8 +121,6 @@ jobs:
         env:
           DB: mariadb
           TYPE: server
-          # Anonymous git to github.com gets throttled to a 401; authenticate the clones.
-          CI_GITHUB_TOKEN: ${{ github.token }}
 
       - name: Run Patch Tests
         run: |

.github/workflows/review-translation-changes.yaml

@@ -22,6 +22,6 @@ jobs:
       pull-requests: write
 
     steps:
-      - uses: alyf-de/po-review-action@5928f84d6bc9094f9ad6e2c5780f01c0044b800e # v1.1.1
+      - uses: alyf-de/po-review-action@v1.1.0
         with:
           hidden-po-files: eo.po

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

@@ -129,8 +129,6 @@ jobs:
           TYPE: server
           FRAPPE_USER: ${{ github.event.inputs.user }}
           FRAPPE_BRANCH: ${{ github.event.inputs.branch }}
-          # Anonymous git to github.com gets throttled to a 401; authenticate the clones.
-          CI_GITHUB_TOKEN: ${{ github.token }}
 
       - name: Run Tests
         run: |

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

@@ -13,7 +13,6 @@ on:
       - 'crowdin.yml'
       - '.coderabbit.yml'
       - '.mergify.yml'
-      - '**.po'
 
 permissions:
   contents: read

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

@@ -13,7 +13,6 @@ on:
       - 'crowdin.yml'
       - '.coderabbit.yml'
       - '.mergify.yml'
-      - '**.po'
   schedule:
     # Run everday at midnight UTC / 5:30 IST
     - cron: "0 0 * * *"
@@ -102,8 +101,6 @@ jobs:
           TYPE: server
           FRAPPE_USER: ${{ github.event.inputs.user }}
           FRAPPE_BRANCH: ${{ github.event.client_payload.sha || github.event.inputs.branch }}
-          # Anonymous git to github.com gets throttled to a 401; authenticate the clones.
-          CI_GITHUB_TOKEN: ${{ github.token }}
           DB_HOST: 127.0.0.1
           DB_USER_HOST: '%'
           WKHTMLTOX_DEB: /tmp/wkhtmltox.deb

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

@@ -103,8 +103,6 @@ jobs:
           DB: postgres
           TYPE: server
           FRAPPE_BRANCH: develop
-          # Anonymous git to github.com gets throttled to a 401; authenticate the clones.
-          CI_GITHUB_TOKEN: ${{ github.token }}
           BENCH_CACHE_DIR: /home/runner/bench-cache
 
       - name: Warm up test data

.mergify.yml

@@ -91,5 +91,3 @@ pull_request_rules:
         commit_message_format:
           title: pr-title
           body: pr-body
-merge_queue:
-  queue_controls_comment: false

banking/package.json

@@ -24,10 +24,10 @@
     "cmdk": "^1.1.1",
     "date-fns": "^4.1.0",
     "dayjs": "^1.11.20",
-    "frappe-react-sdk": "^1.17.1",
+    "frappe-react-sdk": "^1.17.0",
     "fuse.js": "^7.3.0",
-    "jotai": "^2.20.2",
-    "jotai-family": "^1.1.0",
+    "jotai": "^2.20.1",
+    "jotai-family": "^1.0.2",
     "lodash.isplainobject": "^4.0.6",
     "lucide-react": "^1.14.0",
     "radix-ui": "^1.6.1",
@@ -39,7 +39,7 @@
     "react-hook-form": "^7.75.0",
     "react-hotkeys-hook": "^5.3.2",
     "react-markdown": "^10.1.0",
-    "react-router": "^8.3.0",
+    "react-router": "^8.1.0",
     "rehype-raw": "^7.0.0",
     "remark-gfm": "^4.0.1",
     "safe-expr-eval": "^1.0.4",
@@ -48,18 +48,18 @@
     "tailwindcss": "^4.3.0",
     "tw-animate-css": "^1.4.0",
     "usehooks-ts": "^3.1.1",
-    "vite": "^8.2.1"
+    "vite": "^8.0.16"
   },
   "devDependencies": {
-    "@eslint/js": "^9.39.5",
+    "@eslint/js": "^9.39.4",
     "@types/node": "^25.3.0",
     "@types/react": "^19.2.7",
     "@types/react-dom": "^19.2.3",
-    "eslint": "^10.8.1",
+    "eslint": "^9.39.1",
     "eslint-plugin-react-hooks": "^7.1.1",
     "eslint-plugin-react-refresh": "^0.5.3",
     "globals": "^16.5.0",
     "typescript": "~5.9.3",
-    "typescript-eslint": "^8.67.0"
+    "typescript-eslint": "^8.62.1"
   }
 }

banking/src/components/common/AccountsDropdown.tsx

@@ -9,7 +9,6 @@ import Fuse from "fuse.js"
 import { ChevronDownIcon } from "lucide-react"
 import { useLayoutEffect, useMemo, useRef, useState } from "react"
 import { FormControl } from "../ui/form"
-import useResetScrollOnSearch from "@/hooks/useResetScrollOnSearch"
 
 
 export interface AccountsDropdownProps {
@@ -105,10 +104,6 @@ const AccountsDropdown = ({ root_type, report_type, account_type, value, onChang
 
     const buttonRef = useRef<HTMLButtonElement>(null)
 
-    // Searching replaces the grouped list with a short result list, so pin the scroll back to
-    // the top - otherwise the auto-selected first result can be out of view.
-    const listRef = useResetScrollOnSearch(search)
-
     const [width, setWidth] = useState(320)
 
     useLayoutEffect(() => {
@@ -158,7 +153,7 @@ const AccountsDropdown = ({ root_type, report_type, account_type, value, onChang
             <PopoverContent className="p-0" style={{ minWidth: width }} align="start">
                 <Command shouldFilter={false} className="w-full">
                     <CommandInput placeholder={_("Search account...")} onValueChange={setSearch} value={search} />
-                    <CommandList ref={listRef}>
+                    <CommandList>
                         <CommandEmpty>{_("No accounts found.")}</CommandEmpty>
 
                         {recommendedAccounts.length > 0 && (

banking/src/components/common/LinkFieldCombobox.tsx

@@ -10,7 +10,6 @@ import { ChevronDownIcon, ExternalLink } from "lucide-react";
 import { Button } from "../ui/button";
 import { cn } from "@/lib/utils";
 import { Command, CommandEmpty, CommandGroup, CommandInput, CommandItem, CommandList } from "../ui/command";
-import useResetScrollOnSearch from "@/hooks/useResetScrollOnSearch";
 import _ from "@/lib/translate";
 import ErrorBanner from "../ui/error-banner";
 import MarkdownRenderer from "../ui/markdown";
@@ -150,10 +149,6 @@ const LinkFieldCombobox = ({
 
     const buttonRef = useRef<HTMLButtonElement>(null)
 
-    // Results change as the search runs, so pin the scroll back to the top to keep the
-    // auto-selected first result in view.
-    const listRef = useResetScrollOnSearch(searchInput)
-
     const [width, setWidth] = useState(320)
 
     useLayoutEffect(() => {
@@ -269,7 +264,7 @@ const LinkFieldCombobox = ({
                 {error && <ErrorBanner error={error} />}
                 <Command shouldFilter={false} className="w-full">
                     <CommandInput placeholder={placeholder} onValueChange={setSearchInput} />
-                    <CommandList ref={listRef}>
+                    <CommandList>
                         <CommandEmpty>{isLoading ? _("Loading...") : _("No results found.")}</CommandEmpty>
                         <CommandGroup>
                             {items?.map((result) => (
@@ -277,7 +272,7 @@ const LinkFieldCombobox = ({
                                     <span className="font-medium">
                                         {result.label || result.value}
                                     </span>
-                                    {result.description && <span className="text-p-xs text-ink-gray-5">
+                                    {result.description && <span className="text-xs text-ink-gray-5">
                                         <MarkdownRenderer content={result.description} />
                                     </span>}
                                 </CommandItem>

banking/src/components/features/BankReconciliation/BankBalance.tsx

@@ -6,13 +6,13 @@ import { Progress } from "@/components/ui/progress"
 import { useGetAccountClosingBalance, useGetAccountClosingBalanceAsPerStatement, useGetAccountOpeningBalance, useGetUnreconciledTransactions } from "./utils"
 import { flt, formatCurrency } from "@/lib/numbers"
 import { Skeleton } from "@/components/ui/skeleton"
+import { StatContainer, StatLabel, StatValue } from "@/components/ui/stats"
 import { Edit, Info, Trash2 } from "lucide-react"
 import { H4, Paragraph } from "@/components/ui/typography"
 import { HoverCard, HoverCardContent, HoverCardTrigger } from "@/components/ui/hover-card"
 import { getCompanyCurrency } from "@/lib/company"
 import _ from "@/lib/translate"
-import { cn } from "@/lib/utils"
-import { Dialog, DialogClose, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog"
+import { Dialog, DialogClose, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle, DialogTrigger } from "@/components/ui/dialog"
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip"
 import { formatDate } from "@/lib/date"
 import { Form } from "@/components/ui/form"
@@ -26,109 +26,50 @@ import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@
 import { toast } from "sonner"
 import ErrorBanner from "@/components/ui/error-banner"
 
-const useBankCurrency = () => {
-    const bankAccount = useAtomValue(selectedBankAccountAtom)
-    return bankAccount?.account_currency ?? getCompanyCurrency(bankAccount?.company ?? '')
-}
-
-/**
- * One line of the balance summary - label on the left, figure right-aligned.
- *
- * `items-baseline` keeps the figure on the label's FIRST line, so a row carrying a `subLabel`
- * (the statement row's "As of <date>" note) doesn't centre its value against both lines.
- */
-const BalanceRow = ({ label, info, subLabel, emphasis, children }: {
-    label: React.ReactNode
-    info?: React.ReactNode
-    subLabel?: React.ReactNode
-    emphasis?: boolean
-    children: React.ReactNode
-}) => (
-    <div className="flex items-baseline justify-between gap-3">
-        <span className="flex min-w-0 flex-col gap-1.5">
-            <span className={cn("flex items-center gap-1 whitespace-nowrap text-xs text-ink-gray-6",
-                emphasis && "font-medium text-ink-gray-7")}>
-                {label}
-                {info}
-            </span>
-            {subLabel}
-        </span>
-        <div className="flex flex-col items-end">{children}</div>
-    </div>
-)
-
-/**
- * Type styles for a figure. Shared so an interactive figure can put them on the <button>
- * ITSELF rather than on a nested span: Tailwind's preflight sets `font: inherit` on buttons,
- * which resets line-height too, so a button wrapping a `text-sm` span gets a taller strut than
- * the span and the row grows - visible as extra space above a baseline-aligned row.
- */
-const BALANCE_VALUE_CLASSES = "font-numeric text-sm tabular-nums text-ink-gray-8"
-
-const BalanceValue = ({ children, emphasis, tone, className }: { children: React.ReactNode, emphasis?: boolean, tone?: 'red', className?: string }) => (
-    <span className={cn(BALANCE_VALUE_CLASSES,
-        emphasis && "font-semibold",
-        tone === 'red' && "text-ink-red-3",
-        className)}>
-        {children}
-    </span>
-)
-
-const BalanceSkeleton = () => <Skeleton className="h-4 w-24 rounded-sm" />
-
-/**
- * Balances and progress for the selected bank account, laid out like the totals block of an
- * invoice. This sits beside the bank picker rather than in a row of its own (saves vertical
- * space) and outside the picker's horizontal scroll area, so the figures being reconciled
- * against can never scroll out of view.
- */
-const BankAccountBalancePanel = () => {
+const BankBalance = () => {
 
     const bankAccount = useAtomValue(selectedBankAccountAtom)
 
     if (!bankAccount) {
         return null
     }
-
     return (
-        <div className="flex w-72 shrink-0 flex-col justify-center gap-2.5 border-s border-outline-gray-2 ps-4">
-            {/* Names the account these figures belong to - the picker scrolls, so the
-                highlighted card can't be relied on as the referent. */}
-            <span
-                className="truncate text-xs font-medium text-ink-gray-7"
-                title={bankAccount.account_name}>
-                {bankAccount.account_name}
-            </span>
-            <OpeningBalanceRow />
-            <SystemClosingBalanceRow />
-            <StatementClosingBalanceRow />
-            <Separator />
-            <DifferenceRow />
-            <ReconciledRow />
+        <div className="flex justify-between">
+            <div className="w-[80%] flex flex-wrap justify-between gap-2 pe-8 border-e-border border-e">
+                <OpeningBalance />
+                <ClosingBalance />
+                <ClosingBalanceAsPerStatement />
+                <Difference />
+            </div>
+
+            <ReconcileProgress />
         </div>
     )
 }
 
-const OpeningBalanceRow = () => {
-    const currency = useBankCurrency()
+const OpeningBalance = () => {
+    const bankAccount = useAtomValue(selectedBankAccountAtom)
     const { data, isLoading } = useGetAccountOpeningBalance()
 
-    return <BalanceRow label={_("Opening Balance")}>
-        {isLoading ? <BalanceSkeleton /> : <BalanceValue>{formatCurrency(flt(data?.message, 2), currency)}</BalanceValue>}
-    </BalanceRow>
+    return <StatContainer className="min-w-48">
+        <StatLabel>{_("Opening Balance")}</StatLabel>
+        {isLoading ? <Skeleton className="w-[150px] h-5 rounded-sm" /> : <StatValue className="font-numeric">{formatCurrency(flt(data?.message, 2), bankAccount?.account_currency ?? getCompanyCurrency(bankAccount?.company ?? ''))}</StatValue>}
+    </StatContainer>
 }
 
-const SystemClosingBalanceRow = () => {
-    const currency = useBankCurrency()
+const ClosingBalance = () => {
+    const bankAccount = useAtomValue(selectedBankAccountAtom)
     const { data, isLoading } = useGetAccountClosingBalance()
 
     return (
-        <BalanceRow
-            label={_("Closing (system)")}
-            info={
+        <StatContainer className="min-w-48">
+            <div className="flex items-start gap-1">
+                <StatLabel>
+                    {_("Closing Balance as per system")}
+                </StatLabel>
                 <HoverCard openDelay={100}>
                     <HoverCardTrigger>
-                        <Info className="size-3.5 text-ink-gray-6" />
+                        <Info className="size-3.5 text-ink-gray-6 -mt-px" />
                     </HoverCardTrigger>
                     <HoverCardContent className="w-96" align="start" side="right">
                         <H4 className="text-base">{_("Closing balance as per system")}</H4>
@@ -143,111 +84,15 @@ const SystemClosingBalanceRow = () => {
                         </Paragraph>
                     </HoverCardContent>
                 </HoverCard>
-            }
-        >
-            {isLoading ? <BalanceSkeleton /> : <BalanceValue>{formatCurrency(flt(data?.message, 2), currency)}</BalanceValue>}
-        </BalanceRow>
+
+            </div>
+            {isLoading ? <Skeleton className="w-[150px] h-5 rounded-sm" /> : <StatValue className="font-numeric">{formatCurrency(flt(data?.message, 2), bankAccount?.account_currency ?? getCompanyCurrency(bankAccount?.company ?? ''))}</StatValue>}
+        </StatContainer>
     )
 }
 
-const StatementClosingBalanceRow = () => {
-
+const Difference = () => {
     const bankAccount = useAtomValue(selectedBankAccountAtom)
-    const currency = useBankCurrency()
-    const dates = useAtomValue(bankRecDateAtom)
-    const setValue = useSetAtom(bankRecClosingBalanceAtom(bankAccount?.name ?? ''))
-
-    const { data, isLoading } = useGetAccountClosingBalanceAsPerStatement({
-        onSuccess: (data) => {
-            if (data?.message && data?.message?.balance) {
-                setValue({
-                    value: data?.message?.balance,
-                    stringValue: data?.message?.balance.toString()
-                })
-            }
-        }
-    })
-
-    const isDateSame = data?.message?.date === dates.toDate
-
-    // The server uses the returned date to distinguish an unset balance from a saved zero.
-    const hasBalance = Boolean(data?.message?.date)
-
-    const [isOpen, setIsOpen] = useState(false)
-
-    const tooltip = hasBalance
-        ? _("Click to change the closing balance as per statement")
-        : _("Click to set the closing balance as per statement")
-
-    return (
-        <BalanceRow
-            label={_("Closing (statement)")}
-            // The pencil sits beside the label, mirroring the info icon on the row above, so
-            // the figure stays a plain right-aligned number in line with every other row.
-            info={
-                <Tooltip>
-                    <TooltipTrigger asChild>
-                        {/* `p-0`: Tailwind's preflight gives buttons `appearance: button` but
-                            doesn't reset padding, so a bare button picks up the UA's ~1px 6px
-                            and knocks this row out of step with its neighbours. */}
-                        <button
-                            type='button'
-                            aria-label={tooltip}
-                            onClick={() => setIsOpen(true)}
-                            className="cursor-pointer p-0 text-ink-gray-5 transition-colors hover:text-ink-gray-7">
-                            <Edit className="size-3.5" />
-                        </button>
-                    </TooltipTrigger>
-                    <TooltipContent>{tooltip}</TooltipContent>
-                </Tooltip>
-            }
-            subLabel={!isDateSame && data?.message.date
-                ? <span className="whitespace-nowrap text-2xs font-medium text-ink-red-3">
-                    {_("As of {0}", [formatDate(data?.message?.date ?? '', 'Do MMM YYYY')])}
-                </span>
-                : undefined}
-        >
-            {/* Deliberately NOT a flex container: a flex box's baseline doesn't resolve to its
-                text, so the row's `items-baseline` couldn't line this up with the label. As a
-                plain inline button its baseline is the figure's own, like every other row.
-                "Set" gets the same treatment as a figure - it stands in for one. */}
-            {isLoading
-                ? <BalanceSkeleton />
-                : <Tooltip>
-                    <TooltipTrigger asChild>
-                        {/* The figure styles live on the button itself - see
-                            BALANCE_VALUE_CLASSES. `p-0` because preflight leaves the UA's
-                            button padding in place. */}
-                        <button
-                            type='button'
-                            aria-label={tooltip}
-                            onClick={() => setIsOpen(true)}
-                            className={cn(BALANCE_VALUE_CLASSES,
-                                "cursor-pointer p-0 underline decoration-outline-gray-5 decoration-dashed underline-offset-4",
-                                "transition-colors hover:decoration-ink-gray-8")}>
-                            {hasBalance ? formatCurrency(flt(data?.message?.balance, 2), currency) : _("Set")}
-                        </button>
-                    </TooltipTrigger>
-                    <TooltipContent>{tooltip}</TooltipContent>
-                </Tooltip>}
-
-            <Dialog open={isOpen} onOpenChange={setIsOpen}>
-                <DialogContent className="min-w-xl">
-                    <ClosingBalanceForm
-                        defaultBalance={data?.message?.balance ?? 0}
-                        date={dates.toDate}
-                        bankAccount={bankAccount}
-                        onClose={() => setIsOpen(false)}
-                    />
-                </DialogContent>
-            </Dialog>
-        </BalanceRow>
-    )
-}
-
-const DifferenceRow = () => {
-    const bankAccount = useAtomValue(selectedBankAccountAtom)
-    const currency = useBankCurrency()
 
     const { data, isLoading } = useGetAccountClosingBalance()
 
@@ -257,15 +102,16 @@ const DifferenceRow = () => {
 
     const isError = difference !== 0
 
-    return <BalanceRow label={_("Difference")} emphasis>
-        {isLoading
-            ? <BalanceSkeleton />
-            : <BalanceValue emphasis tone={isError ? 'red' : undefined}>{formatCurrency(difference, currency)}</BalanceValue>}
-    </BalanceRow>
+    return <StatContainer className="w-fit text-end sm:min-w-56">
+        <StatLabel className="text-end">{_("Difference")}</StatLabel>
+        {isLoading ? <Skeleton className="w-[150px] h-5 self-end rounded-sm" /> : <StatValue className={isError ? 'text-ink-red-3 font-numeric' : 'font-numeric'}>
+            {formatCurrency(difference,
+                bankAccount?.account_currency ?? getCompanyCurrency(bankAccount?.company ?? ''))
+            }</StatValue>}
+    </StatContainer>
 }
 
-/** Reconciliation progress through the selected date range: a count plus a slim bar. */
-const ReconciledRow = () => {
+const ReconcileProgress = () => {
 
     const bankAccount = useAtomValue(selectedBankAccountAtom)
 
@@ -286,14 +132,75 @@ const ReconciledRow = () => {
 
     const progress = (totalCount ? reconciledCount / totalCount : 0) * 100
 
-    return <div className="flex flex-col gap-1.5">
-        <BalanceRow label={_("Reconciled")}>
-            <BalanceValue>{reconciledCount} / {totalCount ?? 0}</BalanceValue>
-        </BalanceRow>
-        <Progress value={progress} max={100} size="sm" />
+    return <div className="w-[18%] flex flex-col gap-1 items-end">
+        <div className="w-full">
+            <Progress
+                value={progress}
+                max={100}
+                size="md"
+                label="Progress"
+                hint
+                hintText={`${reconciledCount} / ${totalCount} ${_("reconciled")}`} />
+        </div>
     </div>
 }
 
+const ClosingBalanceAsPerStatement = () => {
+
+    const bankAccount = useAtomValue(selectedBankAccountAtom)
+    const dates = useAtomValue(bankRecDateAtom)
+    const setValue = useSetAtom(bankRecClosingBalanceAtom(bankAccount?.name ?? ''))
+
+    const { data, isLoading } = useGetAccountClosingBalanceAsPerStatement({
+        onSuccess: (data) => {
+            if (data?.message && data?.message?.balance) {
+                setValue({
+                    value: data?.message?.balance,
+                    stringValue: data?.message?.balance.toString()
+                })
+            }
+        }
+    })
+
+    const isDateSame = data?.message?.date === dates.toDate
+
+    const [isOpen, setIsOpen] = useState(false)
+
+
+    return <StatContainer className="min-w-48">
+        <StatLabel>{_("Closing Balance as per statement")}</StatLabel>
+        <div className="flex flex-col gap-2 items-start">
+            <Dialog open={isOpen} onOpenChange={setIsOpen}>
+                <DialogTrigger>
+                    <Tooltip>
+                        <TooltipTrigger asChild>
+                            <div className="flex items-center gap-4 underline cursor-pointer underline-offset-6" role="button">
+                                {isLoading ? <Skeleton className="w-[150px] h-5 rounded-sm" /> : <StatValue className="font-numeric">{formatCurrency(flt(data?.message?.balance, 2), bankAccount?.account_currency ?? getCompanyCurrency(bankAccount?.company ?? ''))}</StatValue>}
+                                <Edit className="w-4 h-4" />
+                            </div>
+                        </TooltipTrigger>
+                        <TooltipContent>
+                            {_("Click to set the closing balance as per statement")}
+                        </TooltipContent>
+                    </Tooltip>
+                </DialogTrigger>
+                <DialogContent className="min-w-xl">
+                    <ClosingBalanceForm
+                        defaultBalance={data?.message?.balance ?? 0}
+                        date={dates.toDate}
+                        bankAccount={bankAccount}
+                        onClose={() => setIsOpen(false)}
+                    />
+
+
+                </DialogContent>
+            </Dialog>
+            {!isDateSame && data?.message.date && <span className="text-xs font-medium text-ink-red-3">{_("As of {0}", [formatDate(data?.message?.date ?? '', 'Do MMM YYYY')])}</span>}
+        </div>
+    </StatContainer>
+
+}
+
 const ClosingBalanceForm = ({ defaultBalance, date, bankAccount, onClose }: { defaultBalance: number, date: string, bankAccount: SelectedBank | null, onClose: VoidFunction }) => {
 
     const { mutate } = useSWRConfig()
@@ -395,7 +302,7 @@ const ClosingBalancesList = ({ bankAccount, date }: { bankAccount: SelectedBank
 
     return <div>
         <Separator className="my-8" />
-        <p className="text-p-sm text-center pb-2">{_("Balances as per bank statement before {0}", [formatDate(date, 'Do MMM YYYY')])}</p>
+        <p className="text-sm text-center">{_("Balances as per bank statement before {0}", [formatDate(date, 'Do MMM YYYY')])}</p>
         <Table>
             <TableHeader>
                 <TableRow>
@@ -424,4 +331,4 @@ const ClosingBalancesList = ({ bankAccount, date }: { bankAccount: SelectedBank
 
 }
 
-export default BankAccountBalancePanel
+export default BankBalance

banking/src/components/features/BankReconciliation/BankClearanceSummary.tsx

@@ -205,9 +205,9 @@ const BankClearanceSummaryView = () => {
 
     const content = _("Below is a list of all accounting entries posted against the bank account {0} between {1} and {2}.", [`<strong>${bankAccount?.account}</strong>`, `<strong>${formattedFromDate}</strong>`, `<strong>${formattedToDate}</strong>`])
 
-    return <div className="flex min-h-0 flex-1 flex-col space-y-4 py-2">
+    return <div className="space-y-4 py-2">
 
-        <div className="shrink-0">
+        <div>
             <span className="text-p-sm">
                 <MarkdownRenderer content={content} />
             </span>
@@ -220,9 +220,8 @@ const BankClearanceSummaryView = () => {
                 data={data.message.result}
                 columns={clearanceColumns}
                 getRowId={(row) => `${row.payment_entry}-${row.posting_date}`}
-                className="min-h-0 flex-1"
-                maxHeight="none"
-                scrollAreaClassName="flex-1"
+                maxHeight="calc(100vh - 200px)"
+                scrollAreaClassName="min-h-[calc(100vh-200px)]"
                 emptyState={_("No rows to display.")}
             />
         ) : null}

banking/src/components/features/BankReconciliation/BankPicker.tsx

@@ -74,10 +74,7 @@ const BankPicker = ({ className }: { className?: string }) => {
     }
     return (
         <div
-            // No trailing padding: it would sit inside the fade region, so the mask would
-            // spend itself on empty space and the last card would stop short of the balance
-            // panel instead of fading towards it. The column gap provides the separation.
-            className={cn("flex gap-3 items-stretch w-full overflow-x-auto scroll-fade-x",
+            className={cn("flex gap-3 items-stretch w-full overflow-x-auto pe-4",
                 banks?.length > 4 ? 'pb-2' : '', className,
             )}
             style={{
@@ -111,12 +108,12 @@ const BankPickerItem = ({ bank }: { bank: SelectedBank }) => {
         role="button"
         title={`Select ${bank.account_name}`}
         onClick={onSelect}
-        // `shrink-0`: this is a horizontally scrolling row, so cards keep their own width
-        // instead of being compressed to fit the container.
-        className={cn('w-60 shrink-0 rounded-md border border-outline-gray-1 p-2 overflow-hidden cursor-pointer transition-colors',
+        className={cn('rounded-md border border-outline-gray-1 max-w-60 min-w-60 p-2 overflow-hidden cursor-pointer',
             isSelected ? 'border-outline-gray-5 bg-surface-gray-1' : 'hover:bg-surface-gray-1'
         )}
     >
+
+
         <BankLogo bank={bank} className="mb-2" />
 
         <div className="flex flex-col gap-1">

banking/src/components/features/BankReconciliation/BankRecDateFilter.tsx

@@ -5,179 +5,107 @@ import { AVAILABLE_TIME_PERIODS, formatDate, getDatesForTimePeriod, TimePeriod }
 import { Button } from '@/components/ui/button'
 import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
 import { ChevronDownIcon, ChevronLeftIcon, ChevronRight } from 'lucide-react'
-import { Command, CommandGroup, CommandInput, CommandItem, CommandList } from '@/components/ui/command'
+import { Command, CommandEmpty, CommandInput, CommandItem, CommandList } from '@/components/ui/command'
 import { parse } from "chrono-node"
 import { Calendar } from '@/components/ui/calendar'
 import useFiscalYear from '@/hooks/useFiscalYear'
 import dayjs from 'dayjs'
 import _ from '@/lib/translate'
 import { useDirection } from '@/components/ui/direction'
-import useResetScrollOnSearch from '@/hooks/useResetScrollOnSearch'
-
-const DATE_FORMAT = 'YYYY-MM-DD'
-
-/** Current fiscal year plus this many previous ones, for quarter/year options. */
-const PREVIOUS_FISCAL_YEARS = 2
-
-type DateOption = {
-    /** Stable id - used as the cmdk value and the React key. */
-    key: string
-    label: string
-    translatedLabel: string
-    fromDate: string
-    toDate: string
-    format: string
-    /** Extra terms to match against, beyond the labels and dates. */
-    keywords?: string[]
-    /** Whether to show this option when the search box is empty. */
-    isDefault?: boolean
-}
-
-/**
- * Fiscal years keep the same month/day boundaries year on year, so previous years can be
- * derived by subtracting whole years instead of fetching them. Works for both Jan-Dec and
- * Apr-Mar style fiscal years.
- */
-const fiscalYearLabel = (start: dayjs.Dayjs, end: dayjs.Dayjs) =>
-    start.year() === end.year() ? `${start.year()}` : `${start.year()}-${end.year()}`
 
 const BankRecDateFilter = () => {
 
     const [bankRecDate, setBankRecDate] = useAtom(bankRecDateAtom)
 
-    const { fiscalYear } = useFiscalYear()
+    const { data: fiscalYear } = useFiscalYear()
 
-    const today = useMemo(() => dayjs().format(DATE_FORMAT), [])
-
-    const allOptions = useMemo(() => {
-        const standardOptions: DateOption[] = AVAILABLE_TIME_PERIODS.map((period) => {
+    const timePeriodOptions = useMemo(() => {
+        const standardOptions = AVAILABLE_TIME_PERIODS.map((period) => {
             const dates = getDatesForTimePeriod(period)
             return {
-                key: period,
                 label: period,
-                translatedLabel: dates.translatedLabel ?? _(period),
                 fromDate: dates.fromDate,
                 toDate: dates.toDate,
                 format: dates.format,
-                isDefault: true,
+                translatedLabel: dates.translatedLabel
             }
         })
 
-        if (!fiscalYear) {
-            return standardOptions
-        }
+        if (fiscalYear?.message) {
+            // For a fiscal year, we need to replace "Last Year", "This Year", and add options for quarters
+            const fiscalYearStart = fiscalYear.message.year_start_date
+            const fiscalYearEnd = fiscalYear.message.year_end_date
 
-        const currentStart = dayjs(fiscalYear.year_start_date)
-        const currentEnd = dayjs(fiscalYear.year_end_date)
-
-        const quarterOptions: DateOption[] = []
-        const fiscalYearOptions: DateOption[] = []
-
-        // Static literals so the translation extractor can find them.
-        const quarterLabels = [_("Q1"), _("Q2"), _("Q3"), _("Q4")]
-
-        for (let yearsAgo = 0; yearsAgo <= PREVIOUS_FISCAL_YEARS; yearsAgo++) {
-            const start = currentStart.subtract(yearsAgo, 'year')
-            const end = currentEnd.subtract(yearsAgo, 'year')
-            // Keep the real name for the current year; derive it for the earlier ones.
-            const yearLabel = yearsAgo === 0 ? fiscalYear.name : fiscalYearLabel(start, end)
-
-            for (let quarter = 0; quarter < 4; quarter++) {
-                const quarterStart = start.add(quarter * 3, 'month')
-                // End the day before the next quarter starts, clamped to the fiscal year end
-                // so a short fiscal year can't spill over.
-                const nextQuarterStart = start.add((quarter + 1) * 3, 'month')
-                const quarterEnd = nextQuarterStart.subtract(1, 'day').isAfter(end)
-                    ? end
-                    : nextQuarterStart.subtract(1, 'day')
-
-                if (quarterStart.isAfter(end)) continue
-
-                quarterOptions.push({
-                    key: `Q${quarter + 1}-${yearLabel}`,
-                    label: `Q${quarter + 1}: ${yearLabel}`,
-                    translatedLabel: `${quarterLabels[quarter]}: ${yearLabel}`,
-                    fromDate: quarterStart.format(DATE_FORMAT),
-                    toDate: quarterEnd.format(DATE_FORMAT),
-                    format: 'MMM YYYY',
-                    keywords: ['quarter', `q${quarter + 1}`, yearLabel],
-                    // Only the current fiscal year's quarters clutter the default list;
-                    // older ones stay searchable.
-                    isDefault: yearsAgo === 0,
-                })
+            const q1 = {
+                label: `Q1: ${fiscalYear.message.name}`,
+                translatedLabel: `${_("Q1")}: ${fiscalYear.message.name}`,
+                fromDate: fiscalYearStart,
+                toDate: dayjs(fiscalYearStart).add(3, 'month').format('YYYY-MM-DD'),
+                format: 'MMM YYYY'
             }
 
-            const label = yearsAgo === 0
-                ? 'This Fiscal Year'
-                : yearsAgo === 1
-                    ? 'Last Fiscal Year'
-                    : `FY ${yearLabel}`
+            const q2 = {
+                label: `Q2: ${fiscalYear.message.name}`,
+                translatedLabel: `${_("Q2")}: ${fiscalYear.message.name}`,
+                fromDate: dayjs(fiscalYearStart).add(3, 'month').format('YYYY-MM-DD'),
+                toDate: dayjs(fiscalYearStart).add(6, 'month').format('YYYY-MM-DD'),
+                format: 'MMM YYYY'
+            }
 
-            fiscalYearOptions.push({
-                key: `fiscal-year-${yearLabel}`,
-                label,
-                translatedLabel: yearsAgo <= 1 ? _(label) : `${_("FY")} ${yearLabel}`,
-                fromDate: start.format(DATE_FORMAT),
-                toDate: end.format(DATE_FORMAT),
-                format: 'MMM YYYY',
-                keywords: ['fiscal year', yearLabel],
-                isDefault: yearsAgo <= 1,
+            const q3 = {
+                label: `Q3: ${fiscalYear.message.name}`,
+                translatedLabel: `${_("Q3")}: ${fiscalYear.message.name}`,
+                fromDate: dayjs(fiscalYearStart).add(6, 'month').format('YYYY-MM-DD'),
+                toDate: dayjs(fiscalYearStart).add(9, 'month').format('YYYY-MM-DD'),
+                format: 'MMM YYYY'
+            }
+
+            const q4 = {
+                label: `Q4: ${fiscalYear.message.name}`,
+                translatedLabel: `${_("Q4")}: ${fiscalYear.message.name}`,
+                fromDate: dayjs(fiscalYearStart).add(9, 'month').format('YYYY-MM-DD'),
+                toDate: fiscalYearEnd,
+                format: 'MMM YYYY'
+            }
+
+            const thisYear = {
+                label: `This Fiscal Year`,
+                translatedLabel: `${_("This Fiscal Year")}`,
+                fromDate: fiscalYearStart,
+                toDate: fiscalYearEnd,
+                format: 'MMM YYYY'
+            }
+
+            const lastYear = {
+                label: `Last Fiscal Year`,
+                translatedLabel: `${_("Last Fiscal Year")}`,
+                fromDate: dayjs(fiscalYearStart).subtract(1, 'year').format('YYYY-MM-DD'),
+                toDate: dayjs(fiscalYearEnd).subtract(1, 'year').format('YYYY-MM-DD'),
+                format: 'MMM YYYY'
+            }
+            // Sort the options so that we get "This Month", "Last Month", quarters, fiscal year, then the rest of the standard options
+
+            const topRankedItems = standardOptions.filter((option) => {
+                return option.label === "This Month" || option.label === "Last Month"
             })
+
+            const bottomRankedItems = standardOptions.filter((option) => {
+                return option.label !== "This Month" && option.label !== "Last Month"
+            })
+
+            return [...topRankedItems, q1, q2, q3, q4, thisYear, lastYear, ...bottomRankedItems]
         }
 
-        // "This Month"/"Last Month" first, then quarters and fiscal years, then the rest.
-        const topRanked = standardOptions.filter((o) => o.label === 'This Month' || o.label === 'Last Month')
-        const bottomRanked = standardOptions.filter((o) => o.label !== 'This Month' && o.label !== 'Last Month')
-
-        return [...topRanked, ...quarterOptions, ...fiscalYearOptions, ...bottomRanked]
+        return standardOptions
     }, [fiscalYear])
 
-    // Reconciliation only looks backwards, so a period that hasn't started is never useful.
-    const selectableOptions = useMemo(
-        () => allOptions.filter((option) => option.fromDate <= today),
-        [allOptions, today],
-    )
-
     const [open, setOpen] = useState(false)
     const [value, setValue] = useState("")
 
-    // We filter ourselves (`shouldFilter={false}`) so that the parsed-date suggestion can be a
-    // real CommandItem alongside the predefined options, and keyboard navigation covers both.
-    const filteredOptions = useMemo(() => {
-        const query = value.trim().toLowerCase()
-
-        if (!query) {
-            return selectableOptions.filter((option) => option.isDefault)
-        }
-
-        const tokens = query.split(/\s+/)
-
-        return selectableOptions.filter((option) => {
-            const haystack = [
-                option.label,
-                option.translatedLabel,
-                ...(option.keywords ?? []),
-                option.fromDate,
-                option.toDate,
-            ].join(' ').toLowerCase()
-
-            return tokens.every((token) => haystack.includes(token))
-        })
-    }, [selectableOptions, value])
-
-    const parsedOption = useMemo(() => parseDateRange(value), [value])
-
-    // Filtering shortens the list, so pin the scroll back to the top to keep the
-    // auto-selected first option in view.
-    const listRef = useResetScrollOnSearch(value)
-
-    // Don't show a parsed suggestion that duplicates an option already in the list.
-    const showParsedOption = parsedOption
-        && !filteredOptions.some((o) => o.fromDate === parsedOption.fromDate && o.toDate === parsedOption.toDate)
-
     const timePeriod: TimePeriod | string = useMemo(() => {
         if (bankRecDate.fromDate && bankRecDate.toDate) {
-            for (const period of allOptions) {
+            // Check if the from and to dates match any predefined time period
+            for (const period of timePeriodOptions) {
                 if (period.fromDate === bankRecDate.fromDate && period.toDate === bankRecDate.toDate) {
                     return period.label;
                 }
@@ -186,11 +114,10 @@ const BankRecDateFilter = () => {
         } else {
             return "Date Range";
         }
-    }, [bankRecDate.fromDate, bankRecDate.toDate, allOptions]);
+    }, [bankRecDate.fromDate, bankRecDate.toDate, timePeriodOptions]);
 
     const handleTimePeriodChange = (fromDate: string, toDate: string) => {
         setBankRecDate({ fromDate, toDate })
-        setValue("")
         setOpen(false)
     }
 
@@ -203,9 +130,7 @@ const BankRecDateFilter = () => {
 
     const direction = useDirection()
 
-    const RangeArrow = direction === 'ltr'
-        ? <ChevronRight className='text-[12px] text-ink-gray-5/70' />
-        : <ChevronLeftIcon className='text-[12px] text-ink-gray-5/70' />
+
 
     return <div className='flex items-center'>
         <Popover open={open} onOpenChange={setOpen}>
@@ -216,57 +141,30 @@ const BankRecDateFilter = () => {
                     size='md'
                     className='rounded-e-none border-e-0'
                     role="combobox">
-                    {allOptions.find((period) => period.label === timePeriod)?.translatedLabel ?? _(timePeriod)}
+                    {timePeriodOptions.find((period) => period.label === timePeriod)?.translatedLabel ?? _(timePeriod)}
 
                     <ChevronDownIcon />
                 </Button>
             </PopoverTrigger>
 
             <PopoverContent className="w-84 p-1" align='start'>
-                <Command shouldFilter={false}>
+                <Command>
 
-                    <CommandInput placeholder={_("e.g. Last 3 weeks, Q1, May 2025")} onValueChange={setValue} value={value} />
-                    <CommandList ref={listRef} className='max-h-80'>
-                        {showParsedOption && parsedOption && (
-                            <CommandGroup heading={_("Matched date")}>
-                                <CommandItem
-                                    value='parsed-date-range'
-                                    className='flex justify-between'
-                                    onSelect={() => handleTimePeriodChange(parsedOption.fromDate, parsedOption.toDate)}>
-                                    <span className='max-w-[45%] truncate'>{value}</span>
-                                    <span className='text-xs text-ink-gray-5 flex items-center gap-1 text-end whitespace-nowrap'>
-                                        {parsedOption.fromDate === parsedOption.toDate
-                                            ? formatDate(parsedOption.fromDate, 'Do MMM YYYY')
-                                            : <>{formatDate(parsedOption.fromDate, 'Do MMM YY')} {RangeArrow} {formatDate(parsedOption.toDate, 'Do MMM YY')}</>}
-                                    </span>
-                                </CommandItem>
-                            </CommandGroup>
-                        )}
-
-                        {filteredOptions.length > 0 && (
-                            <CommandGroup>
-                                {filteredOptions.map((period) => (
-                                    <CommandItem
-                                        key={period.key}
-                                        value={period.key}
-                                        className='flex justify-between'
-                                        onSelect={() => handleTimePeriodChange(period.fromDate, period.toDate)}>
-                                        <span>
-                                            {period.translatedLabel}
-                                        </span>
-                                        <span className='text-xs text-ink-gray-5 flex items-center gap-1 text-end whitespace-nowrap'>
-                                            {formatDate(period.fromDate, period.format)} {RangeArrow} {formatDate(period.toDate, period.format)}
-                                        </span>
-                                    </CommandItem>
-                                ))}
-                            </CommandGroup>
-                        )}
-
-                        {!showParsedOption && filteredOptions.length === 0 && (
-                            <div className='p-2 text-sm text-ink-gray-5'>
-                                {_("No results found")}
-                            </div>
-                        )}
+                    <CommandInput placeholder="e.g. Last 3 weeks" onValueChange={setValue} value={value} />
+                    <CommandList className='max-h-fit'>
+                        <CommandEmpty className='text-start p-2 hover:bg-surface-gray-1'>
+                            <EmptyState onSelect={handleTimePeriodChange} value={value} />
+                        </CommandEmpty>
+                        {timePeriodOptions.map((period) => (
+                            <CommandItem key={period.label} className='flex justify-between' onSelect={() => handleTimePeriodChange(period.fromDate, period.toDate)}>
+                                <span>
+                                    {period.translatedLabel ?? _(period.label)}
+                                </span>
+                                <span className='text-xs text-ink-gray-5 flex items-center gap-1 text-end whitespace-nowrap'>
+                                    {formatDate(period.fromDate, period.format)} {direction === 'ltr' ? <ChevronRight className='text-[12px] text-ink-gray-5/70' /> : <ChevronLeftIcon className='text-[12px] text-ink-gray-5/70' />} {formatDate(period.toDate, period.format)}
+                                </span>
+                            </CommandItem>
+                        ))}
                     </CommandList>
                 </Command>
 
@@ -301,97 +199,77 @@ const BankRecDateFilter = () => {
 }
 
 const referentialKeywords = ["last", "this", "next", "previous"]
+const EmptyState = ({ onSelect, value }: { onSelect: (fromDate: string, toDate: string) => void, value: string }) => {
 
-/** chrono exposes `knownValues` on ParsingComponents but doesn't type it publicly. */
-const knownValuesOf = (components: unknown): Record<string, number> =>
-    (components as { knownValues?: Record<string, number> })?.knownValues ?? {}
+    const dates = useMemo(() => {
+        if (value) {
+            // Try parsing the value
+            const parsedDate = parse(value, undefined, { forwardDate: false })
 
-/**
- * How far back a parsed date must move to land in the past. Reconciliation only ever looks
- * backwards, so an ambiguous input that chrono resolves into the future - "December" typed in
- * September, or a bare weekday like "Friday" - is pulled to its most recent past occurrence.
- * An explicitly stated year is respected; a range that is still future gets discarded later.
- *
- * This returns a shift rather than a date so that a range can be moved as a single unit -
- * shifting its start and end independently would distort or invert it.
- */
-const pastShift = (date: Date, knownValues: Record<string, number>) => {
-    const today = dayjs()
-    let candidate = dayjs(date)
+            if (parsedDate && parsedDate.length > 0) {
+                const startDate = parsedDate[0].start.date()
+                const endDate = parsedDate[0].end?.date()
 
-    if (!candidate.isAfter(today, 'date') || knownValues.year !== undefined) {
-        return { amount: 0, unit: 'year' as const }
+                if (!endDate) {
+                    const today = new Date()
+                    // If today is greater than the start date, use today as the end date
+                    if (startDate.getTime() > today.getTime()) {
+                        return { fromDate: today, toDate: startDate }
+                    } else {
+                        // Check if the user only wants a specific month like "May 2025"
+                        // If the "known values" just has month and year, then we need to get the first day of the month and the last day of the month
+                        // @ts-expect-error - "Known Values" is available in the start "ParsingComponents"
+                        if (parsedDate[0].start.knownValues?.month && !parsedDate[0].start.knownValues?.day) {
+                            return {
+                                fromDate: startDate,
+                                toDate: dayjs(startDate).endOf('month').toDate()
+                            }
+                            // @ts-expect-error - "Known Values" is available in the start "ParsingComponents"
+                        } else if (parsedDate[0].start.knownValues?.month && parsedDate[0].start.knownValues?.day && !referentialKeywords.some(keyword => value.toLowerCase().includes(keyword))) {
+                            // If month and day is known, then we should not assume that the user wants to get everything until today
+                            return {
+                                fromDate: startDate,
+                                toDate: startDate,
+                            }
+                        }
+
+                        return {
+                            fromDate: startDate,
+                            toDate: today
+                        }
+                    }
+                } else {
+                    return { fromDate: startDate, toDate: endDate }
+                }
+            }
+
+        }
+    }, [value])
+
+    const onClick = (fromDate: Date, toDate: Date) => {
+        onSelect(formatDate(fromDate, 'YYYY-MM-DD'), formatDate(toDate, 'YYYY-MM-DD'))
     }
 
-    // A bare weekday repeats weekly, everything else (month/day) repeats yearly.
-    const unit = knownValues.weekday !== undefined && knownValues.day === undefined
-        ? 'day' as const
-        : 'year' as const
-    const step = unit === 'day' ? 7 : 1
-    let amount = 0
+    const isEqual = dates?.fromDate && dates?.toDate && dayjs(dates.fromDate).isSame(dates.toDate, 'date')
 
-    for (let i = 0; i < 200 && candidate.isAfter(today, 'date'); i++) {
-        candidate = candidate.subtract(step, unit)
-        amount += step
-    }
-
-    return { amount, unit }
+    return <div>
+        {dates ?
+            <div className='flex gap-2 items-center justify-between cursor-pointer' onClick={() => onClick(dates.fromDate, dates.toDate)}>
+                <span className='text-sm text-ink-gray-5 max-w-[30%]'>
+                    {value}
+                </span>
+                {isEqual ? <span className='text-xs text-ink-gray-5 text-balance flex items-center gap-1'>
+                    {formatDate(dates.fromDate, 'Do MMM YYYY')}
+                </span> :
+                    <span className='text-xs text-ink-gray-5 flex items-center gap-1'>
+                        {formatDate(dates.fromDate, 'Do MMM YY')} <ChevronRight size='16' className='text-ink-gray-5' /> {formatDate(dates.toDate, 'Do MMM YY')}
+                    </span>}
+            </div> :
+            <span className='text-sm text-ink-gray-5'>
+                No results found
+            </span>
+        }
+    </div>
 }
 
-/**
- * Parse free text into a past date range, or return undefined when it can't be parsed or
- * resolves entirely into the future.
- */
-const parseDateRange = (value: string): { fromDate: string, toDate: string } | undefined => {
-    if (!value.trim()) return undefined
-
-    const parsedDate = parse(value, undefined, { forwardDate: false })
-
-    if (!parsedDate || parsedDate.length === 0) return undefined
-
-    const result = parsedDate[0]
-    const startKnownValues = knownValuesOf(result.start)
-
-    // Anchor the shift on the start and apply it to both ends, so an explicit range like
-    // "1st Sept to 30th Sept" keeps its shape instead of having only its end rolled back.
-    const shift = pastShift(result.start.date(), startKnownValues)
-    const startDate = dayjs(result.start.date()).subtract(shift.amount, shift.unit).toDate()
-    const endDate = result.end
-        ? dayjs(result.end.date()).subtract(shift.amount, shift.unit).toDate()
-        : undefined
-
-    const today = new Date()
-    let range: { fromDate: Date, toDate: Date }
-
-    if (endDate) {
-        const endKnownValues = knownValuesOf(result.end)
-        // chrono ends "Apr 2025 to Jun 2025" on the 1st of June, but the user means all of it.
-        const rangeEnd = endKnownValues.month && !endKnownValues.day
-            ? dayjs(endDate).endOf('month').toDate()
-            : endDate
-        range = { fromDate: startDate, toDate: rangeEnd }
-    } else if (startKnownValues.month && !startKnownValues.day) {
-        // The user only wants a specific month like "May 2025" - span the whole month
-        range = { fromDate: dayjs(startDate).startOf('month').toDate(), toDate: dayjs(startDate).endOf('month').toDate() }
-    } else if (startKnownValues.month && startKnownValues.day && !referentialKeywords.some(keyword => value.toLowerCase().includes(keyword))) {
-        // If month and day is known, then we should not assume that the user wants to get everything until today
-        range = { fromDate: startDate, toDate: startDate }
-    } else {
-        range = { fromDate: startDate, toDate: today }
-    }
-
-    // A range that hasn't started yet is never useful for reconciliation. A range that merely
-    // ends in the future is kept as typed, the same way "This Month" spans the whole month.
-    if (dayjs(range.fromDate).isAfter(today, 'date')) return undefined
-
-    if (dayjs(range.toDate).isBefore(range.fromDate, 'date')) {
-        range = { fromDate: range.toDate, toDate: range.fromDate }
-    }
-
-    return {
-        fromDate: dayjs(range.fromDate).format(DATE_FORMAT),
-        toDate: dayjs(range.toDate).format(DATE_FORMAT),
-    }
-}
-
-export default BankRecDateFilter
+export default BankRecDateFilter

banking/src/components/features/BankReconciliation/BankReconciliationStatement.tsx

@@ -191,9 +191,9 @@ const BankReconciliationStatementView = () => {
 
     const content = _("Below is a list of all entries posted against the bank account {0} which have not been cleared till {1}.", [`<strong>${bankAccount?.account}</strong>`, `<strong>${formatDate(dates.toDate)}</strong>`])
 
-    return <div className="flex min-h-0 flex-1 flex-col space-y-4 py-2">
+    return <div className="space-y-4 py-2">
 
-        <div className="shrink-0">
+        <div>
             <span className="text-p-sm">
                 <MarkdownRenderer content={content} />
             </span>
@@ -201,18 +201,16 @@ const BankReconciliationStatementView = () => {
 
         {error && <ErrorBanner error={error} />}
 
-        {data && <div className="shrink-0"><SummarySection data={data} /></div>}
+        {data && <SummarySection data={data} />}
 
         {data && data.message.result.length > 0 && (
-            <div className="flex min-h-0 flex-1 flex-col space-y-2">
-                <p className="shrink-0 text-ink-gray-5 text-sm">{_("Bank Reconciliation Statement")}</p>
+            <div className="space-y-2">
+                <p className="text-ink-gray-5 text-sm">{_("Bank Reconciliation Statement")}</p>
                 <ListView
                     data={statementRows}
                     columns={statementColumns}
                     getRowId={(row) => row.payment_entry}
-                    className="min-h-0 flex-1"
-                    maxHeight="none"
-                    scrollAreaClassName="flex-1"
+                    maxHeight="min(70vh, 640px)"
                     emptyState={_("No entries with a payment document in this list.")}
                 />
             </div>

banking/src/components/features/BankReconciliation/BankTransactionList.tsx

@@ -245,9 +245,9 @@ const BankTransactionListView = () => {
 
     const content = _("Below is a list of all bank transactions imported in the system for the bank account {0} between {1} and {2}.", [`<strong>${bankAccount?.account_name}</strong>`, `<strong>${formattedFromDate}</strong>`, `<strong>${formattedToDate}</strong>`])
 
-    return <div className="flex min-h-0 flex-1 flex-col space-y-2 py-2">
+    return <div className="space-y-2 py-2">
 
-        <div className="flex shrink-0 gap-2 justify-between items-center">
+        <div className="flex gap-2 justify-between items-center">
             <span className="text-p-sm">
                 <MarkdownRenderer content={content} />
             </span>
@@ -278,9 +278,8 @@ const BankTransactionListView = () => {
             data={filteredResults}
             columns={transactionColumns}
             getRowId={(row) => row.name}
-            className="min-h-0 flex-1"
-            maxHeight="none"
-            scrollAreaClassName="flex-1"
+            maxHeight="calc(100vh - 200px)"
+            scrollAreaClassName="min-h-[calc(100vh-200px)]"
             emptyState={<Empty>
                 <EmptyMedia>
                     <ListIcon />

banking/src/components/features/BankReconciliation/IncorrectlyClearedEntries.tsx

@@ -181,9 +181,9 @@ const IncorrectlyClearedEntriesView = () => {
 
     const entriesContent = _("Entries below have a posting date after {0} but the clearance date is before {1}.", [`<strong>${formattedToDate}</strong>`, `<strong>${formattedToDate}</strong>`])
 
-    return <div className="flex min-h-0 flex-1 flex-col space-y-4 py-2">
+    return <div className="space-y-4 py-2">
 
-        <div className="shrink-0">
+        <div>
             <span className="text-p-sm">
                 <MarkdownRenderer content={content} />
                 <br />
@@ -198,15 +198,13 @@ const IncorrectlyClearedEntriesView = () => {
         {error && <ErrorBanner error={error} />}
 
         {data && data.message.result.length > 0 && (
-            <div className="flex min-h-0 flex-1 flex-col space-y-2">
-                <p className="shrink-0 text-ink-gray-5 text-sm">{_("Incorrectly cleared entries as per the report.")}</p>
+            <div className="space-y-2">
+                <p className="text-ink-gray-5 text-sm">{_("Incorrectly cleared entries as per the report.")}</p>
                 <ListView
                     data={data.message.result}
                     columns={incorrectlyClearedColumns}
                     getRowId={(row) => `${row.payment_entry}-${row.posting_date}`}
-                    className="min-h-0 flex-1"
-                    maxHeight="none"
-                    scrollAreaClassName="flex-1"
+                    maxHeight="min(70vh, 640px)"
                     emptyState={_("No rows to display.")}
                 />
             </div>

banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx

@@ -37,7 +37,7 @@ import { Link } from "react-router"
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert"
 import { InputGroup, InputGroupAddon, InputGroupText } from "@/components/ui/input-group"
 
-const MatchAndReconcile = () => {
+const MatchAndReconcile = ({ contentHeight }: { contentHeight: number }) => {
     const selectedBank = useAtomValue(selectedBankAccountAtom)
 
     if (!selectedBank) {
@@ -52,15 +52,15 @@ const MatchAndReconcile = () => {
     }
 
     return <>
-        <div className="flex min-h-0 flex-1 items-stretch space-x-2" >
-            <div className="flex min-h-0 flex-1 flex-col">
-                <H4 className="shrink-0 text-sm font-medium">{_("Unreconciled Transactions")}</H4>
-                <UnreconciledTransactions />
+        <div className={`flex items-start space-x-2`} >
+            <div className="flex-1">
+                <H4 className="text-sm font-medium">{_("Unreconciled Transactions")}</H4>
+                <UnreconciledTransactions contentHeight={contentHeight} />
             </div>
-            <Separator orientation="vertical" className="self-stretch" />
-            <div className="flex min-h-0 flex-1 flex-col px-1">
-                <H4 className="shrink-0 text-sm font-medium">{_("Match or Create")}</H4>
-                <VouchersSection />
+            <Separator orientation="vertical" style={{ minHeight: `${contentHeight}px` }} />
+            <div className="flex-1 px-1">
+                <H4 className="text-sm font-medium">{_("Match or Create")}</H4>
+                <VouchersSection contentHeight={contentHeight} />
             </div>
         </div>
         <TransferModal />
@@ -69,19 +69,16 @@ const MatchAndReconcile = () => {
     </>
 }
 
-/**
- * TanStack requires `estimateSize` for initial scroll range; `measureElement` on each row sets
- * the real height. The scroll container fills its flex parent rather than taking a pixel
- * height - the virtualizer observes its own rect, so it stays correct across resizes and any
- * layout change above it.
- */
+/** TanStack requires `estimateSize` for initial scroll range; `measureElement` on each row sets the real height. */
 function VirtualizedListBody<T>({
     items,
+    height,
     getItemKey,
     children,
     estimateSize = 74,
 }: {
     items: T[]
+    height: number
     getItemKey: (item: T, index: number) => string | number
     children: (item: T, index: number) => React.ReactNode
     estimateSize?: number
@@ -103,7 +100,8 @@ function VirtualizedListBody<T>({
     return (
         <div
             ref={scrollRef}
-            className="min-h-0 flex-1 overflow-auto contain-strict"
+            className="overflow-auto contain-strict"
+            style={{ height }}
         >
             <div
                 className="relative w-full"
@@ -125,7 +123,7 @@ function VirtualizedListBody<T>({
     )
 }
 
-const UnreconciledTransactions = () => {
+const UnreconciledTransactions = ({ contentHeight }: { contentHeight: number }) => {
     const bankAccount = useAtomValue(selectedBankAccountAtom)
 
     const currency = bankAccount?.account_currency ?? getCompanyCurrency(bankAccount?.company ?? '')
@@ -189,13 +187,14 @@ const UnreconciledTransactions = () => {
     }
 
     const hasFilters = search !== '' || typeFilter !== 'All' || amountFilter.value !== 0
+    const listHeight = contentHeight - 72
 
     if (isLoading) {
         return <UnreconciledTransactionsLoadingState />
     }
 
-    return <div className="flex min-h-0 flex-1 flex-col space-y-1">
-        <div className="flex py-2 w-full gap-2 shrink-0">
+    return <div className="space-y-1">
+        <div className="flex py-2 w-full gap-2">
 
             <InputGroup variant='outline'>
                 <label className="sr-only">{_("Search transactions")}</label>
@@ -279,6 +278,7 @@ const UnreconciledTransactions = () => {
 
         <VirtualizedListBody
             items={results}
+            height={listHeight}
             estimateSize={74}
             getItemKey={(transaction) => transaction.name}
         >
@@ -381,7 +381,7 @@ const UnreconciledTransactionItem = ({ transaction }: { transaction: Unreconcile
 }
 
 
-const VouchersSection = () => {
+const VouchersSection = ({ contentHeight }: { contentHeight: number }) => {
 
     const selectedBank = useAtomValue(selectedBankAccountAtom)
     const selectedTransactions = useAtomValue(bankRecSelectedTransactionAtom(selectedBank?.name || ''))
@@ -402,8 +402,8 @@ const VouchersSection = () => {
         return <OptionsForMultipleTransactions transactions={selectedTransactions} />
     }
 
-    return <div className="mt-2 flex min-h-0 flex-1 flex-col">
-        <OptionsForSingleTransaction transaction={selectedTransactions[0]} />
+    return <div style={{ minHeight: contentHeight }} className="mt-2">
+        <OptionsForSingleTransaction transaction={selectedTransactions[0]} contentHeight={contentHeight} />
     </div>
 }
 
@@ -535,11 +535,11 @@ const OptionsForMultipleTransactions = ({ transactions }: { transactions: Unreco
 }
 
 
-const OptionsForSingleTransaction = ({ transaction }: { transaction: UnreconciledTransaction }) => {
+const OptionsForSingleTransaction = ({ transaction, contentHeight }: { transaction: UnreconciledTransaction, contentHeight: number }) => {
 
     const { setTransferModalOpen, setRecordPaymentModalOpen, setRecordJournalEntryModalOpen } = useKeyboardShortcuts()
 
-    return <div className="flex min-h-0 flex-1 flex-col gap-3">
+    return <div className="flex flex-col gap-3">
         <TooltipProvider>
             <div className="flex items-center justify-between pt-2">
                 <div className="flex gap-4 justify-center">
@@ -602,7 +602,7 @@ const OptionsForSingleTransaction = ({ transaction }: { transaction: Unreconcile
             </div>
         </TooltipProvider>
         {transaction.matched_transaction_rule && <RuleAction transaction={transaction} />}
-        <VouchersForTransaction transaction={transaction} />
+        <VouchersForTransaction transaction={transaction} contentHeight={contentHeight} />
     </div>
 }
 
@@ -774,11 +774,12 @@ const RuleAction = ({ transaction }: { transaction: UnreconciledTransaction }) =
     )
 }
 
-const VouchersForTransaction = ({ transaction }: { transaction: UnreconciledTransaction }) => {
+const VouchersForTransaction = ({ transaction, contentHeight }: { transaction: UnreconciledTransaction, contentHeight: number }) => {
 
     const { data: vouchers, isLoading, error } = useGetVouchersForTransaction(transaction)
 
     const voucherList = vouchers?.message ?? []
+    const listHeight = contentHeight - 120
 
     if (error) {
         return <ErrorBanner error={error} />
@@ -800,8 +801,8 @@ const VouchersForTransaction = ({ transaction }: { transaction: UnreconciledTran
         </div>
     }
 
-    return <div className="relative flex min-h-0 flex-1 flex-col space-y-2">
-        <div className="flex shrink-0 items-center gap-2 text-sm text-ink-gray-5">
+    return <div className="relative space-y-2">
+        <div className="flex items-center gap-2 text-sm text-ink-gray-5">
             <Separator className="flex-1" />
             <span>or</span>
             <Separator className="flex-1" />
@@ -817,6 +818,7 @@ const VouchersForTransaction = ({ transaction }: { transaction: UnreconciledTran
         </Empty>}
         <VirtualizedListBody
             items={voucherList}
+            height={listHeight}
             estimateSize={121}
             getItemKey={(voucher) => voucher.name}
         >

banking/src/components/features/BankReconciliation/SelectedTransactionDetails.tsx

@@ -59,8 +59,8 @@ const SelectedTransactionDetails = ({ transaction, showAccount = false, account
                         </div>
                     </div>
                     <div className='flex flex-col gap-1'>
-                        <span className='text-p-sm'>{transaction.description}</span>
-                        {transaction.reference_number ? <span className='text-p-sm text-ink-gray-5'>{_("Ref")}: {transaction.reference_number}</span> : null}
+                        <span className='text-sm'>{transaction.description}</span>
+                        {transaction.reference_number ? <span className='text-sm text-ink-gray-5'>{_("Ref")}: {transaction.reference_number}</span> : null}
                         {showAccount && account ? <span className='text-sm text-ink-gray-5'>{_("GL Account")}: {account}</span> : null}
                     </div>
 

banking/src/components/features/BankReconciliation/TransferModalContent.tsx

@@ -490,7 +490,7 @@ const RecommendedTransferAccount = ({ transaction, onAccountChange }: { transact
                                 <Calendar size='16px' />
                                 <span className='text-sm'>{formatDate(data.message.date, 'Do MMM YYYY')}</span>
                             </div>
-                            <span className='text-p-sm line-clamp-1' title={data.message.description}>{data.message.description}</span>
+                            <span className='text-sm line-clamp-1' title={data.message.description}>{data.message.description}</span>
                         </div>
                     </div>
                 </div>

banking/src/components/features/BankReconciliation/logos.ts

@@ -231,7 +231,7 @@ export const BANK_LOGOS: { keywords: string[], logo: string, locale?: string[],
     {
         keywords: ['Federal Bank'],
         logo: 'Federal_Bank.png',
-        logoDark: 'Federal_Bank-Dark.png',
+        logoDark: 'Federal_Bank-dark.png',
         locale: ['India']
     },
     {

banking/src/components/features/BankStatementImporter/CSV/StatementDetails.tsx

@@ -83,13 +83,10 @@ const StatementDetails = ({ data }: Props) => {
 
     }
 
-    // `progress` is a percentage (drives the bar); `current`/`total` are actual counts.
     const [progress, setProgress] = useState(0)
-    const [imported, setImported] = useState({ current: 0, total: 0 })
 
     useFrappeEventListener("bank-rec-statement-import-progress", (event) => {
         setProgress(event.progress)
-        setImported({ current: event.current ?? 0, total: event.total ?? 0 })
     })
 
     const file_name = data.doc.file.split("/").pop() ?? ""
@@ -115,9 +112,7 @@ const StatementDetails = ({ data }: Props) => {
                     {data.doc.status === 'Completed' ? <Badge theme='green'>{_("Completed")}</Badge> :
                         <Button onClick={onImport} disabled={loading || data.final_transactions?.length === 0} size='sm' type='button'>
                             {loading ? <Loader2Icon className='size-4 animate-spin' /> : null}
-                            {loading ? _("Importing...") : data.final_transactions?.length === 1
-                                ? _("Import 1 transaction")
-                                : _("Import {0} transactions", [data.final_transactions?.length?.toString() || "0"])}</Button>
+                            {loading ? _("Importing...") : _("Import {0} transactions", [data.final_transactions?.length?.toString() || "0"])}</Button>
                     }
                 </div>
                 <div className='flex items-start gap-4'>
@@ -134,9 +129,7 @@ const StatementDetails = ({ data }: Props) => {
                 </div>
 
                 {progress > 0 && <div className='flex flex-col gap-2'><Progress value={progress} max={100} size="lg" />
-                    <span className='text-sm'>{imported.total === 1
-                        ? _("Importing 1 transaction")
-                        : _("Importing {0} of {1} transactions", [imported.current.toString(), imported.total.toString()])}
+                    <span className='text-sm'>{_("Importing {0} transactions", [progress.toString()])}
                     </span>
                 </div>}
 

banking/src/components/ui/list-view.tsx

@@ -387,7 +387,7 @@ function ListViewInner<TData>({
                                     )}
                                     role="columnheader"
                                 >
-                                    <div className="min-w-0 flex-1 truncate leading-snug">
+                                    <div className="min-w-0 flex-1 truncate">
                                         {header.isPlaceholder
                                             ? null
                                             : flexRender(header.column.columnDef.header, header.getContext())}

banking/src/hooks/useFiscalYear.ts

@@ -1,58 +1,13 @@
 import { useFrappeGetCall } from "frappe-react-sdk"
-import { useMemo } from "react"
-import dayjs from "dayjs"
-import { useCurrentCompany } from "./useCurrentCompany"
 
-export type FiscalYear = {
-    name: string
-    year_start_date: string
-    year_end_date: string
-}
-
-/**
- * The fiscal year containing today, for the currently selected company.
- *
- * `company` matters in multi-company setups, where fiscal years can be restricted to
- * specific companies. `date` matters because without it `get_fiscal_year` returns the newest
- * fiscal year in the system (they're ordered by start date, descending) - which may be one
- * created in advance for a year that hasn't started.
- */
 const useFiscalYear = () => {
-    const company = useCurrentCompany()
 
-    const { data, ...rest } = useFrappeGetCall<{ message: FiscalYear | [string, string, string] | false }>(
-        "erpnext.accounts.utils.get_fiscal_year",
-        {
-            date: dayjs().format("YYYY-MM-DD"),
-            company,
-            as_dict: 1,
-            // Return nothing instead of throwing/msgprinting when no fiscal year covers today.
-            raise_on_missing: 0,
-            verbose: 0,
-        },
-        company ? `fiscal_year_${company}` : null,
-        {
-            revalidateOnFocus: false,
-            revalidateIfStale: false,
-            revalidateOnReconnect: false
-        }
-    )
+    return useFrappeGetCall("erpnext.accounts.utils.get_fiscal_year", undefined, 'fiscal_year', {
+        revalidateOnFocus: false,
+        revalidateIfStale: false,
+        revalidateOnReconnect: false
+    })
 
-    // get_fiscal_year returns a dict with as_dict, a (name, start, end) tuple without it, and
-    // false when there's no match - normalise all three.
-    const fiscalYear = useMemo<FiscalYear | undefined>(() => {
-        const message = data?.message
-        if (!message) return undefined
-
-        if (Array.isArray(message)) {
-            const [name, year_start_date, year_end_date] = message
-            return { name, year_start_date, year_end_date }
-        }
-
-        return message
-    }, [data])
-
-    return { fiscalYear, ...rest }
 }
 
-export default useFiscalYear
+export default useFiscalYear

banking/src/hooks/useResetScrollOnSearch.ts

@@ -1,23 +0,0 @@
-import { useLayoutEffect, useRef } from "react"
-
-/**
- * Pins a scrollable list back to the top whenever the search term changes.
- *
- * Dropdowns that do their own filtering (`shouldFilter={false}`) swap a long list for a much
- * shorter one while the scroll container keeps its previous offset - which can leave the
- * auto-selected first item scrolled out of view.
- *
- * Returns a ref to attach to the scroll container (e.g. `CommandList`).
- */
-const useResetScrollOnSearch = (search: string) => {
-    const listRef = useRef<HTMLDivElement>(null)
-
-    // Layout effect so the reset lands before paint, avoiding a visible jump.
-    useLayoutEffect(() => {
-        listRef.current?.scrollTo({ top: 0 })
-    }, [search])
-
-    return listRef
-}
-
-export default useResetScrollOnSearch

banking/src/index.css

@@ -1,6 +1,5 @@
 @import "tailwindcss";
 @import "tw-animate-css";
-@import "./styles/scroll-fade.css";
 
 @font-face {
   font-family: InterVariable;

banking/src/pages/BankReconciliation.tsx

@@ -1,4 +1,4 @@
-import BankAccountBalancePanel from "@/components/features/BankReconciliation/BankBalance"
+import BankBalance from "@/components/features/BankReconciliation/BankBalance"
 import BankPicker from "@/components/features/BankReconciliation/BankPicker"
 import BankRecDateFilter from "@/components/features/BankReconciliation/BankRecDateFilter"
 import BankTransactionUnreconcileModal from "@/components/features/BankReconciliation/BankTransactionUnreconcileModal"
@@ -9,9 +9,10 @@ import ActionLog from "@/components/features/ActionLog/ActionLog"
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"
 import { TooltipProvider } from "@/components/ui/tooltip"
 import _ from "@/lib/translate"
-import { lazy, Suspense } from "react"
+import { lazy, Suspense, useLayoutEffect, useRef, useState } from "react"
 import { AlertTriangleIcon, CheckCircleIcon, HomeIcon, LandmarkIcon, ListIcon, Loader2Icon, ScrollTextIcon, ShuffleIcon } from "lucide-react"
 import { Breadcrumb, BreadcrumbItem, BreadcrumbList, BreadcrumbPage, BreadcrumbSeparator } from "@/components/ui/breadcrumb"
+import { Badge } from "@/components/ui/badge"
 import { Empty, EmptyContent, EmptyDescription, EmptyHeader, EmptyMedia, EmptyTitle } from "@/components/ui/empty"
 import { Button } from "@/components/ui/button"
 import { useAtomValue } from "jotai"
@@ -24,13 +25,23 @@ const IncorrectlyClearedEntries = lazy(() => import('@/components/features/BankR
 
 const BankReconciliation = () => {
 
+    const [headerHeight, setHeaderHeight] = useState(0)
+
+    const ref = useRef<HTMLDivElement>(null)
+
+    useLayoutEffect(() => {
+        if (ref.current) {
+            setHeaderHeight(ref.current.clientHeight)
+        }
+    }, [])
+
+    const remainingHeightAfterTabs = window.innerHeight - headerHeight - 220
+
     return (
         <div>
-            {/* The page owns the viewport height and the tabs/lists below fill what's left, so
-                the virtualizers size themselves from layout instead of a measured pixel value. */}
-            <div className="px-2 pt-1 flex-col gap-4 md:flex hidden h-dvh">
-                <div className="flex flex-col gap-4 shrink-0">
-                    <div className="flex justify-between shrink-0">
+            <div className="p-4 flex-col gap-4 md:flex hidden">
+                <div ref={ref} className="flex flex-col gap-4">
+                    <div className="flex justify-between">
                         <div className="flex items-center gap-6">
                             <Breadcrumb>
                                 <BreadcrumbList>
@@ -43,7 +54,7 @@ const BankReconciliation = () => {
                                     <BreadcrumbItem>
                                         <BreadcrumbPage>
                                             <div className="flex gap-1 items-center">
-                                                {_("Banking")}
+                                                {_("Banking")} <Badge theme="violet" variant="subtle">{_("Beta")}</Badge>
                                             </div>
 
                                         </BreadcrumbPage>
@@ -60,8 +71,10 @@ const BankReconciliation = () => {
                             <BankRecDateFilter />
                         </div>
                     </div>
+                    <BankPicker />
+                    <BankBalance />
                 </div>
-                <BankRecWorkspace />
+                <BankRecTabs remainingHeightAfterTabs={remainingHeightAfterTabs} />
                 <BankTransactionUnreconcileModal />
             </div>
             <div className="md:hidden flex h-screen items-center justify-between">
@@ -91,53 +104,42 @@ const BankReconciliation = () => {
     )
 }
 
-const BankRecWorkspace = () => {
+const BankRecTabs = ({ remainingHeightAfterTabs }: { remainingHeightAfterTabs: number }) => {
     const selectedBankAccount = useAtomValue(selectedBankAccountAtom)
 
-    return <Tabs defaultValue="Match and Reconcile" className="min-h-0 flex-1 gap-4">
-        {/* Picker + tab strip stack on the left, balance panel beside them - the tab strip
-            fills height the panel needs anyway, so it costs no row of its own. The picker
-            scrolls horizontally (`min-w-0` lets it shrink so its overflow-x engages) while
-            the panel stays put, so the figures never scroll away. */}
-        {/* No gap here: the panel's own `border-s ps-4` supplies the separation, and a gap
-            would leave dead space the picker's edge fade can't reach. */}
-        <div className="flex shrink-0 items-stretch">
-            <div className="flex min-w-0 flex-1 flex-col justify-between gap-3">
-                <BankPicker />
-                {selectedBankAccount && <TabsList>
-                    <TabsTrigger value="Match and Reconcile"><ShuffleIcon /> {_("Match and Reconcile")}</TabsTrigger>
-                    <TabsTrigger value="Bank Reconciliation Statement"><ScrollTextIcon /> {_("Reconciliation Statement")}</TabsTrigger>
-                    <TabsTrigger value="Bank Transactions"><ListIcon />{_("Transactions")}</TabsTrigger>
-                    <TabsTrigger value="Bank Clearance Summary"><CheckCircleIcon />{_("Clearance Summary")}</TabsTrigger>
-                    <TabsTrigger value="Incorrectly Cleared Entries"><AlertTriangleIcon /> {_("Incorrectly Cleared")}</TabsTrigger>
-                </TabsList>}
-            </div>
-            {selectedBankAccount && <BankAccountBalancePanel />}
-        </div>
+    if (!selectedBankAccount) {
+        return null
+    }
 
-        {selectedBankAccount && <>
-            <TabsContent value="Match and Reconcile" className="flex min-h-0 flex-col">
-                <MatchAndReconcile />
+    return <Tabs defaultValue="Match and Reconcile">
+        <TabsList>
+            <TabsTrigger value="Match and Reconcile"><ShuffleIcon /> {_("Match and Reconcile")}</TabsTrigger>
+            <TabsTrigger value="Bank Reconciliation Statement"><ScrollTextIcon /> {_("Bank Reconciliation Statement")}</TabsTrigger>
+            <TabsTrigger value="Bank Transactions"><ListIcon />{_("Bank Transactions")}</TabsTrigger>
+            <TabsTrigger value="Bank Clearance Summary"><CheckCircleIcon />{_("Bank Clearance Summary")}</TabsTrigger>
+            <TabsTrigger value="Incorrectly Cleared Entries"><AlertTriangleIcon /> {_("Incorrectly Cleared Entries")}</TabsTrigger>
+        </TabsList>
+        <TabsContent value="Match and Reconcile">
+            <MatchAndReconcile contentHeight={remainingHeightAfterTabs} />
+        </TabsContent>
+        <Suspense fallback={
+            <div className="flex items-center justify-center p-16">
+                <Loader2Icon className="size-6 animate-spin text-muted-foreground" />
+            </div>
+        }>
+            <TabsContent value="Bank Reconciliation Statement">
+                <BankReconciliationStatement />
             </TabsContent>
-            <Suspense fallback={
-                <div className="flex items-center justify-center p-16">
-                    <Loader2Icon className="size-6 animate-spin text-muted-foreground" />
-                </div>
-            }>
-                <TabsContent value="Bank Reconciliation Statement" className="flex min-h-0 flex-col">
-                    <BankReconciliationStatement />
-                </TabsContent>
-                <TabsContent value="Bank Transactions" className="flex min-h-0 flex-col">
-                    <BankTransactions />
-                </TabsContent>
-                <TabsContent value="Bank Clearance Summary" className="flex min-h-0 flex-col">
-                    <BankClearanceSummary />
-                </TabsContent>
-                <TabsContent value="Incorrectly Cleared Entries" className="flex min-h-0 flex-col">
-                    <IncorrectlyClearedEntries />
-                </TabsContent>
-            </Suspense>
-        </>}
+            <TabsContent value="Bank Transactions">
+                <BankTransactions />
+            </TabsContent>
+            <TabsContent value="Bank Clearance Summary">
+                <BankClearanceSummary />
+            </TabsContent>
+            <TabsContent value="Incorrectly Cleared Entries">
+                <IncorrectlyClearedEntries />
+            </TabsContent>
+        </Suspense>
     </Tabs>
 }
 

banking/src/pages/BankStatementImporter.tsx

@@ -226,7 +226,7 @@ const StatementImportLog = () => {
             field: "creation",
             order: "desc"
         },
-        limit: 20
+        limit: 10
     }, bankAccount ? undefined : null, {
         revalidateOnFocus: false
     })

banking/src/styles/scroll-fade.css

@@ -1,94 +0,0 @@
-/* Scroll-edge fade mask for horizontal scroll containers (the bank picker strip).
-   Ported from Raven's `scroll-fade-x`; imported by index.css, since Tailwind processes
-   `@utility` in imported files the same as in the entry file.
-
-   The scroll-timeline keyframes reveal each edge's fade only when there IS content to scroll
-   in that direction - no fade on the left edge when scrolled fully left, none on the right at
-   the end. `@property` makes the fade animate smoothly rather than jumping.
-
-   Without scroll-timeline support (Firefox) there is deliberately NO fade at all: the fade
-   vars stay at their 0px initial value and the gradient stops collapse to the edges. A static
-   both-edges fallback was tried in Raven and removed - on a container with nothing to scroll
-   it dimmed the edges anyway, promising content that didn't exist. */
-
-@property --scroll-fade-l {
-  /* length-percentage, NOT length: the fade size is min(12%, …) - a percentage. A <length>
-     property rejects that value and reverts to initial-value (0px), zeroing the fade. */
-  syntax: "<length-percentage>";
-  inherits: false;
-  initial-value: 0px;
-}
-
-@property --scroll-fade-r {
-  syntax: "<length-percentage>";
-  inherits: false;
-  initial-value: 0px;
-}
-
-@keyframes scroll-fade-reveal-l {
-  from {
-    --scroll-fade-l: 0px;
-  }
-
-  to {
-    --scroll-fade-l: var(--_scroll-fade-size-l);
-  }
-}
-
-@keyframes scroll-fade-reveal-r {
-  from {
-    --scroll-fade-r: var(--_scroll-fade-size-r);
-  }
-
-  to {
-    --scroll-fade-r: 0px;
-  }
-}
-
-@utility scroll-fade-x {
-  --_scroll-fade-size-l: var(--scroll-fade-l-size,
-      var(--scroll-fade-size, min(12%, calc(var(--spacing, 0.25rem) * 10))));
-  --_scroll-fade-size-r: var(--scroll-fade-r-size,
-      var(--scroll-fade-size, min(12%, calc(var(--spacing, 0.25rem) * 10))));
-  /* Eased (smoothstep) alpha ramp, sampled finely so it reads as a smooth curve, NOT fading
-     all the way to transparent: the edge floors at 0.25 (content dims, never vanishes), ramping
-     up to a full 1 for the body. The opaque end MUST be 1 or everything would be permanently
-     dimmed. Stops collapse to the edge when the size animates to 0, so the true first/last card
-     is never dimmed at rest. Tune the floor - higher (~0.4) = subtler, lower (~0.1) = stronger. */
-  --scroll-fade-inline: linear-gradient(to right,
-      rgba(0, 0, 0, 0.25) 0,
-      rgba(0, 0, 0, 0.282) calc(var(--scroll-fade-l, 0px) * 0.125),
-      rgba(0, 0, 0, 0.367) calc(var(--scroll-fade-l, 0px) * 0.25),
-      rgba(0, 0, 0, 0.487) calc(var(--scroll-fade-l, 0px) * 0.375),
-      rgba(0, 0, 0, 0.625) calc(var(--scroll-fade-l, 0px) * 0.5),
-      rgba(0, 0, 0, 0.763) calc(var(--scroll-fade-l, 0px) * 0.625),
-      rgba(0, 0, 0, 0.883) calc(var(--scroll-fade-l, 0px) * 0.75),
-      rgba(0, 0, 0, 0.968) calc(var(--scroll-fade-l, 0px) * 0.875),
-      rgba(0, 0, 0, 1) var(--scroll-fade-l, 0px),
-      rgba(0, 0, 0, 1) calc(100% - var(--scroll-fade-r, 0px)),
-      rgba(0, 0, 0, 0.968) calc(100% - var(--scroll-fade-r, 0px) * 0.875),
-      rgba(0, 0, 0, 0.883) calc(100% - var(--scroll-fade-r, 0px) * 0.75),
-      rgba(0, 0, 0, 0.763) calc(100% - var(--scroll-fade-r, 0px) * 0.625),
-      rgba(0, 0, 0, 0.625) calc(100% - var(--scroll-fade-r, 0px) * 0.5),
-      rgba(0, 0, 0, 0.487) calc(100% - var(--scroll-fade-r, 0px) * 0.375),
-      rgba(0, 0, 0, 0.367) calc(100% - var(--scroll-fade-r, 0px) * 0.25),
-      rgba(0, 0, 0, 0.282) calc(100% - var(--scroll-fade-r, 0px) * 0.125),
-      rgba(0, 0, 0, 0.25) 100%);
-  -webkit-mask-image: var(--scroll-fade-mask, var(--scroll-fade-inline));
-  mask-image: var(--scroll-fade-mask, var(--scroll-fade-inline));
-  -webkit-mask-composite: source-in;
-  mask-composite: intersect;
-  -webkit-mask-repeat: no-repeat;
-  mask-repeat: no-repeat;
-
-  @supports (animation-timeline: scroll()) {
-    animation:
-      scroll-fade-reveal-l 1ms ease-in-out,
-      scroll-fade-reveal-r 1ms ease-in-out;
-    animation-timeline: scroll(self x), scroll(self x);
-    animation-range:
-      0 var(--scroll-fade-reveal, calc(var(--spacing, 0.25rem) * 24)),
-      calc(100% - var(--scroll-fade-reveal, calc(var(--spacing, 0.25rem) * 24))) 100%;
-    animation-fill-mode: both;
-  }
-}

crowdin.yml

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

erpnext/accounts/custom/address.py

@@ -71,6 +71,4 @@ def get_shipping_address(company: str, address: str | None = None):
 	if address:
 		address_as_dict = address[0]
 		name, address_template = get_address_templates(address_as_dict)
-		return address_as_dict.get("name"), frappe.render_template(
-			address_template, address_as_dict, restrict_globals=True
-		)
+		return address_as_dict.get("name"), frappe.render_template(address_template, address_as_dict)

erpnext/accounts/dashboard_chart/profit_and_loss/profit_and_loss.json

@@ -9,7 +9,7 @@
  "idx": 0,
  "is_public": 1,
  "is_standard": 1,
- "modified": "2026-09-04 12:37:31.673782",
+ "modified": "2025-12-19 12:37:31.673782",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Profit and Loss",
@@ -17,6 +17,7 @@
  "owner": "Administrator",
  "report_name": "Profit and Loss Statement",
  "roles": [],
+ "show_values_over_chart": 1,
  "timeseries": 0,
  "type": "Line",
  "use_report_chart": 1,

erpnext/accounts/doctype/account/account.json

@@ -122,7 +122,6 @@
    "description": "Setting Account Type helps in selecting this Account in transactions.",
    "fieldname": "account_type",
    "fieldtype": "Select",
-   "in_preview": 1,
    "in_standard_filter": 1,
    "label": "Account Type",
    "oldfieldname": "account_type",
@@ -204,7 +203,7 @@
  "idx": 1,
  "is_tree": 1,
  "links": [],
- "modified": "2026-09-03 12:59:42.190900",
+ "modified": "2026-04-14 18:14:42.202065",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Account",
@@ -265,46 +264,6 @@
   {
    "role": "HR Manager",
    "select": 1
-  },
-  {
-   "role": "Delivery Manager",
-   "select": 1
-  },
-  {
-   "role": "Delivery User",
-   "select": 1
-  },
-  {
-   "role": "Maintenance Manager",
-   "select": 1
-  },
-  {
-   "role": "Maintenance User",
-   "select": 1
-  },
-  {
-   "role": "Manufacturing Manager",
-   "select": 1
-  },
-  {
-   "role": "Manufacturing User",
-   "select": 1
-  },
-  {
-   "role": "Purchase Master Manager",
-   "select": 1
-  },
-  {
-   "role": "Quality Manager",
-   "select": 1
-  },
-  {
-   "role": "Sales Master Manager",
-   "select": 1
-  },
-  {
-   "role": "Stock Manager",
-   "select": 1
   }
  ],
  "row_format": "Dynamic",

erpnext/accounts/doctype/account/account.py

@@ -727,7 +727,6 @@ def get_company_default_account_fields():
 		"stock_delivered_but_not_billed": "Stock Delivered But Not Billed Account",
 		"stock_adjustment_account": "Stock Adjustment Account",
 		"write_off_account": "Write Off Account",
-		"bank_charges_account": "Bank Charges Account",
 		"default_discount_account": "Default Payment Discount Account",
 		"unrealized_profit_loss_account": "Unrealized Profit / Loss Account",
 		"exchange_gain_loss_account": "Exchange Gain / Loss Account",

erpnext/accounts/doctype/account/account_tree.js

@@ -52,42 +52,6 @@ frappe.treeview_settings["Account"] = {
 	],
 	root_label: "Accounts",
 	get_tree_nodes: "erpnext.accounts.utils.get_children",
-	get_label: function (node) {
-		// clean display name — the account number renders as a badge (see
-		// onrender) instead of being glued into the name
-		return frappe.utils.escape_html(node.data.account_name || node.title || node.label);
-	},
-	onrender: function (node) {
-		if (node.is_root || !node.data) return;
-
-		const flags = [];
-		if (node.data.account_number) {
-			flags.push(frappe.ui.badge({ label: node.data.account_number }));
-		}
-
-		const company = frappe.treeview_settings["Account"].treeview?.page?.fields_dict?.company?.get_value();
-		const company_currency = company && erpnext.get_currency(company);
-		if (
-			node.data.account_currency &&
-			company_currency &&
-			node.data.account_currency !== company_currency
-		) {
-			flags.push(frappe.ui.badge({ label: node.data.account_currency, theme: "blue" }));
-		}
-
-		if (node.data.freeze_account === "Yes") {
-			flags.push(
-				frappe.ui.badge({
-					label: __("Frozen"),
-					icon: "lock",
-					title: __("Frozen - entries restricted"),
-					theme: "orange",
-				})
-			);
-		}
-
-		erpnext.utils.render_tree_node_flags(node, flags);
-	},
 	on_node_render: function (node, deep) {
 		const render_balances = () => {
 			for (let account of cur_tree.account_balance_data) {
@@ -268,7 +232,7 @@ frappe.treeview_settings["Account"] = {
 		frappe.treeview_settings["Account"].treeview["tree"] = treeview.tree;
 		if (treeview.can_create) {
 			treeview.page.set_primary_action(
-				{ label: __("Add Account"), short_label: __("Add") },
+				__("New"),
 				function () {
 					let root_company = treeview.page.fields_dict.root_company.get_value();
 					if (root_company) {
@@ -279,14 +243,13 @@ frappe.treeview_settings["Account"] = {
 						treeview.new_node();
 					}
 				},
-				"plus"
+				"add"
 			);
 		}
 	},
 	toolbar: [
 		{
 			label: __("Add Child"),
-			icon: "plus",
 			condition: function (node) {
 				return (
 					frappe.boot.user.can_create.indexOf("Account") !== -1 &&
@@ -309,7 +272,6 @@ frappe.treeview_settings["Account"] = {
 				return !node.root && frappe.boot.user.can_read.indexOf("GL Entry") !== -1;
 			},
 			label: __("View Ledger"),
-			icon: "book-open",
 			click: function (node, btn) {
 				frappe.route_options = {
 					from_date: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
@@ -324,106 +286,6 @@ frappe.treeview_settings["Account"] = {
 			},
 			btnClass: "hidden-xs",
 		},
-		{
-			// same label and mechanism as the Account form's Actions button:
-			// NOT frappe's generic rename (Allow Rename stays off) — this is
-			// ERPNext's controlled update that rebuilds the derived
-			// "number - name - abbr" document name
-			label: __("Update Account Name / Number"),
-			icon: "text-cursor-input",
-			condition: function (node) {
-				return !node.is_root && frappe.model.can_write("Account");
-			},
-			click: function (node) {
-				const dialog = new frappe.ui.Dialog({
-					title: __("Update Account Number / Name"),
-					fields: [
-						{
-							fieldtype: "Data",
-							fieldname: "account_name",
-							label: __("Account Name"),
-							reqd: 1,
-							default: node.data.account_name,
-						},
-						{
-							fieldtype: "Data",
-							fieldname: "account_number",
-							label: __("Account Number"),
-							default: node.data.account_number,
-						},
-					],
-					primary_action_label: __("Update"),
-					primary_action(values) {
-						dialog.hide();
-						frappe.dom.freeze(__("Updating {0}", [node.label]));
-						frappe.call({
-							method: "erpnext.accounts.doctype.account.account.update_account_number",
-							args: {
-								name: node.label,
-								account_name: values.account_name,
-								account_number: values.account_number,
-							},
-							callback: function (r) {
-								if (r.exc) return;
-								const treeview = frappe.views.trees["Account"];
-								node.parent_node && treeview.tree.load_children(node.parent_node);
-							},
-							always: function () {
-								frappe.dom.unfreeze();
-							},
-						});
-					},
-				});
-				dialog.show();
-			},
-		},
-		{
-			label: __("Convert to Group"),
-			icon: "folder-tree",
-			condition: function (node) {
-				return !node.is_root && !node.expandable && frappe.model.can_write("Account");
-			},
-			click: function (node) {
-				erpnext.accounts.convert_tree_node("Account", node, "convert_ledger_to_group");
-			},
-		},
-		{
-			label: __("Convert to Non-Group"),
-			icon: "file-text",
-			condition: function (node) {
-				// only on groups the user has opened and found empty — a
-				// group with children can't convert, so don't offer it
-				return (
-					!node.is_root &&
-					node.expandable &&
-					node.loaded &&
-					!node.$ul.children().length &&
-					frappe.model.can_write("Account")
-				);
-			},
-			click: function (node) {
-				erpnext.accounts.convert_tree_node("Account", node, "convert_group_to_ledger");
-			},
-		},
 	],
 	extend_toolbar: true,
 };
-
-frappe.provide("erpnext.accounts");
-// shared by the Account and Cost Center tree views (defined in both files,
-// whichever loads first wins): run the doctype's whitelisted convert method,
-// then re-render the branch so the node's group/leaf state updates
-erpnext.accounts.convert_tree_node =
-	erpnext.accounts.convert_tree_node ||
-	function (doctype, node, method) {
-		frappe.call({
-			method: "run_doc_method",
-			args: { dt: doctype, dn: node.label, method: method },
-			callback: function (r) {
-				if (r.exc) return;
-				const treeview = frappe.views.trees[doctype];
-				node.parent_node && treeview.tree.load_children(node.parent_node);
-				frappe.show_alert({ message: __("{0} converted", [node.label]), indicator: "green" });
-			},
-		});
-	};

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

@@ -102,8 +102,6 @@ def identify_is_group(child):
 def get_chart(chart_template: str | None, existing_company: str | None = None):
 	chart = {}
 	if existing_company:
-		frappe.has_permission("Company", doc=existing_company, throw=True)
-
 		return get_account_tree_from_existing_company(existing_company)
 
 	elif chart_template == "Standard":

erpnext/accounts/doctype/accounting_dimension/accounting_dimension.js

@@ -16,8 +16,6 @@ frappe.ui.form.on("Accounting Dimension", {
 			return {
 				filters: {
 					name: ["not in", invalid_doctypes],
-					istable: 0,
-					issingle: 0,
 				},
 			};
 		});

erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py

@@ -60,14 +60,6 @@ class AccountingDimension(Document):
 			msg = _("Not allowed to create accounting dimension for {0}").format(self.document_type)
 			frappe.throw(msg)
 
-		meta = frappe.get_meta(self.document_type)
-		if meta.istable or meta.issingle:
-			frappe.throw(
-				_(
-					"{0} cannot be used as an accounting dimension as it is not a standalone document type."
-				).format(frappe.bold(self.document_type))
-			)
-
 		exists = frappe.db.get_value("Accounting Dimension", {"document_type": self.document_type}, ["name"])
 
 		if exists and self.is_new():

erpnext/accounts/doctype/accounting_dimension/test_accounting_dimension.py

@@ -51,23 +51,6 @@ class TestAccountingDimension(ERPNextTestSuite):
 		self.assertEqual(gle.get("department"), "_Test Department - _TC")
 		self.assertEqual(gle1.get("department"), "_Test Department - _TC")
 
-	def test_child_table_not_allowed_as_dimension(self):
-		dimension = frappe.get_doc({"doctype": "Accounting Dimension", "document_type": "Sales Team"})
-		self.assertRaises(frappe.ValidationError, dimension.insert)
-
-	def test_single_doctype_not_allowed_as_dimension(self):
-		dimension = frappe.get_doc({"doctype": "Accounting Dimension", "document_type": "Selling Settings"})
-		self.assertRaises(frappe.ValidationError, dimension.insert)
-
-	def test_non_scalar_dimension_value_skipped_in_gl_dict(self):
-		si = create_sales_invoice(do_not_save=1)
-
-		si.department = "_Test Department - _TC"
-		self.assertEqual(si.get_gl_dict({}).get("department"), "_Test Department - _TC")
-
-		si.department = ["_Test Department - _TC"]
-		self.assertNotIn("department", si.get_gl_dict({}))
-
 	def test_mandatory(self):
 		location = frappe.get_doc("Accounting Dimension", "Location")
 		location.dimension_defaults[0].mandatory_for_bs = True

erpnext/accounts/doctype/accounts_settings/accounts_settings.json

@@ -95,14 +95,13 @@
   "column_break_25",
   "reports_tab",
   "remarks_section",
-  "disable_include_dimensions",
-  "column_break_lvjk",
   "general_ledger_remarks_length",
+  "receivable_payable_remarks_length",
+  "column_break_lvjk",
   "accounts_receivable_payable_tuning_section",
   "receivable_payable_fetch_method",
   "default_ageing_range",
   "column_break_ntmi",
-  "receivable_payable_remarks_length",
   "legacy_section",
   "ignore_is_opening_check_for_reporting",
   "tab_break_dpet",
@@ -200,12 +199,10 @@
   },
   {
    "default": "1",
-   "description": "System will use the latest saved Currency Exchange rate on or before the transaction date, however old it is. <br>\nUncheck to ignore rates older than Stale Days and fetch a fresh rate from the exchange rate provider instead.",
    "fieldname": "allow_stale",
    "fieldtype": "Check",
    "in_list_view": 1,
-   "label": "Allow Stale Exchange Rates",
-   "show_description_on_click": 1
+   "label": "Allow Stale Exchange Rates"
   },
   {
    "default": "1",
@@ -225,8 +222,7 @@
    "description": "The percentage you are allowed to bill more against the amount ordered. For example, if the order value is $100 for an item and tolerance is set as 10%, then you are allowed to bill up to $110 ",
    "fieldname": "over_billing_allowance",
    "fieldtype": "Currency",
-   "label": "Over Billing Allowance (%)",
-   "non_negative": 1
+   "label": "Over Billing Allowance (%)"
   },
   {
    "default": "1",
@@ -282,10 +278,10 @@
   },
   {
    "default": "0",
-   "description": "Enabling this option prevents the creation of a new Sales Invoice when the customer has an overdue limit set and their outstanding overdue amount exceeds that limit.",
+   "description": "Block a new Sales Invoice when the customer's overdue amount exceeds the Overdue Limit set on the customer.",
    "fieldname": "enable_overdue_billing_threshold",
    "fieldtype": "Check",
-   "label": "Prevent Sales Invoice when Customer is Overdue"
+   "label": "Restrict Customer Over Billing"
   },
   {
    "depends_on": "eval:doc.enable_overdue_billing_threshold",
@@ -479,7 +475,7 @@
   {
    "fieldname": "remarks_section",
    "fieldtype": "Section Break",
-   "label": "General Ledger Report"
+   "label": "Remarks Column Length"
   },
   {
    "default": "0",
@@ -553,7 +549,7 @@
   {
    "fieldname": "accounts_receivable_payable_tuning_section",
    "fieldtype": "Section Break",
-   "label": "Accounts Receivable / Payable Report"
+   "label": "Accounts Receivable / Payable Tuning"
   },
   {
    "fieldname": "legacy_section",
@@ -792,12 +788,6 @@
    "fieldname": "book_stock_expense_gl_entries",
    "fieldtype": "Check",
    "label": "Book Stock Expense GL Entries"
-  },
-  {
-   "default": "0",
-   "fieldname": "disable_include_dimensions",
-   "fieldtype": "Check",
-   "label": "Disable \"Consider Accounting Dimension\" Filter"
   }
  ],
  "grid_page_length": 50,
@@ -806,7 +796,7 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2026-09-04 10:08:30.115003",
+ "modified": "2026-07-15 17:00:00.000000",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Accounts Settings",

erpnext/accounts/doctype/accounts_settings/accounts_settings.py

@@ -72,7 +72,6 @@ class AccountsSettings(Document):
 		default_ageing_range: DF.Data | None
 		delete_linked_ledger_entries: DF.Check
 		determine_address_tax_category_from: DF.Literal["Billing Address", "Shipping Address"]
-		disable_include_dimensions: DF.Check
 		enable_accounting_dimensions: DF.Check
 		enable_common_party_accounting: DF.Check
 		enable_discounts_and_margin: DF.Check
@@ -204,8 +203,8 @@ class AccountsSettings(Document):
 		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_translated_label("add_taxes_from_item_tax_template")),
-					frappe.bold(self.meta.get_translated_label("add_taxes_from_taxes_and_charges_template")),
+					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"),
 			)

erpnext/accounts/doctype/bank/bank.json

@@ -101,7 +101,7 @@
   }
  ],
  "links": [],
- "modified": "2026-08-21 23:11:39.423431",
+ "modified": "2024-03-27 13:06:36.896195",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Bank",
@@ -118,20 +118,11 @@
    "role": "System Manager",
    "share": 1,
    "write": 1
-  },
-  {
-   "role": "Accounts Manager",
-   "select": 1
-  },
-  {
-   "role": "Accounts User",
-   "select": 1
   }
  ],
  "quick_entry": 1,
- "row_format": "Dynamic",
  "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
-}
+}

erpnext/accounts/doctype/bank_account/bank_account.json

@@ -269,7 +269,7 @@
    "link_fieldname": "default_bank_account"
   }
  ],
- "modified": "2026-08-21 23:11:39.585456",
+ "modified": "2026-04-11 19:46:27.609994",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Bank Account",
@@ -299,22 +299,6 @@
    "role": "Accounts User",
    "share": 1,
    "write": 1
-  },
-  {
-   "role": "Purchase Manager",
-   "select": 1
-  },
-  {
-   "role": "Purchase Master Manager",
-   "select": 1
-  },
-  {
-   "role": "Sales Master Manager",
-   "select": 1
-  },
-  {
-   "role": "Sales User",
-   "select": 1
   }
  ],
  "row_format": "Dynamic",

erpnext/accounts/doctype/bank_clearance/test_bank_clearance.py

@@ -4,18 +4,29 @@
 import frappe
 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
+from erpnext.stock.doctype.item.test_item import create_item
+from erpnext.stock.doctype.warehouse.test_warehouse import create_warehouse
 from erpnext.tests.utils import ERPNextTestSuite, if_lending_app_installed, if_lending_app_not_installed
 
 
 class TestBankClearance(ERPNextTestSuite):
 	def setUp(self):
 		frappe.clear_cache()
+		create_warehouse(
+			warehouse_name="_Test Warehouse",
+			properties={"parent_warehouse": "All Warehouses - _TC"},
+			company="_Test Company",
+		)
+		create_item("_Test Item")
+		create_cost_center(cost_center_name="_Test Cost Center", company="_Test Company")
+
 		make_bank_account()
 		add_transactions()
 
@@ -128,8 +139,11 @@ def add_transactions():
 
 
 def make_payment_entry():
+	from erpnext.buying.doctype.supplier.test_supplier import create_supplier
+
+	supplier = create_supplier(supplier_name="_Test Supplier")
 	pi = make_purchase_invoice(
-		supplier="_Test Supplier",
+		supplier=supplier.name,
 		supplier_warehouse="_Test Warehouse - _TC",
 		expense_account="Cost of Goods Sold - _TC",
 		uom="Nos",
@@ -144,6 +158,10 @@ def make_payment_entry():
 
 
 def make_pos_sales_invoice():
+	from erpnext.accounts.doctype.opening_invoice_creation_tool.test_opening_invoice_creation_tool import (
+		make_customer,
+	)
+
 	mode_of_payment = frappe.get_doc({"doctype": "Mode of Payment", "name": "Cash"})
 
 	if not frappe.db.get_value("Mode of Payment Account", {"company": "_Test Company", "parent": "Cash"}):
@@ -152,13 +170,13 @@ def make_pos_sales_invoice():
 		)
 		mode_of_payment.save()
 
+	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="_Test Customer", item="_Test Item", is_pos=1, qty=1, rate=1000, do_not_save=1
-	)
+	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.insert()

erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py

@@ -912,7 +912,7 @@ def search_for_transfer_transaction(transaction_id: str | int):
 
 	days = frappe.db.get_single_value("Accounts Settings", "transfer_match_days")
 
-	if days is None:
+	if not days:
 		days = 3
 
 	min_date = frappe.utils.add_days(date, -days)
@@ -1336,11 +1336,9 @@ def get_pe_matching_query(
 	ref_condition = pe.reference_no == transaction.reference_number
 	ref_rank = frappe.qb.terms.Case().when(ref_condition, 1).else_(0)
 
-	amount_field = pe.received_amount_after_tax if account_from_to == "paid_to" else pe.paid_amount_after_tax
-
-	amount_equality = amount_field == transaction.unallocated_amount
+	amount_equality = pe.paid_amount == transaction.unallocated_amount
 	amount_rank = frappe.qb.terms.Case().when(amount_equality, 1).else_(0)
-	amount_condition = amount_equality if exact_match else amount_field > 0.0
+	amount_condition = amount_equality if exact_match else pe.paid_amount > 0.0
 
 	party_condition = (
 		(pe.party_type == transaction.party_type) & (pe.party == transaction.party) & pe.party.isnotnull()
@@ -1357,7 +1355,7 @@ def get_pe_matching_query(
 			(ref_rank + amount_rank + party_rank + 1).as_("rank"),
 			ConstantColumn("Payment Entry").as_("doctype"),
 			pe.name,
-			amount_field.as_("paid_amount"),
+			pe.base_paid_amount_after_tax.as_("paid_amount"),
 			pe.reference_no,
 			pe.reference_date,
 			pe.party,

erpnext/accounts/doctype/bank_reconciliation_tool/test_bank_reconciliation_tool.py

@@ -10,7 +10,6 @@ from erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool
 	auto_reconcile_vouchers,
 	get_auto_reconcile_message,
 	get_bank_transactions,
-	get_linked_payments,
 )
 from erpnext.accounts.doctype.payment_entry.test_payment_entry import create_payment_entry
 from erpnext.accounts.test.accounts_mixin import AccountsTestMixin
@@ -100,14 +99,13 @@ class TestBankReconciliationTool(ERPNextTestSuite, AccountsTestMixin):
 		transactions = get_bank_transactions(self.bank_account, from_date, to_date)
 		self.assertEqual(len(transactions), 0)
 
-	def make_bank_transaction(self, date, deposit=100, withdrawal=0):
+	def make_bank_transaction(self, date, deposit=100):
 		return (
 			frappe.get_doc(
 				{
 					"doctype": "Bank Transaction",
 					"date": date,
 					"deposit": deposit,
-					"withdrawal": withdrawal,
 					"bank_account": self.bank_account,
 					"currency": "INR",
 				}
@@ -116,73 +114,11 @@ class TestBankReconciliationTool(ERPNextTestSuite, AccountsTestMixin):
 			.submit()
 		)
 
-	def get_matching_payment_entries(self, bank_transaction, exact_match=False):
-		document_types = ["payment_entry", "exact_match"] if exact_match else ["payment_entry"]
-		vouchers = get_linked_payments(
-			bank_transaction,
-			document_types,
-			from_date=add_days(today(), -1),
-			to_date=today(),
-		)
-		return [v for v in vouchers if v.get("doctype") == "Payment Entry"]
-
 	def test_get_bank_transactions_excludes_dates_after_to_date(self):
 		self.make_bank_transaction(date=today())
 		names = [t.name for t in get_bank_transactions(self.bank_account, to_date=add_days(today(), -1))]
 		self.assertEqual(names, [])
 
-	def test_deposit_matches_amount_received_in_bank_account(self):
-		# money leaves another bank account and lands here minus a charge, so the two sides differ
-		payment = frappe.get_doc(
-			{
-				"doctype": "Payment Entry",
-				"payment_type": "Internal Transfer",
-				"company": self.company,
-				"posting_date": today(),
-				"paid_from": "_Test Bank - _TC",
-				"paid_to": self.bank,
-				"paid_amount": 3537.64,
-				"received_amount": 3460.52,
-				"reference_no": "TRF-001",
-				"reference_date": today(),
-			}
-		)
-		payment.set_missing_values()
-		payment.set_exchange_rate()
-		payment.set_amounts()
-		payment.deductions[-1].account = "_Test Exchange Gain/Loss - _TC"
-		payment.deductions[-1].cost_center = "_Test Cost Center - _TC"
-		payment = payment.save().submit()
-
-		transaction = self.make_bank_transaction(date=today(), deposit=3460.52)
-
-		# the received side is what reached this bank account, so that is what is shown
-		matches = self.get_matching_payment_entries(transaction.name)
-		self.assertEqual([m["name"] for m in matches], [payment.name])
-		self.assertEqual(matches[0]["paid_amount"], 3460.52)
-
-		# and what the exact match compares against
-		exact_matches = self.get_matching_payment_entries(transaction.name, exact_match=True)
-		self.assertEqual([m["name"] for m in exact_matches], [payment.name])
-
-	def test_withdrawal_matches_amount_paid_from_bank_account(self):
-		payment = create_payment_entry(
-			company=self.company,
-			payment_type="Pay",
-			party_type="Supplier",
-			party="_Test Supplier",
-			paid_from=self.bank,
-			paid_to="Creditors - _TC",
-			paid_amount=1250,
-		)
-		payment = payment.save().submit()
-
-		transaction = self.make_bank_transaction(date=today(), deposit=0, withdrawal=1250)
-
-		exact_matches = self.get_matching_payment_entries(transaction.name, exact_match=True)
-		self.assertEqual([m["name"] for m in exact_matches], [payment.name])
-		self.assertEqual(exact_matches[0]["paid_amount"], 1250)
-
 	def test_auto_reconcile_message_for_no_matches(self):
 		message, indicator = get_auto_reconcile_message([], [])
 		self.assertEqual(indicator, "blue")

erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py

@@ -166,10 +166,9 @@ def get_transaction_reference(txn_data: dict) -> str:
 	).strip()
 
 
-@frappe.whitelist(methods=["POST"])
+@frappe.whitelist()
 def convert_mt940_to_csv(data_import: str, mt940_file_path: str):
 	doc = frappe.get_doc("Bank Statement Import", data_import)
-	doc.check_permission("write")
 
 	_file_doc, content = get_file(mt940_file_path)
 
@@ -236,30 +235,26 @@ def convert_mt940_to_csv(data_import: str, mt940_file_path: str):
 def get_preview_from_template(
 	data_import: str, import_file: str | None = None, google_sheets_url: str | None = None
 ):
-	bsi = frappe.get_doc("Bank Statement Import", data_import)
-	bsi.check_permission()
-	return bsi.get_preview_from_template(import_file, google_sheets_url)
+	return frappe.get_doc("Bank Statement Import", data_import).get_preview_from_template(
+		import_file, google_sheets_url
+	)
 
 
 @frappe.whitelist()
 def form_start_import(data_import: str):
-	bsi = frappe.get_doc("Bank Statement Import", data_import)
-	bsi.check_permission("write")
-	return bsi.start_import()
+	job_id = frappe.get_doc("Bank Statement Import", data_import).start_import()
+	return job_id is not None
 
 
 @frappe.whitelist()
 def download_errored_template(data_import_name: str):
 	data_import = frappe.get_doc("Bank Statement Import", data_import_name)
-	data_import.check_permission()
 	data_import.export_errored_rows()
 
 
 @frappe.whitelist()
 def download_import_log(data_import_name: str):
-	bsi = frappe.get_doc("Bank Statement Import", data_import_name)
-	bsi.check_permission()
-	return bsi.download_import_log()
+	return frappe.get_doc("Bank Statement Import", data_import_name).download_import_log()
 
 
 def is_mt940_format(content: str) -> bool:
@@ -398,7 +393,6 @@ def get_import_status(docname: str):
 	import_status = {}
 
 	data_import = frappe.get_doc("Bank Statement Import", docname)
-	data_import.check_permission()
 	import_status["status"] = data_import.status
 
 	logs = frappe.get_all(

erpnext/accounts/doctype/bank_statement_import_log/bank_statement_import_log.py

@@ -375,7 +375,8 @@ class BankStatementImportLog(Document):
 				table["column_mapping"] = guess_column_mapping_by_content(table["rows"])
 
 			final_transactions, table["date_format"], table["amount_format"] = build_table_transactions(table)
-			table["included"] = should_include_table(table, final_transactions)
+			# Tables with no detectable transactions (ads, summaries, headers) start excluded.
+			table["included"] = bool(final_transactions)
 
 		self.pdf_tables = json.dumps(tables)
 		return tables
@@ -541,8 +542,6 @@ class BankStatementImportLog(Document):
 				"bank-rec-statement-import-progress",
 				{
 					"progress": round(progress / total_transactions * 100),
-					"current": progress,
-					"total": total_transactions,
 				},
 				doctype="Bank Statement Import Log",
 				docname=self.name,
@@ -552,7 +551,6 @@ class BankStatementImportLog(Document):
 			"bank-rec-statement-import-progress",
 			{
 				"progress": 100,
-				"current": total_transactions,
 				"total": total_transactions,
 			},
 			doctype="Bank Statement Import Log",
@@ -823,15 +821,6 @@ def compute_final_transactions(transaction_rows: list, date_format: str, amount_
 	"""Pure version of the final-transaction builder (date normalized, amount split)."""
 	final_transactions = []
 
-	# Which marker does this statement actually write? A statement that only ever says "Cr"
-	# is marking the credits as its exceptions, so an unmarked row is a withdrawal; one that
-	# only ever says "Dr" means the opposite. With both markers present an unmarked row is
-	# genuinely undetermined, so it stays a withdrawal.
-	unmarked_is_deposit = False
-	if amount_format == 'Amount column has "CR"/"DR" values':
-		markers = {get_amount_cr_dr_marker(row.get("amount")) for row in transaction_rows}
-		unmarked_is_deposit = markers - {None} == {"dr"}
-
 	def parse_amount(transaction_row: dict):
 		if amount_format == "Separate columns for withdrawal and deposit":
 			return get_float_amount(transaction_row.get("withdrawal")), get_float_amount(
@@ -840,43 +829,44 @@ def compute_final_transactions(transaction_rows: list, date_format: str, amount_
 
 		if amount_format == 'Amount column has "CR"/"DR" values':
 			amount = transaction_row.get("amount")
-			marker = get_amount_cr_dr_marker(amount)
-			# The marker carries the direction, so the amount's own sign is ignored.
-			signed_amount = get_float_amount(amount) or 0
 
-			if marker:
-				return (0, abs(signed_amount)) if marker == "cr" else (abs(signed_amount), 0)
+			# If the amount column has CR/DR in it - we should remove any signs (negative or positive) from the amount
+			float_amount = abs(get_float_amount(amount) or 0)
+			if "cr" in amount.lower():
+				return 0, float_amount
+			else:
+				return float_amount, 0
 
-			# An unmarked row takes the opposite direction to the marker this statement
-			# uses. A negative amount reverses that again (a refund).
-			is_deposit = unmarked_is_deposit
-			if signed_amount < 0:
-				is_deposit = not is_deposit
-
-			return (0, abs(signed_amount)) if is_deposit else (abs(signed_amount), 0)
-
-		# `or 0` below: get_float_amount returns None for an unparseable cell, and a blank
-		# transaction-type cell comes through as None. Both used to raise.
 		if amount_format == "Amount column has positive/negative values":
-			amount = get_float_amount(transaction_row.get("amount", "0")) or 0
+			amount = get_float_amount(transaction_row.get("amount", "0"))
 			if amount > 0:
 				return 0, abs(amount)
 			else:
 				return abs(amount), 0
 
-		transaction_type = str(transaction_row.get("debit_credit") or "").strip().lower()
-		amount = abs(get_float_amount(transaction_row.get("amount", "0")) or 0)
-
 		if amount_format == 'Transaction type column has "CR"/"DR" values':
-			# "credit" contains "cr". "debit" does not contain "dr", so it correctly falls
-			# through to the withdrawal side.
-			return (0, amount) if "cr" in transaction_type else (amount, 0)
+			transaction_type = transaction_row.get("debit_credit")
+			amount = get_float_amount(transaction_row.get("amount", "0"))
+			if "cr" in transaction_type.lower():
+				return 0, abs(amount)
+			else:
+				return abs(amount), 0
 
 		if amount_format == 'Transaction type column has "C"/"D" values':
-			return (0, amount) if transaction_type == "c" else (amount, 0)
+			transaction_type = transaction_row.get("debit_credit")
+			amount = get_float_amount(transaction_row.get("amount", "0"))
+			if transaction_type.lower().strip() == "c":
+				return 0, abs(amount)
+			else:
+				return abs(amount), 0
 
 		if amount_format == 'Transaction type column has "Deposit"/"Withdrawal" values':
-			return (0, amount) if "deposit" in transaction_type else (amount, 0)
+			transaction_type = transaction_row.get("debit_credit")
+			amount = get_float_amount(transaction_row.get("amount", "0"))
+			if "deposit" in transaction_type.lower():
+				return 0, abs(amount)
+			else:
+				return abs(amount), 0
 
 		return 0, 0
 
@@ -920,26 +910,6 @@ def build_table_transactions(table: dict):
 	return final_transactions, date_format, amount_format
 
 
-def should_include_table(table: dict, final_transactions: list) -> bool:
-	"""
-	Whether a freshly extracted PDF table should START as included - only the default state
-	of the checkbox, which the user can change afterwards.
-
-	It must have yielded transactions, and it must have a Description column mapped. A
-	transaction table always carries a narration; the summary boxes printed around it -
-	payment due, credit limit, reward points - are dates and figures only. Otherwise the
-	HDFC credit-card "Payment Due Date / Total Dues / Minimum Amount Due" box parses as one
-	transaction and imports a phantom row.
-
-	A description is NOT needed to import (it is not mandatory on Bank Transaction), so a
-	bank that omits narration still works - its table just starts unticked.
-	"""
-	if not final_transactions:
-		return False
-
-	return any(column.get("maps_to") == "Description" for column in table.get("column_mapping", []))
-
-
 def _clean_cell(cell) -> str:
 	"""Normalize a pdfplumber cell: None -> '', collapse wrapped newlines, strip."""
 	if cell is None:
@@ -1085,43 +1055,6 @@ def get_float_amount(amount):
 	return amount
 
 
-# A "CR"/"DR" marker on the amount itself, at either end: "2,378.00Cr", "Cr 100",
-# "INR 50.90 Cr.", "DR 1,234.50".
-# `(?![a-zA-Z])` rather than `\b` on the leading form: there is no word boundary between
-# the "r" of "Cr100" and the digit, but there IS one inside "CREDIT" and "DRAFT".
-AMOUNT_CR_DR_PATTERN = re.compile(r"^\s*(cr|dr)(?![a-zA-Z])\.?|(?:^|[\s\d.)])(cr|dr)\b\.?\s*$", re.IGNORECASE)
-
-
-def get_amount_cr_dr_marker(amount) -> str | None:
-	"""
-	Return "cr" or "dr" if the amount cell carries a direction marker of its own, else None.
-
-	What is left after removing the marker has to look like an amount - it must hold a digit
-	and at most a short currency token - so that text which merely starts or ends with the
-	letters is not read as a marker. That guard is what separates "Cr 100" from a
-	description that bled into the amount column, like "Dr Smith Clinic 500".
-	"""
-	if not isinstance(amount, str):
-		return None
-
-	match = AMOUNT_CR_DR_PATTERN.search(amount)
-	if not match:
-		return None
-
-	# Only the marker itself is removed - the surrounding character the pattern needed to
-	# anchor on (a digit, say) stays part of the remainder.
-	group = 1 if match.group(1) else 2
-	start, end = match.span(group)
-	remainder = amount[:start] + amount[end:]
-
-	if not any(char.isdigit() for char in remainder):
-		return None
-	if sum(char.isalpha() for char in remainder) > 3:
-		return None
-
-	return match.group(group).lower()
-
-
 def get_file_properties(transactions: list):
 	"""
 	From the transaction rows, try to figure out the following:
@@ -1142,8 +1075,6 @@ def get_file_properties(transactions: list):
 		'Transaction type column has "C"/"D" values': 0,
 	}
 
-	amount_column_has_cr_dr = False
-
 	for transaction in transactions:
 		date_format = transaction.get("date_format")
 
@@ -1161,40 +1092,33 @@ def get_file_properties(transactions: list):
 		if not amount:
 			continue
 
-		debit_credit = str(transaction.get("debit_credit") or "").strip().lower()
-
-		# One vote per row, most specific signal first. Order matters: "withdrawal" contains
-		# "dr", so it must be matched before the loose cr/dr check or a Deposit/Withdrawal
-		# column reads as CR/DR. "debit" needs listing because, unlike "credit", it does not
-		# contain "dr". The final else means every row votes, even an unrecognised type.
-		if get_amount_cr_dr_marker(amount):
-			amount_column_has_cr_dr = True
+		if isinstance(amount, str) and ("cr" in amount.lower() or "dr" in amount.lower()):
 			amount_format_frequency['Amount column has "CR"/"DR" values'] += 1
-		elif "deposit" in debit_credit or "withdrawal" in debit_credit:
-			amount_format_frequency['Transaction type column has "Deposit"/"Withdrawal" values'] += 1
-		elif debit_credit in ("c", "d"):
-			amount_format_frequency['Transaction type column has "C"/"D" values'] += 1
-		elif any(token in debit_credit for token in ("cr", "dr", "debit")):
-			amount_format_frequency['Transaction type column has "CR"/"DR" values'] += 1
+
+		# Check if there's a debit_credit column containing "cr"/"dr"
+		if transaction.get("debit_credit", None):
+			if (
+				"cr" in transaction.get("debit_credit", "").lower()
+				or "dr" in transaction.get("debit_credit", "").lower()
+			):
+				amount_format_frequency['Transaction type column has "CR"/"DR" values'] += 1
+			elif (
+				"deposit" in transaction.get("debit_credit", "").lower()
+				or "withdrawal" in transaction.get("debit_credit", "").lower()
+			):
+				amount_format_frequency['Transaction type column has "Deposit"/"Withdrawal" values'] += 1
+			elif (transaction.get("debit_credit", "").lower().strip() == "c") or (
+				transaction.get("debit_credit", "").lower().strip() == "d"
+			):
+				amount_format_frequency['Transaction type column has "C"/"D" values'] += 1
+
+		# Else assume that the amount is expressed as positive/negative value
 		else:
-			# Nothing said which direction this is, so assume the amount carries the sign.
 			amount_format_frequency["Amount column has positive/negative values"] += 1
 
 	most_common_date_format = max(date_format_frequency, key=date_format_frequency.get)
 	most_common_amount_format = max(amount_format_frequency, key=amount_format_frequency.get)
 
-	# With no votes at all (no rows, or every amount blank) max() would return whichever key
-	# happens to be first in the dict. Say what we mean instead.
-	if not amount_format_frequency[most_common_amount_format]:
-		most_common_amount_format = "Amount column has positive/negative values"
-
-	# A CR/DR amount column is proved by a single marker, not by a majority: both formats
-	# describe the same column, and an unmarked row is only the default direction, not
-	# evidence against the notation. Statements mark just the exceptions - one HDFC
-	# credit-card page has 18 rows and a single "50.90Cr".
-	if amount_column_has_cr_dr and most_common_amount_format == "Amount column has positive/negative values":
-		most_common_amount_format = 'Amount column has "CR"/"DR" values'
-
 	return most_common_date_format, most_common_amount_format
 
 

erpnext/accounts/doctype/bank_statement_import_log/test_bank_statement_import_log.py

@@ -11,14 +11,12 @@ from erpnext.accounts.doctype.bank_statement_import_log.bank_statement_import_lo
 	detect_column_mapping,
 	detect_header_row,
 	extract_pdf_tables,
-	get_amount_cr_dr_marker,
 	get_float_amount,
 	get_statement_details,
 	guess_column_mapping_by_content,
 	reextract_pdf_table,
 	set_header_index,
 	set_pdf_table_header,
-	should_include_table,
 	update_column_mapping,
 	update_pdf_tables,
 )
@@ -126,184 +124,6 @@ class TestBankStatementImportLog(ERPNextTestSuite, AccountsTestMixin):
 		self.assertIsNone(get_float_amount("ABCD"))
 		self.assertIsNone(get_float_amount("****"))
 
-	# ------------------------------------------------------------------ #
-	# Amount format detection
-	# ------------------------------------------------------------------ #
-
-	def test_amount_cr_dr_marker(self):
-		"""The marker is read at either end of the cell, but only next to the amount."""
-		for amount in ("2,378.00Cr", "50.90 CR", "INR 50.90 Cr.", "1000cr", "5cr", "(100) Cr"):
-			self.assertEqual(get_amount_cr_dr_marker(amount), "cr", amount)
-
-		for amount in ("2,378.00Dr", "50.90 DR", "1000dr", "-100 Dr"):
-			self.assertEqual(get_amount_cr_dr_marker(amount), "dr", amount)
-
-		# Some banks put the marker in front of the digits instead.
-		for amount in ("Cr 100", "Cr100", "CR INR 100", "cr 0.00"):
-			self.assertEqual(get_amount_cr_dr_marker(amount), "cr", amount)
-
-		for amount in ("Dr 100", "Dr100", "Dr. 1,234.50"):
-			self.assertEqual(get_amount_cr_dr_marker(amount), "dr", amount)
-
-		for amount in ("100.00", "-2,000.00", "INR 25,236.00", "", None, 100.0):
-			self.assertIsNone(get_amount_cr_dr_marker(amount), amount)
-
-		# Text that merely starts or ends with the letters must not be read as a marker, or
-		# a description that bled into the amount column would reclassify the statement.
-		for amount in (
-			"CREDIT CARD PAYMENT 500",
-			"DRAFT 100",
-			"Dr Smith Clinic 500",
-			"DR AMBEDKAR ROAD BRANCH 500",
-			"500 CRC",
-			"Cheque Dr",
-			"Cr",
-		):
-			self.assertIsNone(get_amount_cr_dr_marker(amount), amount)
-
-	def test_sparsely_marked_cr_dr_amount_column(self):
-		"""One marker is enough to prove a CR/DR amount column - it is not a majority vote.
-
-		A real HDFC credit-card page carries 18 rows and a single "50.90Cr": the unmarked
-		rows are ordinary purchases, and only the exceptions are marked. A frequency vote
-		therefore picked "positive/negative" 17-1 and imported that lone credit as a debit.
-		"""
-		doc = self._create_bank_statement_import_log(
-			[
-				["Date", "Transaction Description", "Amount (in Rs.)"],
-				["21/07/2026", "ITC MAURYA NEW DELHI", "2,495.00"],
-				["22/07/2026", "ZOMATO LIMITED Gurugram", "1,288.68"],
-				["23/07/2026", "SWIGGY Bangalore", "532.00"],
-				["26/07/2026", "SWIGGY Bangalore", "1,043.00"],
-				["27/07/2026", "PETRO SURCHARGE WAIVER", "50.90Cr"],
-			]
-		)
-
-		self.assertEqual(doc.detected_amount_format, 'Amount column has "CR"/"DR" values')
-		# Only "Cr" appears, so it is the marked exception and unmarked rows are debits.
-		self.assertEqual(doc.total_credits, 50.90)
-		self.assertEqual(doc.total_credit_transactions, 1)
-		self.assertEqual(doc.total_debits, 5358.68)
-		self.assertEqual(doc.total_debit_transactions, 4)
-
-	def test_dr_only_statement_treats_unmarked_rows_as_deposits(self):
-		"""The mirror image of a Cr-only statement: only withdrawals are marked.
-
-		The unmarked default cannot be hardcoded to the debit, because which side gets
-		marked varies by bank. It is derived from the markers the statement actually uses -
-		here only "Dr" appears, so "Dr" is the exception and everything unmarked is a
-		deposit.
-		"""
-		doc = self._create_bank_statement_import_log(
-			[
-				["Date", "Narration", "Amount"],
-				["01/04/2026", "ATM WITHDRAWAL", "2,000.00Dr"],
-				["03/04/2026", "SALARY", "20,000.00"],
-				["05/04/2026", "INTEREST", "150.00"],
-			]
-		)
-
-		self.assertEqual(doc.detected_amount_format, 'Amount column has "CR"/"DR" values')
-		self.assertEqual(doc.total_debits, 2000.0)
-		self.assertEqual(doc.total_debit_transactions, 1)
-		self.assertEqual(doc.total_credits, 20150.0)
-		self.assertEqual(doc.total_credit_transactions, 2)
-
-	def test_leading_cr_dr_markers(self):
-		"""Some banks print the marker in front of the amount."""
-		doc = self._create_bank_statement_import_log(
-			[
-				["Date", "Narration", "Amount"],
-				["01/04/2026", "ATM WITHDRAWAL", "Dr 2,000.00"],
-				["03/04/2026", "SALARY", "Cr 20,000.00"],
-			]
-		)
-
-		self.assertEqual(doc.detected_amount_format, 'Amount column has "CR"/"DR" values')
-		self.assertEqual(doc.total_debits, 2000.0)
-		self.assertEqual(doc.total_credits, 20000.0)
-
-	def test_partially_marked_cr_dr_amount_column(self):
-		"""A CR/DR amount column stays CR/DR even when some rows carry no marker.
-
-		Every unmarked row used to also vote for "positive/negative", so an ordinary
-		statement with a few unmarked rows was detected as positive/negative and a
-		"2000.00Dr" was then imported as a deposit.
-		"""
-		doc = self._create_bank_statement_import_log(
-			[
-				["Date", "Narration", "Amount", "Balance"],
-				["01/04/2026", "OPENING FEE", "100.00", "9,900.00"],
-				["03/04/2026", "SALARY", "20000.00Cr", "29,900.00"],
-				["05/04/2026", "ATM WDL", "2000.00Dr", "27,900.00"],
-			]
-		)
-
-		self.assertEqual(doc.detected_amount_format, 'Amount column has "CR"/"DR" values')
-		# Both markers appear, so an unmarked row is undetermined and stays a debit.
-		self.assertEqual(doc.total_debits, 2100.0)
-		self.assertEqual(doc.total_debit_transactions, 2)
-		self.assertEqual(doc.total_credits, 20000.0)
-		self.assertEqual(doc.total_credit_transactions, 1)
-
-	def test_deposit_withdrawal_type_column(self):
-		"""The word Withdrawal contains "dr", so a loose CR/DR check claims this column first.
-
-		It then reads "Deposit" (which has no "cr" in it) as a withdrawal, flipping the
-		direction of every credit in the statement.
-		"""
-		doc = self._create_bank_statement_import_log(
-			[
-				["Date", "Narration", "Transaction Type", "Amount"],
-				["01/04/2026", "ATM WDL", "Withdrawal", "2,000.00"],
-				["03/04/2026", "SALARY", "Deposit", "20,000.00"],
-				["05/04/2026", "ATM WDL", "Withdrawal", "500.00"],
-			]
-		)
-
-		self.assertEqual(
-			doc.detected_amount_format, 'Transaction type column has "Deposit"/"Withdrawal" values'
-		)
-		self.assertEqual(doc.total_debits, 2500.0)
-		self.assertEqual(doc.total_debit_transactions, 2)
-		self.assertEqual(doc.total_credits, 20000.0)
-		self.assertEqual(doc.total_credit_transactions, 1)
-
-	def test_unrecognised_type_column_falls_back_to_signed_amount(self):
-		"""An unrecognised transaction type must not stop the amount being read.
-
-		No tally was incremented for these rows, so max() returned the first key -
-		"Separate columns for withdrawal and deposit" - and, with no such columns in the
-		file, every amount came through as None.
-		"""
-		doc = self._create_bank_statement_import_log(
-			[
-				["Date", "Narration", "Transaction Type", "Amount"],
-				["01/04/2026", "ATM WDL", "NEFT", "-2,000.00"],
-				["03/04/2026", "SALARY", "IMPS", "20,000.00"],
-			]
-		)
-
-		self.assertEqual(doc.detected_amount_format, "Amount column has positive/negative values")
-		self.assertEqual(doc.total_debits, 2000.0)
-		self.assertEqual(doc.total_credits, 20000.0)
-
-	def test_blank_transaction_type_cell(self):
-		"""A blank type cell used to raise - `None.lower()` - instead of parsing the row."""
-		doc = self._create_bank_statement_import_log(
-			[
-				["Date", "Narration", "Transaction Type", "Amount"],
-				["01/04/2026", "ATM WDL", "Dr", "2,000.00"],
-				["03/04/2026", "SALARY", "Cr", "20,000.00"],
-				["05/04/2026", "UNKNOWN", None, "500.00"],
-			]
-		)
-
-		self.assertEqual(doc.detected_amount_format, 'Transaction type column has "CR"/"DR" values')
-		# The unmarked row has no direction of its own, so it counts as a withdrawal.
-		self.assertEqual(doc.total_debits, 2500.0)
-		self.assertEqual(doc.total_credits, 20000.0)
-
 	# ------------------------------------------------------------------ #
 	# PDF statement import
 	# ------------------------------------------------------------------ #
@@ -339,8 +159,7 @@ class TestBankStatementImportLog(ERPNextTestSuite, AccountsTestMixin):
 		else:
 			table["header_index"] = None
 			table["column_mapping"] = guess_column_mapping_by_content(table["rows"])
-		final_transactions, _df, _af = build_table_transactions(table)
-		table["included"] = should_include_table(table, final_transactions)
+		table["included"] = True
 		return table
 
 	def test_pdf_multi_page_kept_separate_and_unioned(self):
@@ -378,74 +197,6 @@ class TestBankStatementImportLog(ERPNextTestSuite, AccountsTestMixin):
 		final, _df, _af = build_table_transactions(ad_table)
 		self.assertEqual(final, [])
 
-	def test_pdf_summary_box_not_auto_included(self):
-		"""A summary box that happens to parse as one transaction must not start included.
-
-		The "Payment Due Date / Total Dues / Minimum Amount Due" block on an HDFC
-		credit-card statement has a date column and a figures column, so it yields a single
-		transaction - the due date and the minimum amount - and used to import as a phantom
-		row. What it does not have, and a real transaction table always does, is a narration.
-		"""
-		summary_box = {
-			"header_index": 1,
-			"rows": [
-				["Statement Date:17/08/2025", "Card No: 4341 55XX XXXX 2754", ""],
-				["Payment Due Date", "Total Dues", "Minimum Amount Due"],
-				["06/09/2025", "73,200.00", "3,660.00"],
-				["Credit Limit", "Available Credit Limit", "Available Cash Limit"],
-				["", "32,800", ""],
-			],
-			"column_mapping": [
-				{"index": 0, "header_text": "Payment Due Date", "variable": "a", "maps_to": "Date"},
-				{"index": 1, "header_text": "Total Dues", "variable": "b", "maps_to": "Do not import"},
-				{"index": 2, "header_text": "Minimum Amount Due", "variable": "c", "maps_to": "Amount"},
-			],
-		}
-
-		final, _df, _af = build_table_transactions(summary_box)
-		# It really does parse as a transaction - that is why the previous check missed it.
-		self.assertEqual(len(final), 1)
-		self.assertFalse(should_include_table(summary_box, final))
-
-		# The transaction table beside it, which does carry a narration, still starts included.
-		transactions = self._auto_map(
-			{
-				"rows": [
-					["Date", "Transaction Description", "Amount (in Rs.)"],
-					["21/07/2025", "ITC MAURYA NEW DELHI", "2,495.00"],
-					["27/07/2025", "PETRO SURCHARGE WAIVER", "50.90Cr"],
-				]
-			}
-		)
-		self.assertTrue(transactions["included"])
-
-	def test_pdf_table_without_description_still_importable(self):
-		"""No narration column means "starts unticked", NOT "cannot be imported".
-
-		`description` is not mandatory on Bank Transaction, so a bank that omits narration
-		must still import once the user ticks the table.
-		"""
-		table = {
-			"header_index": 0,
-			"rows": [
-				["Date", "Amount", "Balance"],
-				["01/04/2025", "500.00", "9,500.00"],
-				["03/04/2025", "20000.00", "29,500.00"],
-			],
-			"column_mapping": [
-				{"index": 0, "header_text": "Date", "variable": "a", "maps_to": "Date"},
-				{"index": 1, "header_text": "Amount", "variable": "b", "maps_to": "Amount"},
-				{"index": 2, "header_text": "Balance", "variable": "c", "maps_to": "Balance"},
-			],
-		}
-
-		final, _df, _af = build_table_transactions(table)
-		self.assertFalse(should_include_table(table, final))
-
-		# The transactions themselves are intact and importable.
-		self.assertEqual(len(final), 2)
-		self.assertEqual([t["date"] for t in final], ["2025-04-01", "2025-04-03"])
-
 	def test_headerless_content_mapping(self):
 		"""Without a header row, columns are guessed from their contents."""
 		rows = [

erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py

@@ -23,6 +23,8 @@ from erpnext.tests.utils import ERPNextTestSuite, if_lending_app_installed
 
 class TestBankTransaction(ERPNextTestSuite):
 	def setUp(self):
+		make_pos_profile()
+
 		# generate and use a uniq hash identifier for 'Bank Account' and it's linked GL 'Account' to avoid validation error
 		uniq_identifier = frappe.generate_hash(length=10)
 		gl_account = create_gl_account("_Test Bank " + uniq_identifier)
@@ -30,7 +32,6 @@ class TestBankTransaction(ERPNextTestSuite):
 			gl_account=gl_account, bank_account_name="Checking Account " + uniq_identifier
 		)
 
-		make_pos_profile()
 		add_transactions(bank_account=bank_account)
 		add_vouchers(gl_account=gl_account)
 
@@ -46,7 +47,7 @@ class TestBankTransaction(ERPNextTestSuite):
 			from_date=bank_transaction.date,
 			to_date=utils.today(),
 		)
-		self.assertIn("Conrad Electronic", [payment["party"] for payment in linked_payments])
+		self.assertEqual(linked_payments[0]["party"], "Conrad Electronic")
 
 	# This test validates a simple reconciliation leading to the clearance of the bank transaction and the payment
 	def test_reconcile(self):

erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js

@@ -16,8 +16,6 @@ frappe.ui.form.on("Chart of Accounts Importer", {
 				() => generate_tree_preview(frm),
 				() => create_import_button(frm),
 				() => frm.set_df_property("chart_preview", "hidden", 0),
-				// the preview is the point of this page — open it right away
-				() => frm.fields_dict.chart_preview.collapse(false),
 			]);
 		}
 
@@ -112,6 +110,18 @@ frappe.ui.form.on("Chart of Accounts Importer", {
 				args: {
 					company: frm.doc.company,
 				},
+				callback: function (r) {
+					if (r.message === false) {
+						frm.set_value("company", "");
+						frappe.throw(
+							__(
+								"Transactions against the Company already exist! Chart of Accounts can only be imported for a Company with no transactions."
+							)
+						);
+					} else {
+						frm.trigger("refresh");
+					}
+				},
 			});
 		}
 	},
@@ -130,6 +140,7 @@ var create_import_button = function (frm) {
 				freeze_message: __("Creating Accounts..."),
 				callback: function (r) {
 					if (!r.exc) {
+						clearInterval(frm.page["interval"]);
 						frm.page.set_indicator(__("Import Successful"), "blue");
 						create_reset_button(frm);
 					}
@@ -143,95 +154,42 @@ var create_reset_button = function (frm) {
 	frm.page
 		.set_primary_action(__("Reset"), function () {
 			frm.page.clear_primary_action();
+			delete frm.page["show_import_button"];
 			frm.reload_doc();
 		})
 		.addClass("btn btn-primary");
 };
 
-var generate_tree_preview = function (frm) {
-	let parent = __("All Accounts");
-	const wrapper = $(frm.fields_dict["chart_tree"].wrapper).empty(); // empty wrapper to load new data
-
-	// search + expand/collapse-all lean on frappe.ui.Tree helpers added with
-	// row mode; when running against an older frappe that predates them, skip
-	// this toolbar so the preview still renders (just without the extras)
-	const has_row_helpers =
-		typeof frappe.ui.Tree.prototype.get_expansion_state === "function" &&
-		typeof frappe.ui.Tree.prototype.filter_nodes === "function";
-
-	let tree;
-	let deep_loaded = false;
-	let search_text = "";
-	let update_buttons = () => {};
-
-	if (has_row_helpers) {
-		// same toolbar anatomy as the tree view: search on the left,
-		// expand/collapse-all on the right (three-state: fully collapsed ->
-		// Expand All, fully expanded -> Collapse All, partially expanded -> both)
-		const $toolbar = $('<div class="flex items-center gap-2 mb-2"></div>').appendTo(wrapper);
-
-		const search_control = frappe.ui.form.make_control({
-			df: { fieldtype: "Data", fieldname: "preview_search", placeholder: __("Search") },
-			parent: $toolbar,
-			only_input: true,
-		});
-		search_control.refresh();
-		$(search_control.wrapper).addClass("m-0").css("width", "220px");
-		search_control.$input.addClass("input-xs");
-		search_control.$input.on(
-			"input",
-			frappe.utils.debounce(() => {
-				search_text = search_control.$input.val();
-				const run = () => {
-					// a newer keystroke superseded this one while the deep load ran
-					if (search_text !== search_control.$input.val()) return;
-					tree.filter_nodes(search_text);
-				};
-				if (!search_text || deep_loaded) {
-					run();
-					return;
+var validate_coa = function (frm) {
+	if (frm.doc.import_file) {
+		let parent = __("All Accounts");
+		return frappe.call({
+			method: "erpnext.accounts.doctype.chart_of_accounts_importer.chart_of_accounts_importer.get_coa",
+			args: {
+				file_name: frm.doc.import_file,
+				parent: parent,
+				doctype: "Chart of Accounts Importer",
+				file_type: frm.doc.file_type,
+				for_validate: 1,
+			},
+			callback: function (r) {
+				if (r.message["show_import_button"]) {
+					frm.page["show_import_button"] = Boolean(r.message["show_import_button"]);
 				}
-				tree.load_children(tree.root_node, true).then(() => {
-					deep_loaded = true;
-					run();
-				});
-			}, 300)
-		);
-
-		const $actions = $('<div class="ms-auto flex items-center gap-1"></div>').appendTo($toolbar);
-		update_buttons = () => {
-			const state = tree.get_expansion_state();
-			$expand_all.prop("disabled", !(state === "collapsed" || state === "partial"));
-			$collapse_all.prop("disabled", !(state === "expanded" || state === "partial"));
-		};
-		// tooltip on a wrapper: a disabled es-button has pointer-events:none,
-		// so hover falls through to the wrapper and the tooltip still shows
-		const make_action = (icon, label, onclick) => {
-			const $btn = $(
-				frappe.ui.button({ icon, disabled: true, onclick, attrs: { "aria-label": label } })
-			);
-			const $wrapper = $('<span class="inline-flex"></span>').append($btn).appendTo($actions);
-			frappe.ui.tooltip($wrapper, { text: label });
-			return $btn;
-		};
-		var $expand_all = make_action("chevrons-up-down", __("Expand All"), () => {
-			tree.load_children(tree.root_node, true).then(() => {
-				deep_loaded = true;
-			});
-		});
-		var $collapse_all = make_action("chevrons-down-up", __("Collapse All"), () => {
-			tree.load_children(tree.root_node, false);
+			},
 		});
 	}
+};
+
+var generate_tree_preview = function (frm) {
+	let parent = __("All Accounts");
+	$(frm.fields_dict["chart_tree"].wrapper).empty(); // empty wrapper to load new data
 
 	// generate tree structure based on the csv data
-	tree = new frappe.ui.Tree({
-		parent: wrapper,
+	return new frappe.ui.Tree({
+		parent: $(frm.fields_dict["chart_tree"].wrapper),
 		label: parent,
 		expandable: true,
-		// read-only preview: row-mode visuals without actions or hover cards
-		// (ignored by an older frappe, which renders the legacy tree)
-		row_style: true,
 		method: "erpnext.accounts.doctype.chart_of_accounts_importer.chart_of_accounts_importer.get_coa",
 		args: {
 			file_name: frm.doc.import_file,
@@ -239,9 +197,8 @@ var generate_tree_preview = function (frm) {
 			doctype: "Chart of Accounts Importer",
 			file_type: frm.doc.file_type,
 		},
-		on_node_render: () => update_buttons(),
-		// expanded flips right after this callback — check on the next tick
-		on_click: () => setTimeout(update_buttons, 0),
+		onclick: function (node) {
+			parent = node.value;
+		},
 	});
-	return tree;
 };

erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py

@@ -70,13 +70,7 @@ def validate_company(company: str):
 		frappe.throw(msg, title=_("Wrong Company"))
 
 	if frappe.db.get_all("GL Entry", {"company": company}, "name", limit=1):
-		frappe.throw(
-			_(
-				"Transactions against the Company already exist! Chart of Accounts can only be imported for a Company with no transactions."
-			)
-		)
-
-	validate_user_perms(company)
+		return False
 
 
 @frappe.whitelist()
@@ -85,22 +79,16 @@ def import_coa(file_name: str, company: str):
 
 	# delete existing data for accounts
 	frappe.has_permission("Company", "write", company, throw=True)
+	unset_existing_data(company)
 
 	# create accounts
 	file_doc, extension = get_file(file_name)
-	validate_accounts(file_doc, extension)
 
 	if extension == "csv":
 		data = generate_data_from_csv(file_doc)
 	else:
 		data = generate_data_from_excel(file_doc, extension)
 
-	validate_columns(data)
-
-	validate_company(company)
-
-	unset_existing_data(company)
-
 	frappe.local.flags.ignore_root_company_validation = True
 	forest = build_forest(data)
 	create_charts(company, custom_chart=forest, from_coa_importer=True)
@@ -465,6 +453,7 @@ def get_mandatory_account_types():
 
 def unset_existing_data(company):
 	# remove accounts data from company
+
 	fieldnames = get_linked_fields("Account").get("Company", {}).get("fieldname", [])
 	linked = [{"fieldname": name} for name in fieldnames]
 	update_values = {d.get("fieldname"): "" for d in linked}
@@ -474,30 +463,13 @@ def unset_existing_data(company):
 	# remove accounts data from various doctypes
 	for doctype in [
 		"Account",
-		"Sales Taxes and Charges Template",
-		"Purchase Taxes and Charges Template",
 		"Party Account",
 		"Mode of Payment Account",
 		"Tax Withholding Account",
+		"Sales Taxes and Charges Template",
+		"Purchase Taxes and Charges Template",
 	]:
-		frappe.get_query(doctype, delete=True, filters={"company": company}).run()
-
-
-def validate_user_perms(company):
-	# User Permission Check for Account Deletion
-	company_accounts_count = frappe.get_query(
-		"Account", fields=[{"COUNT": "name"}], filters={"company": company}
-	).run()[0][0]
-	company_accounts_user_has_access_to = frappe.get_query(
-		"Account", fields=[{"COUNT": "name"}], filters={"company": company}, ignore_permissions=False
-	).run()[0][0]
-
-	if company_accounts_count != company_accounts_user_has_access_to:
-		frappe.throw(
-			_("Accounts cannot be removed, as user doesn't have access to all the accounts of {0}").format(
-				frappe.bold(company)
-			)
-		)
+		frappe.get_query(doctype, delete=True, filters={"company": company}, ignore_permissions=False).run()
 
 
 def set_default_accounts(company):

erpnext/accounts/doctype/cost_center/cost_center.json

@@ -126,7 +126,7 @@
  "idx": 1,
  "is_tree": 1,
  "links": [],
- "modified": "2026-08-21 23:11:40.799391",
+ "modified": "2026-04-14 18:15:27.367298",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Cost Center",
@@ -181,54 +181,6 @@
   {
    "role": "HR Manager",
    "select": 1
-  },
-  {
-   "role": "Delivery Manager",
-   "select": 1
-  },
-  {
-   "role": "Delivery User",
-   "select": 1
-  },
-  {
-   "role": "Maintenance Manager",
-   "select": 1
-  },
-  {
-   "role": "Maintenance User",
-   "select": 1
-  },
-  {
-   "role": "Manufacturing Manager",
-   "select": 1
-  },
-  {
-   "role": "Manufacturing User",
-   "select": 1
-  },
-  {
-   "role": "Projects Manager",
-   "select": 1
-  },
-  {
-   "role": "Projects User",
-   "select": 1
-  },
-  {
-   "role": "Purchase Master Manager",
-   "select": 1
-  },
-  {
-   "role": "Quality Manager",
-   "select": 1
-  },
-  {
-   "role": "Sales Master Manager",
-   "select": 1
-  },
-  {
-   "role": "Stock Manager",
-   "select": 1
   }
  ],
  "row_format": "Dynamic",

erpnext/accounts/doctype/cost_center/cost_center_tree.js

@@ -12,19 +12,6 @@ frappe.treeview_settings["Cost Center"] = {
 	],
 	root_label: "Cost Centers",
 	get_tree_nodes: "erpnext.accounts.utils.get_children",
-	get_label: function (node) {
-		// clean display name — the number renders as a badge (see onrender)
-		return frappe.utils.escape_html(node.data.cost_center_name || node.title || node.label);
-	},
-	onrender: function (node) {
-		if (node.is_root || !node.data) return;
-
-		const flags = [];
-		if (node.data.cost_center_number) {
-			flags.push(frappe.ui.badge({ label: node.data.cost_center_number }));
-		}
-		erpnext.utils.render_tree_node_flags(node, flags);
-	},
 	add_tree_node: "erpnext.accounts.utils.add_cc",
 	menu_items: [
 		{
@@ -55,37 +42,6 @@ frappe.treeview_settings["Cost Center"] = {
 		},
 	],
 	ignore_fields: ["parent_cost_center"],
-	toolbar: [
-		{
-			label: __("Convert to Group"),
-			icon: "folder-tree",
-			condition: function (node) {
-				return !node.is_root && !node.expandable && frappe.model.can_write("Cost Center");
-			},
-			click: function (node) {
-				erpnext.accounts.convert_tree_node("Cost Center", node, "convert_ledger_to_group");
-			},
-		},
-		{
-			label: __("Convert to Non-Group"),
-			icon: "file-text",
-			condition: function (node) {
-				// only on groups the user has opened and found empty — a
-				// group with children can't convert, so don't offer it
-				return (
-					!node.is_root &&
-					node.expandable &&
-					node.loaded &&
-					!node.$ul.children().length &&
-					frappe.model.can_write("Cost Center")
-				);
-			},
-			click: function (node) {
-				erpnext.accounts.convert_tree_node("Cost Center", node, "convert_group_to_ledger");
-			},
-		},
-	],
-	extend_toolbar: true,
 	onload: function (treeview) {
 		function get_company() {
 			return treeview.page.fields_dict.company.get_value();
@@ -126,22 +82,3 @@ frappe.treeview_settings["Cost Center"] = {
 		);
 	},
 };
-
-frappe.provide("erpnext.accounts");
-// shared by the Account and Cost Center tree views (defined in both files,
-// whichever loads first wins): run the doctype's whitelisted convert method,
-// then re-render the branch so the node's group/leaf state updates
-erpnext.accounts.convert_tree_node =
-	erpnext.accounts.convert_tree_node ||
-	function (doctype, node, method) {
-		frappe.call({
-			method: "run_doc_method",
-			args: { dt: doctype, dn: node.label, method: method },
-			callback: function (r) {
-				if (r.exc) return;
-				const treeview = frappe.views.trees[doctype];
-				node.parent_node && treeview.tree.load_children(node.parent_node);
-				frappe.show_alert({ message: __("{0} converted", [node.label]), indicator: "green" });
-			},
-		});
-	};

erpnext/accounts/doctype/coupon_code/coupon_code.json

@@ -125,7 +125,7 @@
   }
  ],
  "links": [],
- "modified": "2026-08-21 23:11:41.010871",
+ "modified": "2024-11-19 16:35:11.836441",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Coupon Code",
@@ -179,20 +179,11 @@
    "role": "Website Manager",
    "share": 1,
    "write": 1
-  },
-  {
-   "role": "Maintenance Manager",
-   "select": 1
-  },
-  {
-   "role": "Maintenance User",
-   "select": 1
   }
  ],
- "row_format": "Dynamic",
  "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "title_field": "coupon_name",
  "track_changes": 1
-}
+}

erpnext/accounts/doctype/dunning/dunning.js

@@ -234,10 +234,8 @@ frappe.ui.form.on("Dunning", {
 				dn: frm.doc.name,
 			},
 			callback: function (r) {
-				if (!r.exc) {
-					var doc = frappe.model.sync(r.message);
-					frappe.set_route("Form", doc[0].doctype, doc[0].name);
-				}
+				var doc = frappe.model.sync(r.message);
+				frappe.set_route("Form", doc[0].doctype, doc[0].name);
 			},
 		});
 	},

erpnext/accounts/doctype/finance_book/finance_book.json

@@ -20,7 +20,7 @@
  ],
  "icon": "fa fa-book",
  "links": [],
- "modified": "2026-08-21 23:11:42.386104",
+ "modified": "2024-03-27 13:09:44.514241",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Finance Book",
@@ -55,26 +55,13 @@
    "report": 1,
    "role": "Auditor",
    "share": 1
-  },
-  {
-   "role": "HR Manager",
-   "select": 1
-  },
-  {
-   "role": "Manufacturing Manager",
-   "select": 1
-  },
-  {
-   "role": "Quality Manager",
-   "select": 1
   }
  ],
  "quick_entry": 1,
- "row_format": "Dynamic",
  "search_fields": "finance_book_name",
  "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1,
  "track_seen": 1
-}
+}

erpnext/accounts/doctype/finance_book/test_finance_book.py

@@ -31,4 +31,11 @@ class TestFinanceBook(ERPNextTestSuite):
 
 
 def create_finance_book():
-	return frappe.get_doc("Finance Book", "Test Finance Book 1")
+	if not frappe.db.exists("Finance Book", "_Test Finance Book"):
+		finance_book = frappe.get_doc(
+			{"doctype": "Finance Book", "finance_book_name": "_Test Finance Book"}
+		).insert()
+	else:
+		finance_book = frappe.get_doc("Finance Book", "_Test Finance Book")
+
+	return finance_book

erpnext/accounts/doctype/financial_report_template/financial_report_engine.py

@@ -32,7 +32,6 @@ from erpnext.accounts.doctype.financial_report_template.financial_report_validat
 	AccountFilterValidator,
 	CalculationFormulaValidator,
 	DependencyValidator,
-	get_valid_api_method,
 )
 from erpnext.accounts.report.financial_statements import (
 	get_columns,
@@ -491,10 +490,7 @@ class DataCollector:
 		if company:
 			query = query.where(account.company == company)
 
-		# filters are optional: no filter means all (enabled, non-group) accounts of the company.
-		# invalid filters can't reach here — build_conditions raises on them (raise_on_invalid).
-		conditions = filter_parser.build_conditions(account_rows, account, raise_on_invalid=True)
-		if conditions is not None:
+		if conditions := filter_parser.build_conditions(account_rows, account):
 			query = query.where(conditions)
 
 		return query.run(pluck=True)
@@ -806,20 +802,17 @@ class FilterExpressionParser:
 	def __init__(self):
 		self.validator = AccountFilterValidator()
 
-	def build_conditions(self, report_rows, table, raise_on_invalid=False):
+	def build_conditions(self, report_rows, table):
 		conditions = []
 		for row in report_rows or []:
-			condition = self.build_condition(row, table, raise_on_invalid=raise_on_invalid)
+			condition = self.build_condition(row, table)
 			if condition is not None:
 				conditions.append(condition)
 
-		if not conditions:
-			return None
-
 		# ensure brackets in or condition
 		return reduce(lambda a, b: (a) | (b), conditions)
 
-	def build_condition(self, report_row, table, raise_on_invalid=False):
+	def build_condition(self, report_row, table):
 		"""
 		Build SQL condition directly from filter formula.
 
@@ -849,11 +842,9 @@ class FilterExpressionParser:
 		if not filter_formula:
 			return None
 
-		errors = self.validator.validate_filter(report_row)
+		errors = self.validator.validate(report_row)
 		if not errors.is_valid:
 			error_messages = [str(issue) for issue in errors.issues]
-			if raise_on_invalid:
-				frappe.throw("<br><br>".join(error_messages), title=_("Invalid Filter"))
 			frappe.log_error(f"Filter validation errors found:\n{'<br><br>'.join(error_messages)}")
 			return None
 
@@ -1050,11 +1041,7 @@ class FormulaFieldUpdater:
 
 @frappe.whitelist()
 def get_filtered_accounts(company: str, account_rows: str | list):
-	if not company:
-		frappe.throw(_("Company is required"), title=_("Missing Company"))
-
 	frappe.has_permission("Financial Report Template", ptype="read", throw=True)
-	frappe.has_permission("Company", doc=company, throw=True)
 
 	account_rows = [frappe._dict(row) for row in frappe.parse_json(account_rows)]
 
@@ -1195,12 +1182,10 @@ class RowProcessor:
 
 	def _process_api_row(self, row) -> RowData:
 		api_path = row.calculation_formula
-
-		method = get_valid_api_method(api_path)
+		# TODO
 
 		try:
-			# nosemgrep: frappe-semgrep-rules.rules.security.frappe-codeinjection-eval
-			values = frappe.call(method, filters=self.context.filters, periods=self.period_list, row=row)
+			values = frappe.call(api_path, filters=self.context.filters, periods=self.period_list, row=row)
 
 			if row.reverse_sign:
 				values = [-1 * v for v in values]

erpnext/accounts/doctype/financial_report_template/financial_report_template.js

@@ -163,7 +163,7 @@ function show_accounts_tree(template_rows, has_selection) {
 				fieldname: "company",
 				fieldtype: "Link",
 				options: "Company",
-				label: __("Company"),
+				label: "Company",
 				reqd: 1,
 				default: frappe.defaults.get_user_default("Company"),
 				onchange: () => {
@@ -176,7 +176,7 @@ function show_accounts_tree(template_rows, has_selection) {
 				fieldname: "view_type",
 				fieldtype: "Select",
 				options: ["Missing Accounts", "Filtered Accounts"],
-				label: __("View"),
+				label: "View",
 				default: has_selection ? "Filtered Accounts" : "Missing Accounts",
 				reqd: 1,
 				onchange: () => {
@@ -192,10 +192,10 @@ function show_accounts_tree(template_rows, has_selection) {
 			{
 				fieldname: "tip",
 				fieldtype: "HTML",
-				label: __("Tip"),
+				label: "Tip",
 				options: `
 					<div class="alert alert-success" role="alert">
-							${__("Tip: Select report lines to view their accounts")}
+							Tip: Select report lines to view their accounts
 					</div>
 				`,
 				depends_on: has_selection ? "eval: false" : "eval: true",
@@ -203,7 +203,7 @@ function show_accounts_tree(template_rows, has_selection) {
 			{
 				fieldname: "tree_area",
 				fieldtype: "HTML",
-				label: __("Chart of Accounts"),
+				label: "Chart of Accounts",
 				read_only: 1,
 				depends_on: "eval: doc.company",
 			},
@@ -236,8 +236,6 @@ async function refresh_tree_view(dialog, account_rows) {
 		parent: wrapper,
 		label: company,
 		root_value: company,
-		// read-only preview: row-mode visuals without actions
-		row_style: true,
 		method: "erpnext.accounts.doctype.financial_report_template.financial_report_engine.get_children_accounts",
 		args: { doctype: "Account", company: company, filtered_accounts: filtered_accounts, missed: missed },
 		toolbar: [],
@@ -290,14 +288,14 @@ function update_formula_label(frm, data_source) {
 	if (!field) return;
 
 	const labels = {
-		"Account Data": __("Account Filter"),
-		"Custom API": __("API Method Path"),
+		"Account Data": "Account Filter",
+		"Custom API": "API Method Path",
 	};
 
 	grid.update_docfield_property(
 		"calculation_formula",
 		"label",
-		labels[data_source] || __("Calculation Formula")
+		labels[data_source] || "Calculation Formula"
 	);
 }
 
@@ -372,7 +370,7 @@ function update_formula_description(frm, data_source) {
 		description_html = `
 			<div ${container_style}>
 				<h5 ${title_style}>Custom API Setup</h5>
-				<p ${text_style}>Path to your custom whitelisted method that returns financial data. It must permit GET requests.</p>
+				<p ${text_style}>Path to your custom method that returns financial data.</p>
 
 				<h6 ${subtitle_style}>Format:</h6>
 				<ul ${list_style}>
@@ -382,8 +380,7 @@ function update_formula_description(frm, data_source) {
 
 				<h6 ${subtitle_style}>Method Signature:</h6>
 				<div ${code_style}>
-					<!-- &#10; is used for line breaks since frappe.render replaces newlines with spaces -->
-					<pre ${pre_style} class="language-python">@frappe.whitelist(methods=["GET"])&#10;def get_custom_data(filters, periods, row):&#10;    # filters: dict — report filters (company, period, etc.)&#10;    # periods: list[dict] — period definitions&#10;    # row: dict — the current report row&#10;&#10;    return [1000.0, 1200.0, 1150.0]  # one value per period</pre>
+					<pre ${pre_style}>def get_custom_data(filters, periods, row): <br>&nbsp; # filters: dict — report filters (company, period, etc.) <br>&nbsp; # periods: list[dict] — period definitions <br>&nbsp; # row: dict — the current report row <br><br>&nbsp; return [1000.0, 1200.0, 1150.0]  # one value per period</pre>
 				</div>
 
 				<h6 ${subtitle_style}>Return Format:</h6>

erpnext/accounts/doctype/financial_report_template/financial_report_validation.py

@@ -8,40 +8,17 @@ from dataclasses import dataclass, field
 from typing import Any
 
 import frappe
-from frappe import _, is_whitelisted
+from frappe import _
 from frappe.database.operator_map import OPERATOR_MAP
 
 
-def get_valid_api_method(api_path: str):
-	"""Resolve `api_path`, ensuring it is whitelisted and permits GET (i.e. read-only)."""
-	method = frappe.get_attr(api_path)
-	is_whitelisted(method)
-
-	if "GET" not in frappe.allowed_http_methods_for_whitelisted_func.get(method, ()):
-		frappe.throw(
-			_("Method {0} must permit GET requests").format(frappe.bold(api_path)),
-			frappe.PermissionError,
-			title=_("Method Not Allowed"),
-		)
-
-	return method
-
-
-def get_formula_field_label(data_source: str) -> str:
-	# Must mirror the `labels` map in financial_report_template.js (update_formula_label),
-	labels = {
-		"Account Data": _("Account Filter"),
-		"Custom API": _("API Method Path"),
-	}
-	return labels.get(data_source, _("Calculation Formula"))
-
-
 @dataclass
 class ValidationIssue:
 	"""Represents a single validation issue"""
 
 	message: str
 	row_idx: int | None = None
+	field: str | None = None
 	details: dict[str, Any] = None
 
 	def __post_init__(self):
@@ -49,9 +26,10 @@ class ValidationIssue:
 			self.details = {}
 
 	def __str__(self) -> str:
-		if self.row_idx:
-			return _("Row {0}: {1}", context="Financial Report Template").format(self.row_idx, self.message)
-		return self.message
+		prefix = f"Row {self.row_idx}: " if self.row_idx else ""
+		field_info = f"[{self.field}] " if self.field else ""
+		message = f"{prefix}{field_info}{self.message}"
+		return _(message)
 
 
 @dataclass
@@ -153,9 +131,7 @@ class TemplateStructureValidator(Validator):
 			if not re.match(r"^[A-Za-z][A-Za-z0-9_-]*$", ref_code):
 				result.add_error(
 					ValidationIssue(
-						message=_(
-							"Invalid line reference format: '{0}'. Must start with letter and contain only letters, numbers, underscores, and hyphens"
-						).format(ref_code),
+						message=f"Invalid line reference format: '{ref_code}'. Must start with letter and contain only letters, numbers, underscores, and hyphens",
 						row_idx=row.idx,
 					)
 				)
@@ -164,7 +140,7 @@ class TemplateStructureValidator(Validator):
 			if ref_code in used_codes:
 				result.add_error(
 					ValidationIssue(
-						message=_("Duplicate line reference: '{0}'").format(ref_code),
+						message=f"Duplicate line reference: '{ref_code}'",
 						row_idx=row.idx,
 					)
 				)
@@ -180,7 +156,7 @@ class TemplateStructureValidator(Validator):
 			if row.data_source == "Account Data" and not row.balance_type:
 				result.add_error(
 					ValidationIssue(
-						message=_("Balance Type is required for Account Data"),
+						message="Balance Type is required for Account Data",
 						row_idx=row.idx,
 					)
 				)
@@ -190,11 +166,7 @@ class TemplateStructureValidator(Validator):
 				if not row.calculation_formula:
 					result.add_error(
 						ValidationIssue(
-							message=_("{0} is required when {1} is {2}").format(
-								get_formula_field_label(row.data_source),
-								row.meta.get_translated_label("data_source"),
-								_(row.data_source),
-							),
+							message=f"Formula is required for {row.data_source}",
 							row_idx=row.idx,
 						)
 					)
@@ -221,14 +193,7 @@ class DependencyValidator(Validator):
 
 		for row in self.template.rows:
 			if row.reference_code and row.data_source == "Calculated Amount" and row.calculation_formula:
-				# skip self-reference, `CalculationFormulaValidator` already reports it
-				deps = [
-					code
-					for code in extract_reference_codes_from_formula(
-						row.calculation_formula, list(available_codes)
-					)
-					if code != row.reference_code
-				]
+				deps = extract_reference_codes_from_formula(row.calculation_formula, list(available_codes))
 				if deps:
 					graph[row.reference_code] = deps
 
@@ -258,7 +223,7 @@ class DependencyValidator(Validator):
 				cycle = [*path[cycle_start:], node]
 				result.add_error(
 					ValidationIssue(
-						message=_("Circular dependency detected: {0}").format(" → ".join(cycle)),
+						message=f"Circular dependency detected: {' → '.join(cycle)}",
 					)
 				)
 				return
@@ -290,9 +255,7 @@ class DependencyValidator(Validator):
 				row_idx = self._get_row_idx(ref_code)
 				result.add_error(
 					ValidationIssue(
-						message=_("Line references undefined in {0}: {1}").format(
-							get_formula_field_label("Calculated Amount"), ", ".join(undefined)
-						),
+						message=f"Line References undefined in Formula: {', '.join(undefined)}",
 						row_idx=row_idx,
 					)
 				)
@@ -319,6 +282,16 @@ class CalculationFormulaValidator(Validator):
 		if row.data_source != "Calculated Amount":
 			return result
 
+		if not row.calculation_formula:
+			result.add_error(
+				ValidationIssue(
+					message="Formula is required for Calculated Amount",
+					row_idx=row.idx,
+					field="Formula",
+				)
+			)
+			return result
+
 		formula = self._preprocess_formula(row.calculation_formula)
 		row.calculation_formula = formula
 
@@ -326,7 +299,7 @@ class CalculationFormulaValidator(Validator):
 		if not self._are_parentheses_balanced(formula):
 			result.add_error(
 				ValidationIssue(
-					message=_("Formula has unbalanced parentheses"),
+					message="Formula has unbalanced parentheses",
 					row_idx=row.idx,
 				)
 			)
@@ -338,7 +311,17 @@ class CalculationFormulaValidator(Validator):
 		if row.reference_code and row.reference_code in refs:
 			result.add_error(
 				ValidationIssue(
-					message=_("Formula references itself ('{0}')").format(row.reference_code),
+					message=f"Formula references itself ('{row.reference_code}')",
+					row_idx=row.idx,
+				)
+			)
+
+		# Check undefined references
+		undefined = set(refs) - set(available_codes)
+		if undefined:
+			result.add_error(
+				ValidationIssue(
+					message=f"Formula references undefined codes: {', '.join(undefined)}",
 					row_idx=row.idx,
 				)
 			)
@@ -348,7 +331,7 @@ class CalculationFormulaValidator(Validator):
 		if eval_error:
 			result.add_error(
 				ValidationIssue(
-					message=_("Formula evaluation error: {0}").format(eval_error),
+					message=f"Formula evaluation error: {eval_error}",
 					row_idx=row.idx,
 				)
 			)
@@ -385,7 +368,7 @@ class CalculationFormulaValidator(Validator):
 			result = frappe.safe_eval(formula, eval_globals=None, eval_locals=context)
 
 			if not isinstance(result, (int, float)):  # noqa: UP038
-				return _("Formula must return a numeric value, got {0}").format(type(result).__name__)
+				return f"Formula must return a numeric value, got {type(result).__name__}"
 
 			return None
 		except Exception as e:
@@ -400,20 +383,21 @@ class AccountFilterValidator(Validator):
 		self.account_fields = account_fields or set(self.account_meta._valid_columns)
 
 	def validate(self, row) -> ValidationResult:
-		# dispatch-path guard: only account-data rows are validated here
-		if row.data_source != "Account Data":
-			return ValidationResult()
-
-		return self.validate_filter(row)
-
-	def validate_filter(self, row) -> ValidationResult:
-		"""Validate calculation_formula as an Account filter, regardless of data_source.
-
-		The caller has already decided this row is an account filter, so unlike
-		`validate()` this does not opt out based on `data_source`.
-		"""
 		result = ValidationResult()
 
+		if row.data_source != "Account Data":
+			return result
+
+		if not row.calculation_formula:
+			result.add_error(
+				ValidationIssue(
+					message="Account filter is required for Account Data",
+					row_idx=row.idx,
+					field="Formula",
+				)
+			)
+			return result
+
 		try:
 			filter_config = json.loads(row.calculation_formula)
 			error = self._validate_filter_structure(
@@ -425,21 +409,18 @@ class AccountFilterValidator(Validator):
 			if error:
 				result.add_error(
 					ValidationIssue(
-						message=_("[{0}] {1}", context="Financial Report Template").format(
-							get_formula_field_label("Account Data"), error
-						),
+						message=error,
 						row_idx=row.idx,
+						field="Account Filter",
 					)
 				)
 
 		except json.JSONDecodeError as e:
 			result.add_error(
 				ValidationIssue(
-					message=_("[{0}] {1}", context="Financial Report Template").format(
-						get_formula_field_label("Account Data"),
-						_("Invalid JSON format: {0}").format(str(e)),
-					),
+					message=f"Invalid JSON format: {e!s}",
 					row_idx=row.idx,
+					field="Account Filter",
 				)
 			)
 
@@ -454,35 +435,36 @@ class AccountFilterValidator(Validator):
 		# simple condition: [field, operator, value]
 		if isinstance(filter_config, list):
 			if len(filter_config) != 3:
-				return _("Filter must be [field, operator, value]")
+				return "Filter must be [field, operator, value]"
 
 			field, operator, value = filter_config
 
 			if not isinstance(field, str) or not isinstance(operator, str):
-				return _("Field and operator must be strings")
+				return "Field and operator must be strings"
+
+			display = (field if advanced_filtering else self.account_meta.get_label(field)) or field
 
 			if field not in account_fields:
-				# escape: `field` is caller-supplied and this message renders as HTML
-				return _("Field '{0}' is not a valid Account field").format(frappe.utils.escape_html(field))
+				return f"Field '{display}' is not a valid Account field"
 
 			if operator.casefold() not in OPERATOR_MAP:
-				return _("Invalid operator '{0}'").format(operator)
+				return f"Invalid operator '{operator}'"
 
 			if operator in ["in", "not in"] and not isinstance(value, list):
-				return _("Operator '{0}' requires a list value").format(operator)
+				return f"Operator '{operator}' requires a list value"
 
 		# logical condition: {"and": [condition1, condition2]}
 		elif isinstance(filter_config, dict):
 			if len(filter_config) != 1:
-				return _("Logical condition must have exactly one operator")
+				return "Logical condition must have exactly one operator"
 
 			op = next(iter(filter_config.keys())).lower()
 			if op not in ["and", "or"]:
-				return _("Logical operators must be 'and' or 'or'")
+				return "Logical operators must be 'and' or 'or'"
 
 			conditions = filter_config[next(iter(filter_config.keys()))]
 			if not isinstance(conditions, list) or len(conditions) < 1:
-				return _("Logical conditions need at least 1 sub-condition")
+				return "Logical conditions need at least 1 sub-condition"
 
 			# recursive
 			for condition in conditions:
@@ -490,7 +472,7 @@ class AccountFilterValidator(Validator):
 				if error:
 					return error
 		else:
-			return _("Filter must be a list or dict")
+			return "Filter must be a list or dict"
 
 		return None
 
@@ -526,32 +508,34 @@ class FormulaValidator(Validator):
 		if "." not in api_path:
 			result.add_error(
 				ValidationIssue(
-					message=_("{0} should be in format: app.module.method").format(
-						get_formula_field_label(row.data_source)
-					),
+					message="Custom API path should be in format: app.module.method",
 					row_idx=row.idx,
+					field="Formula",
 				)
 			)
 			return result
 
+		# Method exists?
 		try:
-			get_valid_api_method(api_path)
+			module_path, method_name = api_path.rsplit(".", 1)
+			module = frappe.get_module(module_path)
+
+			if not hasattr(module, method_name):
+				result.add_error(
+					ValidationIssue(
+						message=f"Method '{method_name}' not found in module '{module_path}' (might be environment-specific)",
+						row_idx=row.idx,
+						field="Formula",
+					)
+				)
 		except Exception as e:
-			if isinstance(e, frappe.PermissionError | frappe.ValidationError):
-				# frappe.throw inside get_valid_api_method logs a message that would pop up in UI
-				frappe.clear_last_message()
-
-			if isinstance(e, frappe.PermissionError):
-				message = _("[{0}] {1}", context="Financial Report Template").format(
-					get_formula_field_label(row.data_source),
-					_("Method '{0}' must be whitelisted and permit GET requests").format(api_path),
+			result.add_error(
+				ValidationIssue(
+					message=f"Could not validate API path: {e!s}",
+					row_idx=row.idx,
+					field="Formula",
 				)
-			else:
-				message = _("Could not validate {0}: {1}").format(
-					get_formula_field_label(row.data_source), str(e)
-				)
-
-			result.add_error(ValidationIssue(message=message, row_idx=row.idx))
+			)
 
 		return result
 

erpnext/accounts/doctype/financial_report_template/test_financial_report_template.py

@@ -2,13 +2,7 @@
 # For license information, please see license.txt
 
 import frappe
-from frappe.tests.utils import whitelist_for_tests
 
-from erpnext.accounts.doctype.financial_report_template.financial_report_validation import (
-	AccountFilterValidator,
-	FormulaValidator,
-	get_valid_api_method,
-)
 from erpnext.tests.utils import ERPNextTestSuite
 
 
@@ -78,173 +72,3 @@ class FinancialReportTemplateTestCase(ERPNextTestSuite):
 			{"doctype": "Financial Report Template", "template_name": template_name, "rows": rows_data}
 		)
 		return template
-
-
-def not_whitelisted_method(**kwargs):
-	return [42.0]
-
-
-@whitelist_for_tests(methods=["POST"])
-def whitelisted_post_only_method(**kwargs):
-	return [42.0]
-
-
-@whitelist_for_tests(methods=["GET"])
-def whitelisted_get_method(**kwargs):
-	return [42.0]
-
-
-class TestCustomAPIValidation(FinancialReportTemplateTestCase):
-	"""Custom API rows must point to whitelisted methods that permit GET"""
-
-	TEST_MODULE = "erpnext.accounts.doctype.financial_report_template.test_financial_report_template"
-	NOT_WHITELISTED = f"{TEST_MODULE}.not_whitelisted_method"
-	WHITELISTED_POST_ONLY = f"{TEST_MODULE}.whitelisted_post_only_method"
-	WHITELISTED_GET = f"{TEST_MODULE}.whitelisted_get_method"
-
-	def create_api_template(self, api_path):
-		template = self.create_test_template_with_rows(
-			[
-				{
-					"reference_code": "API001",
-					"display_name": "API Row",
-					"data_source": "Custom API",
-					"calculation_formula": api_path,
-				}
-			]
-		)
-		template.report_type = "Profit and Loss Statement"
-		return template
-
-	def test_get_valid_api_method(self):
-		self.assertRaises(frappe.PermissionError, get_valid_api_method, self.NOT_WHITELISTED)
-		self.assertRaises(frappe.PermissionError, get_valid_api_method, self.WHITELISTED_POST_ONLY)
-		self.assertEqual(get_valid_api_method(self.WHITELISTED_GET), frappe.get_attr(self.WHITELISTED_GET))
-
-	def test_save_rejects_invalid_api_methods(self):
-		for api_path in (self.NOT_WHITELISTED, self.WHITELISTED_POST_ONLY):
-			template = self.create_api_template(api_path)
-			self.assertRaises(frappe.ValidationError, template.insert)
-
-	def test_save_allows_get_whitelisted_method(self):
-		template = self.create_api_template(self.WHITELISTED_GET)
-		template.insert()
-		template.delete()
-
-	def test_engine_rejects_invalid_api_methods(self):
-		from erpnext.accounts.doctype.financial_report_template.financial_report_engine import (
-			ReportContext,
-			RowProcessor,
-		)
-
-		for api_path in (self.NOT_WHITELISTED, self.WHITELISTED_POST_ONLY):
-			template = self.create_api_template(api_path)
-			context = ReportContext(template=template, filters={}, period_list=[{"key": "p1"}])
-			processor = RowProcessor(context)
-			self.assertRaises(frappe.PermissionError, processor._process_api_row, template.rows[0])
-
-	def test_engine_calls_valid_api_method(self):
-		from erpnext.accounts.doctype.financial_report_template.financial_report_engine import (
-			ReportContext,
-			RowProcessor,
-		)
-
-		template = self.create_api_template(self.WHITELISTED_GET)
-		context = ReportContext(template=template, filters={}, period_list=[{"key": "p1"}])
-		processor = RowProcessor(context)
-		row_data = processor._process_api_row(template.rows[0])
-		self.assertEqual(row_data.values, [42.0])
-
-	def test_validation_keeps_message_log_clean(self):
-		validator = FormulaValidator(frappe._dict(rows=[]))
-		message_count = len(frappe.local.message_log)
-
-		# last path raises AppNotInstalledError, which also logs a message via frappe.throw
-		for api_path in (self.NOT_WHITELISTED, self.WHITELISTED_POST_ONLY, "missing_app.api.method"):
-			row = frappe._dict(data_source="Custom API", calculation_formula=api_path, idx=1)
-			result = validator.validate(row)
-			self.assertFalse(result.is_valid)
-			self.assertEqual(len(frappe.local.message_log), message_count)
-
-
-class TestAccountFilter(FinancialReportTemplateTestCase):
-	"""Filter fields must be validated on the account-filter parser path."""
-
-	@staticmethod
-	def _row(formula, **extra):
-		return frappe._dict(calculation_formula=formula, idx=1, **extra)
-
-	def test_validate_filter_enforces_allow_list_without_data_source(self):
-		# the parser path has no `data_source`; the field allow-list must still apply
-		validator = AccountFilterValidator()
-		self.assertFalse(validator.validate_filter(self._row('["bad_field", "=", "x"]')).is_valid)
-		self.assertTrue(validator.validate_filter(self._row('["root_type", "=", "Income"]')).is_valid)
-
-	def test_validate_gate_still_opts_out_for_non_account_data(self):
-		# validate() is the dispatch gate: it must not validate non "Account Data" rows
-		validator = AccountFilterValidator()
-		row = self._row('["bad_field", "=", "x"]', data_source="Custom API")
-		self.assertTrue(validator.validate(row).is_valid)
-
-	def test_error_message_labels_and_escapes_field(self):
-		validator = AccountFilterValidator()
-		result = validator.validate_filter(self._row('["<script>", "=", "x"]'))
-		message = str(result.issues[0])
-		self.assertIn("[Account Filter]", message)
-		self.assertIn("&lt;script&gt;", message)
-		self.assertNotIn("<script>", message)
-
-	def test_build_conditions_raises_on_invalid_field_when_opted_in(self):
-		from erpnext.accounts.doctype.financial_report_template.financial_report_engine import (
-			FilterExpressionParser,
-		)
-
-		account = frappe.qb.DocType("Account")
-		rows = [self._row('["bad_field", "=", "x"]')]
-		parser = FilterExpressionParser()
-
-		# default: invalid rows are skipped, not raised
-		self.assertIsNone(parser.build_conditions(rows, account))
-
-		# opted in (the get_filtered_accounts path): invalid rows raise
-		self.assertRaises(
-			frappe.ValidationError, parser.build_conditions, rows, account, raise_on_invalid=True
-		)
-
-	def test_build_conditions_empty_returns_none(self):
-		from erpnext.accounts.doctype.financial_report_template.financial_report_engine import (
-			FilterExpressionParser,
-		)
-
-		account = frappe.qb.DocType("Account")
-		self.assertIsNone(FilterExpressionParser().build_conditions([], account))
-
-	def test_endpoint_requires_company(self):
-		from erpnext.accounts.doctype.financial_report_template.financial_report_engine import (
-			get_filtered_accounts,
-		)
-
-		self.assertRaises(frappe.ValidationError, get_filtered_accounts, "", "[]")
-
-	def test_endpoint_rejects_invalid_field(self):
-		from erpnext.accounts.doctype.financial_report_template.financial_report_engine import (
-			get_filtered_accounts,
-		)
-
-		company = frappe.get_all("Company", limit=1, pluck="name")[0]
-		rows = frappe.as_json([{"calculation_formula": '["bad_field", "=", "x"]'}])
-		self.assertRaises(frappe.ValidationError, get_filtered_accounts, company, rows)
-
-	def test_endpoint_empty_rows_returns_all_company_accounts(self):
-		# filters are optional: no filter returns every enabled, non-group account of the company
-		from erpnext.accounts.doctype.financial_report_template.financial_report_engine import (
-			get_filtered_accounts,
-		)
-
-		company = frappe.get_all("Company", limit=1, pluck="name")[0]
-		expected = frappe.get_all(
-			"Account",
-			filters={"company": company, "disabled": 0, "is_group": 0},
-			pluck="name",
-		)
-		self.assertEqual(sorted(get_filtered_accounts(company, "[]")), sorted(expected))

erpnext/accounts/doctype/fiscal_year/fiscal_year.json

@@ -82,7 +82,7 @@
  "icon": "fa fa-calendar",
  "idx": 1,
  "links": [],
- "modified": "2026-08-21 23:11:42.509102",
+ "modified": "2024-05-27 17:29:55.560840",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Fiscal Year",
@@ -131,15 +131,10 @@
   {
    "read": 1,
    "role": "Auditor"
-  },
-  {
-   "role": "Sales Master Manager",
-   "select": 1
   }
  ],
- "row_format": "Dynamic",
  "show_name_in_global_search": 1,
  "sort_field": "name",
  "sort_order": "DESC",
  "states": []
-}
+}

erpnext/accounts/doctype/gl_entry/gl_entry.py

@@ -134,7 +134,7 @@ class GLEntry(Document):
 		mandatory = ["account", "voucher_type", "voucher_no", "company"]
 		for k in mandatory:
 			if not self.get(k):
-				frappe.throw(_("{0} is required").format(self.meta.get_translated_label(k)))
+				frappe.throw(_("{0} is required").format(_(self.meta.get_label(k))))
 
 		if not self.is_cancelled and not (self.party_type and self.party):
 			account_type = frappe.get_cached_value("Account", self.account, "account_type")

erpnext/accounts/doctype/item_tax_template/item_tax_template.json

@@ -57,7 +57,7 @@
   }
  ],
  "links": [],
- "modified": "2026-08-21 23:11:43.571355",
+ "modified": "2024-03-27 13:09:55.573483",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Item Tax Template",
@@ -95,61 +95,12 @@
    "report": 1,
    "role": "Accounts User",
    "share": 1
-  },
-  {
-   "role": "Delivery Manager",
-   "select": 1
-  },
-  {
-   "role": "Delivery User",
-   "select": 1
-  },
-  {
-   "role": "Item Manager",
-   "select": 1
-  },
-  {
-   "role": "Maintenance Manager",
-   "select": 1
-  },
-  {
-   "role": "Maintenance User",
-   "select": 1
-  },
-  {
-   "role": "Manufacturing Manager",
-   "select": 1
-  },
-  {
-   "role": "Purchase Manager",
-   "select": 1
-  },
-  {
-   "role": "Purchase User",
-   "select": 1
-  },
-  {
-   "role": "Sales Manager",
-   "select": 1
-  },
-  {
-   "role": "Sales User",
-   "select": 1
-  },
-  {
-   "role": "Stock Manager",
-   "select": 1
-  },
-  {
-   "role": "Stock User",
-   "select": 1
   }
  ],
- "row_format": "Dynamic",
  "show_name_in_global_search": 1,
  "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "title_field": "title",
  "track_changes": 1
-}
+}

erpnext/accounts/doctype/item_tax_template/item_tax_template_dashboard.py

@@ -8,6 +8,6 @@ def get_data():
 			{"label": _("Pre Sales"), "items": ["Quotation", "Supplier Quotation"]},
 			{"label": _("Sales"), "items": ["Sales Invoice", "Sales Order", "Delivery Note"]},
 			{"label": _("Purchase"), "items": ["Purchase Invoice", "Purchase Order", "Purchase Receipt"]},
-			{"label": _("Stock"), "items": ["Item Group", "Item"]},
+			{"label": _("Stock"), "items": ["Item Groups", "Item"]},
 		],
 	}

erpnext/accounts/doctype/journal_entry/journal_entry.js

@@ -249,7 +249,7 @@ Object.assign(erpnext.journal_entry, {
 			);
 		}
 
-		if (frm.doc.docstatus == 1 && !frm.doc.reversal_of) {
+		if (frm.doc.docstatus == 1) {
 			frm.add_custom_button(
 				__("Reverse Journal Entry"),
 				() => erpnext.journal_entry.reverse_journal_entry(frm),
@@ -677,6 +677,6 @@ Object.assign(erpnext.journal_entry, {
 		} else {
 			erpnext.journal_entry.set_debit_credit_in_company_currency(frm, cdt, cdn);
 		}
-		frm.get_field("accounts").grid.refresh_row(cdn);
+		frm.refresh_field("accounts");
 	},
 });

erpnext/accounts/doctype/journal_entry/journal_entry.py

@@ -180,7 +180,7 @@ class JournalEntry(AccountsController):
 
 		JournalTaxWithholding(self).on_validate()
 
-		if not self.title or (self.is_new() and self.amended_from):
+		if self.is_new() or not self.title:
 			self.title = self.get_title()
 
 	def validate_advance_accounts(self):

erpnext/accounts/doctype/journal_entry/mapper.py

@@ -27,7 +27,6 @@ def get_payment_entry_against_order(
 ) -> dict | Document:
 	"""Build an advance-payment Journal Entry against an unbilled Sales/Purchase Order."""
 	ref_doc = frappe.get_doc(dt, dn)
-	ref_doc.check_permission()
 
 	if flt(ref_doc.per_billed, 2) > 0:
 		frappe.throw(_("Can only make payment against unbilled {0}").format(dt))
@@ -79,8 +78,6 @@ def get_payment_entry_against_invoice(
 ) -> dict | Document:
 	"""Build a payment Journal Entry against a Sales/Purchase Invoice's outstanding amount."""
 	ref_doc = frappe.get_doc(dt, dn)
-	ref_doc.check_permission()
-
 	if dt == "Sales Invoice":
 		party_type = "Customer"
 		party_account = get_party_account_based_on_invoice_discounting(dn) or ref_doc.debit_to
@@ -121,8 +118,6 @@ def get_payment_entry(ref_doc, args: dict) -> dict | Document:
 	Returns the Journal Entry document when `args["journal_entry"]` is truthy, otherwise its
 	dict (for client calls).
 	"""
-	frappe.has_permission("Journal Entry", ptype="create", throw=True)
-
 	je = frappe.new_doc("Journal Entry")
 	je.update({"voucher_type": "Bank Entry", "company": ref_doc.company, "remark": args.get("remarks")})
 
@@ -227,20 +222,6 @@ def make_inter_company_journal_entry(name: str, voucher_type: str, company: str)
 @frappe.whitelist()
 def make_reverse_journal_entry(source_name: str, target_doc: str | dict | Document | None = None) -> Document:
 	"""Map a submitted Journal Entry to a reversing one (debits and credits swapped)."""
-	# `get_mapped_doc` checks this as well, but the guards below disclose which entry
-	# reverses which, so read access has to be settled before they run
-	if not frappe.has_permission("Journal Entry", doc=source_name):
-		frappe.throw(_("Not permitted"), frappe.PermissionError)
-
-	reversal_of = frappe.db.get_value("Journal Entry", source_name, "reversal_of")
-	if reversal_of:
-		frappe.throw(
-			_("{0} is already a Reverse Journal Entry of {1}. Cancel it instead of reversing it.").format(
-				get_link_to_form("Journal Entry", source_name),
-				get_link_to_form("Journal Entry", reversal_of),
-			)
-		)
-
 	existing_reverse = frappe.db.exists("Journal Entry", {"reversal_of": source_name, "docstatus": 1})
 	if existing_reverse:
 		frappe.throw(

erpnext/accounts/doctype/journal_entry/test_journal_entry.py

@@ -301,26 +301,6 @@ class TestJournalEntry(ERPNextTestSuite):
 
 		self.check_gl_entries()
 
-	def test_disallow_reversal_of_a_reversal_journal_entry(self):
-		from erpnext.accounts.doctype.journal_entry.mapper import make_reverse_journal_entry
-
-		jv = make_journal_entry("_Test Bank - _TC", "Sales - _TC", 100, submit=True)
-
-		rjv = make_reverse_journal_entry(jv.name)
-		rjv.posting_date = nowdate()
-		rjv.submit()
-
-		self.assertRaisesRegex(
-			frappe.ValidationError,
-			"is already a Reverse Journal Entry",
-			make_reverse_journal_entry,
-			rjv.name,
-		)
-
-		# the guard must not disclose the reversal to a user who cannot read the entry
-		with self.set_user("Guest"):
-			self.assertRaises(frappe.PermissionError, make_reverse_journal_entry, rjv.name)
-
 	def test_disallow_change_in_account_currency_for_a_party(self):
 		# create jv in USD
 		jv = make_journal_entry("_Test Bank USD - _TC", "_Test Receivable USD - _TC", 100, save=False)

erpnext/accounts/doctype/ledger_merge/ledger_merge.py

@@ -56,9 +56,7 @@ class LedgerMerge(Document):
 
 @frappe.whitelist()
 def form_start_merge(docname: str):
-	lm_doc = frappe.get_doc("Ledger Merge", docname)
-	lm_doc.check_permission("write")
-	return lm_doc.start_merge()
+	return frappe.get_doc("Ledger Merge", docname).start_merge()
 
 
 def start_merge(docname):

erpnext/accounts/doctype/loyalty_program/loyalty_program.json

@@ -147,14 +147,14 @@
    "fieldtype": "Column Break"
   },
   {
-   "fieldname": "project",
-   "fieldtype": "Link",
-   "label": "Project",
-   "options": "Project"
+    "fieldname": "project",
+    "fieldtype": "Link",
+    "label": "Project",
+    "options": "Project"
   }
  ],
  "links": [],
- "modified": "2026-08-21 23:11:44.144864",
+ "modified": "2024-03-27 13:10:03.361383",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Loyalty Program",
@@ -171,20 +171,11 @@
    "role": "System Manager",
    "share": 1,
    "write": 1
-  },
-  {
-   "role": "Sales Master Manager",
-   "select": 1
-  },
-  {
-   "role": "Sales User",
-   "select": 1
   }
  ],
  "quick_entry": 1,
- "row_format": "Dynamic",
  "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
-}
+}

erpnext/accounts/doctype/loyalty_program/loyalty_program.py

@@ -97,8 +97,6 @@ def get_loyalty_program_details_with_points(
 	include_expired_entry: bool = False,
 	current_transaction_amount: int | float = 0,
 ):
-	frappe.has_permission("Customer", doc=customer, throw=True)
-
 	lp_details = get_loyalty_program_details(customer, loyalty_program, company=company, silent=silent)
 	loyalty_program = frappe.get_doc("Loyalty Program", loyalty_program)
 	loyalty_details = get_loyalty_details(

erpnext/accounts/doctype/loyalty_program/test_loyalty_program.py

@@ -1,6 +1,6 @@
 # Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-from unittest.mock import patch
+import unittest
 
 import frappe
 from frappe.query_builder.functions import Sum
@@ -196,7 +196,7 @@ class TestLoyaltyProgram(ERPNextTestSuite):
 		for d in company_wise_info:
 			self.assertTrue(d.get("loyalty_points"))
 
-	@patch("erpnext.accounts.doctype.loyalty_program.loyalty_program.get_loyalty_details")
+	@unittest.mock.patch("erpnext.accounts.doctype.loyalty_program.loyalty_program.get_loyalty_details")
 	def test_tier_selection(self, mock_get_loyalty_details):
 		# Create a new loyalty program with multiple tiers
 		loyalty_program = frappe.get_doc(

erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json

@@ -48,7 +48,7 @@
  "idx": 1,
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2026-08-21 23:11:44.763131",
+ "modified": "2026-04-14 18:16:47.795986",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Mode of Payment",
@@ -76,30 +76,6 @@
   {
    "role": "HR Manager",
    "select": 1
-  },
-  {
-   "role": "Maintenance Manager",
-   "select": 1
-  },
-  {
-   "role": "Maintenance User",
-   "select": 1
-  },
-  {
-   "role": "Purchase Manager",
-   "select": 1
-  },
-  {
-   "role": "Purchase User",
-   "select": 1
-  },
-  {
-   "role": "Sales Manager",
-   "select": 1
-  },
-  {
-   "role": "Sales User",
-   "select": 1
   }
  ],
  "quick_entry": 1,

erpnext/accounts/doctype/monthly_distribution/monthly_distribution.json

@@ -46,7 +46,7 @@
  "icon": "fa fa-bar-chart",
  "idx": 1,
  "links": [],
- "modified": "2026-08-21 23:11:44.908490",
+ "modified": "2024-03-27 13:10:05.873547",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Monthly Distribution",
@@ -69,14 +69,9 @@
    "read": 1,
    "report": 1,
    "role": "Accounts Manager"
-  },
-  {
-   "role": "Sales Master Manager",
-   "select": 1
   }
  ],
- "row_format": "Dynamic",
  "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
-}
+}

erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py

@@ -297,9 +297,6 @@ def start_import(invoices):
 				invoice_number = d.invoice_number
 			doc = frappe.get_doc(d)
 			doc.flags.ignore_mandatory = True
-			# the outstanding amount is entered inclusive of tax, so taxes must not
-			# be added on top of it
-			doc.flags.dont_auto_add_taxes = True
 			doc.insert(set_name=invoice_number)
 			doc.submit()
 			if not frappe.in_test:

erpnext/accounts/doctype/opening_invoice_creation_tool/test_opening_invoice_creation_tool.py

@@ -4,11 +4,9 @@
 import frappe
 from frappe.utils import add_days, today
 
-from erpnext.accounts.doctype.account.test_account import create_account
 from erpnext.accounts.doctype.opening_invoice_creation_tool.opening_invoice_creation_tool import (
 	get_temporary_opening_account,
 )
-from erpnext.accounts.doctype.tax_rule.test_tax_rule import make_tax_rule
 from erpnext.projects.doctype.project.test_project import make_project
 from erpnext.tests.utils import ERPNextTestSuite
 
@@ -128,55 +126,6 @@ class TestOpeningInvoiceCreationTool(ERPNextTestSuite):
 		for invoice in invoices:
 			self.assertEqual(frappe.db.get_value("Sales Invoice", invoice, "department"), "Sales - _TOIC")
 
-	@ERPNextTestSuite.change_settings(
-		"Accounts Settings",
-		{"add_taxes_from_taxes_and_charges_template": 1, "add_taxes_from_item_tax_template": 0},
-	)
-	def test_opening_invoice_creation_without_taxes(self):
-		company = "_Test Opening Invoice Company"
-		template = frappe.get_doc(
-			{
-				"doctype": "Sales Taxes and Charges Template",
-				"company": company,
-				"title": "_Test Opening Invoice Tax",
-				"taxes": [
-					{
-						"charge_type": "On Net Total",
-						"account_head": create_account(
-							account_name="_Test Opening Tax Account",
-							parent_account="Duties and Taxes - _TOIC",
-							account_type="Tax",
-							company=company,
-						),
-						"description": "Test taxes",
-						"rate": 9,
-					}
-				],
-			}
-		).insert()
-
-		# makes the template the default for the party, as it would be on a live site
-		make_tax_rule(tax_type="Sales", company=company, sales_tax_template=template.name, save=1)
-
-		tool = self.make_invoices(company=company, return_doc=True)
-		invoices = tool.make_invoices()
-		self.assertEqual(len(invoices), 2)
-
-		# outstanding amount is entered inclusive of tax, so taxes must not be added on top of it
-		for invoice in invoices:
-			si = frappe.get_doc("Sales Invoice", invoice)
-			self.assertFalse(si.taxes)
-			self.assertEqual(si.grand_total, 200)
-			self.assertEqual(si.outstanding_amount, 200)
-
-		# the same invoice created outside the tool keeps the default taxes,
-		# since adding them there is the user's decision
-		si = frappe.get_doc(tool.get_invoices()[0])
-		si.flags.ignore_mandatory = True
-		si.insert()
-		self.assertTrue(si.taxes)
-		self.assertEqual(si.grand_total, 218)
-
 	def test_opening_entry_project_linking(self):
 		doc = self.make_invoices(
 			company="_Test Opening Invoice Company", invoice_type="Sales", return_doc=True

erpnext/accounts/doctype/payment_entry/payment_entry.js

@@ -476,8 +476,6 @@ frappe.ui.form.on("Payment Entry", {
 				return {
 					query: "erpnext.controllers.queries.employee_query",
 				};
-			} else if (["Customer", "Supplier"].includes(frm.doc.party_type)) {
-				return erpnext.queries.party(frm.doc);
 			} else if (frm.doc.party_type == "Shareholder") {
 				return {
 					filters: {
@@ -1279,14 +1277,8 @@ frappe.ui.form.on("Payment Entry", {
 		await frappe.after_ajax();
 		const base_paid_amount = frm.doc.base_paid_amount || 0;
 		const base_received_amount = frm.doc.base_received_amount || 0;
-		let other_deductions = 0;
-		if (frm.doc.payment_type === "Internal Transfer") {
-			other_deductions = (frm.doc.deductions || [])
-				.filter((row) => !row.is_exchange_gain_loss)
-				.reduce((sum, row) => sum + flt(row.amount), 0);
-		}
 		const exchange_gain_loss = flt(
-			base_paid_amount - base_received_amount - other_deductions,
+			base_paid_amount - base_received_amount,
 			get_deduction_amount_precision()
 		);
 
@@ -1300,10 +1292,7 @@ frappe.ui.form.on("Payment Entry", {
 
 		if (!row) {
 			const company_defaults = frappe.get_doc(":Company", frm.doc.company);
-			const is_single_currency =
-				frm.doc.paid_from_account_currency === frm.doc.paid_to_account_currency;
 			const account =
-				(is_single_currency && company_defaults?.bank_charges_account) ||
 				company_defaults?.[account_fieldname] ||
 				(await prompt_for_missing_account(frm, account_fieldname));
 
@@ -1858,24 +1847,16 @@ frappe.ui.form.on("Payment Entry Deduction", {
 	before_deductions_remove: function (doc, cdt, cdn) {
 		const row = frappe.get_doc(cdt, cdn);
 		if (row.is_exchange_gain_loss && row.amount) {
-			frappe.throw(__("Cannot delete a system-generated deduction row"));
+			frappe.throw(__("Cannot delete Exchange Gain/Loss row"));
 		}
 	},
 
 	amount: function (frm) {
-		if (frm.doc.payment_type === "Internal Transfer") {
-			frm.events.set_exchange_gain_loss_deduction(frm);
-		} else {
-			frm.events.set_unallocated_amount(frm);
-		}
+		frm.events.set_unallocated_amount(frm);
 	},
 
 	deductions_remove: function (frm) {
-		if (frm.doc.payment_type === "Internal Transfer") {
-			frm.events.set_exchange_gain_loss_deduction(frm);
-		} else {
-			frm.events.set_unallocated_amount(frm);
-		}
+		frm.events.set_unallocated_amount(frm);
 	},
 });
 

erpnext/accounts/doctype/payment_entry/payment_entry.py

@@ -40,7 +40,6 @@ from erpnext.accounts.party import (
 	complete_contact_details,
 	get_default_contact,
 	get_party_account,
-	validate_party_company,
 )
 from erpnext.accounts.utils import (
 	cancel_exchange_gain_loss_journal,
@@ -278,8 +277,7 @@ class PaymentEntry(AccountsController):
 		if not liability_account:
 			throw(
 				_("Please set default {0} in Company {1}").format(
-					frappe.bold(frappe.get_meta("Company").get_translated_label(fieldname)),
-					frappe.bold(self.company),
+					frappe.bold(frappe.get_meta("Company").get_label(fieldname)), frappe.bold(self.company)
 				)
 			)
 
@@ -662,7 +660,7 @@ class PaymentEntry(AccountsController):
 	def validate_mandatory(self):
 		for field in ("paid_amount", "received_amount", "source_exchange_rate", "target_exchange_rate"):
 			if not self.get(field):
-				frappe.throw(_("{0} is mandatory").format(self.meta.get_translated_label(field)))
+				frappe.throw(_("{0} is mandatory").format(_(self.meta.get_label(field))))
 
 	def validate_reference_documents(self):
 		valid_reference_doctypes = self.get_valid_reference_doctypes()
@@ -1118,14 +1116,8 @@ class PaymentEntry(AccountsController):
 			)
 
 	def set_exchange_gain_loss(self):
-		other_deductions = 0
-		if self.payment_type == "Internal Transfer":
-			other_deductions = sum(
-				flt(row.amount) for row in self.get("deductions") if not row.is_exchange_gain_loss
-			)
-
 		exchange_gain_loss = flt(
-			self.base_paid_amount - self.base_received_amount - other_deductions,
+			self.base_paid_amount - self.base_received_amount,
 			self.precision("amount", "deductions"),
 		)
 
@@ -1143,22 +1135,14 @@ class PaymentEntry(AccountsController):
 
 		if not exchange_gain_loss_row:
 			values = frappe.get_cached_value(
-				"Company",
-				self.company,
-				("bank_charges_account", "exchange_gain_loss_account", "cost_center"),
-				as_dict=True,
+				"Company", self.company, ("exchange_gain_loss_account", "cost_center"), as_dict=True
 			)
-			is_single_currency = self.paid_from_account_currency == self.paid_to_account_currency
-			account = (
-				is_single_currency and values.bank_charges_account
-			) or values.exchange_gain_loss_account
 
-			missing_fields = {"exchange_gain_loss_account": account, "cost_center": values.cost_center}
-			for fieldname, value in missing_fields.items():
+			for fieldname, value in values.items():
 				if value:
 					continue
 
-				label = frappe.get_meta("Company").get_translated_label(fieldname)
+				label = _(frappe.get_meta("Company").get_label(fieldname))
 				return frappe.msgprint(
 					_("Please set {0} in Company {1} to account for Exchange Gain / Loss").format(
 						label, get_link_to_form("Company", self.company)
@@ -1171,7 +1155,7 @@ class PaymentEntry(AccountsController):
 			exchange_gain_loss_row = self.append(
 				"deductions",
 				{
-					"account": account,
+					"account": values.exchange_gain_loss_account,
 					"cost_center": values.cost_center,
 					"is_exchange_gain_loss": 1,
 				},
@@ -2442,7 +2426,6 @@ def get_party_details(company: str, party_type: str, party: str, date: str, cost
 
 	ptype = "select" if frappe.only_has_select_perm(party_type) else "read"
 	frappe.has_permission(party_type, ptype, party, throw=True)
-	validate_party_company(party_type, party, company)
 
 	party_account = get_party_account(party_type, party, company)
 	account_currency = get_account_currency(party_account)
@@ -2626,11 +2609,7 @@ def get_payment_entry(
 	reference_date: str | date | None = None,
 	created_from_payment_request: bool | None = None,
 ):
-	frappe.has_permission("Payment Entry", ptype="create", throw=True)
-
 	doc = frappe.get_doc(dt, dn)
-	doc.check_permission()
-
 	over_billing_allowance = frappe.get_single_value("Accounts Settings", "over_billing_allowance")
 	if dt in ("Sales Order", "Purchase Order") and flt(doc.per_billed, 2) >= (100.0 + over_billing_allowance):
 		frappe.throw(_("Can only make payment against unbilled {0}").format(_(dt)))

erpnext/accounts/doctype/payment_entry/test_payment_entry.py

@@ -782,150 +782,6 @@ class TestPaymentEntry(ERPNextTestSuite):
 
 		self.validate_gl_entries(pe.name, expected_gle)
 
-	def test_bank_charges_deduction(self):
-		bank_charges_account = create_account(
-			parent_account="Indirect Expenses - _TC",
-			account_name="_Test Bank Charges",
-			company="_Test Company",
-		)
-		frappe.db.set_value("Company", "_Test Company", "bank_charges_account", bank_charges_account)
-
-		pe = frappe.new_doc("Payment Entry")
-		pe.payment_type = "Internal Transfer"
-		pe.company = "_Test Company"
-		pe.paid_from = "_Test Bank - _TC"
-		pe.paid_to = "_Test Cash - _TC"
-		pe.paid_amount = 1000
-		pe.received_amount = 990
-		pe.reference_no = "4"
-		pe.reference_date = nowdate()
-
-		pe.setup_party_account_field()
-		pe.set_missing_values()
-		pe.set_exchange_rate()
-		pe.set_amounts()
-
-		self.assertEqual(pe.deductions[0].account, bank_charges_account)
-		self.assertEqual(pe.deductions[0].amount, 10)
-		pe.deductions[0].cost_center = "_Test Cost Center - _TC"
-
-		pe.insert()
-		pe.submit()
-
-		expected_gle = dict(
-			(d[0], d)
-			for d in [
-				["_Test Bank - _TC", 0, 1000, None],
-				["_Test Cash - _TC", 990, 0, None],
-				[bank_charges_account, 10, 0, None],
-			]
-		)
-
-		self.validate_gl_entries(pe.name, expected_gle)
-
-	def test_cross_currency_transfer_ignores_bank_charges_account(self):
-		exchange_gain_loss_account = frappe.db.get_value(
-			"Company", "_Test Company", "exchange_gain_loss_account"
-		)
-		bank_charges_account = create_account(
-			parent_account="Indirect Expenses - _TC",
-			account_name="_Test Bank Charges",
-			company="_Test Company",
-		)
-		frappe.db.set_value("Company", "_Test Company", "bank_charges_account", bank_charges_account)
-
-		pe = frappe.new_doc("Payment Entry")
-		pe.payment_type = "Internal Transfer"
-		pe.company = "_Test Company"
-		pe.paid_from = "_Test Bank USD - _TC"
-		pe.paid_to = "_Test Bank - _TC"
-		pe.paid_amount = 100
-		pe.source_exchange_rate = 50
-		pe.received_amount = 4500
-		pe.reference_no = "5"
-		pe.reference_date = nowdate()
-
-		pe.setup_party_account_field()
-		pe.set_missing_values()
-		pe.set_exchange_rate()
-		pe.set_amounts()
-
-		self.assertEqual(pe.deductions[0].account, exchange_gain_loss_account)
-		self.assertEqual(pe.deductions[0].amount, 500)
-		pe.deductions[0].cost_center = "_Test Cost Center - _TC"
-
-		pe.insert()
-		pe.submit()
-
-		expected_gle = dict(
-			(d[0], d)
-			for d in [
-				["_Test Bank USD - _TC", 0, 5000, None],
-				["_Test Bank - _TC", 4500, 0, None],
-				[exchange_gain_loss_account, 500.0, 0, None],
-			]
-		)
-
-		self.validate_gl_entries(pe.name, expected_gle)
-
-	def test_cross_currency_transfer_splits_bank_charge_and_exchange_gain_loss(self):
-		exchange_gain_loss_account = frappe.db.get_value(
-			"Company", "_Test Company", "exchange_gain_loss_account"
-		)
-		bank_charges_account = create_account(
-			parent_account="Indirect Expenses - _TC",
-			account_name="_Test Bank Charges",
-			company="_Test Company",
-		)
-
-		pe = frappe.new_doc("Payment Entry")
-		pe.payment_type = "Internal Transfer"
-		pe.company = "_Test Company"
-		pe.paid_from = "_Test Bank USD - _TC"
-		pe.paid_to = "_Test Bank - _TC"
-		pe.paid_amount = 100
-		pe.source_exchange_rate = 50
-		pe.received_amount = 4500
-		pe.reference_no = "6"
-		pe.reference_date = nowdate()
-		pe.append(
-			"deductions",
-			{
-				"account": bank_charges_account,
-				"cost_center": "_Test Cost Center - _TC",
-				"amount": 100,
-			},
-		)
-
-		pe.setup_party_account_field()
-		pe.set_missing_values()
-		pe.set_exchange_rate()
-		pe.set_amounts()
-
-		deductions = {d.account: d for d in pe.deductions}
-		self.assertEqual(deductions[bank_charges_account].amount, 100)
-		self.assertEqual(deductions[exchange_gain_loss_account].amount, 400)
-		self.assertTrue(deductions[exchange_gain_loss_account].is_exchange_gain_loss)
-		self.assertEqual(pe.difference_amount, 0)
-
-		for d in pe.deductions:
-			d.cost_center = "_Test Cost Center - _TC"
-
-		pe.insert()
-		pe.submit()
-
-		expected_gle = dict(
-			(d[0], d)
-			for d in [
-				["_Test Bank USD - _TC", 0, 5000, None],
-				["_Test Bank - _TC", 4500, 0, None],
-				[exchange_gain_loss_account, 400.0, 0, None],
-				[bank_charges_account, 100.0, 0, None],
-			]
-		)
-
-		self.validate_gl_entries(pe.name, expected_gle)
-
 	def test_payment_against_negative_sales_invoice(self):
 		si1 = create_sales_invoice()
 
@@ -1107,6 +963,8 @@ class TestPaymentEntry(ERPNextTestSuite):
 		)
 		frappe.db.set_value("Company", "_Test Company", "exchange_gain_account", gain_account)
 		frappe.db.set_value("Company", "_Test Company", "exchange_loss_account", loss_account)
+		self.addCleanup(frappe.db.set_value, "Company", "_Test Company", "exchange_gain_account", "")
+		self.addCleanup(frappe.db.set_value, "Company", "_Test Company", "exchange_loss_account", "")
 
 		si_gain = create_sales_invoice(
 			customer="_Test Customer USD",

erpnext/accounts/doctype/payment_entry_deduction/payment_entry_deduction.json

@@ -53,7 +53,7 @@
    "depends_on": "eval:doc.is_exchange_gain_loss",
    "fieldname": "is_exchange_gain_loss",
    "fieldtype": "Check",
-   "label": "System Generated",
+   "label": "Is Exchange Gain / Loss?",
    "read_only": 1
   }
  ],

erpnext/accounts/doctype/payment_order/payment_order.py

@@ -92,7 +92,6 @@ def get_supplier_query(doctype: str, txt: str, searchfield: str, start: int, pag
 @frappe.whitelist()
 def make_payment_records(name: str, supplier: str, mode_of_payment: str | None = None):
 	doc = frappe.get_doc("Payment Order", name)
-	doc.check_permission()
 	make_journal_entry(doc, supplier, mode_of_payment)
 
 

erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py

@@ -647,7 +647,7 @@ class PaymentReconciliation(Document):
 	def check_mandatory_to_fetch(self):
 		for fieldname in ["company", "party_type", "party", "receivable_payable_account"]:
 			if not self.get(fieldname):
-				frappe.throw(_("Please select {0} first").format(self.meta.get_translated_label(fieldname)))
+				frappe.throw(_("Please select {0} first").format(_(self.meta.get_label(fieldname))))
 
 	def validate_entries(self):
 		if not self.get("invoices"):

erpnext/accounts/doctype/payment_reconciliation/test_payment_reconciliation.py

@@ -201,6 +201,8 @@ class TestPaymentReconciliation(ERPNextTestSuite):
 		)
 		frappe.db.set_value("Company", self.company, "exchange_gain_account", gain_account)
 		frappe.db.set_value("Company", self.company, "exchange_loss_account", loss_account)
+		self.addCleanup(frappe.db.set_value, "Company", self.company, "exchange_gain_account", "")
+		self.addCleanup(frappe.db.set_value, "Company", self.company, "exchange_loss_account", "")
 		return gain_account, loss_account
 
 	def create_foreign_currency_sales_invoice(self, conversion_rate):
@@ -1329,6 +1331,15 @@ class TestPaymentReconciliation(ERPNextTestSuite):
 		test_user = "test@example.com"
 		permitted_ccs = ["_Test Cost Center - _TC", "_Test Cost Center 2 - _TC"]
 		restricted_cc = "_Test Write Off Cost Center - _TC"
+		existing_apply_strict_user_permissions = cint(
+			frappe.db.get_single_value("System Settings", "apply_strict_user_permissions")
+		)
+		self.addCleanup(
+			frappe.db.set_single_value,
+			"System Settings",
+			"apply_strict_user_permissions",
+			existing_apply_strict_user_permissions,
+		)
 		transaction_date = nowdate()
 		rate = 100
 

erpnext/accounts/doctype/payment_request/payment_request.js

@@ -92,7 +92,6 @@ frappe.ui.form.on("Payment Request", "is_a_subscription", function (frm) {
 			freeze: true,
 			callback: function (data) {
 				if (!data.exc) {
-					frm.clear_table("subscription_plans");
 					$.each(data.message || [], function (i, v) {
 						var d = frappe.model.add_child(
 							frm.doc,

erpnext/accounts/doctype/payment_request/payment_request.py

@@ -640,7 +640,7 @@ class PaymentRequest(Document):
 		}
 
 		if self.message:
-			return frappe.render_template(self.message, context, restrict_globals=True)
+			return frappe.render_template(self.message, context)
 
 	def set_failed(self):
 		pass
@@ -875,7 +875,6 @@ def make_payment_request(**args):
 			party_account = get_party_account(party_type, ref_doc.get(party_type.lower()), ref_doc.company)
 			party_account_currency = get_account_currency(party_account)
 
-		subscription_plans = get_subscription_details(ref_doc.doctype, ref_doc.name)
 		pr.update(
 			{
 				"payment_gateway_account": gateway_account.get("name"),
@@ -907,24 +906,12 @@ def make_payment_request(**args):
 					or gateway_account.get("payment_channel", "Email") != "Email"
 				),
 				"phone_number": args.get("phone_number") if args.get("phone_number") else None,
-				"is_a_subscription": 1 if subscription_plans else 0,
 			}
 		)
 
 		if selected_payment_schedules:
 			apply_payment_references(pr, payment_reference)
 
-		if subscription_plans:
-			pr.set(
-				"subscription_plans",
-				[
-					{
-						"plan": row.plan,
-						"qty": row.qty,
-					}
-					for row in subscription_plans
-				],
-			)
 		# Dimensions
 		pr.update(
 			{
@@ -1238,25 +1225,20 @@ def get_dummy_message(doc):
 
 
 @frappe.whitelist()
-def get_subscription_details(reference_doctype: str, reference_name: str) -> list[dict]:
-	frappe.has_permission(reference_doctype, "read", reference_name, throw=True)
-
-	if not frappe.get_meta(reference_doctype).has_field("subscription"):
-		return []
-
-	subscription = frappe.db.get_value(reference_doctype, reference_name, "subscription")
-
-	if not subscription:
-		return []
-
-	return frappe.get_all(
-		"Subscription Plan Detail",
-		filters={"parent": subscription, "parenttype": "Subscription", "parentfield": "plans"},
-		fields=[
-			"plan",
-			"qty",
-		],
-	)
+def get_subscription_details(reference_doctype: str, reference_name: str):
+	if reference_doctype == "Sales Invoice":
+		subscriptions = frappe.get_all(
+			"Subscription Invoice",
+			filters={"invoice": reference_name},
+			fields=["parent as sub_name"],
+			order_by="",  # match the original query (no ORDER BY); avoid get_all's default sort
+		)
+		subscription_plans = []
+		for subscription in subscriptions:
+			plans = frappe.get_doc("Subscription", subscription.sub_name).plans
+			for plan in plans:
+				subscription_plans.append(plan)
+		return subscription_plans
 
 
 @frappe.whitelist()
@@ -1359,7 +1341,6 @@ def get_irequests_of_payment_request(doc: str | None = None) -> list:
 @frappe.whitelist()
 def get_available_payment_schedules(reference_doctype: str, reference_name: str):
 	ref_doc = frappe.get_doc(reference_doctype, reference_name)
-	ref_doc.check_permission()
 
 	if not hasattr(ref_doc, "payment_schedule") or not ref_doc.payment_schedule:
 		return []

erpnext/accounts/doctype/payment_request/test_payment_request.py

@@ -11,27 +11,15 @@ from frappe.utils import add_days, nowdate
 
 from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry
 from erpnext.accounts.doctype.payment_entry.test_payment_entry import create_payment_terms_template
-from erpnext.accounts.doctype.payment_request.payment_request import (
-	get_subscription_details,
-	make_payment_request,
-)
+from erpnext.accounts.doctype.payment_request.payment_request import make_payment_request
 from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make_purchase_invoice
 from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
-from erpnext.accounts.doctype.subscription.test_subscription import (
-	create_plan,
-	create_subscription,
-	make_plans,
-)
 from erpnext.buying.doctype.purchase_order.test_purchase_order import create_purchase_order
 from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
 from erpnext.setup.utils import get_exchange_rate
-from erpnext.stock.doctype.item.test_item import make_item
 from erpnext.tests.utils import ERPNextTestSuite
 
 PAYMENT_URL = "https://example.com/payment"
-SEND_EMAIL_MOCK = MagicMock(return_value=None)
-GET_PAYMENT_URL_MOCK = MagicMock(return_value=PAYMENT_URL)
-GET_PAYMENT_GATEWAY_CONTROLLER_MOCK = MagicMock()
 
 payment_gateways = [
 	{"doctype": "Payment Gateway", "gateway": "_Test Gateway"},
@@ -74,18 +62,6 @@ payment_method = [
 ]
 
 
-@patch(
-	"erpnext.accounts.doctype.payment_request.payment_request.PaymentRequest.send_email",
-	new=SEND_EMAIL_MOCK,
-)
-@patch(
-	"erpnext.accounts.doctype.payment_request.payment_request.PaymentRequest.get_payment_url",
-	new=GET_PAYMENT_URL_MOCK,
-)
-@patch(
-	"erpnext.accounts.doctype.payment_request.payment_request._get_payment_gateway_controller",
-	new=GET_PAYMENT_GATEWAY_CONTROLLER_MOCK,
-)
 class TestPaymentRequest(ERPNextTestSuite):
 	def setUp(self):
 		for payment_gateway in payment_gateways:
@@ -104,11 +80,24 @@ class TestPaymentRequest(ERPNextTestSuite):
 			):
 				frappe.get_doc(method).insert(ignore_permissions=True)
 
-		for mock in (SEND_EMAIL_MOCK, GET_PAYMENT_URL_MOCK, GET_PAYMENT_GATEWAY_CONTROLLER_MOCK):
-			mock.reset_mock()
-		self.send_email = SEND_EMAIL_MOCK
-		self.get_payment_url = GET_PAYMENT_URL_MOCK
-		self._get_payment_gateway_controller = GET_PAYMENT_GATEWAY_CONTROLLER_MOCK
+		send_email = patch(
+			"erpnext.accounts.doctype.payment_request.payment_request.PaymentRequest.send_email",
+			return_value=None,
+		)
+		self.send_email = send_email.start()
+		self.addCleanup(send_email.stop)
+		get_payment_url = patch(
+			# this also shadows one (1) call to _get_payment_gateway_controller
+			"erpnext.accounts.doctype.payment_request.payment_request.PaymentRequest.get_payment_url",
+			return_value=PAYMENT_URL,
+		)
+		self.get_payment_url = get_payment_url.start()
+		self.addCleanup(get_payment_url.stop)
+		_get_payment_gateway_controller = patch(
+			"erpnext.accounts.doctype.payment_request.payment_request._get_payment_gateway_controller",
+		)
+		self._get_payment_gateway_controller = _get_payment_gateway_controller.start()
+		self.addCleanup(_get_payment_gateway_controller.stop)
 
 	def test_payment_request_linkings(self):
 		so_inr = make_sales_order(currency="INR", do_not_save=True)
@@ -2020,140 +2009,3 @@ class TestPaymentRequestV2Gateway(ERPNextTestSuite):
 					call_kwargs = mock_log_error.call_args
 					self.assertIn("Payment Initialization Failed", str(call_kwargs))
 					self.assertIn("_Test Gateway", str(call_kwargs))
-
-	def test_payment_request_with_subscription(self):
-		make_plans()
-
-		subscription_plan = frappe.get_doc("Subscription Plan", "_Test Plan Name")
-		subscription_plan.payment_gateway = "_Test Gateway - INR - _TC"
-		subscription_plan.save()
-
-		subscription = create_subscription(
-			plans=[{"plan": "_Test Plan Name", "qty": 1}],
-			start_date=nowdate(),
-			generate_invoice_at="Prepaid (bill at period start)",
-			submit_invoice=1,
-		)
-		invoice_name = frappe.get_value(
-			"Sales Invoice",
-			{
-				"subscription": subscription.name,
-				"docstatus": 1,
-				"is_return": 0,
-			},
-			"name",
-			order_by="from_date asc",
-		)
-
-		payment_request = make_payment_request(
-			dt="Sales Invoice",
-			dn=invoice_name,
-			recipient_id="test@example.com",
-		)
-
-		self.assertEqual(payment_request.is_a_subscription, 1)
-		self.assertEqual(len(payment_request.subscription_plans), 1)
-
-		subscription_plan = payment_request.subscription_plans[0]
-		self.assertEqual(subscription_plan.plan, "_Test Plan Name")
-		self.assertEqual(subscription_plan.qty, 1)
-		self.assertEqual(payment_request.reference_doctype, "Sales Invoice")
-		self.assertEqual(payment_request.reference_name, invoice_name)
-
-	def test_payment_request_without_subscription(self):
-		si = create_sales_invoice()
-		payment_request = make_payment_request(
-			dt="Sales Invoice",
-			dn=si.name,
-			recipient_id="test@example.com",
-		)
-		self.assertEqual(payment_request.is_a_subscription, 0)
-		self.assertEqual(len(payment_request.subscription_plans), 0)
-		self.assertEqual(payment_request.reference_doctype, "Sales Invoice")
-		self.assertEqual(payment_request.reference_name, si.name)
-
-	def test_payment_request_with_subscription_for_purchase_invoice(self):
-		make_plans()
-
-		subscription_plan = frappe.get_doc("Subscription Plan", "_Test Plan Name")
-		subscription_plan.payment_gateway = "_Test Gateway - INR - _TC"
-		subscription_plan.save()
-
-		subscription = create_subscription(
-			party_type="Supplier",
-			party="_Test Supplier",
-			plans=[{"plan": "_Test Plan Name", "qty": 1}],
-			start_date=nowdate(),
-			generate_invoice_at="Prepaid (bill at period start)",
-			submit_invoice=1,
-		)
-		invoice_name = frappe.get_value(
-			"Purchase Invoice",
-			{
-				"subscription": subscription.name,
-				"docstatus": 1,
-				"is_return": 0,
-			},
-			"name",
-			order_by="from_date asc",
-		)
-
-		payment_request = make_payment_request(
-			dt="Purchase Invoice",
-			dn=invoice_name,
-			party_type="Supplier",
-			party="_Test Supplier",
-			recipient_id="test@example.com",
-		)
-
-		self.assertEqual(payment_request.is_a_subscription, 1)
-		self.assertEqual(len(payment_request.subscription_plans), 1)
-
-		subscription_plan = payment_request.subscription_plans[0]
-		self.assertEqual(subscription_plan.plan, "_Test Plan Name")
-		self.assertEqual(subscription_plan.qty, 1)
-		self.assertEqual(payment_request.reference_doctype, "Purchase Invoice")
-		self.assertEqual(payment_request.reference_name, invoice_name)
-
-	def test_payment_request_without_subscription_for_purchase_invoice(self):
-		pi = make_purchase_invoice()
-		payment_request = make_payment_request(
-			dt="Purchase Invoice",
-			dn=pi.name,
-			party_type="Supplier",
-			party=pi.supplier,
-			recipient_id="test@example.com",
-		)
-		self.assertEqual(payment_request.is_a_subscription, 0)
-		self.assertEqual(len(payment_request.subscription_plans), 0)
-		self.assertEqual(payment_request.reference_doctype, "Purchase Invoice")
-		self.assertEqual(payment_request.reference_name, pi.name)
-
-	def test_get_subscription_details_returns_empty_for_doctype_without_subscription_field(self):
-		so = make_sales_order()
-		self.assertEqual(get_subscription_details("Sales Order", so.name), [])
-
-	def test_get_subscription_details_requires_read_permission_on_reference(self):
-		si = create_sales_invoice()
-
-		restricted_user = "no-roles@example.com"
-		if not frappe.db.exists("User", restricted_user):
-			user = frappe.new_doc("User")
-			user.email = restricted_user
-			user.first_name = "No Roles"
-			user.send_welcome_email = 0
-			user.insert()
-
-		accounts_user = "accounts-user@example.com"
-		if not frappe.db.exists("User", accounts_user):
-			user = frappe.new_doc("User")
-			user.email = accounts_user
-			user.first_name = "Accounts"
-			user.send_welcome_email = 0
-			user.add_roles("Accounts User")
-
-		with self.set_user(restricted_user):
-			self.assertRaises(frappe.PermissionError, get_subscription_details, "Sales Invoice", si.name)
-
-		with self.set_user(accounts_user):
-			self.assertEqual(get_subscription_details("Sales Invoice", si.name), [])