Merge branch 'develop' into fix-employee-onboarding-status

2021-06-24 12:24:44 +05:30
parent 67519d6b79 ab7a16a952
commit c5c858e428
716 changed files with 10532 additions and 16865 deletions
--- a/erpnext/hr/utils.py
+++ b/erpnext/hr/utils.py
@@ -276,6 +276,7 @@ def get_total_exemption_amount(declarations):
 	total_exemption_amount = sum([flt(d.total_exemption_amount) for d in exemptions.values()])
 	return total_exemption_amount

+@frappe.whitelist()
 def get_leave_period(from_date, to_date, company):
 	leave_period = frappe.db.sql("""
 		select name, from_date, to_date