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

Merge pull request #24424 from AfshanKhan/fix-add-stat-comp-in-sal-struct

Browse Source 
fix: allow statistical component in salary structure.
This commit is contained in:
Afshan 2021-01-20 15:21:04 +05:30 committed by GitHub
commit 53edb872c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -216,8 +216,9 @@ def get_earning_deduction_components(doctype, txt, searchfield, start, page_len,
return frappe.db.sql("""
select t1.salary_component
from `tabSalary Component` t1, `tabSalary Component Account` t2
where t1.name = t2.parent
where (t1.name = t2.parent
and t1.type = %s
and t2.company = %s
and t2.company = %s)
or (t1.statistical_component = 1)
order by salary_component
""", (filters['type'], filters['company']) )
""", (filters['type'], filters['company']))