chore(release): Bumped to Version 16.32.2

## [16.32.2](https://github.com/frappe/erpnext/compare/v16.32.1...v16.32.2) (2026-08-18)

### Bug Fixes

* get items from sales order in sales invoice (backport [#58163](https://github.com/frappe/erpnext/issues/58163)) ([#58258](https://github.com/frappe/erpnext/issues/58258)) ([204f979](204f979f33))

.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:-$githubbranch}

.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/linters.yml

@@ -23,19 +23,6 @@ jobs:
       - name: Install and Run Pre-commit
         uses: pre-commit/action@v3.0.1
 
-  js-unit-tests:
-    name: js unit tests
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 24
-
-      - name: Run JS unit tests
-        run: yarn test:js
-
   semgrep:
     name: semgrep
     runs-on: ubuntu-latest

.github/workflows/patch.yml

@@ -105,8 +105,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,4 +22,4 @@ jobs:
       pull-requests: write
 
     steps:
-      - uses: alyf-de/po-review-action@5928f84d6bc9094f9ad6e2c5780f01c0044b800e # v1.1.1
+      - uses: alyf-de/po-review-action@v1.1.0

.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

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,14 @@
-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

erpnext/__init__.py

@@ -6,7 +6,7 @@ import frappe
 from frappe.model.document import Document
 from frappe.utils.user import is_website_user
 
-__version__ = "16.26.2"
+__version__ = "16.32.2"
 
 
 def get_default_company(user=None):
@@ -177,12 +177,7 @@ def normalize_ctx_input(T: type) -> callable:
 
 	def decorator(func: callable):
 		# conserve annotations for frappe.utils.typing_validations
-		@functools.wraps(
-			func,
-			assigned=(
-				a for a in functools.WRAPPER_ASSIGNMENTS if a not in ("__annotations__", "__annotate__")
-			),
-		)
+		@functools.wraps(func, assigned=(a for a in functools.WRAPPER_ASSIGNMENTS if a != "__annotations__"))
 		def wrapper(ctx: T | Document | dict | str, *args, **kwargs):
 			if isinstance(ctx, Document):
 				ctx = T(**ctx.as_dict())

erpnext/accounts/custom/address.py

@@ -55,9 +55,6 @@ class ERPNextAddress(Address):
 
 @frappe.whitelist()
 def get_shipping_address(company, address=None):
-	# `select`, not `read`: Delivery, Maintenance, Purchase and Stock Manager fill in forms that ask
-	# for this while holding no Company `read` row. doc= so User Permissions apply to the named company.
-	frappe.has_permission("Company", ptype="select", doc=company, throw=True)
 	filters = [
 		["Dynamic Link", "link_doctype", "=", "Company"],
 		["Dynamic Link", "link_name", "=", company],

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/dashboard_chart_source/account_balance_timeline/account_balance_timeline.py

@@ -24,7 +24,7 @@ def get(
 	heatmap_year=None,
 ):
 	if chart_name:
-		chart = frappe.get_doc("Dashboard Chart", chart_name, check_permission="read")
+		chart = frappe.get_doc("Dashboard Chart", chart_name)
 	else:
 		chart = frappe._dict(frappe.parse_json(chart))
 	timespan = chart.timespan
@@ -53,9 +53,6 @@ def get(
 			)
 		)
 
-	# authorise the account itself, as get_balance_on() does; doc= brings User Permissions with it
-	frappe.has_permission("Account", doc=account, throw=True)
-
 	if not to_date:
 		to_date = nowdate()
 	if not from_date:

erpnext/accounts/doctype/account/account.json

@@ -7,7 +7,6 @@
  "description": "Heads (or groups) against which Accounting Entries are made and balances are maintained.",
  "doctype": "DocType",
  "document_type": "Setup",
- "documentation": "https://docs.frappe.io/erpnext/chart-of-accounts",
  "engine": "InnoDB",
  "field_order": [
   "properties",
@@ -123,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",
@@ -201,11 +199,11 @@
    "options": "Account Category"
   }
  ],
- "icon": "vault",
+ "icon": "fa fa-money",
  "idx": 1,
  "is_tree": 1,
  "links": [],
- "modified": "2026-09-25 15:33:56.058228",
+ "modified": "2026-04-14 18:14:42.202065",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Account",
@@ -266,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

@@ -503,19 +503,12 @@ class Account(NestedSet):
 @frappe.whitelist()
 @frappe.validate_and_sanitize_search_inputs
 def get_parent_account(doctype, txt, searchfield, start, page_len, filters):
-	return frappe.get_list(
-		"Account",
-		filters=[
-			["is_group", "=", 1],
-			["docstatus", "!=", 2],
-			["company", "=", filters["company"]],
-			[searchfield, "like", f"%{txt}%"],
-		],
-		fields=["name"],
-		order_by="name",
-		limit_start=start,
-		limit_page_length=page_len,
-		as_list=True,
+	return frappe.db.sql(
+		"""select name from tabAccount
+		where is_group = 1 and docstatus != 2 and company = {}
+		and {} like {} order by name limit {} offset {}""".format("%s", searchfield, "%s", "%s", "%s"),
+		(filters["company"], "%%%s%%" % txt, page_len, start),
+		as_list=1,
 	)
 
 

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, existing_company=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/account_category/account_category.json

@@ -40,7 +40,6 @@
   }
  ],
  "grid_page_length": 50,
- "icon": "folder-tree",
  "index_web_pages_for_search": 1,
  "links": [
   {

erpnext/accounts/doctype/account_closing_balance/account_closing_balance.json

@@ -147,7 +147,7 @@
    "precision": "9"
   }
  ],
- "icon": "scale",
+ "icon": "fa fa-list",
  "in_create": 1,
  "links": [],
  "modified": "2025-08-22 19:13:50.400404",

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

@@ -3,7 +3,6 @@
  "autoname": "field:label",
  "creation": "2019-05-04 18:13:37.002352",
  "doctype": "DocType",
- "documentation": "https://docs.frappe.io/erpnext/user/manual/en/accounting-dimensions",
  "engine": "InnoDB",
  "field_order": [
   "document_type",
@@ -50,7 +49,6 @@
    "options": "Accounting Dimension Detail"
   }
  ],
- "icon": "layers",
  "links": [],
  "modified": "2024-03-27 13:05:56.890002",
  "modified_by": "Administrator",

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():
@@ -235,11 +227,8 @@ def delete_accounting_dimension(doc):
 		frappe.clear_cache(doctype=doctype)
 
 
-@frappe.whitelist(methods=["POST"])
+@frappe.whitelist()
 def disable_dimension(doc):
-	# toggle_disabling rewrites a Custom Field site-wide, so demand the write that configures dimensions
-	frappe.has_permission("Accounting Dimension", "write", throw=True)
-
 	if frappe.in_test:
 		toggle_disabling(doc=doc)
 	else:

erpnext/accounts/doctype/accounting_dimension/test_accounting_dimension.py

@@ -52,23 +52,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/accounting_dimension_filter/accounting_dimension_filter.js

