Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: perm errors during expense claim creation for ESS users (backport #794) #795

Merged
merged 2 commits into from
Aug 16, 2023
Merged

fix: perm errors during expense claim creation for ESS users (backport #794) #795

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fcd2120
fix: perm errors during expense claim creation for ESS users
ruchamahabal Aug 14, 2023
79ba752
chore: fix conflicts
ruchamahabal Aug 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions hrms/patches.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
ruchamahabal marked this conversation as resolved.
Show resolved Hide resolved
execute:frappe.db.set_default("date_format", frappe.db.get_single_value("System Settings", "date_format"))
hrms.patches.v14_0.create_vehicle_service_item
4 changes: 3 additions & 1 deletion hrms/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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"],
Expand Down
Loading