schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Grant leaves via modal and backgroud jobs (#15026)

Browse Source
This commit is contained in:
Nabin Hait
2018-07-30 10:58:49 +05:30
committed by GitHub
parent 89c87fd6a6
commit 9c735e43b0
8 changed files with 1127 additions and 1330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/hr/utils.py
View File

@@ -209,10 +209,10 @@ def get_employee_leave_policy(employee):
leave_policy = frappe.db.get_value("Employee Grade", employee_grade, "default_leave_policy")
if not leave_policy:
frappe.throw(_("Employee {0} of grade {1} have no default leave policy").format(employee, employee_grade))
else:
frappe.throw(_("Employee {0} has no grade to get default leave policy").format(employee))
if leave_policy:
return frappe.get_doc("Leave Policy", leave_policy)
else:
frappe.throw(_("Please set leave policy for employee {0} in Employee / Grade record").format(employee))
def validate_tax_declaration(declarations):
subcategories = []