From 06c6da5c0dc6bc9c1ba2375e93738fbb84af66e7 Mon Sep 17 00:00:00 2001
From: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
Date: Thu, 23 Nov 2023 14:02:27 +0100
Subject: [PATCH 1/2] feat: add Bank Transaction to connections in Journal and
 Payment Entry (#38297)

* feat(Payment Entry): Bank Transaction connection

* feat(Journal Entry): Bank Transaction connection

(cherry picked from commit 3be345e6056f36baa6eef75818a7cdc63826b5f8)

# Conflicts:
#	erpnext/accounts/doctype/payment_entry/payment_entry.json
---
 .../doctype/journal_entry/journal_entry.json        | 12 ++++++++++--
 .../doctype/payment_entry/payment_entry.json        | 13 +++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.json b/erpnext/accounts/doctype/journal_entry/journal_entry.json
index 2eb54a54d54..906760ec312 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.json
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.json
@@ -548,8 +548,16 @@
  "icon": "fa fa-file-text",
  "idx": 176,
  "is_submittable": 1,
- "links": [],
- "modified": "2023-08-10 14:32:22.366895",
+ "links": [
+  {
+   "is_child_table": 1,
+   "link_doctype": "Bank Transaction Payments",
+   "link_fieldname": "payment_entry",
+   "parent_doctype": "Bank Transaction",
+   "table_fieldname": "payment_entries"
+  }
+ ],
+ "modified": "2023-11-23 12:11:04.128015",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Journal Entry",
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.json b/erpnext/accounts/doctype/payment_entry/payment_entry.json
index 6224d4038d6..f4fd0d1ef52 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.json
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.json
@@ -739,8 +739,21 @@
  ],
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
+<<<<<<< HEAD
  "links": [],
  "modified": "2023-06-19 11:38:04.387219",
+=======
+ "links": [
+  {
+   "is_child_table": 1,
+   "link_doctype": "Bank Transaction Payments",
+   "link_fieldname": "payment_entry",
+   "parent_doctype": "Bank Transaction",
+   "table_fieldname": "payment_entries"
+  }
+ ],
+ "modified": "2023-11-23 12:07:20.887885",
+>>>>>>> 3be345e605 (feat: add Bank Transaction to connections in Journal and Payment Entry (#38297))
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Entry",

From 2293696ab40b29efacc5328427d3eadd5d817794 Mon Sep 17 00:00:00 2001
From: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
Date: Thu, 23 Nov 2023 15:10:29 +0100
Subject: [PATCH 2/2] chore: resolve conflicts

---
 erpnext/accounts/doctype/payment_entry/payment_entry.json | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.json b/erpnext/accounts/doctype/payment_entry/payment_entry.json
index f4fd0d1ef52..bd43fb77c23 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.json
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.json
@@ -739,10 +739,6 @@
  ],
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
-<<<<<<< HEAD
- "links": [],
- "modified": "2023-06-19 11:38:04.387219",
-=======
  "links": [
   {
    "is_child_table": 1,
@@ -753,7 +749,6 @@
   }
  ],
  "modified": "2023-11-23 12:07:20.887885",
->>>>>>> 3be345e605 (feat: add Bank Transaction to connections in Journal and Payment Entry (#38297))
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Entry",
@@ -799,4 +794,4 @@
  "states": [],
  "title_field": "title",
  "track_changes": 1
-}
\ No newline at end of file
+}