nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 08:24:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: enable Track Changes in Leave Allocation

Browse Source 
(cherry picked from commit f8f1c3d8b5)

# Conflicts:
#	erpnext/hr/doctype/leave_allocation/leave_allocation.json
This commit is contained in:
Rucha Mahabal
2022-04-07 10:06:08 +05:30
parent af039be03e
commit 0c163eef23
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/hr/doctype/leave_allocation/leave_allocation.json
View File

@@ -237,7 +237,11 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2021-10-01 15:28:26.335104", "modified": "2021-10-01 15:28:26.335104",
=======
"modified": "2022-04-07 09:50:33.145825",
>>>>>>> f8f1c3d8b5 (fix: enable Track Changes in Leave Allocation)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Leave Allocation", "name": "Leave Allocation",
@@ -278,5 +282,13 @@
"show_name_in_global_search": 1, "show_name_in_global_search": 1,
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC", "sort_order": "DESC",
<<<<<<< HEAD
"timeline_field": "employee" "timeline_field": "employee"
} }
=======
"states": [],
"timeline_field": "employee",
"title_field": "employee_name",
"track_changes": 1
}
>>>>>>> f8f1c3d8b5 (fix: enable Track Changes in Leave Allocation)