From fcd2120f0f6f9f84087b084f69541d01f4bc1f70 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Mon, 14 Aug 2023 14:00:54 +0530 Subject: [PATCH 1/2] fix: perm errors during expense claim creation for ESS users (cherry picked from commit 42ba599eb91726a42c1a5a5ff14c787830015011) # Conflicts: # hrms/patches.txt --- hrms/patches.txt | 5 +++++ hrms/setup.py | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/hrms/patches.txt b/hrms/patches.txt index 4b0742f151..d99208ec24 100644 --- a/hrms/patches.txt +++ b/hrms/patches.txt @@ -6,6 +6,11 @@ hrms.patches.v1_0.rearrange_employee_fields hrms.patches.post_install.update_allocate_on_in_leave_type hrms.patches.v14_0.create_custom_field_for_appraisal_template hrms.patches.post_install.update_performance_module_changes #2023-04-17 +<<<<<<< HEAD hrms.patches.v14_0.update_ess_user_access +======= +hrms.patches.v14_0.update_payroll_frequency_to_none_if_salary_slip_is_based_on_timesheet +hrms.patches.v14_0.update_ess_user_access #2023-08-14 +>>>>>>> 42ba599e (fix: perm errors during expense claim creation for ESS users) execute:frappe.db.set_default("date_format", frappe.db.get_single_value("System Settings", "date_format")) hrms.patches.v14_0.create_vehicle_service_item \ No newline at end of file diff --git a/hrms/setup.py b/hrms/setup.py index c176f22755..540466ddae 100644 --- a/hrms/setup.py +++ b/hrms/setup.py @@ -507,7 +507,7 @@ def add_non_standard_user_types(): user_type_limit = {} for user_type, data in user_types.items(): - user_type_limit.setdefault(frappe.scrub(user_type), 20) + user_type_limit.setdefault(frappe.scrub(user_type), 30) update_site_config("user_type_doctype_limit", user_type_limit) @@ -526,11 +526,13 @@ def get_user_types_data(): # masters "Holiday List": ["read"], "Employee": ["read", "write"], + "Company": ["read"], # payroll "Salary Slip": ["read"], "Employee Benefit Application": ["read", "write", "create", "delete"], # expenses "Expense Claim": ["read", "write", "create", "delete"], + "Expense Claim Type": ["read"], "Employee Advance": ["read", "write", "create", "delete"], # leave and attendance "Leave Application": ["read", "write", "create", "delete"], From 79ba7520851677204fc2ff90e51effafe1050151 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Wed, 16 Aug 2023 12:19:29 +0530 Subject: [PATCH 2/2] chore: fix conflicts --- hrms/patches.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/hrms/patches.txt b/hrms/patches.txt index d99208ec24..1b2d93f787 100644 --- a/hrms/patches.txt +++ b/hrms/patches.txt @@ -6,11 +6,6 @@ hrms.patches.v1_0.rearrange_employee_fields hrms.patches.post_install.update_allocate_on_in_leave_type hrms.patches.v14_0.create_custom_field_for_appraisal_template hrms.patches.post_install.update_performance_module_changes #2023-04-17 -<<<<<<< HEAD -hrms.patches.v14_0.update_ess_user_access -======= -hrms.patches.v14_0.update_payroll_frequency_to_none_if_salary_slip_is_based_on_timesheet hrms.patches.v14_0.update_ess_user_access #2023-08-14 ->>>>>>> 42ba599e (fix: perm errors during expense claim creation for ESS users) execute:frappe.db.set_default("date_format", frappe.db.get_single_value("System Settings", "date_format")) hrms.patches.v14_0.create_vehicle_service_item \ No newline at end of file