From 2bfb5fe8b841691f82700cdfbce2f19a3d566940 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 17 Jun 2026 00:54:45 +0530
Subject: [PATCH] fix: check for bank account permission when updating balance
 (backport #56016) (#56017)

fix: check for bank account permission when updating balance (backport #56016)
---
 .../features/BankReconciliation/BankBalance.tsx    |  2 +-
 banking/src/lib/frappe.ts                          | 10 ++++++++++
 .../bank_account_balance/bank_account_balance.json | 14 ++++++++++++--
 .../bank_account_balance/bank_account_balance.py   |  1 +
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/banking/src/components/features/BankReconciliation/BankBalance.tsx b/banking/src/components/features/BankReconciliation/BankBalance.tsx
index a46ce362140..632f3d62e8d 100644
--- a/banking/src/components/features/BankReconciliation/BankBalance.tsx
+++ b/banking/src/components/features/BankReconciliation/BankBalance.tsx
@@ -250,7 +250,7 @@ const ClosingBalanceForm = ({ defaultBalance, date, bankAccount, onClose }: { de
                     {_("Enter the closing balance you see in your bank statement for {0} as of the {1}", [bankAccount?.account_name ?? bankAccount?.name ?? '', formatDate(date, 'Do MMM YYYY')])}
                 </DialogDescription>
             </DialogHeader>
-            {error && <ErrorBanner error={error} />}
+            {error && <div className="py-2"><ErrorBanner error={error} /></div>}
             <div className="py-4">
                 <CurrencyFormField
                     name="balance"
diff --git a/banking/src/lib/frappe.ts b/banking/src/lib/frappe.ts
index a9ba51e2d29..8c62209c6a7 100644
--- a/banking/src/lib/frappe.ts
+++ b/banking/src/lib/frappe.ts
@@ -33,6 +33,16 @@ export const getErrorMessages = (error?: FrappeError | null): ParsedErrorMessage
         }
     })
 
+    // @ts-expect-error - some errors have _error_message
+    if (error?._error_message) {
+        eMessages.push({
+            // @ts-expect-error - some errors have _error_message
+            message: error?._error_message,
+            title: "Error",
+            indicator: "red"
+        })
+    }
+
     if (eMessages.length === 0) {
         // Get the message from the exception by removing the exc_type
         const indexOfFirstColon = error?.exception?.indexOf(':')
diff --git a/erpnext/accounts/doctype/bank_account_balance/bank_account_balance.json b/erpnext/accounts/doctype/bank_account_balance/bank_account_balance.json
index 2b8989571d9..947bfa2dfea 100644
--- a/erpnext/accounts/doctype/bank_account_balance/bank_account_balance.json
+++ b/erpnext/accounts/doctype/bank_account_balance/bank_account_balance.json
@@ -1,5 +1,6 @@
 {
  "actions": [],
+ "allow_bulk_edit": 1,
  "allow_rename": 1,
  "creation": "2026-04-11 19:48:13.622253",
  "doctype": "DocType",
@@ -7,7 +8,8 @@
  "field_order": [
   "bank_account",
   "date",
-  "balance"
+  "balance",
+  "company"
  ],
  "fields": [
   {
@@ -31,12 +33,20 @@
    "in_list_view": 1,
    "label": "Balance",
    "reqd": 1
+  },
+  {
+   "fetch_from": "bank_account.company",
+   "fieldname": "company",
+   "fieldtype": "Link",
+   "label": "Company",
+   "options": "Company",
+   "read_only": 1
   }
  ],
  "grid_page_length": 50,
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2026-04-11 19:49:45.374695",
+ "modified": "2026-06-16 22:17:48.007982",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Bank Account Balance",
diff --git a/erpnext/accounts/doctype/bank_account_balance/bank_account_balance.py b/erpnext/accounts/doctype/bank_account_balance/bank_account_balance.py
index bce8b29d68d..dd01e50ad6d 100644
--- a/erpnext/accounts/doctype/bank_account_balance/bank_account_balance.py
+++ b/erpnext/accounts/doctype/bank_account_balance/bank_account_balance.py
@@ -16,6 +16,7 @@ class BankAccountBalance(Document):
 
 		balance: DF.Currency
 		bank_account: DF.Link
+		company: DF.Link | None
 		date: DF.Date
 	# end: auto-generated types