From b52b04a10c25b32b0c5b5779c25213cf3338e6fe Mon Sep 17 00:00:00 2001
From: barredterra <14891507+barredterra@users.noreply.github.com>
Date: Thu, 23 Oct 2025 17:38:34 +0200
Subject: [PATCH 1/2] fix(Bank Transaction): make transaction ID non-unique

(cherry picked from commit a2a41a0eaa570341333b5a0a006734310fc7ef43)

# Conflicts:
#	erpnext/accounts/doctype/bank_transaction/bank_transaction.json
---
 .../doctype/bank_transaction/bank_transaction.json         | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/erpnext/accounts/doctype/bank_transaction/bank_transaction.json b/erpnext/accounts/doctype/bank_transaction/bank_transaction.json
index 02ff1dbf3e9..b5d7eb1d4b7 100644
--- a/erpnext/accounts/doctype/bank_transaction/bank_transaction.json
+++ b/erpnext/accounts/doctype/bank_transaction/bank_transaction.json
@@ -123,8 +123,7 @@
    "fieldname": "transaction_id",
    "fieldtype": "Data",
    "label": "Transaction ID",
-   "read_only": 1,
-   "unique": 1
+   "read_only": 1
   },
   {
    "allow_on_submit": 1,
@@ -239,7 +238,11 @@
  "grid_page_length": 50,
  "is_submittable": 1,
  "links": [],
+<<<<<<< HEAD
  "modified": "2025-10-14 11:53:45.908169",
+=======
+ "modified": "2025-10-23 17:32:58.514807",
+>>>>>>> a2a41a0eaa (fix(Bank Transaction): make transaction ID non-unique)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Bank Transaction",

From 977f38500677c2e4baa8e25fff988bda0b386e45 Mon Sep 17 00:00:00 2001
From: Diptanil Saha <diptanil@frappe.io>
Date: Tue, 28 Oct 2025 09:07:14 +0530
Subject: [PATCH 2/2] chore: resolve conflict

---
 .../accounts/doctype/bank_transaction/bank_transaction.json   | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/erpnext/accounts/doctype/bank_transaction/bank_transaction.json b/erpnext/accounts/doctype/bank_transaction/bank_transaction.json
index b5d7eb1d4b7..599a0604755 100644
--- a/erpnext/accounts/doctype/bank_transaction/bank_transaction.json
+++ b/erpnext/accounts/doctype/bank_transaction/bank_transaction.json
@@ -238,11 +238,7 @@
  "grid_page_length": 50,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2025-10-14 11:53:45.908169",
-=======
  "modified": "2025-10-23 17:32:58.514807",
->>>>>>> a2a41a0eaa (fix(Bank Transaction): make transaction ID non-unique)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Bank Transaction",