schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: conflicts

Browse Source
This commit is contained in:
Rucha Mahabal
2022-04-07 13:01:02 +05:30
parent 8393d113d4
commit 07ff2cb1d3
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -237,11 +237,7 @@
"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": "2022-04-07 09:50:33.145825", "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",
@@ -282,13 +278,8 @@
"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"
}
=======
"states": [], "states": [],
"timeline_field": "employee", "timeline_field": "employee",
"title_field": "employee_name", "title_field": "employee_name",
"track_changes": 1 "track_changes": 1
} }
>>>>>>> f8f1c3d8b5 (fix: enable Track Changes in Leave Allocation)