mirror of
https://github.com/frappe/erpnext.git
synced 2026-06-07 15:12:51 +00:00
show only submitted salary_structure and leave_policy in Employee Grade app (#15434)
* update staff plan when add or delete job-opening * Update job_opening.py * filter default_salary_structure and default_leave_policy * merge
This commit is contained in:
committed by
Nabin Hait
parent
9c361c38f0
commit
b9228fa443
1
.gitignore
vendored
1
.gitignore
vendored
@@ -12,3 +12,4 @@ erpnext/docs/current
|
||||
*.swo
|
||||
__pycache__
|
||||
*~
|
||||
.idea/
|
||||
@@ -2,7 +2,28 @@
|
||||
// For license information, please see license.txt
|
||||
|
||||
frappe.ui.form.on('Employee Grade', {
|
||||
refresh: function(frm) {
|
||||
refresh: function (frm) {
|
||||
|
||||
},
|
||||
setup: function (frm) {
|
||||
frm.set_query("default_salary_structure", function () {
|
||||
return {
|
||||
"filters": {
|
||||
"docstatus": 1,
|
||||
"is_active": "Yes"
|
||||
}
|
||||
};
|
||||
});
|
||||
|
||||
frm.set_query("default_leave_policy", function () {
|
||||
return {
|
||||
"filters": {
|
||||
"docstatus": 1
|
||||
}
|
||||
};
|
||||
});
|
||||
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
"fields": [
|
||||
{
|
||||
"allow_bulk_edit": 0,
|
||||
"allow_in_quick_entry": 0,
|
||||
"allow_on_submit": 0,
|
||||
"bold": 0,
|
||||
"collapsible": 0,
|
||||
@@ -47,6 +48,7 @@
|
||||
},
|
||||
{
|
||||
"allow_bulk_edit": 0,
|
||||
"allow_in_quick_entry": 0,
|
||||
"allow_on_submit": 0,
|
||||
"bold": 0,
|
||||
"collapsible": 0,
|
||||
@@ -88,7 +90,7 @@
|
||||
"issingle": 0,
|
||||
"istable": 0,
|
||||
"max_attachments": 0,
|
||||
"modified": "2018-04-13 16:14:24.174138",
|
||||
"modified": "2018-09-18 17:17:45.617624",
|
||||
"modified_by": "Administrator",
|
||||
"module": "HR",
|
||||
"name": "Employee Grade",
|
||||
@@ -153,12 +155,13 @@
|
||||
"write": 1
|
||||
}
|
||||
],
|
||||
"quick_entry": 1,
|
||||
"quick_entry": 0,
|
||||
"read_only": 0,
|
||||
"read_only_onload": 0,
|
||||
"show_name_in_global_search": 0,
|
||||
"sort_field": "modified",
|
||||
"sort_order": "DESC",
|
||||
"track_changes": 1,
|
||||
"track_seen": 0
|
||||
"track_seen": 0,
|
||||
"track_views": 0
|
||||
}
|
||||
Reference in New Issue
Block a user