@@ -6,7 +6,7 @@ frappe.ui.form.on("Accounting Dimension Filter", {
 		let help_content = `<table class="table table-bordered" style="background-color: var(--scrollbar-track-color);">
 				<tr><td>
 					<p>
-						<svg class="icon icon-sm"><use href="#icon-info"></use></svg>
+						<i class="fa fa-hand-right"></i>
 						{{__('Note: On checking Is Mandatory the accounting dimension will become mandatory against that specific account for all accounting transactions')}}
 					</p>
 				</td></tr>

erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json

@@ -3,7 +3,6 @@
  "autoname": "format:{accounting_dimension}-{#####}",
  "creation": "2020-11-08 18:28:11.906146",
  "doctype": "DocType",
- "documentation": "https://docs.frappe.io/erpnext/user/manual/en/accounting-dimension-filter",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -100,7 +99,6 @@
    "label": "Fieldname"
   }
  ],
- "icon": "funnel",
  "index_web_pages_for_search": 1,
  "links": [],
  "modified": "2025-08-08 14:13:22.203011",

erpnext/accounts/doctype/accounting_period/accounting_period.json

@@ -3,7 +3,6 @@
  "autoname": "field:period_name",
  "creation": "2018-04-13 18:50:14.672323",
  "doctype": "DocType",
- "documentation": "https://docs.frappe.io/erpnext/user/manual/en/accounting-period",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -78,7 +77,6 @@
    "options": "Role"
   }
  ],
- "icon": "calendar-range",
  "links": [],
  "modified": "2026-03-09 17:15:33.577217",
  "modified_by": "Administrator",

erpnext/accounts/doctype/accounts_settings/accounts_settings.json

@@ -3,7 +3,6 @@
  "creation": "2013-06-24 15:49:57",
  "doctype": "DocType",
  "document_type": "Other",
- "documentation": "https://docs.frappe.io/erpnext/user/manual/en/accounts-settings",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -95,14 +94,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 +198,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 +221,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 +277,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 +474,7 @@
   {
    "fieldname": "remarks_section",
    "fieldtype": "Section Break",
-   "label": "General Ledger Report"
+   "label": "Remarks Column Length"
   },
   {
    "default": "0",
@@ -553,7 +548,7 @@
   {
    "fieldname": "accounts_receivable_payable_tuning_section",
    "fieldtype": "Section Break",
-   "label": "Accounts Receivable / Payable Report"
+   "label": "Accounts Receivable / Payable Tuning"
   },
   {
    "fieldname": "legacy_section",
@@ -785,21 +780,15 @@
    "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,
- "icon": "settings",
+ "icon": "icon-cog",
  "idx": 1,
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2026-09-04 10:08:30.115003",
+ "modified": "2026-07-27 12: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
@@ -221,13 +220,6 @@ class AccountsSettings(Document):
 		set_allow_on_submit_for_dimension_fields(doctypes)
 
 
-@frappe.whitelist(methods=["POST"])
-def get_posting_date_confirmation() -> int:
-	return cint(
-		frappe.db.get_single_value("Accounts Settings", "confirm_before_resetting_posting_date", cache=False)
-	)
-
-
 def toggle_accounting_dimension_sections(hide):
 	accounting_dimension_doctypes = frappe.get_hooks("accounting_dimension_doctypes")
 	for doctype in accounting_dimension_doctypes:

erpnext/accounts/doctype/accounts_settings/test_accounts_settings.py

@@ -2,16 +2,10 @@ import unittest
 
 import frappe
 
-from erpnext.accounts.doctype.accounts_settings.accounts_settings import get_posting_date_confirmation
 from erpnext.tests.utils import ERPNextTestSuite
 
 
 class TestAccountsSettings(ERPNextTestSuite):
-	def test_posting_date_confirmation_uses_current_setting(self):
-		for enabled in (0, 1, 0):
-			frappe.db.set_single_value("Accounts Settings", "confirm_before_resetting_posting_date", enabled)
-			self.assertEqual(get_posting_date_confirmation(), enabled)
-
 	def test_stale_days(self):
 		cur_settings = frappe.get_doc("Accounts Settings", "Accounts Settings")
 		cur_settings.allow_stale = 0

erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json

@@ -4,7 +4,6 @@
  "creation": "2024-10-16 16:57:12.085072",
  "doctype": "DocType",
  "engine": "InnoDB",
- "icon": "book-open",
  "field_order": [
   "company",
   "voucher_type",

erpnext/accounts/doctype/bank/bank.json

@@ -6,7 +6,6 @@
  "creation": "2018-04-07 16:59:59.496668",
  "doctype": "DocType",
  "document_type": "Setup",
- "documentation": "https://docs.frappe.io/erpnext/user/manual/en/bank",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -101,9 +100,8 @@
    "read_only": 1
   }
  ],
- "icon": "landmark",
  "links": [],
- "modified": "2026-09-16 11:42:07.000000",
+ "modified": "2024-03-27 13:06:36.896195",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Bank",
@@ -120,14 +118,6 @@
    "role": "System Manager",
    "share": 1,
    "write": 1
-  },
-  {
-   "role": "Accounts Manager",
-   "select": 1
-  },
-  {
-   "role": "Accounts User",
-   "select": 1
   }
  ],
  "quick_entry": 1,

erpnext/accounts/doctype/bank_account/bank_account.json

@@ -5,7 +5,6 @@
  "creation": "2017-05-29 21:35:13.136357",
  "doctype": "DocType",
  "document_type": "Setup",
- "documentation": "https://docs.frappe.io/erpnext/user/manual/en/bank-account",
  "engine": "InnoDB",
  "field_order": [
   "account_name",
@@ -228,7 +227,6 @@
   }
  ],
  "grid_page_length": 50,
- "icon": "credit-card",
  "links": [
   {
    "group": "Transactions",
@@ -271,7 +269,7 @@
    "link_fieldname": "default_bank_account"
   }
  ],
- "modified": "2026-09-16 11:42:07.000000",
+ "modified": "2026-04-11 19:46:27.609994",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Bank Account",
@@ -301,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_account_balance/bank_account_balance.json

@@ -44,7 +44,6 @@
   }
  ],
  "grid_page_length": 50,
- "icon": "wallet",
  "index_web_pages_for_search": 1,
  "links": [],
  "modified": "2026-06-16 22:17:48.007982",

erpnext/accounts/doctype/bank_account_subtype/bank_account_subtype.json

@@ -18,7 +18,6 @@
    "unique": 1
   }
  ],
- "icon": "credit-card",
  "links": [],
  "modified": "2024-03-27 13:06:37.221876",
  "modified_by": "Administrator",

erpnext/accounts/doctype/bank_account_type/bank_account_type.json

@@ -18,7 +18,6 @@
    "unique": 1
   }
  ],
- "icon": "credit-card",
  "links": [],
  "modified": "2024-03-27 13:06:37.347035",
  "modified_by": "Administrator",

erpnext/accounts/doctype/bank_clearance/bank_clearance.json

@@ -87,7 +87,7 @@
   }
  ],
  "hide_toolbar": 1,
- "icon": "badge-check",
+ "icon": "fa fa-check",
  "idx": 1,
  "issingle": 1,
  "links": [],

erpnext/accounts/doctype/bank_guarantee/bank_guarantee.json

@@ -5,7 +5,6 @@
  "creation": "2016-12-17 10:43:35.731631",
  "doctype": "DocType",
  "document_type": "Document",
- "documentation": "https://docs.frappe.io/erpnext/user/manual/en/bank-guarantee",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -217,7 +216,6 @@
   }
  ],
  "grid_page_length": 50,
- "icon": "shield-check",
  "is_submittable": 1,
  "links": [],
  "modified": "2026-05-25 18:12:10.768835",

erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py

@@ -60,9 +60,6 @@ def get_voucher_details(bank_guarantee_type: str, reference_name: str):
 	if not isinstance(reference_name, str):
 		raise TypeError("reference_name must be a string")
 
-	# the form is the boundary, not the referenced order: an order guard would break one of the two roles
-	frappe.has_permission("Bank Guarantee", throw=True)
-
 	fields_to_fetch = ["grand_total"]
 
 	if bank_guarantee_type == "Receiving":

erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js

@@ -68,7 +68,6 @@ frappe.ui.form.on("Bank Reconciliation Tool", {
 				frappe.msgprint(__("Please select Bank Account"));
 				return;
 			}
-			frm.events.validate_dates(frm);
 			frappe.call({
 				method: "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.auto_reconcile_vouchers",
 				args: {
@@ -83,7 +82,7 @@ frappe.ui.form.on("Bank Reconciliation Tool", {
 		});
 
 		frm.add_custom_button(__("Get Unreconciled Entries"), function () {
-			return frm.trigger("make_reconciliation_tool");
+			frm.trigger("make_reconciliation_tool");
 		});
 		frm.change_custom_button_type(__("Get Unreconciled Entries"), null, "primary");
 
@@ -107,24 +106,7 @@ frappe.ui.form.on("Bank Reconciliation Tool", {
 		frm.trigger("get_account_opening_balance");
 	},
 
-	validate_dates(frm) {
-		const from_date = frm.doc.filter_by_reference_date
-			? frm.doc.from_reference_date
-			: frm.doc.bank_statement_from_date;
-		const to_date = frm.doc.filter_by_reference_date
-			? frm.doc.to_reference_date
-			: frm.doc.bank_statement_to_date;
-		if (from_date && to_date && from_date > to_date) {
-			frappe.throw(
-				frm.doc.filter_by_reference_date
-					? __("From Reference Date cannot be greater than To Reference Date")
-					: __("From Date cannot be greater than To Date")
-			);
-		}
-	},
-
 	make_reconciliation_tool(frm) {
-		frm.events.validate_dates(frm);
 		frm.get_field("reconciliation_tool_cards").$wrapper.empty();
 		if (frm.doc.company && frm.doc.bank_account && frm.doc.bank_statement_to_date) {
 			frm.trigger("get_cleared_balance").then(() => {

erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.json

@@ -116,7 +116,6 @@
   }
  ],
  "hide_toolbar": 1,
- "icon": "arrow-left-right",
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],

erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py

@@ -10,7 +10,7 @@ from frappe import _
 from frappe.model.document import Document
 from frappe.query_builder.custom import ConstantColumn
 from frappe.query_builder.functions import Sum
-from frappe.utils import cint, create_batch, flt, getdate
+from frappe.utils import cint, create_batch, flt
 
 from erpnext import get_default_cost_center
 from erpnext.accounts.doctype.bank_transaction.bank_transaction import get_total_allocated_amount
@@ -55,8 +55,6 @@ def get_bank_transactions(
 	all_transactions: bool = False,
 ):
 	# returns bank transactions for a bank account
-	validate_date_range(from_date, to_date)
-
 	filters = []
 	filters.append(["bank_account", "=", bank_account])
 	filters.append(["docstatus", "=", 1])
@@ -796,7 +794,6 @@ def create_bulk_payment_entry_and_reconcile(
 				"deposit",
 				"withdrawal",
 				"bank_account",
-				"company",
 				"currency",
 				"unallocated_amount",
 				"date",
@@ -831,7 +828,11 @@ def create_bulk_payment_entry_and_reconcile(
 				"paid_from": paid_from,
 				"paid_to": paid_to,
 				"paid_amount": bank_transaction.unallocated_amount,
+				"base_paid_amount": bank_transaction.unallocated_amount,
 				"received_amount": bank_transaction.unallocated_amount,
+				"base_received_amount": bank_transaction.unallocated_amount,
+				"target_exchange_rate": 1,
+				"source_exchange_rate": 1,
 				"reference_date": bank_transaction.date,
 				"posting_date": bank_transaction.date,
 				"reference_no": (bank_transaction.reference_number or bank_transaction.description or "")[
@@ -840,8 +841,6 @@ def create_bulk_payment_entry_and_reconcile(
 			}
 		)
 
-		set_multi_currency_amounts(payment_entry_doc)
-
 		payment_entry_doc.insert()
 		payment_entry_doc.submit()
 
@@ -880,7 +879,6 @@ def create_payment_entry_and_reconcile(bank_transaction_name: str | int, payment
 			"doctype": "Payment Entry",
 		}
 	)
-	set_multi_currency_amounts(payment_entry)
 	payment_entry.insert()
 	payment_entry.submit()
 	transaction = reconcile_vouchers(
@@ -903,33 +901,6 @@ def create_payment_entry_and_reconcile(bank_transaction_name: str | int, payment
 	}
 
 
-def set_multi_currency_amounts(pe):
-	"""Set real exchange rates when the bank and party accounts differ in currency."""
-	company_currency = frappe.get_cached_value("Company", pe.company, "default_currency")
-	pe.paid_from_account_currency = frappe.get_cached_value("Account", pe.paid_from, "account_currency")
-	pe.paid_to_account_currency = frappe.get_cached_value("Account", pe.paid_to, "account_currency")
-
-	pe.source_exchange_rate = (
-		1.0
-		if pe.paid_from_account_currency == company_currency
-		else get_exchange_rate(pe.paid_from_account_currency, company_currency, pe.posting_date)
-	)
-	pe.target_exchange_rate = (
-		1.0
-		if pe.paid_to_account_currency == company_currency
-		else get_exchange_rate(pe.paid_to_account_currency, company_currency, pe.posting_date)
-	)
-
-	# derive the party-side amount from the authoritative bank-side amount; Payment Entry books any
-	# rounding residual to Exchange Gain/Loss during validation (set_exchange_gain_loss)
-	if pe.payment_type == "Receive" and pe.source_exchange_rate:
-		base_amount = flt(pe.received_amount) * pe.target_exchange_rate
-		pe.paid_amount = flt(base_amount / pe.source_exchange_rate, pe.precision("paid_amount"))
-	elif pe.payment_type == "Pay" and pe.target_exchange_rate:
-		base_amount = flt(pe.paid_amount) * pe.source_exchange_rate
-		pe.received_amount = flt(base_amount / pe.target_exchange_rate, pe.precision("received_amount"))
-
-
 @frappe.whitelist(methods=["GET"])
 def search_for_transfer_transaction(transaction_id: str | int):
 	"""
@@ -945,7 +916,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)
@@ -998,7 +969,6 @@ def auto_reconcile_vouchers(
 	from_reference_date: str | date | None = None,
 	to_reference_date: str | date | None = None,
 ):
-	validate_date_range(from_date, to_date, filter_by_reference_date, from_reference_date, to_reference_date)
 	bank_transactions = get_bank_transactions(bank_account)
 
 	if len(bank_transactions) > 10:
@@ -1117,7 +1087,6 @@ def get_linked_payments(
 	to_reference_date: str | date | None = None,
 ):
 	# get all matching payments for a bank transaction
-	validate_date_range(from_date, to_date, filter_by_reference_date, from_reference_date, to_reference_date)
 	transaction = frappe.get_doc("Bank Transaction", bank_transaction_name)
 	bank_account = frappe.db.get_values(
 		"Bank Account", transaction.bank_account, ["account", "company"], as_dict=True
@@ -1137,23 +1106,6 @@ def get_linked_payments(
 	return subtract_allocations(gl_account, matching)
 
 
-def validate_date_range(
-	from_date,
-	to_date,
-	filter_by_reference_date=False,
-	from_reference_date=None,
-	to_reference_date=None,
-):
-	if cint(filter_by_reference_date):
-		from_date, to_date = from_reference_date, to_reference_date
-		message = _("From Reference Date cannot be greater than To Reference Date")
-	else:
-		message = _("From Date cannot be greater than To Date")
-
-	if from_date and to_date and getdate(from_date) > getdate(to_date):
-		frappe.throw(message)
-
-
 def subtract_allocations(gl_account, vouchers):
 	"Look up & subtract any existing Bank Transaction allocations"
 	copied = []
@@ -1388,11 +1340,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()
@@ -1409,7 +1359,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

@@ -2,26 +2,18 @@
 # See license.txt
 
 
-from unittest.mock import patch
-
 import frappe
 from frappe import qb
 from frappe.utils import add_days, today
 
 from erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool import (
 	auto_reconcile_vouchers,
-	create_bulk_payment_entry_and_reconcile,
-	create_payment_entry_and_reconcile,
-	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
 from erpnext.tests.utils import ERPNextTestSuite
 
-RATE_METHOD = "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.get_exchange_rate"
-
 
 class TestBankReconciliationTool(ERPNextTestSuite, AccountsTestMixin):
 	def setUp(self):
@@ -105,244 +97,3 @@ class TestBankReconciliationTool(ERPNextTestSuite, AccountsTestMixin):
 		# assert API output post reconciliation
 		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):
-		return (
-			frappe.get_doc(
-				{
-					"doctype": "Bank Transaction",
-					"date": date,
-					"deposit": deposit,
-					"withdrawal": withdrawal,
-					"bank_account": self.bank_account,
-					"currency": "INR",
-				}
-			)
-			.save()
-			.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_rejects_reversed_date_ranges(self):
-		from_date, to_date = today(), add_days(today(), -1)
-		with self.assertRaisesRegex(frappe.ValidationError, "From Date cannot be greater than To Date"):
-			get_bank_transactions(self.bank_account, from_date, to_date)
-
-		with self.assertRaisesRegex(
-			frappe.ValidationError, "From Reference Date cannot be greater than To Reference Date"
-		):
-			auto_reconcile_vouchers(
-				self.bank_account,
-				filter_by_reference_date=True,
-				from_reference_date=from_date,
-				to_reference_date=to_date,
-			)
-
-		transaction = self.make_bank_transaction(date=today())
-		with self.assertRaisesRegex(
-			frappe.ValidationError, "From Reference Date cannot be greater than To Reference Date"
-		):
-			get_linked_payments(
-				transaction.name,
-				["payment_entry"],
-				filter_by_reference_date=True,
-				from_reference_date=from_date,
-				to_reference_date=to_date,
-			)
-
-	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")
-		self.assertIn("No matches", message)
-
-	def test_auto_reconcile_message_counts_and_pluralizes(self):
-		# reconciled count is reported and the indicator turns green
-		message, indicator = get_auto_reconcile_message([], ["t1", "t2"])
-		self.assertEqual(indicator, "green")
-		self.assertIn("2 Transaction(s) Reconciled", message)
-
-		# partially-reconciled label is singular for one, plural for many
-		singular, _ = get_auto_reconcile_message(["p1"], [])
-		self.assertIn("1 Transaction Partially Reconciled", singular)
-		plural, _ = get_auto_reconcile_message(["p1", "p2"], [])
-		self.assertIn("2 Transactions Partially Reconciled", plural)
-
-	def test_multi_currency_pay_converts_and_balances(self):
-		# withdrawal from an INR bank paying a USD supplier; rate 3.0 makes 100/3 non-exact
-		self.enable_multi_currency_setup()
-		pe = self.reconcile_new_payment(
-			self.make_multi_currency_txn(withdrawal=100),
-			payment_type="Pay",
-			party_type="Supplier",
-			party=self.supplier,
-			party_account=self.creditors_usd,
-			paid_from=self.bank,
-			paid_to=self.creditors_usd,
-			rate=3.0,
-		)
-		self.assertEqual(pe.docstatus, 1)  # submits despite the rounding residual
-		self.assertEqual((pe.source_exchange_rate, pe.target_exchange_rate), (1.0, 3.0))
-		self.assertEqual((pe.paid_amount, pe.received_amount), (100, 33.33))  # bank side kept, 100/3
-		self.assertEqual(pe.difference_amount, 0)
-		# Payment Entry auto-books the rounding residual to Exchange Gain/Loss
-		self.assertTrue(pe.deductions[0].is_exchange_gain_loss)
-		self.assertEqual(pe.deductions[0].amount, 0.01)  # 100 - 33.33 * 3
-
-	def test_multi_currency_receive_converts_and_balances(self):
-		# deposit into an INR bank from a USD customer; the party side must convert
-		self.enable_multi_currency_setup()
-		pe = self.reconcile_new_payment(
-			self.make_multi_currency_txn(deposit=100),
-			payment_type="Receive",
-			party_type="Customer",
-			party=self.customer,
-			party_account=self.debtors_usd,
-			paid_from=self.debtors_usd,
-			paid_to=self.bank,
-			rate=3.0,
-		)
-		self.assertEqual(pe.docstatus, 1)
-		self.assertEqual((pe.source_exchange_rate, pe.target_exchange_rate), (3.0, 1.0))
-		self.assertEqual((pe.received_amount, pe.paid_amount), (100, 33.33))  # bank side kept, 100/3
-		self.assertEqual(pe.difference_amount, 0)
-
-	def test_multi_currency_bulk_pay_converts_and_balances(self):
-		# the bulk path builds the Payment Entry itself, so it must convert too
-		self.enable_multi_currency_setup()
-		txn = self.make_multi_currency_txn(withdrawal=100)
-		with patch(RATE_METHOD, return_value=3.0):
-			result = create_bulk_payment_entry_and_reconcile(
-				[txn.name], "Supplier", self.supplier, self.creditors_usd
-			)
-
-		pe = frappe.get_doc("Payment Entry", result[0]["payment_entry"].name)
-		self.assertEqual(pe.docstatus, 1)
-		self.assertEqual(pe.target_exchange_rate, 3.0)
-		self.assertEqual((pe.paid_amount, pe.received_amount), (100, 33.33))
-		self.assertEqual(pe.difference_amount, 0)
-
-	def enable_multi_currency_setup(self):
-		# USD party/accounts + a company gain/loss account to absorb rounding residuals
-		self.company_abbr = "_TC"
-		self.create_supplier(supplier_name="_Test Supplier USD", currency="USD")
-		self.create_customer(customer_name="_Test Customer USD", currency="USD")
-		self.create_usd_payable_account()
-		self.create_usd_receivable_account()
-		self.set_party_account("Supplier", self.supplier, self.creditors_usd)
-		if not frappe.db.get_value("Company", self.company, "exchange_gain_loss_account"):
-			frappe.db.set_value(
-				"Company", self.company, "exchange_gain_loss_account", "Exchange Gain/Loss - _TC"
-			)
-
-	def set_party_account(self, party_type, party, account):
-		doc = frappe.get_doc(party_type, party)
-		if not any(row.company == self.company for row in doc.accounts):
-			doc.append("accounts", {"company": self.company, "account": account})
-			doc.save()
-
-	def make_multi_currency_txn(self, withdrawal=0, deposit=0):
-		return (
-			frappe.get_doc(
-				{
-					"doctype": "Bank Transaction",
-					"date": today(),
-					"withdrawal": withdrawal,
-					"deposit": deposit,
-					"bank_account": self.bank_account,
-					"currency": "INR",
-					"reference_number": "TEST-FX-REF",
-				}
-			)
-			.save()
-			.submit()
-		)
-
-	def reconcile_new_payment(
-		self, txn, *, payment_type, party_type, party, party_account, paid_from, paid_to, rate
-	):
-		# mimics the /banking frontend, which sends a hardcoded 1:1 rate
-		payment_entry_doc = {
-			"payment_type": payment_type,
-			"company": self.company,
-			"party_type": party_type,
-			"party": party,
-			"party_account": party_account,
-			"paid_from": paid_from,
-			"paid_to": paid_to,
-			"paid_amount": txn.unallocated_amount,
-			"received_amount": txn.unallocated_amount,
-			"source_exchange_rate": 1,
-			"target_exchange_rate": 1,
-			"posting_date": today(),
-			"reference_no": f"TEST-FX-{payment_type}",
-			"reference_date": today(),
-		}
-		with patch(RATE_METHOD, return_value=rate):
-			result = create_payment_entry_and_reconcile(txn.name, payment_entry_doc)
-		return frappe.get_doc("Payment Entry", result["payment_entry"].name)

erpnext/accounts/doctype/bank_statement_import/bank_statement_import.json

@@ -224,7 +224,6 @@
   }
  ],
  "hide_toolbar": 1,
- "icon": "file-down",
  "links": [],
  "modified": "2026-05-30 20:51:10.353723",
  "modified_by": "Administrator",

erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py

@@ -167,10 +167,9 @@ def get_transaction_reference(txn_data: dict) -> str:
 	).strip()
 
 
-@frappe.whitelist(methods=["POST"])
+@frappe.whitelist()
 def convert_mt940_to_csv(data_import, mt940_file_path):
 	doc = frappe.get_doc("Bank Statement Import", data_import)
-	doc.check_permission("write")
 
 	_file_doc, content = get_file(mt940_file_path)
 
@@ -235,30 +234,26 @@ def convert_mt940_to_csv(data_import, mt940_file_path):
 
 @frappe.whitelist()
 def get_preview_from_template(data_import, import_file=None, google_sheets_url=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):
-	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):
 	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):
-	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:
@@ -397,7 +392,6 @@ def get_import_status(docname):
 	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(
@@ -436,9 +430,6 @@ def get_import_logs(docname: str):
 
 @frappe.whitelist()
 def upload_bank_statement(**args):
-	# The only caller routes into a new Bank Statement Import form, so `create` is the right to require.
-	frappe.has_permission("Bank Statement Import", "create", throw=True)
-
 	args = frappe._dict(args)
 	bsi = frappe.new_doc("Bank Statement Import")
 

erpnext/accounts/doctype/bank_statement_import_log/bank_statement_import_log.json

@@ -188,7 +188,6 @@
   }
  ],
  "grid_page_length": 50,
- "icon": "file-clock",
  "index_web_pages_for_search": 1,
  "links": [],
  "modified": "2026-07-09 17:55:25.615942",

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/bank_transaction.json

@@ -4,7 +4,6 @@
  "autoname": "naming_series:",
  "creation": "2018-10-22 18:19:02.784533",
  "doctype": "DocType",
- "documentation": "https://docs.frappe.io/erpnext/user/manual/en/bank-transaction",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -278,7 +277,6 @@
   }
  ],
  "grid_page_length": 50,
- "icon": "arrow-left-right",
  "is_submittable": 1,
  "links": [],
  "modified": "2026-04-11 20:41:15.124085",

erpnext/accounts/doctype/bank_transaction/bank_transaction_upload.py

@@ -11,10 +11,6 @@ from frappe.utils.dateutils import parse_date
 
 @frappe.whitelist()
 def upload_bank_statement():
-	# Parsing a statement is the first step of creating Bank Transactions from it. Both functions here
-	# are reached only over HTTP, so there is no in-process caller to break.
-	frappe.has_permission("Bank Transaction", "create", throw=True)
-
 	if getattr(frappe, "uploaded_file", None):
 		with open(frappe.uploaded_file, "rb") as upfile:
 			fcontent = upfile.read()
@@ -38,13 +34,8 @@ def upload_bank_statement():
 	return {"columns": columns, "data": data}
 
 
-@frappe.whitelist(methods=["POST"])
+@frappe.whitelist()
 def create_bank_entries(columns, data, bank_account):
-	# insert()/submit() enforce this per document, but only after the loop has read each Bank Account
-	# and written an Error Log per rejected row. Check once up front.
-	frappe.has_permission("Bank Transaction", "create", throw=True)
-	frappe.has_permission("Bank Account", doc=bank_account, throw=True)
-
 	header_map = get_header_mapping(columns, bank_account)
 
 	success = 0

erpnext/accounts/doctype/bank_transaction_rule/bank_transaction_rule.json

@@ -140,7 +140,6 @@
   }
  ],
  "grid_page_length": 50,
- "icon": "zap",
  "index_web_pages_for_search": 1,
  "links": [],
  "modified": "2026-04-11 21:36:26.754667",

erpnext/accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.json

@@ -167,7 +167,6 @@
   }
  ],
  "hide_toolbar": 1,
- "icon": "split",
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],

erpnext/accounts/doctype/bisect_nodes/bisect_nodes.json

@@ -68,7 +68,6 @@
    "label": "Generated"
   }
  ],
- "icon": "git-branch",
  "index_web_pages_for_search": 1,
  "links": [],
  "modified": "2024-03-27 13:06:39.766063",

erpnext/accounts/doctype/budget/budget.json

@@ -4,7 +4,6 @@
  "autoname": "naming_series:",
  "creation": "2016-05-16 11:42:29.632528",
  "doctype": "DocType",
- "documentation": "https://docs.frappe.io/erpnext/user/manual/en/budgeting",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -331,7 +330,6 @@
   }
  ],
  "grid_page_length": 50,
- "icon": "piggy-bank",
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],

erpnext/accounts/doctype/cashier_closing/cashier_closing.json

@@ -122,7 +122,6 @@
    "read_only": 1
   }
  ],
- "icon": "lock",
  "is_submittable": 1,
  "links": [],
  "modified": "2024-03-27 13:06:44.260440",

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),
 			]);
 		}
 
@@ -130,6 +128,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 +142,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 +185,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.json

@@ -5,7 +5,6 @@
  "description": "Import Chart of Accounts from a csv file",
  "doctype": "DocType",
  "document_type": "Other",
- "documentation": "https://docs.frappe.io/erpnext/user/manual/en/chart-of-accounts-importer",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -48,7 +47,6 @@
   }
  ],
  "hide_toolbar": 1,
- "icon": "file-input",
  "in_create": 1,
  "issingle": 1,
  "links": [],

erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py

@@ -8,7 +8,6 @@ from functools import reduce
 
 import frappe
 from frappe import _
-from frappe.core.doctype.file.utils import find_file_by_url
 from frappe.desk.form.linked_with import get_linked_fields
 from frappe.model.document import Document
 from frappe.utils import cint, cstr
@@ -59,8 +58,6 @@ def validate_columns(data):
 
 @frappe.whitelist()
 def validate_company(company):
-	frappe.has_permission("Chart of Accounts Importer", throw=True)
-
 	parent_company, allow_account_creation_against_child_company = frappe.get_cached_value(
 		"Company", company, ["parent_company", "allow_account_creation_against_child_company"]
 	)
@@ -113,10 +110,7 @@ def import_coa(file_name, company):
 
 
 def get_file(file_name):
-	file_doc = find_file_by_url(file_name)
-	if not file_doc:
-		raise frappe.PermissionError
-
+	file_doc = frappe.get_doc("File", {"file_url": file_name})
 	parts = file_doc.get_extension()
 	extension = parts[1]
 	extension = extension.lstrip(".")
@@ -183,8 +177,6 @@ def generate_data_from_excel(file_doc, extension, as_dict=False):
 def get_coa(doctype, parent, is_root=False, file_name=None, for_validate=0):
 	"""called by tree view (to fetch node's children)"""
 
-	frappe.has_permission("Chart of Accounts Importer", throw=True)
-
 	file_doc, extension = get_file(file_name)
 	parent = None if parent == _("All Accounts") else parent
 
@@ -332,8 +324,6 @@ def build_response_as_excel(writer):
 
 @frappe.whitelist()
 def download_template(file_type, template_type, company):
-	frappe.has_permission("Chart of Accounts Importer", throw=True)
-
 	writer = get_template(template_type, company)
 
 	if file_type == "CSV":
@@ -386,6 +376,7 @@ def get_sample_template(writer, company):
 	return writer
 
 
+@frappe.whitelist()
 def validate_accounts(file_doc, extension):
 	if extension == "csv":
 		accounts = generate_data_from_csv(file_doc, as_dict=True)

erpnext/accounts/doctype/cheque_print_template/cheque_print_template.json

@@ -4,7 +4,6 @@
  "autoname": "field:bank_name",
  "creation": "2016-05-04 14:35:00.402544",
  "doctype": "DocType",
- "documentation": "https://docs.frappe.io/erpnext/user/manual/en/cheque-print-template",
  "engine": "InnoDB",
  "field_order": [
   "settings",
@@ -294,7 +293,6 @@
    "fieldtype": "HTML"
   }
  ],
- "icon": "printer",
  "links": [],
  "max_attachments": 1,
  "modified": "2026-06-08 12:10:35.829531",

erpnext/accounts/doctype/cost_center/cost_center.json

@@ -7,7 +7,6 @@
  "description": "Track separate Income and Expense for product verticals or divisions.",
  "doctype": "DocType",
  "document_type": "Setup",
- "documentation": "https://docs.frappe.io/erpnext/user/manual/en/cost-center",
  "engine": "InnoDB",
  "field_order": [
   "sb0",
@@ -123,11 +122,11 @@
    "label": "Disabled"
   }
  ],
- "icon": "chart-pie",
+ "icon": "fa fa-money",
  "idx": 1,
  "is_tree": 1,
  "links": [],
- "modified": "2026-09-16 11:42:07.000000",
+ "modified": "2026-04-14 18:15:27.367298",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Cost Center",
@@ -182,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/cost_center_allocation/cost_center_allocation.json

@@ -4,7 +4,6 @@
  "autoname": "CC-ALLOC-.#####",
  "creation": "2022-01-13 20:07:29.871109",
  "doctype": "DocType",
- "documentation": "https://docs.frappe.io/erpnext/user/manual/en/cost_center_allocation",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -66,7 +65,6 @@
    "read_only": 1
   }
  ],
- "icon": "chart-pie",
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],

erpnext/accounts/doctype/coupon_code/coupon_code.js

@@ -5,10 +5,7 @@ frappe.ui.form.on("Coupon Code", {
 	setup: function (frm) {
 		frm.set_query("pricing_rule", function () {
 			return {
-				filters: {
-					coupon_code_based: 1,
-					disable: 0,
-				},
+				filters: [["Pricing Rule", "coupon_code_based", "=", "1"]],
 			};
 		});
 	},

erpnext/accounts/doctype/coupon_code/coupon_code.json

@@ -5,7 +5,6 @@
  "creation": "2018-01-22 14:34:39.701832",
  "doctype": "DocType",
  "document_type": "Other",
- "documentation": "https://docs.frappe.io/erpnext/user/manual/en/coupon-code",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -125,9 +124,8 @@
    "label": "From External Ecomm Platform"
   }
  ],
- "icon": "ticket-percent",
  "links": [],
- "modified": "2026-09-16 11:42:07.000000",
+ "modified": "2024-11-19 16:35:11.836441",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Coupon Code",
@@ -181,14 +179,6 @@
    "role": "Website Manager",
    "share": 1,
    "write": 1
-  },
-  {
-   "role": "Maintenance Manager",
-   "select": 1
-  },
-  {
-   "role": "Maintenance User",
-   "select": 1
   }
  ],
  "sort_field": "creation",

erpnext/accounts/doctype/coupon_code/coupon_code.py

@@ -42,23 +42,7 @@ class CouponCode(Document):
 				self.coupon_code = frappe.generate_hash()[:10].upper()
 
 	def validate(self):
-		self.validate_from_to_dates("valid_from", "valid_upto")
-		self.validate_pricing_rule()
-
 		if self.coupon_type == "Gift Card":
 			self.maximum_use = 1
 			if not self.customer:
 				frappe.throw(_("Please select the customer."))
-
-	def validate_pricing_rule(self):
-		if not self.pricing_rule or self.from_external_ecomm_platform:
-			return
-
-		# Allow existing coupons to be updated after their pricing rule is disabled.
-		if not (
-			self.has_value_changed("pricing_rule") or self.has_value_changed("from_external_ecomm_platform")
-		):
-			return
-
-		if frappe.db.get_value("Pricing Rule", self.pricing_rule, "disable"):
-			frappe.throw(_("Pricing Rule {0} is disabled").format(frappe.bold(self.pricing_rule)))

erpnext/accounts/doctype/coupon_code/test_coupon_code.py

@@ -113,43 +113,6 @@ class TestCouponCode(ERPNextTestSuite):
 	def setUp(self):
 		test_create_test_data()
 
-	def test_disabled_pricing_rule_validation(self):
-		coupon = frappe.get_doc("Coupon Code", "SAVE30")
-		rule = frappe.get_doc("Pricing Rule", coupon.pricing_rule)
-		rule.disable = 1
-		rule.save()
-
-		with self.subTest("new coupon cannot select a disabled rule"):
-			new_coupon = frappe.copy_doc(coupon)
-			new_coupon.coupon_name = "Festival Savings"
-			new_coupon.coupon_code = "FESTSAVE"
-			with self.assertRaisesRegex(frappe.ValidationError, "is disabled"):
-				new_coupon.insert()
-
-		with self.subTest("existing coupon can retain a disabled rule"):
-			coupon.description = "Offer paused"
-			coupon.save()
-			coupon.reload()
-			self.assertEqual(coupon.description, "Offer paused")
-			self.assertEqual(coupon.pricing_rule, rule.name)
-
-		with self.subTest("existing coupon cannot switch to a disabled rule"):
-			disabled_rule = frappe.copy_doc(rule)
-			disabled_rule.insert()
-			coupon.reload()
-			coupon.pricing_rule = disabled_rule.name
-			with self.assertRaisesRegex(frappe.ValidationError, "is disabled"):
-				coupon.save()
-			coupon.reload()
-			self.assertEqual(coupon.pricing_rule, rule.name)
-
-	def test_cannot_save_coupon_with_reversed_validity_dates(self):
-		coupon = frappe.get_doc("Coupon Code", "SAVE30")
-		coupon.valid_from = "2026-09-17"
-		coupon.valid_upto = "2026-09-02"
-		with self.assertRaises(frappe.exceptions.InvalidDates):
-			coupon.save()
-
 	def test_sales_order_with_coupon_code(self):
 		frappe.db.set_value("Coupon Code", "SAVE30", "used", 0)
 

erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.json

@@ -2,7 +2,6 @@
  "actions": [],
  "creation": "2022-01-10 13:03:26.237081",
  "doctype": "DocType",
- "documentation": "https://docs.frappe.io/erpnext/user/manual/en/currency-exchange-settings",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -102,7 +101,6 @@
    "label": "Use HTTP Protocol"
   }
  ],
- "icon": "refresh-cw",
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],

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/dunning/dunning.json

@@ -4,7 +4,6 @@
  "autoname": "naming_series:",
  "creation": "2019-07-05 16:34:31.013238",
  "doctype": "DocType",
- "documentation": "https://docs.frappe.io/erpnext/user/manual/en/dunning",
  "engine": "InnoDB",
  "field_order": [
   "naming_series",
@@ -398,7 +397,6 @@
    "fieldtype": "Column Break"
   }
  ],
- "icon": "bell-ring",
  "is_submittable": 1,
  "links": [],
  "modified": "2026-05-30 23:18:04.712528",

erpnext/accounts/doctype/dunning/dunning.py

@@ -17,8 +17,7 @@ import json
 import frappe
 from frappe import _
 from frappe.contacts.doctype.address.address import get_address_display
-from frappe.query_builder.functions import Sum
-from frappe.utils import flt, getdate
+from frappe.utils import getdate
 
 from erpnext.controllers.accounts_controller import AccountsController
 
@@ -148,31 +147,6 @@ class Dunning(AccountsController):
 			)
 			row.dunning_level = len(past_dunnings) + 1
 
-	def get_unpaid_base_dunning_amount(self):
-		"""Interest and dunning fee that is still to be collected, in company currency."""
-		if not self.base_dunning_amount:
-			return 0.0
-
-		return flt(
-			flt(self.base_dunning_amount) - get_paid_dunning_amount(self.name),
-			self.precision("base_dunning_amount"),
-		)
-
-	def get_unpaid_dunning_amount(self):
-		"""Interest and dunning fee that is still to be collected, in the dunning currency."""
-		return flt(
-			self.get_unpaid_base_dunning_amount() / (flt(self.conversion_rate) or 1),
-			self.precision("dunning_amount"),
-		)
-
-	def get_unpaid_overdue_payments(self):
-		"""Overdue payments with their outstanding as of now, not as of dunning creation."""
-		return [
-			(row, outstanding)
-			for row in self.overdue_payments
-			if (outstanding := get_current_outstanding(row)) > 0
-		]
-
 	def on_cancel(self):
 		super().on_cancel()
 		self.ignore_linked_doctypes = [
@@ -187,7 +161,6 @@ class Dunning(AccountsController):
 			"Unreconcile Payment Entries",
 			"Payment Ledger Entry",
 			"Serial and Batch Bundle",
-			"Payment Entry",
 		]
 
 	@frappe.whitelist()
@@ -286,73 +259,11 @@ def update_linked_dunnings(doc, previous_outstanding_amount):
 			if has_outstanding:
 				break
 
-		set_dunning_status(dunning, has_outstanding, respect_manual_resolution=True)
+		new_status = "Resolved" if not has_outstanding else "Unresolved"
 
-
-def update_dunnings_linked_to_payment(payment_entry):
-	"""Refresh dunnings whose interest and fee are settled by this payment."""
-	dunnings = {row.dunning for row in payment_entry.get("deductions") if row.dunning}
-
-	for name in dunnings:
-		dunning = frappe.get_doc("Dunning", name)
-		if dunning.docstatus != 1:
-			continue
-
-		set_dunning_status(dunning, bool(dunning.get_unpaid_overdue_payments()))
-
-
-def set_dunning_status(dunning, has_outstanding_payments: bool, respect_manual_resolution: bool = False):
-	"""A dunning is only resolved once the invoiced sum *and* its interest and fee are paid."""
-	has_unpaid_dunning_amount = dunning.get_unpaid_dunning_amount() > 0
-	new_status = "Unresolved" if has_outstanding_payments or has_unpaid_dunning_amount else "Resolved"
-
-	# resolving by hand waives the interest, only an invoice that is owed again reopens it
-	if respect_manual_resolution and dunning.status == "Resolved" and not has_outstanding_payments:
-		return
-
-	if dunning.status != new_status:
-		dunning.db_set("status", new_status, notify=True)
-
-
-def get_paid_dunning_amount(dunning: str) -> float:
-	"""Interest and fee collected for this dunning, in company currency."""
-	deduction = frappe.qb.DocType("Payment Entry Deduction")
-	payment_entry = frappe.qb.DocType("Payment Entry")
-
-	paid = (
-		frappe.qb.from_(deduction)
-		.join(payment_entry)
-		.on(payment_entry.name == deduction.parent)
-		.select(Sum(deduction.amount))
-		.where((deduction.dunning == dunning) & (payment_entry.docstatus == 1))
-	).run()
-
-	# the dunning amount is booked as a negative deduction, against the income account
-	return -flt(paid[0][0]) if paid else 0.0
-
-
-def get_current_outstanding(overdue_payment) -> float:
-	"""Outstanding of an overdue payment as of now, in the invoice's transaction currency."""
-	invoice = frappe.db.get_value(
-		"Sales Invoice",
-		overdue_payment.sales_invoice,
-		["outstanding_amount", "currency", "party_account_currency"],
-		as_dict=True,
-	)
-	schedule_outstanding = (
-		flt(frappe.db.get_value("Payment Schedule", overdue_payment.payment_schedule, "outstanding"))
-		if overdue_payment.payment_schedule
-		else flt(overdue_payment.outstanding)
-	)
-
-	if flt(invoice.outstanding_amount) <= 0 or schedule_outstanding <= 0:
-		return 0.0
-
-	outstanding = min(schedule_outstanding, flt(overdue_payment.outstanding))
-	if invoice.currency == invoice.party_account_currency:
-		outstanding = min(outstanding, flt(invoice.outstanding_amount))
-
-	return outstanding
+		if dunning.status != new_status:
+			dunning.status = new_status
+			dunning.save()
 
 
 def get_linked_dunnings_as_per_state(sales_invoice, state):
@@ -364,7 +275,6 @@ def get_linked_dunnings_as_per_state(sales_invoice, state):
 		.join(overdue_payment)
 		.on(overdue_payment.parent == dunning.name)
 		.select(dunning.name)
-		.distinct()
 		.where(
 			(dunning.status == state)
 			& (dunning.docstatus != 2)

erpnext/accounts/doctype/dunning/test_dunning.py

@@ -12,7 +12,6 @@ from erpnext.accounts.doctype.sales_invoice.sales_invoice import (
 	create_dunning as create_dunning_from_sales_invoice,
 )
 from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import (
-	create_sales_invoice,
 	create_sales_invoice_against_cost_center,
 )
 from erpnext.tests.utils import ERPNextTestSuite
@@ -55,123 +54,6 @@ class TestDunning(ERPNextTestSuite):
 		dunning.reload()
 		self.assertEqual(dunning.status, "Resolved")
 
-	def test_dunning_not_resolved_by_payment_of_invoiced_sum_only(self):
-		"""
-		Regression for #58220: paying the invoice without the interest and fee must not
-		resolve the dunning, the interest is still owed and has to stay claimable.
-		"""
-		dunning = create_dunning(overdue_days=15, dunning_type_name="Second Notice - _TC")
-		dunning.submit()
-		sales_invoice = dunning.overdue_payments[0].sales_invoice
-
-		pe = get_payment_entry("Sales Invoice", sales_invoice)
-		pe.reference_no, pe.reference_date = "4", nowdate()
-		pe.insert()
-		pe.submit()
-
-		self.assertEqual(frappe.get_value("Sales Invoice", sales_invoice, "outstanding_amount"), 0)
-
-		dunning.reload()
-		self.assertEqual(dunning.status, "Unresolved")
-		self.assertEqual(round(dunning.get_unpaid_dunning_amount(), 2), 10.41)
-
-		# the interest and fee can still be collected on their own
-		pe = get_payment_entry("Dunning", dunning.name)
-		pe.reference_no, pe.reference_date = "5", nowdate()
-		self.assertEqual(pe.references, [])
-		self.assertEqual(round(pe.paid_amount, 2), 10.41)
-		pe.insert()
-		pe.submit()
-
-		dunning.reload()
-		self.assertEqual(dunning.status, "Resolved")
-		self.assertEqual(dunning.get_unpaid_dunning_amount(), 0)
-
-		# cancelling the interest payment makes the dunning claimable again
-		pe.cancel()
-		dunning.reload()
-		self.assertEqual(dunning.status, "Unresolved")
-		self.assertEqual(round(dunning.get_unpaid_dunning_amount(), 2), 10.41)
-
-	def test_dunning_can_be_cancelled_after_its_interest_was_paid(self):
-		"""
-		The payment collecting the interest links back to the dunning, which must not stand in
-		the way of cancelling it.
-		"""
-		dunning = create_dunning(overdue_days=15, dunning_type_name="Second Notice - _TC")
-		dunning.submit()
-
-		pe = get_payment_entry("Dunning", dunning.name)
-		pe.reference_no, pe.reference_date = "6", nowdate()
-		pe.insert()
-		pe.submit()
-
-		dunning.reload()
-		self.assertEqual(dunning.status, "Resolved")
-
-		dunning.cancel()
-		self.assertEqual(dunning.docstatus, 2)
-
-	def test_waived_interest_keeps_a_manually_resolved_dunning_resolved(self):
-		"""
-		Resolving a dunning by hand waives its interest, so a later payment of the invoice
-		must not reopen it.
-		"""
-		dunning = create_dunning(overdue_days=15, dunning_type_name="Second Notice - _TC")
-		dunning.submit()
-		sales_invoice = dunning.overdue_payments[0].sales_invoice
-
-		# what the "Resolve" button does
-		dunning.reload()
-		dunning.status = "Resolved"
-		dunning.save()
-
-		pe = get_payment_entry("Sales Invoice", sales_invoice)
-		pe.reference_no, pe.reference_date = "7", nowdate()
-		pe.insert()
-		pe.submit()
-
-		dunning.reload()
-		self.assertEqual(dunning.status, "Resolved")
-		self.assertEqual(round(dunning.get_unpaid_dunning_amount(), 2), 10.41)
-
-	def test_unpaid_dunning_amount_is_tracked_in_company_currency(self):
-		"""
-		The interest and fee are collected as a Payment Entry deduction, a company currency
-		field, so what is left to collect has to be measured in the same currency.
-		"""
-		si = create_sales_invoice(
-			posting_date=add_days(today(), -15),
-			customer="_Test Customer USD",
-			currency="USD",
-			conversion_rate=50,
-			rate=100,
-			debit_to="_Test Receivable USD - _TC",
-		)
-
-		dunning = create_dunning_from_sales_invoice(si.name)
-		dunning_type = frappe.get_doc("Dunning Type", "Second Notice - _TC")
-		dunning.dunning_type = dunning_type.name
-		dunning.rate_of_interest = dunning_type.rate_of_interest
-		dunning.dunning_fee = dunning_type.dunning_fee
-		dunning.income_account = dunning_type.income_account
-		dunning.cost_center = dunning_type.cost_center
-		dunning.save()
-
-		self.assertEqual(dunning.currency, "USD")
-		self.assertEqual(dunning.conversion_rate, 50)
-		self.assertEqual(round(dunning.dunning_amount, 2), 10.41)
-		self.assertEqual(round(dunning.base_dunning_amount, 2), 520.55)
-
-		# nothing collected yet, in either currency
-		self.assertEqual(round(dunning.get_unpaid_base_dunning_amount(), 2), 520.55)
-		self.assertEqual(round(dunning.get_unpaid_dunning_amount(), 2), 10.41)
-
-		# the deduction booking the interest is in company currency
-		dunning.submit()
-		pe = get_payment_entry("Dunning", dunning.name)
-		self.assertEqual(round(pe.deductions[0].amount, 2), -520.55)
-
 	def test_fetch_overdue_payments(self):
 		"""
 		Create SI with overdue payment. Check if overdue payment is fetched in Dunning.
@@ -240,41 +122,6 @@ class TestDunning(ERPNextTestSuite):
 		self.assertEqual(sales_invoice.status, "Overdue")
 		self.assertEqual(dunning.status, "Unresolved")
 
-	def test_payment_against_invoice_with_multiple_overdue_installments_in_dunning(self):
-		"""
-		When an invoice has more than one overdue installment, its Dunning holds one
-		Overdue Payment row per installment. Submitting a Payment Entry for the invoice
-		must resolve the Dunning without raising a TimestampMismatchError caused by the
-		same Dunning being loaded and saved more than once.
-		"""
-		create_payment_terms_template_for_dunning()
-		# Post far enough in the past that BOTH installments (5 and 10 credit days) are overdue.
-		sales_invoice = create_sales_invoice_against_cost_center(
-			posting_date=add_days(today(), -15),
-			qty=1,
-			rate=100,
-			do_not_submit=True,
-		)
-		sales_invoice.payment_terms_template = "_Test 50-50 for Dunning"
-		sales_invoice.submit()
-
-		dunning = create_dunning_from_sales_invoice(sales_invoice.name)
-		# Two overdue installments -> two overdue payment rows for the same invoice.
-		self.assertEqual(len(dunning.overdue_payments), 2)
-		dunning.submit()
-		self.assertEqual(dunning.status, "Unresolved")
-
-		# Pay the invoice in full. This previously raised TimestampMismatchError on the Dunning.
-		pe = get_payment_entry("Sales Invoice", sales_invoice.name)
-		pe.reference_no, pe.reference_date = "3", nowdate()
-		pe.insert()
-		pe.submit()
-
-		sales_invoice.reload()
-		dunning.reload()
-		self.assertEqual(sales_invoice.outstanding_amount, 0)
-		self.assertEqual(dunning.status, "Resolved")
-
 	def test_dunning_resolution_from_credit_note(self):
 		"""
 		Test that dunning is resolved when a credit note is issued against the original invoice.

erpnext/accounts/doctype/dunning_type/dunning_type.json

@@ -100,7 +100,6 @@
    "fieldtype": "Column Break"
   }
  ],
- "icon": "bell",
  "links": [
   {
    "link_doctype": "Dunning",

erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.json

@@ -4,7 +4,6 @@
  "autoname": "ACC-ERR-.YYYY.-.#####",
  "creation": "2018-04-13 18:25:55.943587",
  "doctype": "DocType",
- "documentation": "https://docs.frappe.io/erpnext/user/manual/en/exchange-rate-revaluation",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -108,7 +107,6 @@
    "precision": "9"
   }
  ],
- "icon": "arrow-right-left",
  "is_submittable": 1,
  "links": [],
  "modified": "2024-03-27 13:09:42.951164",