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

Salary Slip - fix query (#14693)

Browse Source
This commit is contained in:
Ranjith Kurungadam 2018-06-27 11:15:39 +05:30 committed by Nabin Hait
parent 86aed90a5c
commit 53cdbe960e
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
erpnext/hr/doctype/salary_slip/salary_slip.py
View File

@ -225,16 +225,16 @@ class SalarySlip(TransactionBase):
self.end_date = date_details.end_date self.end_date = date_details.end_date
def check_sal_struct(self, joining_date, relieving_date): def check_sal_struct(self, joining_date, relieving_date):
cond = '' cond = """and sa.employee=%(employee)s and (sa.from_date <= %(start_date)s or
sa.from_date <= %(end_date)s or sa.from_date <= %(joining_date)s)"""
if self.payroll_frequency: if self.payroll_frequency:
cond = """and payroll_frequency = '%(payroll_frequency)s'""" % {"payroll_frequency": self.payroll_frequency} cond += """and ss.payroll_frequency = '%(payroll_frequency)s'""" % {"payroll_frequency": self.payroll_frequency}
st_name = frappe.db.sql("""select salary_structure from `tabSalary Structure Assignment` st_name = frappe.db.sql("""select sa.salary_structure from `tabSalary Structure Assignment` sa
where employee=%s and (from_date <= %s or from_date <= %s or from_date <= %s) join `tabSalary Structure` ss where sa.salary_structure=ss.name
and docstatus = 1 and sa.docstatus = 1 and ss.docstatus = 1 and ss.is_active ='Yes' %s
and salary_structure in (select name from `tabSalary Structure` order by sa.from_date desc limit 1 """ %cond, {'employee': self.employee, 'start_date': self.start_date,
where is_active = 'Yes' %s) order by from_date desc limit 1 'end_date': self.end_date, 'joining_date': joining_date})
""", (self.employee, self.start_date, self.end_date, joining_date, cond))
if st_name: if st_name:
if len(st_name) > 1: if len(st_name) > 1: