fix: HR Settings permissions (#1924)

(cherry picked from commit 6062f15) # Conflicts: # hrms/hr/doctype/hr_settings/hr_settings.json
frappe · Jun 26, 2024 · 765f6f1 · 765f6f1
1 parent e9e3a16
commit 765f6f1
Showing 1 changed file with 26 additions and 0 deletions.
diff --git a/hrms/hr/doctype/hr_settings/hr_settings.json b/hrms/hr/doctype/hr_settings/hr_settings.json
@@ -302,7 +302,11 @@
  "idx": 1,
  "issingle": 1,
  "links": [],
+<<<<<<< HEAD
  "modified": "2023-12-28 23:07:36.317223",
+=======
+ "modified": "2024-06-26 15:20:17.802079",
+>>>>>>> 6062f15ad (fix: HR Settings permissions (#1924))
  "modified_by": "Administrator",
  "module": "HR",
  "name": "HR Settings",
@@ -316,6 +320,28 @@
    "role": "System Manager",
    "share": 1,
    "write": 1
+<<<<<<< HEAD
+=======
+  },
+  {
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "role": "HR Manager",
+   "share": 1,
+   "write": 1
+  },
+  {
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "role": "HR User",
+   "share": 1
+  },
+  {
+   "read": 1,
+   "role": "Employee"
+>>>>>>> 6062f15ad (fix: HR Settings permissions (#1924))
   }
  ],
  "sort_field": "modified",