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.

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

feat: Employee reminders (backport #25735) #45228

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 12, 2025

  • New Reminders Section in HR Settings
  • Work Anniversary Reminders
  • Holiday Reminders

Screenshot 2021-08-24 at 2 55 29 PM

Show a warning in case a change in frequency of holiday reminders will lead to missing reminders for a date range:

save_freq_change.mp4

Refactoring:

  1. New employee_reminders and test_employee_reminders modules
  2. is_holiday: "Explicit is better than implicit"
  3. get_holidays_for_employee
  4. HR Settings Reminders Section
  5. Holiday Reminders on the day of the event was removed in: 836dfff

Tests:

  1. is_holiday: Previously there were no explicit tests for this function
  2. Reminder emails

no-docs (temp)


This is an automatic backport of pull request #25735 done by Mergify.

* feat: Add reminders section to HR Settings

* refactor: Extract generic function for getting Employees

* feat: Employee Work Anniversary Reminder

* feat: Daily Holiday Reminder

* fix: Unnecessary params and replace [] with .get()

* test: Daily Holiday Reminders

* test: is_holiday basic tests

* refactor: Move employee reminders code to separate module

* feat: Add advance reminder to HR settings

* feat: Advance Holiday Reminders

* refactor: get_holidays_for_employee

* feat: Email holiday reminders in advance + tests

* fix: Remove unused import

* refactor: HR Setting Reminder Section

* refactor: Remove Daily Holiday Reminders feat

* feat: Reminder miss warning

* fix: Failing test and function name change

* chore: Add patch for field rename

* chore: Rename frequency label

* fix: Failing patch test

* fix: sider and removed description of fields

* fix: email alignment

Co-authored-by: pateljannat <[email protected]>
Co-authored-by: Jannat Patel <[email protected]>
(cherry picked from commit 24b2a31)

# Conflicts:
#	erpnext/hooks.py
#	erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py
#	erpnext/hr/doctype/employee/employee.py
#	erpnext/hr/doctype/employee/test_employee.py
#	erpnext/hr/doctype/hr_settings/hr_settings.json
#	erpnext/hr/doctype/hr_settings/hr_settings.py
#	erpnext/hr/doctype/upload_attendance/upload_attendance.py
#	erpnext/hr/utils.py
#	erpnext/patches.txt
#	erpnext/payroll/doctype/employee_benefit_application/employee_benefit_application.py
#	erpnext/payroll/doctype/payroll_period/payroll_period.py
#	erpnext/payroll/doctype/salary_slip/salary_slip.py
#	erpnext/public/js/utils.js
#	erpnext/setup/doctype/employee/employee_reminders.py
#	erpnext/setup/doctype/employee/test_employee_reminders.py
Copy link
Contributor Author

mergify bot commented Jan 12, 2025

Cherry-pick of 24b2a31 has failed:

On branch mergify/bp/develop/pr-25735
Your branch is up to date with 'origin/develop'.

You are currently cherry-picking commit 24b2a31581.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   erpnext/patches/v13_0/rename_stop_to_send_birthday_reminders.py
	new file:   erpnext/templates/emails/anniversary_reminder.html
	new file:   erpnext/templates/emails/holiday_reminder.html

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   erpnext/hooks.py
	deleted by us:   erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py
	deleted by us:   erpnext/hr/doctype/employee/employee.py
	deleted by us:   erpnext/hr/doctype/employee/test_employee.py
	deleted by us:   erpnext/hr/doctype/hr_settings/hr_settings.json
	deleted by us:   erpnext/hr/doctype/hr_settings/hr_settings.py
	deleted by us:   erpnext/hr/doctype/upload_attendance/upload_attendance.py
	deleted by us:   erpnext/hr/utils.py
	both modified:   erpnext/patches.txt
	deleted by us:   erpnext/payroll/doctype/employee_benefit_application/employee_benefit_application.py
	deleted by us:   erpnext/payroll/doctype/payroll_period/payroll_period.py
	deleted by us:   erpnext/payroll/doctype/salary_slip/salary_slip.py
	both modified:   erpnext/public/js/utils.js
	added by them:   erpnext/setup/doctype/employee/employee_reminders.py
	added by them:   erpnext/setup/doctype/employee/test_employee_reminders.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant