From 5178baf4705ff69afa6c8370ca6cd112bb447c55 Mon Sep 17 00:00:00 2001 From: krantheman Date: Wed, 21 Aug 2024 15:49:06 +0530 Subject: [PATCH 1/2] fix(Employee Grievance): fix perms for Reports To field (cherry picked from commit 7ca003c02b0e9709a420d3c157ca22e985c14bcc) # Conflicts: # hrms/hr/doctype/employee_grievance/employee_grievance.json --- hrms/hr/doctype/employee_grievance/employee_grievance.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hrms/hr/doctype/employee_grievance/employee_grievance.json b/hrms/hr/doctype/employee_grievance/employee_grievance.json index b69248fccd..99bcafc81d 100644 --- a/hrms/hr/doctype/employee_grievance/employee_grievance.json +++ b/hrms/hr/doctype/employee_grievance/employee_grievance.json @@ -143,6 +143,7 @@ "fetch_from": "raised_by.reports_to", "fieldname": "reports_to", "fieldtype": "Link", + "ignore_user_permissions": 1, "label": "Reports To", "options": "Employee", "read_only": 1 @@ -202,7 +203,11 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], +<<<<<<< HEAD "modified": "2023-11-28 16:27:28.626837", +======= + "modified": "2024-08-21 15:46:21.711485", +>>>>>>> 7ca003c02 (fix(Employee Grievance): fix perms for Reports To field) "modified_by": "Administrator", "module": "HR", "name": "Employee Grievance", From d263804f484e1479c9453a889fcb6610be9beade Mon Sep 17 00:00:00 2001 From: krantheman Date: Wed, 21 Aug 2024 16:20:24 +0530 Subject: [PATCH 2/2] fix: merge conflicts --- hrms/hr/doctype/employee_grievance/employee_grievance.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/hrms/hr/doctype/employee_grievance/employee_grievance.json b/hrms/hr/doctype/employee_grievance/employee_grievance.json index 99bcafc81d..a9e6a5de7e 100644 --- a/hrms/hr/doctype/employee_grievance/employee_grievance.json +++ b/hrms/hr/doctype/employee_grievance/employee_grievance.json @@ -203,11 +203,7 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], -<<<<<<< HEAD - "modified": "2023-11-28 16:27:28.626837", -======= "modified": "2024-08-21 15:46:21.711485", ->>>>>>> 7ca003c02 (fix(Employee Grievance): fix perms for Reports To field) "modified_by": "Administrator", "module": "HR", "name": "Employee Grievance", @@ -276,4 +272,4 @@ "states": [], "title_field": "subject", "track_changes": 1 -} \ No newline at end of file +}