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

Merge pull request #20537 from Alchez/dev-wfh-attendance-report

Browse Source 
fix: show WFH in monthly attendance sheet report
This commit is contained in:
Deepesh Garg 2020-02-06 18:20:55 +05:30 committed by GitHub
commit 38f7e7b9f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,13 +37,22 @@ def execute(filters=None):
total_p = total_a = total_l = 0.0 total_p = total_a = total_l = 0.0
for day in range(filters["total_days_in_month"]): for day in range(filters["total_days_in_month"]):
status = att_map.get(emp).get(day + 1, "None") status = att_map.get(emp).get(day + 1)
status_map = {"Present": "P", "Absent": "A", "Half Day": "HD", "On Leave": "L", "None": "", "Holiday":"<b>H</b>"} status_map = {
if status == "None" and holiday_map: "Absent": "A",
"Half Day": "HD",
"Holiday":"<b>H</b>",
"On Leave": "L",
"Present": "P",
"Work From Home": "WFH"
}
if status is 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 emp_holiday_list in holiday_map and (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.get(status, ""))
if status == "Present": if status == "Present":
total_p += 1 total_p += 1