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

Payroll Entry - fix only one employee fetched (#14718)

Browse Source
This commit is contained in:
Ranjith Kurungadam 2018-06-28 14:40:29 +05:30 committed by Nabin Hait
parent 8b22310d66
commit b66bde32f8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,13 +43,13 @@ class PayrollEntry(Document):
cond += "and %(from_date)s >= t2.from_date" cond += "and %(from_date)s >= t2.from_date"
emp_list = frappe.db.sql(""" emp_list = frappe.db.sql("""
select select
t1.name as employee, t1.employee_name, t1.department, t1.designation, t2.name distinct t1.name as employee, t1.employee_name, t1.department, t1.designation
from from
`tabEmployee` t1, `tabSalary Structure Assignment` t2 `tabEmployee` t1, `tabSalary Structure Assignment` t2
where where
t1.name = t2.employee t1.name = t2.employee
and t2.docstatus = 1 and t2.docstatus = 1
%s order by t2.from_date desc limit 1"""% cond, {"sal_struct": sal_struct, "from_date": self.start_date}, as_dict=True) %s order by t2.from_date desc"""% cond, {"sal_struct": sal_struct, "from_date": self.start_date}, as_dict=True)
return emp_list return emp_list
def fill_employee_details(self): def fill_employee_details(self):