nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-18 17:15:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into backport-github-action

Browse Source
This commit is contained in:
Suraj Shetty
2020-02-20 16:20:03 +05:30
committed by GitHub
parent e4351011c5 1db8ea317d
commit 3fa2e489d6
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/hr/doctype/additional_salary/additional_salary.js
View File

@@ -8,7 +8,8 @@ frappe.ui.form.on('Additional Salary', {
frm.set_query("employee", function() {
return {
filters: {
company: frm.doc.company
company: frm.doc.company,
status: "Active"
}
};
});