Skip to content

Commit

Permalink
Merge pull request #39147 from frappe/mergify/bp/version-14-hotfix/pr…
Browse files Browse the repository at this point in the history
…-39126

fix(Employee): treeview (backport #39126)
  • Loading branch information
barredterra authored Jan 4, 2024
2 parents 20aac93 + 080a742 commit 948045e
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions erpnext/setup/doctype/employee/employee.json
Original file line number Diff line number Diff line change
Expand Up @@ -616,8 +616,8 @@
"fieldname": "relieving_date",
"fieldtype": "Date",
"label": "Relieving Date",
"no_copy": 1,
"mandatory_depends_on": "eval:doc.status == \"Left\"",
"no_copy": 1,
"oldfieldname": "relieving_date",
"oldfieldtype": "Date"
},
Expand Down Expand Up @@ -822,12 +822,14 @@
"icon": "fa fa-user",
"idx": 24,
"image_field": "image",
"is_tree": 1,
"links": [],
"modified": "2023-10-04 10:57:05.174592",
"modified": "2024-01-03 17:36:20.984421",
"modified_by": "Administrator",
"module": "Setup",
"name": "Employee",
"naming_rule": "By \"Naming Series\" field",
"nsm_parent_field": "reports_to",
"owner": "Administrator",
"permissions": [
{
Expand Down Expand Up @@ -860,7 +862,6 @@
"read": 1,
"report": 1,
"role": "HR Manager",
"set_user_permissions": 1,
"share": 1,
"write": 1
}
Expand All @@ -871,4 +872,4 @@
"sort_order": "DESC",
"states": [],
"title_field": "employee_name"
}
}

0 comments on commit 948045e

Please sign in to comment.