Merge pull request #23524 from michellealva/employee_exit

fix(Employee): Field level change in Exit section
This commit is contained in:
rohitwaghchaure 2020-10-12 16:23:54 +05:30 committed by GitHub
commit a060f8c00b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -109,7 +109,6 @@
"encashment_date", "encashment_date",
"exit_interview_details", "exit_interview_details",
"held_on", "held_on",
"reason_for_resignation",
"new_workplace", "new_workplace",
"feedback", "feedback",
"lft", "lft",
@ -682,7 +681,7 @@
}, },
{ {
"fieldname": "reason_for_leaving", "fieldname": "reason_for_leaving",
"fieldtype": "Data", "fieldtype": "Small Text",
"label": "Reason for Leaving", "label": "Reason for Leaving",
"oldfieldname": "reason_for_leaving", "oldfieldname": "reason_for_leaving",
"oldfieldtype": "Data" "oldfieldtype": "Data"
@ -696,6 +695,7 @@
"options": "\nYes\nNo" "options": "\nYes\nNo"
}, },
{ {
"depends_on": "eval:doc.leave_encashed ==\"Yes\"",
"fieldname": "encashment_date", "fieldname": "encashment_date",
"fieldtype": "Date", "fieldtype": "Date",
"label": "Encashment Date", "label": "Encashment Date",
@ -705,7 +705,6 @@
{ {
"fieldname": "exit_interview_details", "fieldname": "exit_interview_details",
"fieldtype": "Column Break", "fieldtype": "Column Break",
"label": "Exit Interview Details",
"oldfieldname": "col_brk6", "oldfieldname": "col_brk6",
"oldfieldtype": "Column Break", "oldfieldtype": "Column Break",
"width": "50%" "width": "50%"
@ -713,18 +712,10 @@
{ {
"fieldname": "held_on", "fieldname": "held_on",
"fieldtype": "Date", "fieldtype": "Date",
"label": "Held On", "label": "Exit Interview Held On",
"oldfieldname": "held_on", "oldfieldname": "held_on",
"oldfieldtype": "Date" "oldfieldtype": "Date"
}, },
{
"fieldname": "reason_for_resignation",
"fieldtype": "Select",
"label": "Reason for Resignation",
"oldfieldname": "reason_for_resignation",
"oldfieldtype": "Select",
"options": "\nBetter Prospects\nHealth Concerns"
},
{ {
"fieldname": "new_workplace", "fieldname": "new_workplace",
"fieldtype": "Data", "fieldtype": "Data",
@ -809,37 +800,29 @@
"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
}, },
{ {
"fieldname": "approvers_section", "fieldname": "approvers_section",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"label": "Approvers", "label": "Approvers"
"show_days": 1,
"show_seconds": 1
}, },
{ {
"fieldname": "column_break_45", "fieldname": "column_break_45",
"fieldtype": "Column Break", "fieldtype": "Column Break"
"show_days": 1,
"show_seconds": 1
}, },
{ {
"fieldname": "shift_request_approver", "fieldname": "shift_request_approver",
"fieldtype": "Link", "fieldtype": "Link",
"label": "Shift Request Approver", "label": "Shift Request 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-07-28 01:36:04.109189", "modified": "2020-10-06 15:58:23.805489",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Employee", "name": "Employee",