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

Payroll Entry - fix query, get assignment by end date (#14827)

Browse Source
This commit is contained in:
Ranjith Kurungadam 2018-07-06 13:30:40 +05:30 committed by Nabin Hait
parent 1cfcf70905
commit 6429ba9ed9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/hr/doctype/payroll_entry/payroll_entry.py
View File

@ -55,7 +55,7 @@ class PayrollEntry(Document):
t1.name = t2.employee t1.name = t2.employee
and t2.docstatus = 1 and t2.docstatus = 1
%s order by t2.from_date desc %s order by t2.from_date desc
""" % cond, {"sal_struct": tuple(sal_struct), "from_date": self.start_date}, as_dict=True) """ % cond, {"sal_struct": tuple(sal_struct), "from_date": self.end_date}, as_dict=True)
return emp_list return emp_list
def fill_employee_details(self): def fill_employee_details(self):