| commit | 68abe25371c7c84f07cd19471cb76f8c24746020 | [log] [tgz] |
|---|---|---|
| author | Ranjith Kurungadam <rkurungadam@gmail.com> | Mon Jul 23 11:31:46 2018 +0530 |
| committer | Nabin Hait <nabinhait@gmail.com> | Mon Jul 23 11:31:46 2018 +0530 |
| tree | e7e10e6f9caf5d1641c75a5fcb9dbf2a0568e681 | |
| parent | 83dfc0a2b11752c06f432f9a3065aee125f8546a [diff] |
fix - assigned Salary Structure query (#14965)
diff --git a/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py b/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py index 210f75d..cf09066 100644 --- a/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +++ b/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py
@@ -38,7 +38,7 @@ select salary_structure from `tabSalary Structure Assignment` where employee=%(employee)s 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, 'on_date': on_date, })