From 737c4809e3e768a935e914d669c9bacc0094ef79 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Sun, 28 Apr 2024 14:41:34 +0530 Subject: [PATCH 1/2] fix: Ignore user perm in Bank Reco Tool for company (cherry picked from commit 9f346e7ba00707bc1b3cb324a2dcbd1e2e25397b) # Conflicts: # erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.json --- .../bank_reconciliation_tool/bank_reconciliation_tool.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.json b/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.json index 93fc4439d35..23d2fc8d413 100644 --- a/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.json +++ b/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.json @@ -26,6 +26,7 @@ { "fieldname": "company", "fieldtype": "Link", + "ignore_user_permissions": 1, "label": "Company", "options": "Company" }, @@ -118,7 +119,11 @@ "index_web_pages_for_search": 1, "issingle": 1, "links": [], +<<<<<<< HEAD "modified": "2023-03-07 11:02:24.535714", +======= + "modified": "2024-04-28 14:40:50.910884", +>>>>>>> 9f346e7ba0 (fix: Ignore user perm in Bank Reco Tool for company) "modified_by": "Administrator", "module": "Accounts", "name": "Bank Reconciliation Tool", From 03b4a8582521c9aac7a4f791a0d9c97093ea0848 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Tue, 30 Apr 2024 10:25:51 +0530 Subject: [PATCH 2/2] chore: resolve conflicts --- .../bank_reconciliation_tool/bank_reconciliation_tool.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.json b/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.json index 23d2fc8d413..2969161949f 100644 --- a/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.json +++ b/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.json @@ -119,11 +119,7 @@ "index_web_pages_for_search": 1, "issingle": 1, "links": [], -<<<<<<< HEAD - "modified": "2023-03-07 11:02:24.535714", -======= "modified": "2024-04-28 14:40:50.910884", ->>>>>>> 9f346e7ba0 (fix: Ignore user perm in Bank Reco Tool for company) "modified_by": "Administrator", "module": "Accounts", "name": "Bank Reconciliation Tool", @@ -144,4 +140,4 @@ "sort_field": "modified", "sort_order": "DESC", "states": [] -} \ No newline at end of file +}