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

Merge pull request #22413 from Anurag810/salary-structure-help-fix

Browse Source 
fix: 'Condition & Formula Help' appears twice
This commit is contained in:
rohitwaghchaure 2020-06-28 16:29:20 +05:30 committed by GitHub
commit e4d296bb1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/payroll/doctype/salary_structure/salary_structure.js
View File

@ -35,7 +35,9 @@ frappe.ui.form.on('Salary Structure', {
d.show()
});
frm.get_field("conditions_and_formula_variable_and_example").$wrapper.append(frm.doc.filters_html).append(help_button)
let help_button_wrapper = frm.get_field("conditions_and_formula_variable_and_example").$wrapper;
help_button_wrapper.empty();
help_button_wrapper.append(frm.doc.filters_html).append(help_button)
frm.toggle_reqd(['payroll_frequency'], !frm.doc.salary_slip_based_on_timesheet)