Merge pull request #24415 from AfshanKhan/sal-comp-err
fix: select sal comp while making sal struct
diff --git a/erpnext/payroll/doctype/salary_structure/salary_structure.js b/erpnext/payroll/doctype/salary_structure/salary_structure.js
index ba824c5..6c7b382 100755
--- a/erpnext/payroll/doctype/salary_structure/salary_structure.js
+++ b/erpnext/payroll/doctype/salary_structure/salary_structure.js
@@ -70,6 +70,9 @@
});
},
+ company: function(frm) {
+ frm.trigger('set_earning_deduction_component');
+ },
currency: function(frm) {
calculate_totals(frm.doc);
@@ -117,6 +120,7 @@
fields_read_only.forEach(function(field) {
frappe.meta.get_docfield("Salary Detail", field, frm.doc.name).read_only = 1;
});
+ frm.trigger('set_earning_deduction_component');
},
assign_to_employees:function (frm) {
diff --git a/erpnext/payroll/doctype/salary_structure/salary_structure.py b/erpnext/payroll/doctype/salary_structure/salary_structure.py
index 77914bb..340f4e8 100644
--- a/erpnext/payroll/doctype/salary_structure/salary_structure.py
+++ b/erpnext/payroll/doctype/salary_structure/salary_structure.py
@@ -216,7 +216,7 @@
return frappe.db.sql("""
select t1.salary_component
from `tabSalary Component` t1, `tabSalary Component Account` t2
- where t1.salary_component = t2.parent
+ where t1.name = t2.parent
and t1.type = %s
and t2.company = %s
order by salary_component