| commit | d6aadef395636afcbaf12bfdd20e30e8df80bcf1 | [log] [tgz] |
|---|---|---|
| author | Nabin Hait <nabinhait@gmail.com> | Fri Apr 13 14:38:23 2018 +0530 |
| committer | Nabin Hait <nabinhait@gmail.com> | Fri Apr 13 14:38:23 2018 +0530 |
| tree | bf29e29279a16ea0bea0e5958fe7fd936d633d80 | |
| parent | 02fd6f56d62a2111ee9ebf1ebf9b7784c5e9e0ad [diff] | |
| parent | 11c899bc1f86c9dd18e3c8fec93a81550caf14b4 [diff] |
Merge branch 'hotfix'
diff --git a/erpnext/hr/doctype/leave_application/leave_application.py b/erpnext/hr/doctype/leave_application/leave_application.py index 1135099..c0b19f1 100755 --- a/erpnext/hr/doctype/leave_application/leave_application.py +++ b/erpnext/hr/doctype/leave_application/leave_application.py
@@ -384,7 +384,7 @@ return allocated_leaves - +@frappe.whitelist() def get_holidays(employee, from_date, to_date): '''get holidays between two dates for the given employee''' holiday_list = get_holiday_list_for_employee(employee)