From f14bd6b03e2d7db62870716daad59e6d0a812dec Mon Sep 17 00:00:00 2001 From: Horilla Date: Fri, 2 May 2025 10:19:55 +0530 Subject: [PATCH] [UPDT] EMPLOYEE: #472 --- employee/forms.py | 5 +++++ employee/views.py | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/employee/forms.py b/employee/forms.py index 94fb67c68..d37429cf4 100644 --- a/employee/forms.py +++ b/employee/forms.py @@ -536,6 +536,11 @@ class EmployeeExportExcelForm(forms.Form): "employee_work_info__work_type_id", "employee_work_info__reporting_manager_id", "employee_work_info__employee_type_id", + "employee_work_info__location", + "employee_work_info__date_joining", + "employee_work_info__basic_salary", + "employee_work_info__salary_hour", + "employee_work_info__contract_end_date", "employee_work_info__company_id", ], ) diff --git a/employee/views.py b/employee/views.py index d14786677..2317a5d72 100755 --- a/employee/views.py +++ b/employee/views.py @@ -2453,22 +2453,22 @@ def work_info_import_file(request): "Badge ID", "First Name", "Last Name", - "Phone", "Email", + "Phone", "Gender", "Department", "Job Position", "Job Role", - "Work Type", "Shift", - "Employee Type", + "Work Type", "Reporting Manager", - "Company", + "Employee Type", "Location", "Date Joining", - "Contract End Date", "Basic Salary", "Salary Hour", + "Contract End Date", + "Company", ] )