nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 08:24:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Inactive employees show up in report

Browse Source
This commit is contained in:
Valmik Jangla
2016-02-17 15:05:35 +05:30
parent 5136a64d12
commit b7ae1c1076
1 changed files with 3 additions and 5 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

@@ -39,7 +39,6 @@ def execute(filters=None):
total_a += 0.5 total_a += 0.5
row += [total_p, total_a] row += [total_p, total_a]
data.append(row) data.append(row)
return columns, data return columns, data
@@ -96,9 +95,8 @@ def get_conditions(filters):
def get_employee_details(): def get_employee_details():
emp_map = frappe._dict() emp_map = frappe._dict()
for d in frappe.db.sql("""select name, employee_name, designation, for d in frappe.db.sql("""select name, employee_name, designation,
department, branch, company department, branch, company, status
from tabEmployee where docstatus < 2 from tabEmployee""", as_dict=1):
and status = 'Active'""", as_dict=1):
emp_map.setdefault(d.name, d) emp_map.setdefault(d.name, d)
return emp_map return emp_map