fix: remove HR specific fields from depatment and employee
- these will be added to the masters as custom fields on HRMS app setup
diff --git a/erpnext/setup/doctype/department/department.json b/erpnext/setup/doctype/department/department.json
index dcb6a74..7b35f40 100644
--- a/erpnext/setup/doctype/department/department.json
+++ b/erpnext/setup/doctype/department/department.json
@@ -13,14 +13,6 @@
"company",
"is_group",
"disabled",
- "section_break_4",
- "payroll_cost_center",
- "column_break_9",
- "leave_block_list",
- "approvers",
- "leave_approvers",
- "expense_approvers",
- "shift_request_approver",
"lft",
"rgt",
"old_parent"
@@ -75,38 +67,6 @@
"show_seconds": 1
},
{
- "fieldname": "section_break_4",
- "fieldtype": "Section Break",
- "show_days": 1,
- "show_seconds": 1
- },
- {
- "description": "Days for which Holidays are blocked for this department.",
- "fieldname": "leave_block_list",
- "fieldtype": "Link",
- "in_list_view": 1,
- "label": "Leave Block List",
- "options": "Leave Block List",
- "show_days": 1,
- "show_seconds": 1
- },
- {
- "fieldname": "leave_approvers",
- "fieldtype": "Table",
- "label": "Leave Approver",
- "options": "Department Approver",
- "show_days": 1,
- "show_seconds": 1
- },
- {
- "fieldname": "expense_approvers",
- "fieldtype": "Table",
- "label": "Expense Approver",
- "options": "Department Approver",
- "show_days": 1,
- "show_seconds": 1
- },
- {
"fieldname": "lft",
"fieldtype": "Int",
"hidden": 1,
@@ -141,43 +101,13 @@
"fieldtype": "Column Break",
"show_days": 1,
"show_seconds": 1
- },
- {
- "fieldname": "payroll_cost_center",
- "fieldtype": "Link",
- "label": "Payroll Cost Center",
- "options": "Cost Center",
- "show_days": 1,
- "show_seconds": 1
- },
- {
- "fieldname": "column_break_9",
- "fieldtype": "Column Break",
- "show_days": 1,
- "show_seconds": 1
- },
- {
- "description": "The first Approver in the list will be set as the default Approver.",
- "fieldname": "approvers",
- "fieldtype": "Section Break",
- "label": "Approvers",
- "show_days": 1,
- "show_seconds": 1
- },
- {
- "fieldname": "shift_request_approver",
- "fieldtype": "Table",
- "label": "Shift Request Approver",
- "options": "Department Approver",
- "show_days": 1,
- "show_seconds": 1
}
],
"icon": "fa fa-sitemap",
"idx": 1,
"is_tree": 1,
"links": [],
- "modified": "2020-06-23 15:42:00.563272",
+ "modified": "2020-06-10 12:28:00.563272",
"modified_by": "Administrator",
"module": "HR",
"name": "Department",
diff --git a/erpnext/setup/doctype/employee/employee.json b/erpnext/setup/doctype/employee/employee.json
index a3638e1..3df433e 100644
--- a/erpnext/setup/doctype/employee/employee.json
+++ b/erpnext/setup/doctype/employee/employee.json
@@ -18,7 +18,6 @@
"last_name",
"salutation",
"employee_name",
- "employment_type",
"image",
"column_break1",
"company",
@@ -37,7 +36,6 @@
"create_user",
"create_user_permission",
"employment_details",
- "job_applicant",
"scheduled_confirmation_date",
"final_confirmation_date",
"col_break_22",
@@ -49,7 +47,6 @@
"designation",
"reports_to",
"column_break_31",
- "grade",
"branch",
"approvers_section",
"expense_approver",
@@ -60,7 +57,6 @@
"attendance_device_id",
"column_break_44",
"holiday_list",
- "default_shift",
"salary_information",
"salary_currency",
"ctc",
@@ -69,9 +65,6 @@
"column_break_52",
"bank_name",
"bank_ac_no",
- "health_insurance_section",
- "health_insurance_provider",
- "health_insurance_no",
"contact_details",
"cell_number",
"prefered_email",
@@ -222,15 +215,6 @@
"oldfieldtype": "Data"
},
{
- "fieldname": "employment_type",
- "fieldtype": "Link",
- "ignore_user_permissions": 1,
- "label": "Employment Type",
- "oldfieldname": "employment_type",
- "oldfieldtype": "Link",
- "options": "Employment Type"
- },
- {
"fieldname": "gender",
"fieldtype": "Link",
"label": "Gender",
@@ -315,12 +299,6 @@
"label": "Joining Details"
},
{
- "fieldname": "job_applicant",
- "fieldtype": "Link",
- "label": "Job Applicant",
- "options": "Job Applicant"
- },
- {
"fieldname": "scheduled_confirmation_date",
"fieldtype": "Date",
"label": "Offer Date",
@@ -363,7 +341,7 @@
"collapsible": 1,
"fieldname": "job_profile",
"fieldtype": "Section Break",
- "label": "Department and Grade"
+ "label": "Department"
},
{
"fieldname": "department",
@@ -399,12 +377,6 @@
"fieldtype": "Column Break"
},
{
- "fieldname": "grade",
- "fieldtype": "Link",
- "label": "Grade",
- "options": "Employee Grade"
- },
- {
"fieldname": "branch",
"fieldtype": "Link",
"label": "Branch",
@@ -456,24 +428,6 @@
},
{
"collapsible": 1,
- "fieldname": "health_insurance_section",
- "fieldtype": "Section Break",
- "label": "Health Insurance"
- },
- {
- "fieldname": "health_insurance_provider",
- "fieldtype": "Link",
- "label": "Health Insurance Provider",
- "options": "Employee Health Insurance"
- },
- {
- "depends_on": "eval:doc.health_insurance_provider",
- "fieldname": "health_insurance_no",
- "fieldtype": "Data",
- "label": "Health Insurance No"
- },
- {
- "collapsible": 1,
"fieldname": "contact_details",
"fieldtype": "Section Break",
"label": "Contact Details"
@@ -762,12 +716,6 @@
"fieldtype": "Column Break"
},
{
- "fieldname": "default_shift",
- "fieldtype": "Link",
- "label": "Default Shift",
- "options": "Shift Type"
- },
- {
"fieldname": "leave_approver",
"fieldtype": "Link",
"label": "Leave Approver",
@@ -827,7 +775,7 @@
"idx": 24,
"image_field": "image",
"links": [],
- "modified": "2022-04-22 16:21:55.811983",
+ "modified": "2022-06-10 12:28:55.811983",
"modified_by": "Administrator",
"module": "HR",
"name": "Employee",