| commit | dff4cce8fd309656c61c032a81448d13c4f10e87 | [log] [tgz] |
|---|---|---|
| author | Nabin Hait <nabinhait@gmail.com> | Wed May 01 09:57:28 2019 +0530 |
| committer | GitHub <noreply@github.com> | Wed May 01 09:57:28 2019 +0530 |
| tree | a231e75eb43c9d6f06ede3439d0c262dc7d9c77a | |
| parent | 6b77f6edf3e0db1e628267efcb5ce8ba3b4a7564 [diff] | |
| parent | 513e3f97e50c8259e7eacba7ec26012fb165745e [diff] |
Merge pull request #17408 from Mangesh-Khairnar/salary-register-fix fix(salary-register): Track doj for non active employee
diff --git a/erpnext/hr/report/salary_register/salary_register.py b/erpnext/hr/report/salary_register/salary_register.py index 586ca67..869ca23 100644 --- a/erpnext/hr/report/salary_register/salary_register.py +++ b/erpnext/hr/report/salary_register/salary_register.py
@@ -99,8 +99,6 @@ employee, date_of_joining FROM `tabEmployee` - WHERE - `status`='Active' """)) def get_ss_earning_map(salary_slips):