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

Minor fix

Browse Source
This commit is contained in:
Valmik Jangla 2016-02-05 15:07:16 +05:30
parent 8d0ed21c04
commit 235de6566e
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,12 +26,10 @@ def get_columns():
def get_employees(filters): def get_employees(filters):
holidays = frappe.get_all("Holiday", holidays = frappe.get_all("Holiday", fields=["holiday_date", "description"],
fields=["holiday_date", "description"], filters=[["holiday_date", ">=",
filters=[["holiday_date", ">", filters.from_date],
filters.from_date], ["holiday_date", "<=", filters.to_date]])
["holiday_date", "<", filters.to_date]])
print holidays
holiday_names = {} holiday_names = {}
holidays_list = [] holidays_list = []
@ -44,7 +42,7 @@ def get_employees(filters):
from tabAttendance from tabAttendance
where where
att_date in ({0})""".format(', '.join(["%s"] * len(holidays_list))), att_date in ({0})""".format(', '.join(["%s"] * len(holidays_list))),
holidays_list, as_list=True) holidays_list, as_list=True)
for employee_data in employee_list: for employee_data in employee_list:
employee_data.append(holiday_names[employee_data[2]]) employee_data.append(holiday_names[employee_data[2]])