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

fix: leave policy dashboard fix and roles (#24170)

Browse Source
This commit is contained in:
Anurag Mishra 2020-12-22 11:16:36 +05:30 committed by GitHub
parent bd4bdca6ad
commit 0a1390a7ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/hr/doctype/leave_policy/leave_policy_dashboard.py
View File

@ -4,22 +4,10 @@ from frappe import _
def get_data(): def get_data():
return { return {
'fieldname': 'leave_policy', 'fieldname': 'leave_policy',
'non_standard_fieldnames': {
'Employee Grade': 'default_leave_policy'
},
'transactions': [ 'transactions': [
{
'label': _('Employees'),
'items': ['Employee', 'Employee Grade']
},
{ {
'label': _('Leaves'), 'label': _('Leaves'),
'items': ['Leave Allocation'] 'items': ['Leave Allocation']
}, },
] ]
} }

5
erpnext/hr/doctype/leave_policy_assignment/leave_policy_assignment.json
View File

@ -111,7 +111,7 @@
], ],
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2020-10-15 15:18:15.227848", "modified": "2020-12-17 16:27:20.311060",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Leave Policy Assignment", "name": "Leave Policy Assignment",
@ -127,6 +127,7 @@
"report": 1, "report": 1,
"role": "HR Manager", "role": "HR Manager",
"share": 1, "share": 1,
"submit": 1,
"write": 1 "write": 1
}, },
{ {
@ -139,6 +140,7 @@
"report": 1, "report": 1,
"role": "HR User", "role": "HR User",
"share": 1, "share": 1,
"submit": 1,
"write": 1 "write": 1
}, },
{ {
@ -151,6 +153,7 @@
"report": 1, "report": 1,
"role": "System Manager", "role": "System Manager",
"share": 1, "share": 1,
"submit": 1,
"write": 1 "write": 1
} }
], ],