From 5579aee890e0a920e7a3efff75e916ad6df49a46 Mon Sep 17 00:00:00 2001 From: Diptanil Saha Date: Sat, 6 Jun 2026 17:14:08 +0530 Subject: [PATCH] fix: updated role based permission for terms and conditions doctype (#55674) (cherry picked from commit 0ba29611033481008f873d3e98ed6cfbd699a877) # Conflicts: # erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json --- .../terms_and_conditions.json | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json b/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json index 30598c9143b..744fcc25704 100644 --- a/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json +++ b/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json @@ -89,7 +89,7 @@ "icon": "icon-legal", "idx": 1, "links": [], - "modified": "2026-04-29 22:51:49.285298", + "modified": "2026-06-06 16:35:34.394675", "modified_by": "Administrator", "module": "Setup", "name": "Terms and Conditions", @@ -135,13 +135,35 @@ "print": 1, "read": 1, "report": 1, - "role": "Accounts User", + "role": "Accounts Manager", "share": 1, "write": 1 }, { "read": 1, "role": "Stock User" +<<<<<<< HEAD +======= + }, + { + "role": "HR User", + "select": 1 + }, + { + "create": 1, + "read": 1, + "role": "HR Manager", + "write": 1 + }, + { + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "Accounts User", + "share": 1 +>>>>>>> 0ba2961103 (fix: updated role based permission for terms and conditions doctype (#55674)) } ], "quick_entry": 1,