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

Merge pull request #17408 from Mangesh-Khairnar/salary-register-fix

Browse Source 
fix(salary-register): Track doj for non active employee
This commit is contained in:
Nabin Hait
2019-05-01 09:57:28 +05:30
committed by GitHub
parent 6b77f6edf3 513e3f97e5
commit dff4cce8fd
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/hr/report/salary_register/salary_register.py
View File

@@ -99,8 +99,6 @@ def get_employee_doj_map():
employee, employee,
date_of_joining date_of_joining
FROM `tabEmployee` FROM `tabEmployee`
WHERE
`status`='Active'
""")) """))
def get_ss_earning_map(salary_slips): def get_ss_earning_map(salary_slips):