| commit | 3fa2e489d6600ea173ba589bb1a2cb29cd9bb01b | [log] [tgz] |
|---|---|---|
| author | Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> | Thu Feb 20 16:20:03 2020 +0530 |
| committer | GitHub <noreply@github.com> | Thu Feb 20 16:20:03 2020 +0530 |
| tree | b212915e59e18aef104eeed9cab154d53ddb3ac4 | |
| parent | e4351011c51f97caf5dbabca59aa6da7bb7fe36a [diff] | |
| parent | 1db8ea317dda14b1c2140fe55bdd658e9e359712 [diff] |
Merge branch 'develop' into backport-github-action
diff --git a/erpnext/hr/doctype/additional_salary/additional_salary.js b/erpnext/hr/doctype/additional_salary/additional_salary.js index d0f64ab..18f6b8b 100644 --- a/erpnext/hr/doctype/additional_salary/additional_salary.js +++ b/erpnext/hr/doctype/additional_salary/additional_salary.js
@@ -8,7 +8,8 @@ frm.set_query("employee", function() { return { filters: { - company: frm.doc.company + company: frm.doc.company, + status: "Active" } }; });