Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into ksa-vat

Browse Source
This commit is contained in:
Ahmad 2021-09-07 00:02:12 +05:00 committed by GitHub
commit 69470fc15a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/hr/doctype/employee/employee_reminders.py
View File

@ -13,7 +13,7 @@ from erpnext.hr.utils import get_holidays_for_employee
# HOLIDAY REMINDERS # HOLIDAY REMINDERS
# ----------------- # -----------------
def send_reminders_in_advance_weekly(): def send_reminders_in_advance_weekly():
to_send_in_advance = int(frappe.db.get_single_value("HR Settings", "send_holiday_reminders") or 1) to_send_in_advance = int(frappe.db.get_single_value("HR Settings", "send_holiday_reminders"))
frequency = frappe.db.get_single_value("HR Settings", "frequency") frequency = frappe.db.get_single_value("HR Settings", "frequency")
if not (to_send_in_advance and frequency == "Weekly"): if not (to_send_in_advance and frequency == "Weekly"):
return return
@ -21,7 +21,7 @@ def send_reminders_in_advance_weekly():
send_advance_holiday_reminders("Weekly") send_advance_holiday_reminders("Weekly")
def send_reminders_in_advance_monthly(): def send_reminders_in_advance_monthly():
to_send_in_advance = int(frappe.db.get_single_value("HR Settings", "send_holiday_reminders") or 1) to_send_in_advance = int(frappe.db.get_single_value("HR Settings", "send_holiday_reminders"))
frequency = frappe.db.get_single_value("HR Settings", "frequency") frequency = frappe.db.get_single_value("HR Settings", "frequency")
if not (to_send_in_advance and frequency == "Monthly"): if not (to_send_in_advance and frequency == "Monthly"):
return return
@ -79,7 +79,7 @@ def send_holidays_reminder_in_advance(employee, holidays):
# ------------------ # ------------------
def send_birthday_reminders(): def send_birthday_reminders():
"""Send Employee birthday reminders if no 'Stop Birthday Reminders' is not set.""" """Send Employee birthday reminders if no 'Stop Birthday Reminders' is not set."""
to_send = int(frappe.db.get_single_value("HR Settings", "send_birthday_reminders") or 1) to_send = int(frappe.db.get_single_value("HR Settings", "send_birthday_reminders"))
if not to_send: if not to_send:
return return