Merge pull request #5684 from rohitwaghchaure/v7_ts_issue

[Salary Structure] Make salary_component field mandatory if salary_slip_based_on_timesheet is true
diff --git a/erpnext/hr/doctype/salary_structure/salary_structure.js b/erpnext/hr/doctype/salary_structure/salary_structure.js
index aedd5ec..10b7544 100755
--- a/erpnext/hr/doctype/salary_structure/salary_structure.js
+++ b/erpnext/hr/doctype/salary_structure/salary_structure.js
@@ -32,7 +32,8 @@
 	},
 
 	toggle_fields: function(frm) {
-		frm.toggle_display('time_sheet_earning_detail', cint(frm.doc.salary_slip_based_on_timesheet)==1);
+		frm.toggle_display('time_sheet_earning_detail', frm.doc.salary_slip_based_on_timesheet);
+		frm.toggle_reqd('salary_component', frm.doc.salary_slip_based_on_timesheet);
 	}
 })