nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-14 12:25:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4718 from vjFaLk/holiday-fix

Browse Source 
Fixed issue where no Holidays would cause the report to break
This commit is contained in:
Nabin Hait
2016-02-01 15:49:15 +05:30
parent fcd4f2b86b 0a76b8b29a
commit 8b92de26f0
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
erpnext/hr/report/employee_holiday_attendance/employee_holiday_attendance.py
View File

@@ -33,15 +33,17 @@ def get_employees():
for holiday in holidays:
holidays_list.append(holiday.holiday_date)
holiday_names[holiday.holiday_date] = holiday.description
if(holidays_list):
employee_list = frappe.db.sql("""select
employee, employee_name, att_date, status
from tabAttendance
where
att_date in ({0})""".format(', '.join(["%s"]*len(holidays_list))),
holidays_list, as_list=True)
employee_list = frappe.db.sql("""select
employee, employee_name, att_date, status
from tabAttendance
where
att_date in ({0})""".format(', '.join(["%s"]*len(holidays_list))),
holidays_list, as_list=True)
for employee_data in employee_list:
employee_data.append(holiday_names[employee_data[2]])
for employee_data in employee_list:
employee_data.append(holiday_names[employee_data[2]])
return employee_list
return employee_list
else:
return None