From ac89edd5d785fa7e2711376ed301ccb1474efded Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Wed, 17 Dec 2025 14:36:40 +0530
Subject: [PATCH] fix: update button was getting freezed after validation

(cherry picked from commit 62acc4aeb57a6e1a754fb71d7aa26653788c1be0)

# Conflicts:
#	erpnext/accounts/doctype/bank_clearance/bank_clearance.py
#	erpnext/accounts/doctype/bank_clearance_detail/bank_clearance_detail.json
---
 .../doctype/bank_clearance/bank_clearance.py  |  8 +++
 .../bank_clearance_detail.json                | 56 ++++++++++++++++++-
 2 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/erpnext/accounts/doctype/bank_clearance/bank_clearance.py b/erpnext/accounts/doctype/bank_clearance/bank_clearance.py
index 4ff2a13eae2..7eb35846c92 100644
--- a/erpnext/accounts/doctype/bank_clearance/bank_clearance.py
+++ b/erpnext/accounts/doctype/bank_clearance/bank_clearance.py
@@ -124,10 +124,18 @@ class BankClearance(Document):
 
 				clearance_date_updated = True
 
+<<<<<<< HEAD
 		if clearance_date_updated:
 			self.get_payment_entries()
 			msgprint(_("Clearance Date updated"))
 		else:
+=======
+			msg += "</ul>"
+			msgprint(_(msg))
+			return
+
+		if not entries_to_update:
+>>>>>>> 62acc4aeb5 (fix: update button was getting freezed after validation)
 			msgprint(_("Clearance Date not mentioned"))
 
 
diff --git a/erpnext/accounts/doctype/bank_clearance_detail/bank_clearance_detail.json b/erpnext/accounts/doctype/bank_clearance_detail/bank_clearance_detail.json
index 04988bf66d8..e9926c48063 100644
--- a/erpnext/accounts/doctype/bank_clearance_detail/bank_clearance_detail.json
+++ b/erpnext/accounts/doctype/bank_clearance_detail/bank_clearance_detail.json
@@ -45,6 +45,7 @@
    "unique": 0
   }, 
   {
+<<<<<<< HEAD
    "allow_bulk_edit": 0, 
    "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
@@ -79,6 +80,17 @@
    "unique": 0, 
    "width": "50"
   }, 
+=======
+   "columns": 2,
+   "fieldname": "payment_entry",
+   "fieldtype": "Dynamic Link",
+   "in_list_view": 1,
+   "label": "Payment Entry",
+   "oldfieldname": "voucher_id",
+   "oldfieldtype": "Link",
+   "options": "payment_document"
+  },
+>>>>>>> 62acc4aeb5 (fix: update button was getting freezed after validation)
   {
    "allow_bulk_edit": 0, 
    "allow_in_quick_entry": 0, 
@@ -213,6 +225,7 @@
    "unique": 0
   }, 
   {
+<<<<<<< HEAD
    "allow_bulk_edit": 0, 
    "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
@@ -278,6 +291,27 @@
    "translatable": 0, 
    "unique": 0
   }, 
+=======
+   "columns": 1,
+   "fieldname": "cheque_number",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Cheque Number",
+   "oldfieldname": "cheque_number",
+   "oldfieldtype": "Data",
+   "read_only": 1
+  },
+  {
+   "columns": 2,
+   "fieldname": "cheque_date",
+   "fieldtype": "Date",
+   "in_list_view": 1,
+   "label": "Cheque Date",
+   "oldfieldname": "cheque_date",
+   "oldfieldtype": "Date",
+   "read_only": 1
+  },
+>>>>>>> 62acc4aeb5 (fix: update button was getting freezed after validation)
   {
    "allow_bulk_edit": 0, 
    "allow_in_quick_entry": 0, 
@@ -311,6 +345,7 @@
    "translatable": 0, 
    "unique": 0
   }
+<<<<<<< HEAD
  ], 
  "has_web_view": 0, 
  "hide_heading": 0, 
@@ -337,4 +372,23 @@
  "track_changes": 0, 
  "track_seen": 0, 
  "track_views": 0
-}
\ No newline at end of file
+}
+=======
+ ],
+ "grid_page_length": 50,
+ "idx": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2025-12-17 14:33:45.913311",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Bank Clearance Detail",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "row_format": "Dynamic",
+ "sort_field": "creation",
+ "sort_order": "ASC",
+ "states": []
+}
+>>>>>>> 62acc4aeb5 (fix: update button was getting freezed after validation)