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

[fix] https://github.com/frappe/erpnext/issues/10956

Browse Source
This commit is contained in:
Rushabh Mehta 2017-09-28 15:21:36 +05:30
parent edd4fd4692
commit 2b87d100fa
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,7 +36,7 @@ def execute(filters=None):
status_map = {"Present": "P", "Absent": "A", "Half Day": "HD", "On Leave": "L", "None": "", "Holiday":"<b>H</b>"} status_map = {"Present": "P", "Absent": "A", "Half Day": "HD", "On Leave": "L", "None": "", "Holiday":"<b>H</b>"}
if status == "None" and holiday_map: if status == "None" and holiday_map:
emp_holiday_list = emp_det.holiday_list if emp_det.holiday_list else default_holiday_list emp_holiday_list = emp_det.holiday_list if emp_det.holiday_list else default_holiday_list
if (day+1) in holiday_map[emp_holiday_list]: if emp_holiday_list in holiday_map and (day+1) in holiday_map[emp_holiday_list]:
status = "Holiday" status = "Holiday"
row.append(status_map[status]) row.append(status_map[status])
@ -45,7 +45,7 @@ def execute(filters=None):
elif status == "Absent": elif status == "Absent":
total_a += 1 total_a += 1
elif status == "On Leave": elif status == "On Leave":
total_l += 1 total_l += 1
elif status == "Half Day": elif status == "Half Day":
total_p += 0.5 total_p += 0.5
total_a += 0.5 total_a += 0.5