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

fix: query for salary componet in salary structure

Browse Source
This commit is contained in:
Afshan 2021-01-20 16:48:42 +05:30
parent 53edb872c7
commit 36e3e05a0e
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/payroll/doctype/salary_structure/salary_structure.py
View File

@ -217,8 +217,12 @@ def get_earning_deduction_components(doctype, txt, searchfield, start, page_len,
select t1.salary_component select t1.salary_component
from `tabSalary Component` t1, `tabSalary Component Account` t2 from `tabSalary Component` t1, `tabSalary Component Account` t2
where (t1.name = t2.parent where (t1.name = t2.parent
and t1.type = %s and t1.type = %(type)s
and t2.company = %s) and t2.company = %(company)s)
or (t1.statistical_component = 1) or (t1.type = %(type)s
and t1.statistical_component = 1)
order by salary_component order by salary_component
""", (filters['type'], filters['company'])) """,{
"type": filters['type'],
"company": filters['company']
})