nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 19:29:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: missing parameter (#21802)

Browse Source
This commit is contained in:
Anurag Mishra
2020-05-20 16:14:09 +05:30
committed by GitHub
parent 2b04e8eef0
commit 2346353a22
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py
View File

@@ -66,11 +66,11 @@ def execute(filters=None):
emp_att_map = {} emp_att_map = {}
for parameter in group_by_parameters: for parameter in group_by_parameters:
data.append([ "<b>"+ parameter + "</b>"]) data.append([ "<b>"+ parameter + "</b>"])
record, aaa = add_data(emp_map[parameter], att_map, filters, holiday_map, conditions, leave_list=leave_list) record, aaa = add_data(emp_map[parameter], att_map, filters, holiday_map, conditions, default_holiday_list, leave_list=leave_list)
emp_att_map.update(aaa) emp_att_map.update(aaa)
data += record data += record
else: else:
record, emp_att_map = add_data(emp_map, att_map, filters, holiday_map, conditions, leave_list=leave_list) record, emp_att_map = add_data(emp_map, att_map, filters, holiday_map, conditions, default_holiday_list, leave_list=leave_list)
data += record data += record
chart_data = get_chart_data(emp_att_map, days) chart_data = get_chart_data(emp_att_map, days)
@@ -120,7 +120,7 @@ def get_chart_data(emp_att_map, days):
return chart return chart
def add_data(employee_map, att_map, filters, holiday_map, conditions,leave_list=None): def add_data(employee_map, att_map, filters, holiday_map, conditions, default_holiday_list, leave_list=None):
record = [] record = []
emp_att_map = {} emp_att_map = {}