schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add Bank Transaction to connections in Journal and Payment Entry (#38297)

Browse Source 
* feat(Payment Entry): Bank Transaction connection

* feat(Journal Entry): Bank Transaction connection

(cherry picked from commit 3be345e605)

# Conflicts:
#	erpnext/accounts/doctype/payment_entry/payment_entry.json
This commit is contained in:
Raffael Meyer
2023-11-23 14:02:27 +01:00
committed by Mergify
parent 5261aba81f
commit 06c6da5c0d
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/accounts/doctype/journal_entry/journal_entry.json
View File

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

13
erpnext/accounts/doctype/payment_entry/payment_entry.json
View File

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