nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 07:54:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: fetch "Employee Leave Policy" from "Employee Grade" if available (#22570)

Browse Source 
* fix:fetch "Employee Leave Policy" from "Employee Grade" if available

* fix: checked "Fetch IF Empty" checkbox

Co-authored-by: Marica <maricadsouza221197@gmail.com>
This commit is contained in:
Afshan
2020-07-08 14:40:22 +05:30
committed by GitHub
parent b78dc75456
commit e0ff0cfcb9
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -410,6 +410,8 @@
"options": "Branch" "options": "Branch"
}, },
{ {
"fetch_from": "grade.default_leave_policy",
"fetch_if_empty": 1,
"fieldname": "leave_policy", "fieldname": "leave_policy",
"fieldtype": "Link", "fieldtype": "Link",
"label": "Leave Policy", "label": "Leave Policy",
@@ -804,16 +806,14 @@
"fieldname": "expense_approver", "fieldname": "expense_approver",
"fieldtype": "Link", "fieldtype": "Link",
"label": "Expense Approver", "label": "Expense Approver",
"options": "User", "options": "User"
"show_days": 1,
"show_seconds": 1
} }
], ],
"icon": "fa fa-user", "icon": "fa fa-user",
"idx": 24, "idx": 24,
"image_field": "image", "image_field": "image",
"links": [], "links": [],
"modified": "2020-06-18 18:01:27.223535", "modified": "2020-07-03 21:28:04.109189",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Employee", "name": "Employee",