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

feat: Added default Leave Approver in Employee (#18953)

Browse Source
This commit is contained in:
Nabin Hait 2019-09-07 12:31:07 +05:30 committed by GitHub
parent 8e67a3a8a8
commit 3b366c30a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/hr/doctype/employee/employee.json
View File

@ -7,6 +7,7 @@
"doctype": "DocType", "doctype": "DocType",
"document_type": "Setup", "document_type": "Setup",
"editable_grid": 1, "editable_grid": 1,
"engine": "InnoDB",
"field_order": [ "field_order": [
"basic_information", "basic_information",
"employee", "employee",
@ -54,6 +55,7 @@
"column_break_44", "column_break_44",
"holiday_list", "holiday_list",
"default_shift", "default_shift",
"leave_approver",
"salary_information", "salary_information",
"salary_mode", "salary_mode",
"bank_name", "bank_name",
@ -767,12 +769,18 @@
"fieldtype": "Link", "fieldtype": "Link",
"label": "Default Shift", "label": "Default Shift",
"options": "Shift Type" "options": "Shift Type"
},
{
"fieldname": "leave_approver",
"fieldtype": "Link",
"label": "Leave Approver",
"options": "User"
} }
], ],
"icon": "fa fa-user", "icon": "fa fa-user",
"idx": 24, "idx": 24,
"image_field": "image", "image_field": "image",
"modified": "2019-06-01 16:05:55.132180", "modified": "2019-09-06 15:54:36.735147",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Employee", "name": "Employee",

12
erpnext/hr/doctype/leave_application/leave_application.py
View File

@ -745,10 +745,12 @@ def get_approved_leaves_for_period(employee, leave_type, from_date, to_date):
return leave_days return leave_days
@frappe.whitelist() @frappe.whitelist()
def get_leave_approver(employee, department=None): def get_leave_approver(employee):
if not department: leave_approver, department = frappe.db.get_value("Employee",
department = frappe.db.get_value('Employee', employee, 'department') employee, ["leave_approver", "department"])
if department: if not leave_approver and department:
return frappe.db.get_value('Department Approver', {'parent': department, leave_approver = frappe.db.get_value('Department Approver', {'parent': department,
'parentfield': 'leave_approvers', 'idx': 1}, 'approver') 'parentfield': 'leave_approvers', 'idx': 1}, 'approver')
return leave_approver