nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 03:09:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix - assigned Salary Structure query (#14965)

Browse Source
This commit is contained in:
Ranjith Kurungadam
2018-07-23 11:31:46 +05:30
committed by Nabin Hait
parent 83dfc0a2b1
commit 68abe25371
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,7 +38,7 @@ def get_assigned_salary_structure(employee, on_date):
select salary_structure from `tabSalary Structure Assignment` select salary_structure from `tabSalary Structure Assignment`
where employee=%(employee)s where employee=%(employee)s
and docstatus = 1 and docstatus = 1
and %(on_date)s > from_date order by from_date desc limit 1""", { and %(on_date)s >= from_date order by from_date desc limit 1""", {
'employee': employee, 'employee': employee,
'on_date': on_date, 'on_date': on_date,
}) })