diff --git a/base/methods.py b/base/methods.py
index 1e36a814e..8bc472c11 100644
--- a/base/methods.py
+++ b/base/methods.py
@@ -324,9 +324,12 @@ def get_nested_instances(model, field_names, field_values):
                 related_model = related_field.remote_field.model
             except:
                 pass
-        field_values = [int(value) for value in field_values]
-        related_instances = related_model.objects.filter(id__in=field_values)
-        return [str(instance) for instance in related_instances]
+        object_ids = [int(value) for value in field_values if value != "not_set"]
+        related_instances = related_model.objects.filter(id__in=object_ids)
+        result = [str(instance) for instance in related_instances]
+        if "not_set" in field_values:
+            result.insert(0, "not_set")
+        return result
     except (ObjectDoesNotExist, ValueError):
         return None
 
diff --git a/base/translator.py b/base/translator.py
index 0e0d5e4a8..9e54be1c4 100644
--- a/base/translator.py
+++ b/base/translator.py
@@ -300,4 +300,15 @@ _("company"),
 _("employee-create-personal-info"),
 _("offboarding"),
 _("offboarding-pipeline"),
-_("pagination-settings-view"),
\ No newline at end of file
+_("pagination-settings-view"),
+_("organisation-chart"),
+_("document-request-view"),
+_("disciplinary-actions"),
+_("view-policies"),
+_("resignation-requests-view"),
+_("action-type"),
+_("general-settings"),
+_(""),
+_(""),
+_(""),
+_(""),
\ No newline at end of file
diff --git a/employee/filters.py b/employee/filters.py
index a242e99ed..9789f5cf5 100644
--- a/employee/filters.py
+++ b/employee/filters.py
@@ -4,6 +4,10 @@ filters.py
 This page is used to register filter for employee models
 
 """
+import datetime
+
+import django
+from attendance.models import Attendance
 from employee.models import DisciplinaryAction, Policy
 import uuid
 from django import forms
@@ -69,6 +73,9 @@ class EmployeeFilter(FilterSet):
             (False, "No"),
         ],
     )
+    working_today = django_filters.BooleanFilter(
+        label="Working", method="get_working_today"
+    )
 
     not_in_yet = django_filters.DateFilter(
         method="not_in_yet_func",
@@ -135,18 +142,43 @@ class EmployeeFilter(FilterSet):
         """
         Override the default filtering behavior to handle None option.
         """
+        from django.db.models import Q
+
         data = self.form.cleaned_data
-        not_set_dict = {key: value for key, value in data.items() if value == "not_set"}
+        not_set_dict = {}
+        for key, value in data.items():
+            if isinstance(value,(list,django.db.models.query.QuerySet)):
+                if value and "not_set" in value:
+                    not_set_dict[key] = value
+
         if not_set_dict:
-            filtered_data = queryset
-            for key, value in not_set_dict.items():
-                not_set = f"{key}__isnull"
-                filtered_data = filtered_data.filter(**{not_set: True})
-            return filtered_data
+            q_objects = Q()
+            for key, values in not_set_dict.items():
+                for value in values:
+                    if value == "not_set":
+                        q_objects |= Q(**{f"{key}__isnull": True})
+                    else:
+                        q_objects |= Q(**{key: value})
+            return queryset.filter(q_objects)
         return super().filter_queryset(queryset)
 
         # Continue with the default behavior for other filters
 
+    def get_working_today(self, queryset, _, value):
+        today = datetime.datetime.now().date()
+        yesterday = today - datetime.timedelta(days=1)
+
+        working_employees = Attendance.objects.filter(
+            attendance_date__gte=yesterday,
+            attendance_date__lte=today,
+            attendance_clock_out_date__isnull=True,
+        ).values_list("employee_id", flat=True)
+        if value:
+            queryset = queryset.filter(id__in=working_employees)
+        else:
+            queryset = queryset.exclude(id__in=working_employees)
+        return queryset
+
     def filter_by_name(self, queryset, _, value):
         """
         Filter queryset by first name or last name.
@@ -207,7 +239,7 @@ class EmployeeFilter(FilterSet):
         self.model_choice_filters = [
             filter
             for filter in self.filters.values()
-            if isinstance(filter, django_filters.ModelChoiceFilter)
+            if isinstance(filter, django_filters.ModelMultipleChoiceFilter)
         ]
         for model_choice_filter in self.model_choice_filters:
             queryset = (
@@ -216,20 +248,25 @@ class EmployeeFilter(FilterSet):
                 else model_choice_filter.queryset
             )
             choices = [
-                ("", "---------"),
                 ("not_set", _("Not Set")),
             ]
             choices.extend([(obj.id, str(obj)) for obj in queryset])
-            self.form.fields[model_choice_filter.field_name] = forms.ChoiceField(
-                choices=choices,
-                required=False,
-                widget=forms.Select(
-                    attrs={
-                        "class": "oh-select oh-select-2 select2-hidden-accessible",
-                        "id": uuid.uuid4(),
-                    }
-                ),
-            )
+            if (
+                model_choice_filter.field_name != "user_permissions"
+                and model_choice_filter.field_name != "groups"
+            ):
+                self.form.fields[
+                    model_choice_filter.field_name
+                ] = forms.MultipleChoiceField(
+                    choices=choices,
+                    required=False,
+                    widget=forms.SelectMultiple(
+                        attrs={
+                            "class": "oh-select oh-select-2 select2-hidden-accessible",
+                            "id": uuid.uuid4(),
+                        }
+                    ),
+                )
 
 
 class EmployeeReGroup:
@@ -303,20 +340,19 @@ class DisciplinaryActionFilter(FilterSet):
     search = CharFilter(method=filter_by_name)
 
     start_date = django_filters.DateFilter(
-    widget=forms.DateInput(attrs={"type": "date"}),
+        widget=forms.DateInput(attrs={"type": "date"}),
     )
 
     class Meta:
-
         model = DisciplinaryAction
-        fields = [  
-                    "employee_id",
-                    "action",
-                    "employee_id__employee_work_info__job_position_id",
-                    "employee_id__employee_work_info__department_id",
-                    "employee_id__employee_work_info__work_type_id",
-                    "employee_id__employee_work_info__job_role_id",
-                    "employee_id__employee_work_info__reporting_manager_id",
-                    "employee_id__employee_work_info__company_id",
-                    "employee_id__employee_work_info__shift_id",
-                ]
+        fields = [
+            "employee_id",
+            "action",
+            "employee_id__employee_work_info__job_position_id",
+            "employee_id__employee_work_info__department_id",
+            "employee_id__employee_work_info__work_type_id",
+            "employee_id__employee_work_info__job_role_id",
+            "employee_id__employee_work_info__reporting_manager_id",
+            "employee_id__employee_work_info__company_id",
+            "employee_id__employee_work_info__shift_id",
+        ]
diff --git a/employee/urls.py b/employee/urls.py
index f5a5dfb92..c93184caa 100644
--- a/employee/urls.py
+++ b/employee/urls.py
@@ -271,7 +271,7 @@ urlpatterns = [
         views.document_delete,
         name="document-delete",
     ),
-    path("organisation-chart", views.organisation_chart, name="organisation-chart"),
+    path("organisation-chart/", views.organisation_chart, name="organisation-chart"),
 
     path("delete-policies",policies.delete_policies,name="delete-policies"),
 
diff --git a/horilla/filters.py b/horilla/filters.py
index 840a9dded..6e75b2ac3 100755
--- a/horilla/filters.py
+++ b/horilla/filters.py
@@ -4,7 +4,12 @@ filters.py
 import uuid
 import django_filters
 from django import forms
+from django.db import models
 from base.methods import reload_queryset
+from django_filters.filterset import FILTER_FOR_DBFIELD_DEFAULTS
+
+
+FILTER_FOR_DBFIELD_DEFAULTS[models.ForeignKey]["filter_class"]=django_filters.ModelMultipleChoiceFilter
 
 def filter_by_name(queryset, name, value):
     """
diff --git a/horilla/locale/en/LC_MESSAGES/django.po b/horilla/locale/en/LC_MESSAGES/django.po
index a57d19261..24ea32779 100644
--- a/horilla/locale/en/LC_MESSAGES/django.po
+++ b/horilla/locale/en/LC_MESSAGES/django.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#: .\leave\views.py:2323
+#: .\base\translator.py:311 .\base\translator.py:312 .\base\translator.py:313
+#: .\base\translator.py:314 .\leave\views.py:2327
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-24 08:49+0530\n"
+"POT-Creation-Date: 2024-01-29 09:11+0530\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -81,15 +82,19 @@ msgstr ""
 #: .\base\templates\shift_request\shift_request_nav.html:94
 #: .\base\templates\work_type_request\work_type_request_export.html:44
 #: .\base\templates\work_type_request\work_type_request_nav.html:78
-#: .\employee\models.py:413 .\employee\templates\documents\document_nav.html:88
+#: .\employee\models.py:413
+#: .\employee\templates\disciplinary_actions\disciplinary_nav.html:72
+#: .\employee\templates\documents\document_nav.html:88
 #: .\employee\templates\employee\profile\work_info.html:55
 #: .\employee\templates\employee\update_form\work_details.html:138
 #: .\employee\templates\employee_export_filter.html:67
 #: .\employee\templates\employee_filters.html:46
 #: .\employee\templates\employee_personal_info\employee_list.html:91
 #: .\employee\templates\employee_personal_info\group_by.html:69
-#: .\employee\templates\tabs\personal-tab.html:259 .\pms\models.py:21
-#: .\pms\models.py:165
+#: .\employee\templates\tabs\personal-tab.html:259
+#: .\leave\templates\leave\leave_request\filter_leave_requests.html:51
+#: .\leave\templates\leave\leave_request\leave_requests_export_filter.html:79
+#: .\pms\models.py:21 .\pms\models.py:165
 #: .\pms\templates\feedback\question_template\question_template_update.html:11
 #: .\pms\templates\feedback\question_template\question_template_view.html:117
 #: .\pms\templates\period\period_create.html:44
@@ -102,7 +107,7 @@ msgstr ""
 #: .\recruitment\templates\recruitment\recruitment_duplicate_form.html:82
 #: .\recruitment\templates\recruitment\recruitment_form.html:92
 #: .\recruitment\templates\recruitment\recruitment_update_form.html:93
-#: .\recruitment\templates\stage\filters.html:34 .\templates\settings.html:214
+#: .\recruitment\templates\stage\filters.html:34 .\templates\settings.html:233
 msgid "Company"
 msgstr ""
 
@@ -145,6 +150,7 @@ msgstr ""
 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_view.html:250
 #: .\leave\templates\leave\leave_request\leave_requests.html:22
 #: .\leave\templates\leave\user_leave\user_requests.html:20
+#: .\offboarding\templates\offboarding\resignation\request_cards.html:13
 #: .\payroll\templates\payroll\reimbursement\request_cards.html:10
 msgid "Requested"
 msgstr ""
@@ -167,6 +173,8 @@ msgstr ""
 #: .\leave\templates\leave\user_leave\group_by.html:101
 #: .\leave\templates\leave\user_leave\user_requests.html:24
 #: .\leave\templates\leave\user_leave\user_requests.html:110
+#: .\offboarding\templates\offboarding\resignation\request_cards.html:18
+#: .\offboarding\templates\offboarding\resignation\request_cards.html:84
 #: .\payroll\templates\payroll\reimbursement\request_cards.html:14
 #: .\payroll\templates\payroll\reimbursement\request_cards.html:120
 msgid "Approved"
@@ -180,6 +188,7 @@ msgstr ""
 #: .\leave\templates\leave\leave_request\leave_requests.html:10
 #: .\leave\templates\leave\leave_request\one_request_view.html:74
 #: .\leave\templates\leave\user_leave\user_requests.html:8
+#: .\offboarding\templates\offboarding\resignation\request_cards.html:8
 msgid "Rejected"
 msgstr ""
 
@@ -214,9 +223,12 @@ msgstr ""
 #: .\base\templates\work_type_request\htmx\requests.html:49
 #: .\base\templates\work_type_request\htmx\work_type_request_single_view.html:70
 #: .\base\translator.py:96 .\employee\models.py:541
+#: .\employee\templates\disciplinary_actions\disciplinary_records.html:19
+#: .\employee\templates\disciplinary_actions\form.html:25
+#: .\employee\templates\disciplinary_actions\update_form.html:39
 #: .\employee\templates\documents\document_request_create_form.html:52
 #: .\employee\templates\tabs\shift-tab.html:150
-#: .\employee\templates\tabs\shift-tab.html:614 .\leave\forms.py:472
+#: .\employee\templates\tabs\shift-tab.html:614 .\leave\forms.py:476
 #: .\leave\models.py:407
 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_group_by.html:37
 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_group_by.html:215
@@ -224,7 +236,7 @@ msgstr ""
 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_list.html:173
 #: .\leave\templates\leave\user_leave\user_request_one.html:54
 #: .\onboarding\templates\onboarding\candidate_creation_form.html:4
-#: .\payroll\models\models.py:91 .\pms\templates\anonymous\single_view.html:53
+#: .\payroll\models\models.py:92 .\pms\templates\anonymous\single_view.html:53
 #: .\pms\templates\okr\key_result\key_result_creation.html:58
 #: .\pms\templates\okr\key_result\key_result_creation_htmx.html:40
 #: .\pms\templates\okr\key_result\key_result_update.html:37
@@ -295,14 +307,15 @@ msgstr ""
 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_list.html:17
 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_list.html:172
 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_view.html:138
+#: .\leave\templates\leave\leave_request\filter_leave_requests.html:33
 #: .\leave\templates\leave\leave_request\group_by.html:58
 #: .\leave\templates\leave\leave_request\leave_requests.html:76
 #: .\leave\templates\leave\leave_request\leave_requests_export_filter.html:61
-#: .\leave\templates\leave\leave_request\request_view.html:118
 #: .\leave\templates\leave\user_leave\group_by.html:66
 #: .\leave\templates\leave\user_leave\user_request_view.html:98
 #: .\leave\templates\leave\user_leave\user_requests.html:72
-#: .\payroll\forms\component_forms.py:320 .\payroll\models\models.py:169
+#: .\offboarding\templates\offboarding\resignation\filter.html:23
+#: .\payroll\forms\component_forms.py:320 .\payroll\models\models.py:170
 #: .\payroll\templates\payroll\contract\contract_export_filter.html:66
 #: .\payroll\templates\payroll\contract\contract_list.html:26
 #: .\payroll\templates\payroll\contract\contract_single_view.html:35
@@ -361,6 +374,7 @@ msgstr ""
 #: .\attendance\templates\attendance\penalty\form.html:74
 #: .\attendance\templates\attendance_form.html:52
 #: .\attendance\templates\requests\attendance\attendance_request_comment_form.html:51
+#: .\base\templates\base\action_type\action_type_form.html:18
 #: .\base\templates\base\audit_tag\audit_tag_form.html:29
 #: .\base\templates\base\employee_tag\employee_tag_form.html:29
 #: .\base\templates\base\tags\tags_form.html:29
@@ -537,6 +551,8 @@ msgstr ""
 #: .\attendance\templates\attendance\break_point\condition.html:123
 #: .\attendance\templates\attendance\break_point\condition.html:132
 #: .\attendance\templates\attendance\late_come_early_out\nav.html:159
+#: .\base\templates\announcement\announcement.html:224
+#: .\base\templates\announcement\announcement_one.html:52
 #: .\base\templates\base\rotating_shift\rotating_shift_assign_nav.html:153
 #: .\base\templates\base\rotating_work_type\rotating_work_type_assign_nav.html:153
 #: .\base\templates\base\shift\shift_view.html:139
@@ -565,8 +581,8 @@ msgstr ""
 #: .\helpdesk\templates\helpdesk\ticket\ticket_list.html:509
 #: .\helpdesk\templates\helpdesk\ticket\ticket_nav.html:76
 #: .\leave\templates\leave\company_leave\company_leave.html:48
-#: .\leave\templates\leave\holiday\holiday.html:92
-#: .\leave\templates\leave\holiday\holiday_view.html:115
+#: .\leave\templates\leave\holiday\holiday.html:93
+#: .\leave\templates\leave\holiday\holiday_view.html:116
 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_group_by.html:110
 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_group_by.html:289
 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_list.html:91
@@ -579,16 +595,16 @@ msgstr ""
 #: .\leave\templates\leave\leave_request\group_by.html:183
 #: .\leave\templates\leave\leave_request\leave_requests.html:203
 #: .\leave\templates\leave\leave_request\penalty\create.html:50
-#: .\leave\templates\leave\leave_request\request_view.html:232
+#: .\leave\templates\leave\leave_request\request_view.html:161
 #: .\leave\templates\leave\leave_type\leave_type_individual_view.html:146
 #: .\leave\templates\leave\leave_type\leave_types.html:54
 #: .\leave\templates\leave\user_leave\group_by.html:148
 #: .\leave\templates\leave\user_leave\user_request_view.html:206
 #: .\leave\templates\leave\user_leave\user_requests.html:158
-#: .\offboarding\templates\offboarding\pipeline\offboardings.html:39
+#: .\offboarding\templates\offboarding\pipeline\offboardings.html:52
 #: .\offboarding\templates\offboarding\stage\offboarding_body.html:48
-#: .\offboarding\templates\offboarding\stage\offboarding_body.html:74
-#: .\offboarding\templates\offboarding\task\table_body.html:48
+#: .\offboarding\templates\offboarding\stage\offboarding_body.html:76
+#: .\offboarding\templates\offboarding\task\table_body.html:101
 #: .\onboarding\templates\onboarding\candidates.html:77
 #: .\onboarding\templates\onboarding\kanban\kanban.html:170
 #: .\onboarding\templates\onboarding\onboarding_table.html:196
@@ -705,8 +721,8 @@ msgstr "Employee"
 #: .\attendance\templates\attendance\late_come_early_out\report_list.html:123
 #: .\attendance\templates\attendance\own_attendance\attendances.html:229
 #: .\attendance\templates\attendance\own_attendance\attendances.html:233
-#: .\attendance\templates\attendance\work_record\work_record_list.html:42
-#: .\attendance\templates\attendance\work_record\work_record_list.html:47
+#: .\attendance\templates\attendance\work_record\work_record_list.html:50
+#: .\attendance\templates\attendance\work_record\work_record_list.html:55
 #: .\attendance\templates\requests\attendance\group_by.html:188
 #: .\attendance\templates\requests\attendance\group_by.html:192
 #: .\attendance\templates\requests\attendance\group_by.html:251
@@ -719,6 +735,8 @@ msgstr "Employee"
 #: .\attendance\templates\requests\attendance\request_lines.html:159
 #: .\attendance\templates\requests\attendance\request_lines.html:315
 #: .\attendance\templates\requests\attendance\request_lines.html:320
+#: .\base\templates\announcement\announcement.html:306
+#: .\base\templates\announcement\announcement.html:310
 #: .\base\templates\base\auth\group_assign_view.html:87
 #: .\base\templates\base\auth\group_assign_view.html:91
 #: .\base\templates\base\auth\permission_view.html:62
@@ -739,6 +757,8 @@ msgstr "Employee"
 #: .\base\templates\work_type_request\htmx\group_by.html:180
 #: .\base\templates\work_type_request\htmx\requests.html:161
 #: .\base\templates\work_type_request\htmx\requests.html:165
+#: .\employee\templates\disciplinary_actions\disciplinary_records.html:97
+#: .\employee\templates\disciplinary_actions\disciplinary_records.html:101
 #: .\employee\templates\employee_personal_info\employee_card.html:104
 #: .\employee\templates\employee_personal_info\employee_card.html:109
 #: .\employee\templates\employee_personal_info\employee_list.html:262
@@ -761,8 +781,8 @@ msgstr "Employee"
 #: .\helpdesk\templates\helpdesk\ticket\ticket_list.html:532
 #: .\leave\templates\leave\company_leave\company_leave.html:62
 #: .\leave\templates\leave\company_leave\company_leave.html:66
-#: .\leave\templates\leave\holiday\holiday.html:107
-#: .\leave\templates\leave\holiday\holiday.html:111
+#: .\leave\templates\leave\holiday\holiday.html:108
+#: .\leave\templates\leave\holiday\holiday.html:112
 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_group_by.html:130
 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_group_by.html:134
 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_group_by.html:343
@@ -785,6 +805,8 @@ msgstr "Employee"
 #: .\leave\templates\leave\user_leave\group_by.html:182
 #: .\leave\templates\leave\user_leave\user_requests.html:184
 #: .\leave\templates\leave\user_leave\user_requests.html:188
+#: .\offboarding\templates\offboarding\resignation\request_cards.html:103
+#: .\offboarding\templates\offboarding\resignation\request_cards.html:108
 #: .\onboarding\templates\onboarding\candidates.html:89
 #: .\onboarding\templates\onboarding\candidates.html:93
 #: .\onboarding\templates\onboarding\kanban\kanban.html:266
@@ -891,8 +913,8 @@ msgstr ""
 #: .\attendance\templates\attendance\late_come_early_out\report_list.html:133
 #: .\attendance\templates\attendance\own_attendance\attendances.html:229
 #: .\attendance\templates\attendance\own_attendance\attendances.html:244
-#: .\attendance\templates\attendance\work_record\work_record_list.html:42
-#: .\attendance\templates\attendance\work_record\work_record_list.html:58
+#: .\attendance\templates\attendance\work_record\work_record_list.html:50
+#: .\attendance\templates\attendance\work_record\work_record_list.html:66
 #: .\attendance\templates\requests\attendance\group_by.html:188
 #: .\attendance\templates\requests\attendance\group_by.html:203
 #: .\attendance\templates\requests\attendance\group_by.html:251
@@ -905,6 +927,8 @@ msgstr ""
 #: .\attendance\templates\requests\attendance\request_lines.html:169
 #: .\attendance\templates\requests\attendance\request_lines.html:315
 #: .\attendance\templates\requests\attendance\request_lines.html:330
+#: .\base\templates\announcement\announcement.html:306
+#: .\base\templates\announcement\announcement.html:319
 #: .\base\templates\base\auth\group_assign_view.html:87
 #: .\base\templates\base\auth\group_assign_view.html:101
 #: .\base\templates\base\auth\permission_view.html:62
@@ -925,6 +949,8 @@ msgstr ""
 #: .\base\templates\work_type_request\htmx\group_by.html:183
 #: .\base\templates\work_type_request\htmx\requests.html:161
 #: .\base\templates\work_type_request\htmx\requests.html:168
+#: .\employee\templates\disciplinary_actions\disciplinary_records.html:97
+#: .\employee\templates\disciplinary_actions\disciplinary_records.html:112
 #: .\employee\templates\employee_personal_info\employee_card.html:104
 #: .\employee\templates\employee_personal_info\employee_card.html:119
 #: .\employee\templates\employee_personal_info\employee_list.html:262
@@ -947,8 +973,8 @@ msgstr ""
 #: .\helpdesk\templates\helpdesk\ticket\ticket_list.html:543
 #: .\leave\templates\leave\company_leave\company_leave.html:62
 #: .\leave\templates\leave\company_leave\company_leave.html:69
-#: .\leave\templates\leave\holiday\holiday.html:107
-#: .\leave\templates\leave\holiday\holiday.html:122
+#: .\leave\templates\leave\holiday\holiday.html:108
+#: .\leave\templates\leave\holiday\holiday.html:123
 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_group_by.html:130
 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_group_by.html:137
 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_group_by.html:343
@@ -971,6 +997,8 @@ msgstr ""
 #: .\leave\templates\leave\user_leave\group_by.html:185
 #: .\leave\templates\leave\user_leave\user_requests.html:184
 #: .\leave\templates\leave\user_leave\user_requests.html:191
+#: .\offboarding\templates\offboarding\resignation\request_cards.html:104
+#: .\offboarding\templates\offboarding\resignation\request_cards.html:112
 #: .\onboarding\templates\onboarding\candidates.html:89
 #: .\onboarding\templates\onboarding\candidates.html:96
 #: .\onboarding\templates\onboarding\kanban\kanban.html:266
@@ -1061,13 +1089,14 @@ msgstr ""
 #: .\attendance\templates\attendance\late_come_early_out\group_by.html:205
 #: .\attendance\templates\attendance\late_come_early_out\report_list.html:138
 #: .\attendance\templates\attendance\own_attendance\attendances.html:254
-#: .\attendance\templates\attendance\work_record\work_record_list.html:68
+#: .\attendance\templates\attendance\work_record\work_record_list.html:76
 #: .\attendance\templates\requests\attendance\group_by.html:213
 #: .\attendance\templates\requests\attendance\group_by.html:276
 #: .\attendance\templates\requests\attendance\group_by.html:478
 #: .\attendance\templates\requests\attendance\group_by.html:541
 #: .\attendance\templates\requests\attendance\request_lines.html:174
 #: .\attendance\templates\requests\attendance\request_lines.html:335
+#: .\base\templates\announcement\announcement.html:328
 #: .\base\templates\base\auth\group_assign_view.html:111
 #: .\base\templates\base\auth\permission_view.html:75
 #: .\base\templates\base\rotating_shift\htmx\group_by.html:212
@@ -1078,6 +1107,7 @@ msgstr ""
 #: .\base\templates\shift_request\htmx\requests.html:168
 #: .\base\templates\work_type_request\htmx\group_by.html:189
 #: .\base\templates\work_type_request\htmx\requests.html:174
+#: .\employee\templates\disciplinary_actions\disciplinary_records.html:122
 #: .\employee\templates\employee_personal_info\employee_card.html:124
 #: .\employee\templates\employee_personal_info\employee_list.html:287
 #: .\employee\templates\employee_personal_info\group_by.html:271
@@ -1089,7 +1119,7 @@ msgstr ""
 #: .\helpdesk\templates\helpdesk\ticket\ticket_list.html:359
 #: .\helpdesk\templates\helpdesk\ticket\ticket_list.html:553
 #: .\leave\templates\leave\company_leave\company_leave.html:75
-#: .\leave\templates\leave\holiday\holiday.html:132
+#: .\leave\templates\leave\holiday\holiday.html:133
 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_group_by.html:143
 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_group_by.html:357
 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_list.html:123
@@ -1101,6 +1131,7 @@ msgstr ""
 #: .\leave\templates\leave\leave_type\leave_types.html:80
 #: .\leave\templates\leave\user_leave\group_by.html:191
 #: .\leave\templates\leave\user_leave\user_requests.html:197
+#: .\offboarding\templates\offboarding\resignation\request_cards.html:119
 #: .\onboarding\templates\onboarding\kanban\kanban.html:289
 #: .\onboarding\templates\onboarding\onboarding_view.html:235
 #: .\payroll\templates\payroll\allowance\card_allowance.html:78
@@ -1162,13 +1193,14 @@ msgstr ""
 #: .\attendance\templates\attendance\late_come_early_out\group_by.html:208
 #: .\attendance\templates\attendance\late_come_early_out\report_list.html:141
 #: .\attendance\templates\attendance\own_attendance\attendances.html:262
-#: .\attendance\templates\attendance\work_record\work_record_list.html:76
+#: .\attendance\templates\attendance\work_record\work_record_list.html:84
 #: .\attendance\templates\requests\attendance\group_by.html:221
 #: .\attendance\templates\requests\attendance\group_by.html:284
 #: .\attendance\templates\requests\attendance\group_by.html:486
 #: .\attendance\templates\requests\attendance\group_by.html:549
 #: .\attendance\templates\requests\attendance\request_lines.html:177
 #: .\attendance\templates\requests\attendance\request_lines.html:338
+#: .\base\templates\announcement\announcement.html:335
 #: .\base\templates\base\auth\group_assign_view.html:119
 #: .\base\templates\base\auth\permission_view.html:80
 #: .\base\templates\base\rotating_shift\htmx\group_by.html:220
@@ -1179,6 +1211,7 @@ msgstr ""
 #: .\base\templates\shift_request\htmx\requests.html:173
 #: .\base\templates\work_type_request\htmx\group_by.html:194
 #: .\base\templates\work_type_request\htmx\requests.html:179
+#: .\employee\templates\disciplinary_actions\disciplinary_records.html:130
 #: .\employee\templates\employee_personal_info\employee_card.html:127
 #: .\employee\templates\employee_personal_info\employee_list.html:295
 #: .\employee\templates\employee_personal_info\group_by.html:280
@@ -1191,7 +1224,7 @@ msgstr ""
 #: .\helpdesk\templates\helpdesk\ticket\ticket_list.html:561
 #: .\leave\templates\leave\company_leave\company_leave.html:80
 #: .\leave\templates\leave\dashboard.html:78
-#: .\leave\templates\leave\holiday\holiday.html:140
+#: .\leave\templates\leave\holiday\holiday.html:141
 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_group_by.html:148
 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_group_by.html:362
 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_list.html:128
@@ -1203,6 +1236,7 @@ msgstr ""
 #: .\leave\templates\leave\leave_type\leave_types.html:85
 #: .\leave\templates\leave\user_leave\group_by.html:197
 #: .\leave\templates\leave\user_leave\user_requests.html:202
+#: .\offboarding\templates\offboarding\resignation\request_cards.html:124
 #: .\onboarding\templates\onboarding\candidates.html:107
 #: .\onboarding\templates\onboarding\kanban\kanban.html:292
 #: .\onboarding\templates\onboarding\onboarding_view.html:238
@@ -1265,13 +1299,14 @@ msgstr ""
 #: .\attendance\templates\attendance\late_come_early_out\group_by.html:213
 #: .\attendance\templates\attendance\late_come_early_out\report_list.html:146
 #: .\attendance\templates\attendance\own_attendance\attendances.html:271
-#: .\attendance\templates\attendance\work_record\work_record_list.html:85
+#: .\attendance\templates\attendance\work_record\work_record_list.html:93
 #: .\attendance\templates\requests\attendance\group_by.html:230
 #: .\attendance\templates\requests\attendance\group_by.html:293
 #: .\attendance\templates\requests\attendance\group_by.html:495
 #: .\attendance\templates\requests\attendance\group_by.html:559
 #: .\attendance\templates\requests\attendance\request_lines.html:182
 #: .\attendance\templates\requests\attendance\request_lines.html:343
+#: .\base\templates\announcement\announcement.html:343
 #: .\base\templates\base\auth\group_assign_view.html:128
 #: .\base\templates\base\auth\permission_view.html:87
 #: .\base\templates\base\rotating_shift\htmx\group_by.html:228
@@ -1282,6 +1317,7 @@ msgstr ""
 #: .\base\templates\shift_request\htmx\requests.html:180
 #: .\base\templates\work_type_request\htmx\group_by.html:201
 #: .\base\templates\work_type_request\htmx\requests.html:186
+#: .\employee\templates\disciplinary_actions\disciplinary_records.html:139
 #: .\employee\templates\employee_personal_info\employee_card.html:132
 #: .\employee\templates\employee_personal_info\employee_list.html:304
 #: .\employee\templates\employee_personal_info\group_by.html:290
@@ -1293,7 +1329,7 @@ msgstr ""
 #: .\helpdesk\templates\helpdesk\ticket\ticket_list.html:376
 #: .\helpdesk\templates\helpdesk\ticket\ticket_list.html:570
 #: .\leave\templates\leave\company_leave\company_leave.html:87
-#: .\leave\templates\leave\holiday\holiday.html:150
+#: .\leave\templates\leave\holiday\holiday.html:151
 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_group_by.html:155
 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_group_by.html:369
 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_list.html:135
@@ -1305,6 +1341,7 @@ msgstr ""
 #: .\leave\templates\leave\leave_type\leave_types.html:92
 #: .\leave\templates\leave\user_leave\group_by.html:205
 #: .\leave\templates\leave\user_leave\user_requests.html:209
+#: .\offboarding\templates\offboarding\resignation\request_cards.html:131
 #: .\onboarding\templates\onboarding\candidates.html:112
 #: .\onboarding\templates\onboarding\kanban\kanban.html:297
 #: .\onboarding\templates\onboarding\onboarding_view.html:243
@@ -1367,13 +1404,14 @@ msgstr ""
 #: .\attendance\templates\attendance\late_come_early_out\group_by.html:216
 #: .\attendance\templates\attendance\late_come_early_out\report_list.html:149
 #: .\attendance\templates\attendance\own_attendance\attendances.html:279
-#: .\attendance\templates\attendance\work_record\work_record_list.html:93
+#: .\attendance\templates\attendance\work_record\work_record_list.html:101
 #: .\attendance\templates\requests\attendance\group_by.html:238
 #: .\attendance\templates\requests\attendance\group_by.html:301
 #: .\attendance\templates\requests\attendance\group_by.html:503
 #: .\attendance\templates\requests\attendance\group_by.html:567
 #: .\attendance\templates\requests\attendance\request_lines.html:185
 #: .\attendance\templates\requests\attendance\request_lines.html:346
+#: .\base\templates\announcement\announcement.html:350
 #: .\base\templates\base\auth\group_assign_view.html:136
 #: .\base\templates\base\auth\permission_view.html:92
 #: .\base\templates\base\rotating_shift\htmx\group_by.html:236
@@ -1384,6 +1422,7 @@ msgstr ""
 #: .\base\templates\shift_request\htmx\requests.html:185
 #: .\base\templates\work_type_request\htmx\group_by.html:206
 #: .\base\templates\work_type_request\htmx\requests.html:191
+#: .\employee\templates\disciplinary_actions\disciplinary_records.html:147
 #: .\employee\templates\employee_personal_info\employee_card.html:135
 #: .\employee\templates\employee_personal_info\employee_list.html:312
 #: .\employee\templates\employee_personal_info\group_by.html:299
@@ -1395,7 +1434,7 @@ msgstr ""
 #: .\helpdesk\templates\helpdesk\ticket\ticket_list.html:384
 #: .\helpdesk\templates\helpdesk\ticket\ticket_list.html:578
 #: .\leave\templates\leave\company_leave\company_leave.html:92
-#: .\leave\templates\leave\holiday\holiday.html:158
+#: .\leave\templates\leave\holiday\holiday.html:159
 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_group_by.html:160
 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_group_by.html:374
 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_list.html:140
@@ -1407,6 +1446,7 @@ msgstr ""
 #: .\leave\templates\leave\leave_type\leave_types.html:97
 #: .\leave\templates\leave\user_leave\group_by.html:211
 #: .\leave\templates\leave\user_leave\user_requests.html:214
+#: .\offboarding\templates\offboarding\resignation\request_cards.html:136
 #: .\onboarding\templates\onboarding\candidates.html:117
 #: .\onboarding\templates\onboarding\kanban\kanban.html:300
 #: .\onboarding\templates\onboarding\onboarding_view.html:246
@@ -1539,16 +1579,16 @@ msgstr ""
 #: .\onboarding\templates\onboarding\dashboard.html:18
 #: .\payroll\templates\payroll\dashboard.html:19
 #: .\pms\templates\dashboard\pms_dashboard.html:24
-#: .\templates\dashboard.html:75
+#: .\templates\dashboard.html:82
 msgid "Back"
 msgstr ""
 
 #: .\asset\templates\asset\dashboard.html:33
-#: .\employee\templates\employee\profile\profile_view.html:247
-#: .\employee\templates\employee\profile\profile_view.html:256
+#: .\employee\templates\employee\profile\profile_view.html:255
+#: .\employee\templates\employee\profile\profile_view.html:264
 #: .\employee\templates\employee\view\individual.html:297
 #: .\employee\templates\employee\view\individual.html:305
-#: .\templates\sidebar.html:801
+#: .\templates\sidebar.html:825
 msgid "Assets"
 msgstr ""
 
@@ -1649,6 +1689,8 @@ msgstr ""
 #: .\attendance\templates\attendance\attendance_account\overtime_empty.html:48
 #: .\attendance\templates\attendance\break_point\condition.html:10
 #: .\attendance\templates\attendance\break_point\condition.html:64
+#: .\base\templates\announcement\announcement.html:183
+#: .\base\templates\base\action_type\action_type.html:17
 #: .\base\templates\base\auth\group_accordion.html:29
 #: .\base\templates\base\company\company.html:17
 #: .\base\templates\base\department\department.html:17
@@ -1672,19 +1714,21 @@ msgstr ""
 #: .\employee\templates\employee_nav.html:412
 #: .\employee\templates\policies\nav.html:18
 #: .\employee\templates\tabs\document_tab.html:16
+#: .\employee\templates\tabs\resignation.html:13
 #: .\helpdesk\templates\department_managers\department_managers.html:17
 #: .\helpdesk\templates\helpdesk\faq\faq_category_nav.html:71
 #: .\helpdesk\templates\helpdesk\faq\faq_nav.html:97
 #: .\helpdesk\templates\helpdesk\ticket\ticket_nav.html:101
 #: .\leave\templates\leave\company_leave\company_leave_view.html:67
-#: .\leave\templates\leave\holiday\holiday_view.html:137
+#: .\leave\templates\leave\holiday\holiday_view.html:140
 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_view.html:217
-#: .\leave\templates\leave\leave_request\request_view.html:251
+#: .\leave\templates\leave\leave_request\request_view.html:181
 #: .\leave\templates\leave\leave_type\leave_type_creation.html:185
 #: .\leave\templates\leave\leave_type\leave_type_empty_view.html:32
 #: .\leave\templates\leave\leave_type\leave_type_view.html:84
-#: .\leave\templates\leave\user_leave\user_request_view.html:228
+#: .\leave\templates\leave\user_leave\user_request_view.html:229
 #: .\offboarding\templates\offboarding\pipeline\nav.html:18
+#: .\offboarding\templates\offboarding\resignation\nav.html:20
 #: .\onboarding\templates\onboarding\candidate_creation.html:82
 #: .\onboarding\templates\onboarding\candidates_view.html:53
 #: .\onboarding\templates\onboarding\stage_form.html:33
@@ -1762,7 +1806,7 @@ msgstr ""
 #: .\helpdesk\templates\helpdesk\faq\faq_nav.html:28
 #: .\helpdesk\templates\helpdesk\ticket\ticket_filter.html:23
 #: .\leave\templates\leave\company_leave\company_leave_view.html:19
-#: .\leave\templates\leave\holiday\holiday_view.html:51
+#: .\leave\templates\leave\holiday\holiday_view.html:52
 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_view.html:71
 #: .\leave\templates\leave\leave_assign\assign_view.html:141
 #: .\leave\templates\leave\leave_request\request_view.html:57
@@ -1798,6 +1842,9 @@ msgstr ""
 #: .\attendance\templates\attendance\late_come_early_out\nav.html:133
 #: .\attendance\templates\requests\attendance\group_by.html:63
 #: .\attendance\templates\requests\attendance\request_lines.html:43
+#: .\base\templates\announcement\announcement.html:205
+#: .\base\templates\announcement\announcement_one.html:23
+#: .\base\templates\base\action_type\action_type_view.html:6
 #: .\base\templates\base\audit_tag\audit_tag_view.html:9
 #: .\base\templates\base\auth\permission_table.html:22
 #: .\base\templates\base\employee_tag\employee_tag_view.html:9
@@ -1834,8 +1881,8 @@ msgstr ""
 #: .\helpdesk\templates\helpdesk\ticket\ticket_list.html:440
 #: .\helpdesk\templates\helpdesk\ticket\ticket_nav.html:32
 #: .\leave\templates\leave\company_leave\company_leave.html:10
-#: .\leave\templates\leave\holiday\holiday.html:45
-#: .\leave\templates\leave\holiday\holiday_view.html:80
+#: .\leave\templates\leave\holiday\holiday.html:46
+#: .\leave\templates\leave\holiday\holiday_view.html:81
 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_group_by.html:39
 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_group_by.html:217
 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_list.html:20
@@ -1846,7 +1893,7 @@ msgstr ""
 #: .\leave\templates\leave\leave_request\group_by.html:64
 #: .\leave\templates\leave\leave_request\leave_requests.html:82
 #: .\leave\templates\leave\leave_request\penalty\create.html:15
-#: .\leave\templates\leave\leave_request\request_view.html:209
+#: .\leave\templates\leave\leave_request\request_view.html:138
 #: .\leave\templates\leave\leave_type\leave_types.html:36
 #: .\leave\templates\leave\user_leave\group_by.html:69
 #: .\leave\templates\leave\user_leave\user_request_view.html:193
@@ -1929,7 +1976,7 @@ msgstr ""
 #: .\attendance\templates\attendance\attendance\attendance_empty.html:119
 #: .\attendance\templates\attendance\attendance\attendance_nav.html:316
 #: .\employee\templates\employee_nav.html:353
-#: .\leave\templates\leave\holiday\holiday_view.html:95
+#: .\leave\templates\leave\holiday\holiday_view.html:96
 #: .\leave\templates\leave\leave_assign\assign_view.html:220
 msgid "Import"
 msgstr ""
@@ -1939,7 +1986,7 @@ msgstr ""
 #: .\attendance\templates\attendance\attendance\attendance_empty.html:67
 #: .\attendance\templates\attendance\attendance\attendance_nav.html:112
 #: .\employee\templates\employee_nav.html:80
-#: .\leave\templates\leave\holiday\holiday_view.html:275
+#: .\leave\templates\leave\holiday\holiday_view.html:256
 #: .\leave\templates\leave\leave_assign\assign_view.html:45
 msgid "Upload a File"
 msgstr ""
@@ -1949,7 +1996,7 @@ msgstr ""
 #: .\attendance\templates\attendance\attendance\attendance_empty.html:70
 #: .\attendance\templates\attendance\attendance\attendance_nav.html:115
 #: .\employee\templates\employee_nav.html:83
-#: .\leave\templates\leave\holiday\holiday_view.html:278
+#: .\leave\templates\leave\holiday\holiday_view.html:259
 #: .\leave\templates\leave\leave_assign\assign_view.html:48
 msgid "Drag and drop files here"
 msgstr ""
@@ -1959,7 +2006,7 @@ msgstr ""
 #: .\attendance\templates\attendance\attendance\attendance_empty.html:79
 #: .\attendance\templates\attendance\attendance\attendance_nav.html:124
 #: .\employee\templates\employee_nav.html:93
-#: .\leave\templates\leave\holiday\holiday_view.html:287
+#: .\leave\templates\leave\holiday\holiday_view.html:268
 #: .\leave\templates\leave\leave_assign\assign_view.html:57
 msgid "Upload"
 msgstr ""
@@ -1985,12 +2032,12 @@ msgstr ""
 #: .\employee\templates\documents\document_nav.html:194
 #: .\employee\templates\employee_nav.html:126
 #: .\employee\templates\employee_nav.html:365
-#: .\leave\templates\leave\holiday\holiday_view.html:106
-#: .\leave\templates\leave\holiday\holiday_view.html:326
+#: .\leave\templates\leave\holiday\holiday_view.html:107
+#: .\leave\templates\leave\holiday\holiday_view.html:307
 #: .\leave\templates\leave\leave_assign\assign_view.html:94
 #: .\leave\templates\leave\leave_assign\assign_view.html:231
-#: .\leave\templates\leave\leave_request\request_view.html:223
-#: .\leave\templates\leave\leave_request\request_view.html:412
+#: .\leave\templates\leave\leave_request\request_view.html:152
+#: .\leave\templates\leave\leave_request\request_view.html:343
 #: .\payroll\templates\payroll\contract\contract_view.html:30
 #: .\payroll\templates\payroll\contract\contract_view.html:169
 #: .\payroll\templates\payroll\dashboard.html:92
@@ -2032,6 +2079,8 @@ msgstr ""
 #: .\base\templates\shift_request\shift_request_nav.html:211
 #: .\base\templates\work_type_request\work_type_request_nav.html:50
 #: .\base\templates\work_type_request\work_type_request_nav.html:165
+#: .\employee\templates\disciplinary_actions\disciplinary_nav.html:30
+#: .\employee\templates\disciplinary_actions\disciplinary_nav.html:114
 #: .\employee\templates\documents\document_nav.html:58
 #: .\employee\templates\documents\document_nav.html:165
 #: .\employee\templates\employee_nav.html:266
@@ -2043,19 +2092,21 @@ msgstr ""
 #: .\leave\templates\leave\company_leave\company_leave_view.html:25
 #: .\leave\templates\leave\company_leave\company_leave_view.html:54
 #: .\leave\templates\leave\holiday\holiday_filter.html:41
-#: .\leave\templates\leave\holiday\holiday_view.html:65
+#: .\leave\templates\leave\holiday\holiday_view.html:66
 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_view.html:82
 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_view.html:151
 #: .\leave\templates\leave\leave_assign\assign_view.html:149
 #: .\leave\templates\leave\leave_assign\assigned_leaves_filter.html:121
+#: .\leave\templates\leave\leave_request\filter_leave_requests.html:119
 #: .\leave\templates\leave\leave_request\request_view.html:77
-#: .\leave\templates\leave\leave_request\request_view.html:156
 #: .\leave\templates\leave\leave_type\leave_type_view.html:58
 #: .\leave\templates\leave\leave_type\leave_type_view.html:73
 #: .\leave\templates\leave\user_leave\user_leave_view.html:22
 #: .\leave\templates\leave\user_leave\user_leave_view.html:46
 #: .\leave\templates\leave\user_leave\user_request_view.html:58
 #: .\leave\templates\leave\user_leave\user_request_view.html:137
+#: .\offboarding\templates\offboarding\resignation\filter.html:5
+#: .\offboarding\templates\offboarding\resignation\filter.html:50
 #: .\onboarding\templates\onboarding\candidate_filter.html:71
 #: .\onboarding\templates\onboarding\candidates_view.html:37
 #: .\onboarding\templates\onboarding\kanban\kanban.html:53
@@ -2102,7 +2153,7 @@ msgstr ""
 
 #: .\asset\templates\category\asset_category_view.html:292
 #: .\asset\templates\request_allocation\asset_request_allocation_view.html:357
-#: .\templates\dashboard.html:947
+#: .\templates\dashboard.html:1149
 msgid "Add Asset Report"
 msgstr ""
 
@@ -2198,6 +2249,7 @@ msgstr ""
 #: .\leave\templates\leave\leave_request\leave_requests.html:158
 #: .\leave\templates\leave\leave_request\one_request_view.html:119
 #: .\leave\templates\leave\leave_request\one_request_view.html:124
+#: .\offboarding\templates\offboarding\resignation\request_cards.html:79
 #: .\payroll\templates\payroll\reimbursement\request_cards.html:115
 msgid "Approve"
 msgstr ""
@@ -2230,6 +2282,7 @@ msgstr ""
 #: .\leave\templates\leave\leave_request\leave_requests.html:172
 #: .\leave\templates\leave\leave_request\one_request_view.html:132
 #: .\leave\templates\leave\leave_request\one_request_view.html:138
+#: .\offboarding\templates\offboarding\resignation\request_cards.html:72
 msgid "Reject"
 msgstr ""
 
@@ -2249,7 +2302,7 @@ msgstr ""
 #: .\asset\templates\request_allocation\asset_request_allocation_view.html:205
 #: .\asset\templates\request_allocation\asset_request_allocation_view.html:274
 #: .\asset\templates\request_allocation\asset_request_creation.html:2
-#: .\templates\dashboard.html:792
+#: .\templates\dashboard.html:855
 msgid "Asset Request"
 msgstr ""
 
@@ -2296,8 +2349,8 @@ msgstr ""
 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_view.html:173
 #: .\leave\templates\leave\leave_assign\assign_view.html:163
 #: .\leave\templates\leave\leave_assign\assign_view.html:173
-#: .\leave\templates\leave\leave_request\request_view.html:167
-#: .\leave\templates\leave\leave_request\request_view.html:177
+#: .\leave\templates\leave\leave_request\request_view.html:96
+#: .\leave\templates\leave\leave_request\request_view.html:106
 #: .\leave\templates\leave\user_leave\user_request_view.html:150
 #: .\leave\templates\leave\user_leave\user_request_view.html:159
 #: .\payroll\templates\payroll\contract\contract_view.html:109
@@ -2325,7 +2378,7 @@ msgstr ""
 #: .\helpdesk\templates\helpdesk\ticket\ticket_filter.html:157
 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_view.html:177
 #: .\leave\templates\leave\leave_assign\assign_view.html:177
-#: .\leave\templates\leave\leave_request\request_view.html:181
+#: .\leave\templates\leave\leave_request\request_view.html:110
 #: .\leave\templates\leave\user_leave\user_request_view.html:163
 #: .\payroll\templates\payroll\contract\contract_view.html:123
 #: .\pms\templates\okr\objective_list_view.html:203
@@ -2583,8 +2636,8 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: .\attendance\forms.py:75 .\base\forms.py:176 .\base\forms.py:220
-#: .\employee\forms.py:259 .\payroll\forms\tax_forms.py:39
+#: .\attendance\forms.py:75 .\base\forms.py:181 .\base\forms.py:225
+#: .\employee\forms.py:261 .\payroll\forms\tax_forms.py:39
 #: .\recruitment\forms.py:77 .\recruitment\forms.py:121
 #, python-brace-format
 msgid "---Choose {label}---"
@@ -2603,20 +2656,20 @@ msgstr ""
 #: .\base\templates\base\auth\group_assign_view.html:37
 #: .\base\templates\base\auth\permission_assign.html:3
 #: .\employee\templates\documents\document_request_create_form.html:24
-#: .\employee\templates\employee_nav.html:178 .\employee\views.py:2362
-#: .\employee\views.py:2385
+#: .\employee\templates\employee_nav.html:178 .\employee\views.py:2384
+#: .\employee\views.py:2407
 #: .\leave\templates\leave\leave_assign\assigned_leaves_export_filter.html:32
 #: .\leave\templates\leave\leave_assign\assigned_leaves_filter.html:15
 #: .\leave\templates\leave\leave_assign\leave_assign_one_form.html:14
 #: .\offboarding\templates\offboarding\stage\offboarding_body.html:9
-#: .\templates\sidebar.html:307
+#: .\templates\sidebar.html:306
 msgid "Employees"
 msgstr ""
 
-#: .\attendance\forms.py:315 .\base\forms.py:561 .\base\forms.py:982
-#: .\base\models.py:965 .\payroll\models\models.py:268
-#: .\payroll\models\models.py:957 .\payroll\models\models.py:968
-#: .\payroll\models\models.py:1226
+#: .\attendance\forms.py:315 .\base\forms.py:566 .\base\forms.py:987
+#: .\base\models.py:965 .\payroll\models\models.py:269
+#: .\payroll\models\models.py:976 .\payroll\models\models.py:987
+#: .\payroll\models\models.py:1245
 #: .\pms\templates\feedback\feedback_creation.html:45
 #: .\pms\templates\feedback\feedback_creation.html:57
 #: .\pms\templates\feedback\feedback_creation.html:120
@@ -2630,7 +2683,7 @@ msgstr ""
 msgid "Attendance for the date is already exist for %(emp)s"
 msgstr ""
 
-#: .\attendance\forms.py:345 .\base\forms.py:869
+#: .\attendance\forms.py:345 .\base\forms.py:874
 msgid "Employee not chosen"
 msgstr ""
 
@@ -2639,6 +2692,7 @@ msgstr ""
 #: .\attendance\templates\attendance\attendance_account\attendance_account_filter.html:52
 #: .\attendance\templates\attendance\attendance_account\group_by.html:33
 #: .\attendance\templates\attendance\attendance_account\overtime_list.html:28
+#: .\attendance\templates\attendance\work_record\work_record_view.html:63
 #: .\employee\templates\tabs\attendance-tab.html:165 .\leave\models.py:93
 msgid "Month"
 msgstr ""
@@ -2703,6 +2757,10 @@ msgstr ""
 #: .\base\templates\work_type_request\work_type_request_export.html:32
 #: .\base\templates\work_type_request\work_type_request_nav.html:66
 #: .\employee\models.py:363 .\employee\models.py:489
+#: .\employee\templates\disciplinary_actions\disciplinary_nav.html:46
+#: .\employee\templates\disciplinary_actions\disciplinary_records.html:14
+#: .\employee\templates\disciplinary_actions\form.html:8
+#: .\employee\templates\disciplinary_actions\update_form.html:21
 #: .\employee\templates\documents\document_nav.html:74
 #: .\employee\templates\employee_export_filter.html:27
 #: .\employee\templates\employee_filters.html:5
@@ -2728,10 +2786,11 @@ msgstr ""
 #: .\leave\templates\leave\leave_assign\group_by.html:29
 #: .\leave\templates\leave\leave_request\group_by.html:53
 #: .\leave\templates\leave\leave_request\leave_requests.html:71
+#: .\offboarding\templates\offboarding\resignation\filter.html:19
 #: .\offboarding\templates\offboarding\stage\offboarding_body.html:61
-#: .\payroll\forms\component_forms.py:311 .\payroll\models\models.py:137
-#: .\payroll\models\models.py:345 .\payroll\models\models.py:1265
-#: .\payroll\models\models.py:1369
+#: .\payroll\forms\component_forms.py:311 .\payroll\models\models.py:138
+#: .\payroll\models\models.py:346 .\payroll\models\models.py:1284
+#: .\payroll\models\models.py:1388
 #: .\payroll\templates\payroll\contract\contract_list.html:20
 #: .\payroll\templates\payroll\contract\contract_single_view.html:31
 #: .\payroll\templates\payroll\contract\group_by.html:36
@@ -2759,8 +2818,8 @@ msgstr ""
 #: .\pms\templates\okr\key_result\key_result_update.html:92
 #: .\pms\templates\okr\objective_creation.html:88
 #: .\pms\templates\okr\objective_list_view.html:86
-#: .\pms\templates\okr\objective_update.html:59 .\templates\dashboard.html:838
-#: .\templates\sidebar.html:328
+#: .\pms\templates\okr\objective_update.html:59 .\templates\dashboard.html:1040
+#: .\templates\sidebar.html:333
 msgid "Employee"
 msgstr ""
 
@@ -2822,7 +2881,7 @@ msgstr ""
 #: .\employee\templates\tabs\attendance-tab.html:168
 #: .\employee\templates\tabs\attendance-tab.html:244
 #: .\employee\templates\tabs\profile-attendance-tab.html:18
-#: .\payroll\models\models.py:685
+#: .\payroll\models\models.py:704
 msgid "Overtime"
 msgstr ""
 
@@ -2848,8 +2907,8 @@ msgstr ""
 msgid "Request description"
 msgstr ""
 
-#: .\attendance\models.py:62 .\base\forms.py:57 .\base\forms.py:63
-#: .\base\forms.py:65 .\base\models.py:23
+#: .\attendance\models.py:62 .\base\forms.py:62 .\base\forms.py:68
+#: .\base\forms.py:70 .\base\models.py:23
 msgid "Invalid format, it should be HH:MM format"
 msgstr ""
 
@@ -2981,7 +3040,7 @@ msgstr ""
 #: .\base\templates\shift_request\shift_request_view.html:29
 #: .\base\templates\work_type_request\work_type_request_view.html:27
 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_view.html:337
-#: .\leave\templates\leave\user_leave\user_request_view.html:285
+#: .\leave\templates\leave\user_leave\user_request_view.html:286
 msgid "Update Request"
 msgstr ""
 
@@ -3034,7 +3093,9 @@ msgstr ""
 #: .\base\templates\shift_request\shift_request_nav.html:89
 #: .\base\templates\work_type_request\work_type_request_export.html:40
 #: .\base\templates\work_type_request\work_type_request_nav.html:74
-#: .\employee\models.py:424 .\employee\templates\documents\document_nav.html:84
+#: .\employee\models.py:424
+#: .\employee\templates\disciplinary_actions\disciplinary_nav.html:82
+#: .\employee\templates\documents\document_nav.html:84
 #: .\employee\templates\employee_export_filter.html:75
 #: .\employee\templates\employee_filters.html:54
 #: .\employee\templates\employee_personal_info\employee_list.html:81
@@ -3042,8 +3103,10 @@ msgstr ""
 #: .\employee\templates\tabs\attendance-tab.html:56
 #: .\employee\templates\tabs\attendance-tab.html:240
 #: .\employee\templates\tabs\profile-attendance-tab.html:14
-#: .\payroll\models\models.py:201 .\payroll\models\models.py:684
-#: .\payroll\models\models.py:796
+#: .\leave\templates\leave\leave_request\filter_leave_requests.html:75
+#: .\leave\templates\leave\leave_request\leave_requests_export_filter.html:103
+#: .\payroll\models\models.py:202 .\payroll\models\models.py:703
+#: .\payroll\models\models.py:815
 #: .\payroll\templates\payroll\contract\contract_single_view.html:90
 msgid "Shift"
 msgstr ""
@@ -3086,6 +3149,7 @@ msgstr ""
 #: .\base\templates\work_type_request\work_type_request_export.html:62
 #: .\base\templates\work_type_request\work_type_request_nav.html:96
 #: .\employee\models.py:384
+#: .\employee\templates\disciplinary_actions\disciplinary_nav.html:99
 #: .\employee\templates\documents\document_nav.html:106
 #: .\employee\templates\employee\profile\work_info.html:27
 #: .\employee\templates\employee\update_form\work_details.html:104
@@ -3097,8 +3161,10 @@ msgstr ""
 #: .\employee\templates\tabs\attendance-tab.html:241
 #: .\employee\templates\tabs\personal-tab.html:235
 #: .\employee\templates\tabs\profile-attendance-tab.html:15
-#: .\payroll\models\models.py:209 .\payroll\models\models.py:686
-#: .\payroll\models\models.py:820
+#: .\leave\templates\leave\leave_request\filter_leave_requests.html:81
+#: .\leave\templates\leave\leave_request\leave_requests_export_filter.html:109
+#: .\payroll\models\models.py:210 .\payroll\models\models.py:705
+#: .\payroll\models\models.py:839
 #: .\payroll\templates\payroll\contract\contract_single_view.html:96
 #: .\templates\settings.html:82
 msgid "Work Type"
@@ -3130,11 +3196,11 @@ msgstr ""
 #: .\attendance\templates\requests\attendance\group_by.html:342
 #: .\attendance\templates\requests\attendance\request_lines.html:33
 #: .\attendance\templates\requests\attendance\request_lines.html:200
-#: .\attendance\views\clock_in_out.py:365
+#: .\attendance\views\clock_in_out.py:378
 #: .\employee\templates\tabs\attendance-tab.html:52
 #: .\employee\templates\tabs\attendance-tab.html:236
 #: .\employee\templates\tabs\profile-attendance-tab.html:10
-#: .\templates\index.html:444
+#: .\templates\index.html:446
 msgid "Check-In"
 msgstr ""
 
@@ -3164,11 +3230,11 @@ msgstr ""
 #: .\attendance\templates\requests\attendance\group_by.html:348
 #: .\attendance\templates\requests\attendance\request_lines.html:35
 #: .\attendance\templates\requests\attendance\request_lines.html:202
-#: .\attendance\views\clock_in_out.py:210
+#: .\attendance\views\clock_in_out.py:223
 #: .\employee\templates\tabs\attendance-tab.html:54
 #: .\employee\templates\tabs\attendance-tab.html:238
 #: .\employee\templates\tabs\profile-attendance-tab.html:12
-#: .\templates\index.html:436
+#: .\templates\index.html:438
 msgid "Check-Out"
 msgstr ""
 
@@ -3180,7 +3246,7 @@ msgstr ""
 msgid "Minimum hour"
 msgstr ""
 
-#: .\attendance\models.py:235 .\attendance\views\views.py:1225
+#: .\attendance\models.py:235 .\attendance\views\views.py:1226
 msgid "Overtime approved"
 msgstr ""
 
@@ -3204,7 +3270,9 @@ msgstr ""
 #: .\attendance\templates\requests\attendance\comment_view.html:27
 #: .\attendance\templates\requests\attendance\group_by.html:60
 #: .\attendance\templates\requests\attendance\request_lines.html:42
-#: .\base\models.py:749 .\base\models.py:885
+#: .\base\models.py:749 .\base\models.py:885 .\base\models.py:1207
+#: .\base\templates\announcement\comment_form.html:25
+#: .\base\templates\announcement\comment_view.html:21
 #: .\base\templates\shift_request\htmx\comment_view.html:21
 #: .\base\templates\shift_request\htmx\group_by.html:68
 #: .\base\templates\shift_request\htmx\requests.html:50
@@ -3222,15 +3290,15 @@ msgstr ""
 #: .\leave\templates\leave\leave_request\leave_requests.html:78
 #: .\leave\templates\leave\user_leave\group_by.html:67
 #: .\leave\templates\leave\user_leave\user_requests.html:73
-#: .\payroll\models\models.py:1668
+#: .\payroll\models\models.py:1687
 #: .\payroll\templates\payroll\reimbursement\comment_view.html:21
 #: .\pms\templates\okr\objective_detailed_view.html:262
 msgid "Comment"
 msgstr ""
 
 #: .\attendance\models.py:585 .\base\models.py:752 .\base\models.py:888
-#: .\employee\models.py:544 .\leave\models.py:655 .\leave\models.py:737
-#: .\payroll\models\models.py:1671
+#: .\base\models.py:1210 .\employee\models.py:544 .\leave\models.py:655
+#: .\leave\models.py:737 .\payroll\models\models.py:1690
 msgid "Created At"
 msgstr ""
 
@@ -3271,11 +3339,11 @@ msgstr ""
 #: .\attendance\templates\attendance\attendance\export_filter.html:70
 #: .\attendance\templates\attendance\own_attendance\filters.html:20
 #: .\attendance\templates\requests\attendance\filter.html:51
-#: .\employee\templates\employee\profile\profile_view.html:196
-#: .\employee\templates\employee\profile\profile_view.html:205
+#: .\employee\templates\employee\profile\profile_view.html:204
+#: .\employee\templates\employee\profile\profile_view.html:213
 #: .\employee\templates\employee\view\individual.html:227
 #: .\employee\templates\employee\view\individual.html:235
-#: .\payroll\models\models.py:683 .\templates\sidebar.html:515
+#: .\payroll\models\models.py:702 .\templates\sidebar.html:530
 msgid "Attendance"
 msgstr ""
 
@@ -3284,6 +3352,7 @@ msgstr ""
 #: .\attendance\templates\attendance\late_come_early_out\group_by.html:34
 #: .\attendance\templates\attendance\late_come_early_out\late_come_early_out_filters.html:57
 #: .\attendance\templates\attendance\late_come_early_out\report_list.html:26
+#: .\base\templates\base\action_type\action_type_view.html:7
 #: .\base\templates\base\ticket_type\ticket_type_view.html:7
 #: .\helpdesk\templates\helpdesk\ticket\ticket_group.html:45
 #: .\helpdesk\templates\helpdesk\ticket\ticket_group.html:266
@@ -3346,7 +3415,7 @@ msgstr ""
 #: .\attendance\templates\attendance\attendance\attendance_empty.html:57
 #: .\attendance\templates\attendance\attendance\attendance_nav.html:102
 #: .\employee\templates\employee_nav.html:64
-#: .\leave\templates\leave\holiday\holiday_view.html:265
+#: .\leave\templates\leave\holiday\holiday_view.html:246
 #: .\leave\templates\leave\leave_assign\assign_view.html:35
 msgid "Uploading..."
 msgstr ""
@@ -3354,7 +3423,7 @@ msgstr ""
 #: .\attendance\templates\attendance\attendance\attendance_empty.html:91
 #: .\attendance\templates\attendance\attendance\attendance_nav.html:173
 #: .\attendance\templates\requests\attendance\view-requests.html:40
-#: .\templates\sidebar.html:491
+#: .\templates\sidebar.html:506
 msgid "Attendances"
 msgstr ""
 
@@ -3389,6 +3458,8 @@ msgstr ""
 #: .\employee\templates\employee_export_filter.html:62
 #: .\employee\templates\employee_filters.html:41
 #: .\employee\templates\employee_personal_info\employee_work_info.html:7
+#: .\leave\templates\leave\leave_request\filter_leave_requests.html:45
+#: .\leave\templates\leave\leave_request\leave_requests_export_filter.html:73
 msgid "Work Info"
 msgstr ""
 
@@ -3402,6 +3473,7 @@ msgstr ""
 #: .\attendance\templates\attendance\late_come_early_out\late_come_early_out_filters.html:14
 #: .\attendance\templates\requests\attendance\filter.html:15
 #: .\base\models.py:79 .\base\models.py:117
+#: .\base\templates\announcement\announcement.html:239
 #: .\base\templates\base\department\department.html:7
 #: .\base\templates\base\department\department_form.html:26
 #: .\base\templates\base\department\department_view.html:6
@@ -3415,7 +3487,9 @@ msgstr ""
 #: .\base\templates\shift_request\shift_request_nav.html:108
 #: .\base\templates\work_type_request\work_type_request_export.html:54
 #: .\base\templates\work_type_request\work_type_request_nav.html:88
-#: .\employee\models.py:377 .\employee\templates\documents\document_nav.html:98
+#: .\employee\models.py:377
+#: .\employee\templates\disciplinary_actions\disciplinary_nav.html:77
+#: .\employee\templates\documents\document_nav.html:98
 #: .\employee\templates\employee\profile\work_info.html:13
 #: .\employee\templates\employee\update_form\work_details.html:90
 #: .\employee\templates\employee_export_filter.html:71
@@ -3423,8 +3497,11 @@ msgstr ""
 #: .\employee\templates\employee_personal_info\employee_list.html:80
 #: .\employee\templates\employee_personal_info\group_by.html:64
 #: .\employee\templates\tabs\personal-tab.html:164
+#: .\leave\templates\leave\leave_request\filter_leave_requests.html:63
+#: .\leave\templates\leave\leave_request\leave_requests_export_filter.html:91
 #: .\leave\templates\leave\leave_request\penalty\create.html:9
-#: .\payroll\models\models.py:177
+#: .\offboarding\templates\offboarding\resignation\filter.html:33
+#: .\payroll\models\models.py:178
 #: .\payroll\templates\payroll\contract\contract_single_view.html:76
 #: .\payroll\templates\payroll\loan\filter.html:37
 #: .\payroll\templates\payroll\payslip\individual_payslip.html:80
@@ -3458,6 +3535,7 @@ msgstr ""
 #: .\base\templates\work_type_request\work_type_request_export.html:66
 #: .\base\templates\work_type_request\work_type_request_nav.html:100
 #: .\base\translator.py:103 .\employee\models.py:406
+#: .\employee\templates\disciplinary_actions\disciplinary_nav.html:90
 #: .\employee\templates\documents\document_nav.html:111
 #: .\employee\templates\employee\profile\work_info.html:49
 #: .\employee\templates\employee\update_form\work_details.html:132
@@ -3467,6 +3545,8 @@ msgstr ""
 #: .\employee\templates\employee_personal_info\employee_list.html:89
 #: .\employee\templates\employee_personal_info\group_by.html:68
 #: .\employee\templates\tabs\personal-tab.html:193
+#: .\leave\templates\leave\leave_request\filter_leave_requests.html:57
+#: .\leave\templates\leave\leave_request\leave_requests_export_filter.html:85
 msgid "Reporting Manager"
 msgstr ""
 
@@ -3480,6 +3560,7 @@ msgstr ""
 #: .\attendance\templates\attendance\late_come_early_out\late_come_early_out_filters.html:34
 #: .\attendance\templates\requests\attendance\filter.html:35
 #: .\base\models.py:128 .\base\models.py:139
+#: .\base\templates\announcement\announcement.html:251
 #: .\base\templates\base\job_position\job_position.html:5
 #: .\base\templates\base\job_position\job_position_form.html:4
 #: .\base\templates\base\job_position\job_position_form.html:34
@@ -3494,18 +3575,23 @@ msgstr ""
 #: .\base\templates\shift_request\shift_request_nav.html:84
 #: .\base\templates\work_type_request\work_type_request_export.html:36
 #: .\base\templates\work_type_request\work_type_request_nav.html:70
-#: .\employee\models.py:370 .\employee\templates\documents\document_nav.html:79
+#: .\employee\models.py:370
+#: .\employee\templates\disciplinary_actions\disciplinary_nav.html:95
+#: .\employee\templates\documents\document_nav.html:79
 #: .\employee\templates\employee\update_form\work_details.html:84
 #: .\employee\templates\employee_export_filter.html:85
 #: .\employee\templates\employee_filters.html:69
 #: .\employee\templates\employee_personal_info\employee_list.html:79
 #: .\employee\templates\employee_personal_info\group_by.html:63
 #: .\employee\templates\tabs\personal-tab.html:226 .\leave\models.py:103
+#: .\leave\templates\leave\leave_request\filter_leave_requests.html:69
+#: .\leave\templates\leave\leave_request\leave_requests_export_filter.html:97
+#: .\offboarding\templates\offboarding\pipeline\individual_view.html:27
 #: .\onboarding\templates\onboarding\candidate_filter.html:22
 #: .\onboarding\templates\onboarding\onboarding_table.html:149
 #: .\onboarding\templates\onboarding\single_view.html:32
 #: .\onboarding\templates\onboarding\task_view.html:10
-#: .\payroll\models\models.py:185
+#: .\payroll\models\models.py:186
 #: .\payroll\templates\payroll\contract\contract_single_view.html:80
 #: .\pms\models.py:286 .\pms\models.py:311
 #: .\pms\templates\anonymous\anonymous_feedback_form.html:56
@@ -3637,8 +3723,8 @@ msgstr ""
 #: .\employee\templates\employee_filters.html:81
 #: .\leave\templates\leave\leave_assign\assigned_leaves_export_filter.html:74
 #: .\leave\templates\leave\leave_assign\assigned_leaves_filter.html:57
-#: .\leave\templates\leave\leave_request\leave_requests_export_filter.html:73
-#: .\leave\templates\leave\leave_request\request_view.html:130
+#: .\leave\templates\leave\leave_request\filter_leave_requests.html:93
+#: .\leave\templates\leave\leave_request\leave_requests_export_filter.html:121
 #: .\leave\templates\leave\leave_type\leave_type_filter.html:53
 #: .\leave\templates\leave\user_leave\user_request_view.html:111
 #: .\onboarding\templates\onboarding\kanban\kanban.html:84
@@ -3785,13 +3871,13 @@ msgid "Search in : Work Type"
 msgstr ""
 
 #: .\attendance\templates\attendance\attendance\attendance_nav.html:217
-#: .\employee\filters.py:37 .\employee\templates\employee_nav.html:221
+#: .\employee\filters.py:36 .\employee\templates\employee_nav.html:221
 #: .\leave\templates\leave\leave_request\request_view.html:64
 msgid "Search in : Department"
 msgstr ""
 
 #: .\attendance\templates\attendance\attendance\attendance_nav.html:218
-#: .\employee\filters.py:38 .\employee\templates\employee_nav.html:222
+#: .\employee\filters.py:37 .\employee\templates\employee_nav.html:222
 #: .\leave\templates\leave\leave_request\request_view.html:65
 msgid "Search in : Job Position"
 msgstr ""
@@ -3849,7 +3935,7 @@ msgstr ""
 #: .\helpdesk\templates\helpdesk\ticket\ticket_list.html:13
 #: .\helpdesk\templates\helpdesk\ticket\ticket_list.html:209
 #: .\helpdesk\templates\helpdesk\ticket\ticket_list.html:427
-#: .\leave\templates\leave\holiday\holiday.html:35
+#: .\leave\templates\leave\holiday\holiday.html:36
 #: .\leave\templates\leave\leave_assign\assigned_leave.html:10
 #: .\leave\templates\leave\leave_assign\assigned_leaves_export_filter.html:10
 #: .\leave\templates\leave\leave_assign\group_by.html:27
@@ -3893,6 +3979,7 @@ msgstr ""
 #: .\attendance\templates\requests\attendance\group_by.html:339
 #: .\attendance\templates\requests\attendance\request_lines.html:31
 #: .\attendance\templates\requests\attendance\request_lines.html:198
+#: .\employee\templates\disciplinary_actions\disciplinary_nav.html:56
 #: .\employee\templates\tabs\attendance-tab.html:50
 #: .\employee\templates\tabs\attendance-tab.html:234
 #: .\employee\templates\tabs\profile-attendance-tab.html:8
@@ -3963,6 +4050,9 @@ msgstr ""
 #: .\attendance\templates\attendance\break_point\condition.html:41
 #: .\attendance\templates\attendance\break_point\condition.html:110
 #: .\attendance\templates\requests\attendance\individual_view.html:147
+#: .\base\templates\announcement\announcement.html:213
+#: .\base\templates\announcement\announcement_one.html:38
+#: .\base\templates\base\action_type\action_type_view.html:29
 #: .\base\templates\base\audit_tag\audit_tag_view.html:33
 #: .\base\templates\base\auth\group_view.html:72
 #: .\base\templates\base\company\company_view.html:45
@@ -3986,8 +4076,9 @@ msgstr ""
 #: .\base\templates\work_type_request\htmx\group_by.html:134
 #: .\base\templates\work_type_request\htmx\requests.html:115
 #: .\base\templates\work_type_request\htmx\work_type_request_single_view.html:100
+#: .\employee\templates\disciplinary_actions\disciplinary_records.html:74
 #: .\employee\templates\documents\requests.html:115
-#: .\employee\templates\employee\profile\profile_view.html:86
+#: .\employee\templates\employee\profile\profile_view.html:94
 #: .\employee\templates\employee\update_form\form_view.html:7
 #: .\employee\templates\employee\view\individual.html:106
 #: .\employee\templates\employee_personal_info\employee_card.html:63
@@ -4011,7 +4102,7 @@ msgstr ""
 #: .\helpdesk\templates\helpdesk\ticket\ticket_list.html:276
 #: .\helpdesk\templates\helpdesk\ticket\ticket_list.html:492
 #: .\leave\templates\leave\company_leave\company_leave.html:40
-#: .\leave\templates\leave\holiday\holiday.html:79
+#: .\leave\templates\leave\holiday\holiday.html:80
 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_group_by.html:93
 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_group_by.html:272
 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_list.html:74
@@ -4027,9 +4118,10 @@ msgstr ""
 #: .\leave\templates\leave\leave_type\leave_types.html:49
 #: .\leave\templates\leave\user_leave\group_by.html:142
 #: .\leave\templates\leave\user_leave\user_requests.html:152
-#: .\offboarding\templates\offboarding\pipeline\offboardings.html:31
+#: .\offboarding\templates\offboarding\pipeline\offboardings.html:44
+#: .\offboarding\templates\offboarding\resignation\request_cards.html:38
 #: .\offboarding\templates\offboarding\stage\offboarding_body.html:41
-#: .\offboarding\templates\offboarding\task\table_body.html:43
+#: .\offboarding\templates\offboarding\task\table_body.html:89
 #: .\onboarding\templates\onboarding\candidates.html:62
 #: .\onboarding\templates\onboarding\kanban\kanban.html:165
 #: .\onboarding\templates\onboarding\onboarding_table.html:36
@@ -4096,6 +4188,7 @@ msgstr ""
 #: .\attendance\templates\attendance\attendance_activity\group_by.html:76
 #: .\attendance\templates\attendance\late_come_early_out\group_by.html:107
 #: .\attendance\templates\attendance\late_come_early_out\report_list.html:101
+#: .\base\templates\base\action_type\action_type_view.html:44
 #: .\base\templates\base\audit_tag\audit_tag_view.html:48
 #: .\base\templates\base\auth\group_assign_view.html:65
 #: .\base\templates\base\auth\group_view.html:56
@@ -4128,6 +4221,7 @@ msgstr ""
 #: .\base\templates\work_type_request\htmx\requests.html:127
 #: .\base\templates\work_type_request\htmx\work_type_request_single_view.html:107
 #: .\base\templates\work_type_request\htmx\work_type_request_single_view.html:112
+#: .\employee\templates\disciplinary_actions\disciplinary_records.html:80
 #: .\employee\templates\employee_personal_info\employee_list.html:244
 #: .\employee\templates\employee_personal_info\group_by.html:227
 #: .\employee\templates\tabs\attendance-tab.html:204
@@ -4237,7 +4331,7 @@ msgstr ""
 #: .\payroll\templates\payroll\reimbursement\request_cards.html:201
 #: .\recruitment\templates\recruitment\open_recruitments.html:61
 #: .\recruitment\templates\survey\survey_card.html:92
-#: .\templates\dashboard.html:893 .\templates\dashboard.html:923
+#: .\templates\dashboard.html:1095 .\templates\dashboard.html:1125
 msgid "Details"
 msgstr ""
 
@@ -4313,7 +4407,7 @@ msgstr ""
 #: .\attendance\templates\attendance\attendance_account\overtime_empty.html:32
 #: .\employee\templates\tabs\attendance-tab.html:37
 #: .\employee\templates\tabs\attendance-tab.html:167
-#: .\templates\sidebar.html:530
+#: .\templates\sidebar.html:545
 msgid "Hour Account"
 msgstr ""
 
@@ -4329,7 +4423,7 @@ msgstr ""
 #: .\attendance\templates\attendance\attendance_activity\activity_filters.html:47
 #: .\attendance\templates\attendance\attendance_activity\export_filter.html:70
 #: .\attendance\templates\attendance\attendance_activity\nav.html:42
-#: .\templates\sidebar.html:546
+#: .\templates\sidebar.html:561
 msgid "Attendance Activity"
 msgstr ""
 
@@ -4408,6 +4502,7 @@ msgid "Attendance Condition"
 msgstr ""
 
 #: .\attendance\templates\attendance\break_point\condition_form.html:35
+#: .\base\templates\announcement\expiry_day.html:14
 #: .\base\templates\base\auth\group_assign.html:12
 #: .\base\templates\base\auth\group_user_assign.html:10
 #: .\base\templates\base\auth\permission_assign.html:15
@@ -4454,21 +4549,21 @@ msgid "On Time"
 msgstr ""
 
 #: .\attendance\templates\attendance\dashboard\dashboard.html:109
-#: .\templates\dashboard.html:299
+#: .\templates\dashboard.html:306
 msgid "Attendance Analytic"
 msgstr ""
 
 #: .\attendance\templates\attendance\dashboard\dashboard.html:127
 #: .\attendance\templates\attendance\dashboard\dashboard.html:299
-#: .\base\methods.py:367 .\leave\models.py:40 .\payroll\models\models.py:114
+#: .\base\methods.py:367 .\leave\models.py:40 .\payroll\models\models.py:115
 msgid "Weekly"
 msgstr ""
 
 #: .\attendance\templates\attendance\dashboard\dashboard.html:130
 #: .\attendance\templates\attendance\dashboard\dashboard.html:302
 #: .\base\methods.py:368 .\base\methods.py:373 .\base\models.py:255
-#: .\leave\models.py:39 .\payroll\models\models.py:115
-#: .\payroll\models\models.py:121
+#: .\leave\models.py:39 .\payroll\models\models.py:116
+#: .\payroll\models\models.py:122
 msgid "Monthly"
 msgstr ""
 
@@ -4480,7 +4575,7 @@ msgid "Date range"
 msgstr "Update"
 
 #: .\attendance\templates\attendance\dashboard\dashboard.html:174
-#: .\templates\dashboard.html:343
+#: .\templates\dashboard.html:350
 msgid "Hours Chart"
 msgstr ""
 
@@ -4561,7 +4656,7 @@ msgstr ""
 
 #: .\attendance\templates\attendance\own_attendance\attendances.html:71
 #: .\attendance\templates\requests\attendance\view-requests.html:30
-#: .\payroll\models\models.py:445
+#: .\payroll\models\models.py:436
 msgid "Validated"
 msgstr ""
 
@@ -4592,12 +4687,12 @@ msgstr ""
 #: .\leave\templates\leave\leave_assign\assigned_leaves_export_filter.html:38
 #: .\leave\templates\leave\leave_assign\assigned_leaves_filter.html:21
 #: .\leave\templates\leave\leave_assign\group_by.html:30
+#: .\leave\templates\leave\leave_request\filter_leave_requests.html:15
 #: .\leave\templates\leave\leave_request\group_by.html:54
 #: .\leave\templates\leave\leave_request\leave_requests.html:72
 #: .\leave\templates\leave\leave_request\leave_requests_export_filter.html:42
 #: .\leave\templates\leave\leave_request\one_request_view.html:51
 #: .\leave\templates\leave\leave_request\penalty\form.html:46
-#: .\leave\templates\leave\leave_request\request_view.html:100
 #: .\leave\templates\leave\leave_type\leave_type_filter.html:4
 #: .\leave\templates\leave\user_leave\group_by.html:62
 #: .\leave\templates\leave\user_leave\user_leave_view.html:34
@@ -4674,8 +4769,8 @@ msgstr ""
 #: .\base\methods.py:419 .\base\templates\base\audit_tag\audit_tag_view.html:18
 #: .\base\templates\shift_request\htmx\shift_request_detail.html:76
 #: .\base\templates\work_type_request\htmx\work_type_request_single_view.html:76
-#: .\employee\views.py:2254 .\leave\forms.py:33
-#: .\leave\templates\leave\holiday\holiday.html:67
+#: .\employee\views.py:2276 .\leave\forms.py:33
+#: .\leave\templates\leave\holiday\holiday.html:68
 msgid "Yes"
 msgstr ""
 
@@ -4683,8 +4778,8 @@ msgstr ""
 #: .\base\methods.py:421 .\base\templates\base\audit_tag\audit_tag_view.html:20
 #: .\base\templates\shift_request\htmx\shift_request_detail.html:77
 #: .\base\templates\work_type_request\htmx\work_type_request_single_view.html:77
-#: .\employee\views.py:2256 .\leave\forms.py:33
-#: .\leave\templates\leave\holiday\holiday.html:69
+#: .\employee\views.py:2278 .\leave\forms.py:33
+#: .\leave\templates\leave\holiday\holiday.html:70
 #: .\payroll\templates\payroll\allowance\view_single_allowance.html:39
 #: .\payroll\templates\payroll\allowance\view_single_allowance.html:49
 #: .\payroll\templates\payroll\allowance\view_single_allowance.html:81
@@ -4695,21 +4790,16 @@ msgid "No"
 msgstr ""
 
 #: .\attendance\templates\attendance\work_record\work_record_list.html:5
-#: .\attendance\templates\attendance\work_record\work_record_view.html:36
+#: .\attendance\templates\attendance\work_record\work_record_view.html:56
 #: .\payroll\templates\payroll\work_record\work_record_employees_view.html:43
 msgid "Work Records"
 msgstr ""
 
-#: .\attendance\templates\attendance\work_record\work_record_view.html:40
+#: .\attendance\templates\attendance\work_record\work_record_view.html:60
 #: .\payroll\templates\payroll\work_record\work_record_employees_view.html:37
 msgid "Date:"
 msgstr ""
 
-#: .\attendance\templates\attendance\work_record\work_record_view.html:42
-#: .\payroll\templates\payroll\work_record\work_record_employees_view.html:38
-msgid "Month:"
-msgstr ""
-
 #: .\attendance\templates\requests\attendance\attendance_request_comment_form.html:16
 #: .\attendance\templates\requests\attendance\group_by.html:145
 #: .\attendance\templates\requests\attendance\request_lines.html:107
@@ -4732,6 +4822,7 @@ msgid "Add Comment"
 msgstr ""
 
 #: .\attendance\templates\requests\attendance\comment_view.html:15
+#: .\base\templates\announcement\comment_view.html:9
 #: .\base\templates\shift_request\htmx\comment_view.html:9
 #: .\base\templates\work_type_request\htmx\comment_view.html:9
 #: .\leave\templates\leave\leave_allocation_request\comment_view.html:21
@@ -4747,6 +4838,7 @@ msgid "Delete Comment"
 msgstr ""
 
 #: .\attendance\templates\requests\attendance\comment_view.html:45
+#: .\base\templates\announcement\comment_view.html:35
 #: .\base\templates\shift_request\htmx\comment_view.html:34
 #: .\base\templates\work_type_request\htmx\comment_view.html:34
 #: .\leave\templates\leave\leave_allocation_request\comment_view.html:46
@@ -4756,6 +4848,7 @@ msgid "By"
 msgstr ""
 
 #: .\attendance\templates\requests\attendance\comment_view.html:51
+#: .\base\templates\announcement\comment_view.html:48
 #: .\base\templates\shift_request\htmx\comment_view.html:40
 #: .\base\templates\work_type_request\htmx\comment_view.html:40
 #: .\leave\templates\leave\leave_allocation_request\comment_view.html:52
@@ -4765,6 +4858,7 @@ msgid "Date & Time"
 msgstr ""
 
 #: .\attendance\templates\requests\attendance\comment_view.html:53
+#: .\base\templates\announcement\comment_view.html:50
 #: .\base\templates\shift_request\htmx\comment_view.html:42
 #: .\base\templates\work_type_request\htmx\comment_view.html:42
 #: .\leave\templates\leave\leave_allocation_request\comment_view.html:54
@@ -4774,6 +4868,9 @@ msgid "on"
 msgstr ""
 
 #: .\attendance\templates\requests\attendance\comment_view.html:54
+#: .\base\templates\announcement\announcement.html:198
+#: .\base\templates\announcement\announcement_one.html:68
+#: .\base\templates\announcement\comment_view.html:51
 #: .\base\templates\shift_request\htmx\comment_view.html:43
 #: .\base\templates\work_type_request\htmx\comment_view.html:43
 #: .\employee\templates\tabs\note_tab.html:71
@@ -4895,7 +4992,7 @@ msgstr ""
 msgid "Requested Attendances"
 msgstr ""
 
-#: .\attendance\views\clock_in_out.py:218
+#: .\attendance\views\clock_in_out.py:231
 msgid ""
 "You Don't have work information filled or your employee detail neither "
 "entered "
@@ -4969,8 +5066,8 @@ msgstr ""
 msgid "Attendance Deleted"
 msgstr ""
 
-#: .\attendance\views\views.py:543 .\attendance\views\views.py:809
-#: .\attendance\views\views.py:996
+#: .\attendance\views\views.py:543 .\attendance\views\views.py:810
+#: .\attendance\views\views.py:997
 msgid "Attendance not found."
 msgstr ""
 
@@ -5008,229 +5105,245 @@ msgstr ""
 msgid "You cannot delete {hour_account}"
 msgstr ""
 
-#: .\attendance\views\views.py:782
+#: .\attendance\views\views.py:783
 msgid "Attendance activity deleted"
 msgstr ""
 
-#: .\attendance\views\views.py:784
+#: .\attendance\views\views.py:785
 msgid "Attendance activity Does not exists.."
 msgstr ""
 
-#: .\attendance\views\views.py:786
+#: .\attendance\views\views.py:787
 msgid "You cannot delete this activity"
 msgstr ""
 
-#: .\attendance\views\views.py:805
+#: .\attendance\views\views.py:806
 #, python-brace-format
 msgid "{employee} activity deleted."
 msgstr ""
 
-#: .\attendance\views\views.py:967
+#: .\attendance\views\views.py:968
 msgid "Late-in early-out deleted"
 msgstr ""
 
-#: .\attendance\views\views.py:969
+#: .\attendance\views\views.py:970
 msgid "Late-in early-out Does not exists.."
 msgstr ""
 
-#: .\attendance\views\views.py:971
+#: .\attendance\views\views.py:972
 msgid "You cannot delete this Late-in early-out"
 msgstr ""
 
-#: .\attendance\views\views.py:991
+#: .\attendance\views\views.py:992
 #, python-brace-format
 msgid "{employee} Late-in early-out deleted."
 msgstr ""
 
-#: .\attendance\views\views.py:1069
+#: .\attendance\views\views.py:1070
 msgid "validation condition deleted."
 msgstr ""
 
-#: .\attendance\views\views.py:1071
+#: .\attendance\views\views.py:1072
 msgid "validation condition Does not exists.."
 msgstr ""
 
-#: .\attendance\views\views.py:1073
+#: .\attendance\views\views.py:1074
 msgid "You cannot delete this validation condition."
 msgstr ""
 
-#: .\attendance\views\views.py:1090 .\attendance\views\views.py:1122
+#: .\attendance\views\views.py:1091 .\attendance\views\views.py:1123
 msgid "Attendance validated."
 msgstr ""
 
-#: .\attendance\views\views.py:1543
+#: .\attendance\views\views.py:1544
 msgid "Grace time created successfully."
 msgstr ""
 
-#: .\attendance\views\views.py:1573
+#: .\attendance\views\views.py:1574
 msgid "Grace time updated successfully."
 msgstr ""
 
-#: .\attendance\views\views.py:1599
+#: .\attendance\views\views.py:1600
 msgid "Grace time deleted successfully."
 msgstr ""
 
-#: .\attendance\views\views.py:1601
+#: .\attendance\views\views.py:1602
 msgid "Grace Time Does not exists.."
 msgstr ""
 
-#: .\attendance\views\views.py:1603
+#: .\attendance\views\views.py:1604
 msgid "Related datas exists."
 msgstr ""
 
-#: .\attendance\views\views.py:1627
+#: .\attendance\views\views.py:1628
 msgid "Default grace time activated successfully."
 msgstr ""
 
-#: .\attendance\views\views.py:1633
+#: .\attendance\views\views.py:1634
 msgid "Default grace time deactivated successfully."
 msgstr ""
 
-#: .\attendance\views\views.py:1660 .\base\views.py:3987 .\base\views.py:4094
-#: .\leave\views.py:3275 .\leave\views.py:3390 .\payroll\views\views.py:1213
+#: .\attendance\views\views.py:1661 .\base\views.py:4020 .\base\views.py:4127
+#: .\leave\views.py:3293 .\leave\views.py:3408 .\payroll\views\views.py:1214
 msgid "Comment added successfully!"
 msgstr ""
 
-#: .\attendance\views\views.py:1746 .\base\views.py:4070 .\base\views.py:4177
-#: .\leave\views.py:3365 .\leave\views.py:3473 .\payroll\views\views.py:1289
+#: .\attendance\views\views.py:1747 .\base\views.py:4103 .\base\views.py:4210
+#: .\leave\views.py:3383 .\leave\views.py:3491 .\payroll\views\views.py:1290
 msgid "Comment deleted successfully!"
 msgstr ""
 
-#: .\base\forms.py:864
+#: .\base\announcement.py:60
+msgid "Announcement created successfully."
+msgstr ""
+
+#: .\base\announcement.py:125
+msgid "Announcement deleted successfully."
+msgstr ""
+
+#: .\base\announcement.py:149
+msgid "Announcement updated successfully."
+msgstr ""
+
+#: .\base\announcement.py:225
+msgid "You commented a post."
+msgstr ""
+
+#: .\base\forms.py:869
 #, python-brace-format
 msgid "Shift schedule is already exist for {day}"
 msgstr ""
 
-#: .\base\forms.py:919 .\payroll\models\models.py:139
+#: .\base\forms.py:924 .\payroll\models\models.py:140
 msgid "Start date"
 msgstr ""
 
-#: .\base\forms.py:1254
+#: .\base\forms.py:1259
 msgid "Old password"
 msgstr ""
 
-#: .\base\forms.py:1259
+#: .\base\forms.py:1264
 msgid "Enter Old Password"
 msgstr ""
 
-#: .\base\forms.py:1263
+#: .\base\forms.py:1268
 msgid "Enter your old password."
 msgstr ""
 
-#: .\base\forms.py:1266 .\base\forms.py:1325
+#: .\base\forms.py:1271 .\base\forms.py:1330
 msgid "New password"
 msgstr ""
 
-#: .\base\forms.py:1271
+#: .\base\forms.py:1276
 msgid "Enter New Password"
 msgstr ""
 
-#: .\base\forms.py:1277 .\base\forms.py:1337
+#: .\base\forms.py:1282 .\base\forms.py:1342
 msgid "New password confirmation"
 msgstr ""
 
-#: .\base\forms.py:1282 .\base\forms.py:1342
+#: .\base\forms.py:1287 .\base\forms.py:1347
 msgid "Re-Enter Password"
 msgstr ""
 
-#: .\base\forms.py:1313
+#: .\base\forms.py:1318
 msgid "New password and confirm password do not match"
 msgstr ""
 
-#: .\base\forms.py:1330
+#: .\base\forms.py:1335
 msgid "Enter Strong Password"
 msgstr ""
 
-#: .\base\forms.py:1334
+#: .\base\forms.py:1339
 msgid "Enter your new password."
 msgstr ""
 
-#: .\base\forms.py:1346
+#: .\base\forms.py:1351
 msgid "Enter the same password as before, for verification."
 msgstr ""
 
-#: .\base\forms.py:1355
+#: .\base\forms.py:1360
 msgid "Password must contain at least 8 characters."
 msgstr ""
 
-#: .\base\forms.py:1358
+#: .\base\forms.py:1363
 msgid "Password must contain at least one uppercase letter."
 msgstr ""
 
-#: .\base\forms.py:1362
+#: .\base\forms.py:1367
 msgid "Password must contain at least one lowercase letter."
 msgstr ""
 
-#: .\base\forms.py:1365
+#: .\base\forms.py:1370
 msgid "Password must contain at least one digit."
 msgstr ""
 
-#: .\base\forms.py:1370
+#: .\base\forms.py:1375
 msgid "Password must contain at least one special character."
 msgstr ""
 
-#: .\base\forms.py:1384
+#: .\base\forms.py:1389
 msgid "Password must be same."
 msgstr ""
 
-#: .\base\forms.py:1582 .\base\models.py:988 .\payroll\models\models.py:622
-#: .\payroll\models\models.py:631
+#: .\base\forms.py:1587 .\base\models.py:988 .\payroll\models\models.py:641
+#: .\payroll\models\models.py:650
 msgid "Equal (==)"
 msgstr ""
 
-#: .\base\forms.py:1583 .\base\models.py:989 .\payroll\models\models.py:623
-#: .\payroll\models\models.py:632
+#: .\base\forms.py:1588 .\base\models.py:989 .\payroll\models\models.py:642
+#: .\payroll\models\models.py:651
 msgid "Not Equal (!=)"
 msgstr ""
 
-#: .\base\forms.py:1584 .\base\models.py:990
+#: .\base\forms.py:1589 .\base\models.py:990
 msgid "Range"
 msgstr ""
 
-#: .\base\forms.py:1585 .\base\models.py:991 .\payroll\models\models.py:624
-#: .\payroll\models\models.py:633
+#: .\base\forms.py:1590 .\base\models.py:991 .\payroll\models\models.py:643
+#: .\payroll\models\models.py:652
 msgid "Less Than (<)"
 msgstr ""
 
-#: .\base\forms.py:1586 .\base\models.py:992 .\payroll\models\models.py:625
-#: .\payroll\models\models.py:634
+#: .\base\forms.py:1591 .\base\models.py:992 .\payroll\models\models.py:644
+#: .\payroll\models\models.py:653
 msgid "Greater Than (>)"
 msgstr ""
 
-#: .\base\forms.py:1587 .\base\models.py:993 .\payroll\models\models.py:626
-#: .\payroll\models\models.py:635
+#: .\base\forms.py:1592 .\base\models.py:993 .\payroll\models\models.py:645
+#: .\payroll\models\models.py:654
 msgid "Less Than or Equal To (<=)"
 msgstr ""
 
-#: .\base\forms.py:1588 .\base\models.py:994 .\payroll\models\models.py:627
-#: .\payroll\models\models.py:636
+#: .\base\forms.py:1593 .\base\models.py:994 .\payroll\models\models.py:646
+#: .\payroll\models\models.py:655
 msgid "Greater Than or Equal To (>=)"
 msgstr ""
 
-#: .\base\forms.py:1589 .\base\models.py:995 .\payroll\models\models.py:628
+#: .\base\forms.py:1594 .\base\models.py:995 .\payroll\models\models.py:647
 msgid "Contains"
 msgstr ""
 
-#: .\base\forms.py:1594
+#: .\base\forms.py:1599
 msgid "Approval Manager"
 msgstr ""
 
-#: .\base\methods.py:360 .\employee\views.py:2379 .\recruitment\models.py:227
+#: .\base\methods.py:360 .\employee\views.py:2401 .\recruitment\models.py:227
 msgid "Male"
 msgstr ""
 
-#: .\base\methods.py:361 .\employee\views.py:2379 .\recruitment\models.py:227
+#: .\base\methods.py:361 .\employee\views.py:2401 .\recruitment\models.py:227
 msgid "Female"
 msgstr ""
 
-#: .\base\methods.py:362 .\employee\views.py:2379 .\recruitment\models.py:227
+#: .\base\methods.py:362 .\employee\views.py:2401 .\recruitment\models.py:227
 #: .\recruitment\models.py:231
 msgid "Other"
 msgstr ""
 
 #: .\base\methods.py:363 .\employee\templates\tabs\payroll-tab.html:12
-#: .\payroll\models\models.py:124 .\payroll\models\models.py:339
-#: .\payroll\models\models.py:1257
+#: .\payroll\models\models.py:125 .\payroll\models\models.py:340
+#: .\payroll\models\models.py:1276
 #: .\payroll\templates\payroll\contract\contract_view.html:243
 #: .\payroll\templates\payroll\dashboard.html:71
 #: .\payroll\templates\payroll\payslip\generate_payslip_list.html:25
@@ -5243,19 +5356,19 @@ msgid "Draft"
 msgstr ""
 
 #: .\base\methods.py:364
-#: .\employee\templates\employee\profile\profile_view.html:108
+#: .\employee\templates\employee\profile\profile_view.html:116
 #: .\employee\templates\employee\view\individual.html:128
-#: .\employee\views.py:2355 .\payroll\models\models.py:125
+#: .\employee\views.py:2377 .\payroll\models\models.py:126
 #: .\payroll\templates\payroll\contract\contract_view.html:254
 msgid "Active"
 msgstr ""
 
-#: .\base\methods.py:365 .\payroll\models\models.py:126
+#: .\base\methods.py:365 .\payroll\models\models.py:127
 #: .\payroll\templates\payroll\contract\contract_view.html:232
 msgid "Expired"
 msgstr ""
 
-#: .\base\methods.py:366 .\payroll\models\models.py:127
+#: .\base\methods.py:366 .\payroll\models\models.py:128
 #: .\payroll\templates\payroll\contract\contract_view.html:221
 msgid "Terminated"
 msgstr ""
@@ -5264,16 +5377,16 @@ msgstr ""
 msgid "After"
 msgstr ""
 
-#: .\base\methods.py:370 .\payroll\models\models.py:116
+#: .\base\methods.py:370 .\payroll\models\models.py:117
 msgid "Semi-Monthly"
 msgstr ""
 
-#: .\base\methods.py:371 .\payroll\models\models.py:109
-#: .\payroll\models\models.py:119
+#: .\base\methods.py:371 .\payroll\models\models.py:110
+#: .\payroll\models\models.py:120
 msgid "Hourly"
 msgstr ""
 
-#: .\base\methods.py:372 .\payroll\models\models.py:120
+#: .\base\methods.py:372 .\payroll\models\models.py:121
 msgid "Daily"
 msgstr ""
 
@@ -5312,7 +5425,7 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
-#: .\base\models.py:80
+#: .\base\models.py:80 .\base\templates\announcement\announcement_one.html:78
 msgid "Departments"
 msgstr ""
 
@@ -5338,7 +5451,7 @@ msgstr ""
 #: .\employee\templates\employee\update_form\work_details.html:121
 #: .\employee\templates\employee_personal_info\employee_list.html:83
 #: .\employee\templates\employee_personal_info\group_by.html:67
-#: .\leave\models.py:103 .\payroll\models\models.py:193
+#: .\leave\models.py:103 .\payroll\models\models.py:194
 #: .\payroll\templates\payroll\contract\contract_single_view.html:86
 #: .\templates\settings.html:72
 msgid "Job Role"
@@ -5428,14 +5541,14 @@ msgstr ""
 #: .\employee\templates\tabs\payroll-tab.html:33
 #: .\employee\templates\tabs\shift-tab.html:311
 #: .\employee\templates\tabs\shift-tab.html:453 .\leave\models.py:206
-#: .\leave\models.py:390 .\leave\templates\leave\holiday\holiday.html:41
-#: .\leave\templates\leave\holiday\holiday_form.html:38
-#: .\leave\templates\leave\holiday\holiday_update_form.html:39
+#: .\leave\models.py:390 .\leave\templates\leave\holiday\holiday.html:42
+#: .\leave\templates\leave\holiday\holiday_form.html:40
+#: .\leave\templates\leave\holiday\holiday_update_form.html:41
+#: .\leave\templates\leave\leave_request\filter_leave_requests.html:21
 #: .\leave\templates\leave\leave_request\group_by.html:55
 #: .\leave\templates\leave\leave_request\leave_requests.html:73
 #: .\leave\templates\leave\leave_request\leave_requests_export_filter.html:48
 #: .\leave\templates\leave\leave_request\one_request_view.html:36
-#: .\leave\templates\leave\leave_request\request_view.html:106
 #: .\leave\templates\leave\user_leave\group_by.html:63
 #: .\leave\templates\leave\user_leave\user_request_one.html:35
 #: .\leave\templates\leave\user_leave\user_request_view.html:85
@@ -5540,7 +5653,7 @@ msgstr ""
 #: .\base\models.py:324
 #: .\base\templates\base\rotating_work_type\rotating_work_type_assign.html:25
 #: .\base\templates\base\rotating_work_type\rotating_work_type_assign_nav.html:5
-#: .\templates\sidebar.html:367
+#: .\templates\sidebar.html:372
 msgid "Rotating Work Type Assign"
 msgstr ""
 
@@ -5662,7 +5775,7 @@ msgstr ""
 #: .\base\models.py:616
 #: .\base\templates\base\rotating_shift\rotating_shift_assign.html:16
 #: .\base\templates\base\rotating_shift\rotating_shift_assign_nav.html:6
-#: .\employee\templates\tabs\shift-tab.html:913 .\templates\sidebar.html:359
+#: .\employee\templates\tabs\shift-tab.html:913 .\templates\sidebar.html:364
 msgid "Rotating Shift Assign"
 msgstr ""
 
@@ -5718,7 +5831,7 @@ msgstr ""
 #: .\base\templates\work_type_request\work_type_request_nav.html:112
 #: .\base\templates\work_type_request\work_type_request_nav.html:312
 #: .\employee\templates\tabs\shift-tab.html:870
-#: .\templates\quick_access.html:80 .\templates\sidebar.html:351
+#: .\templates\quick_access.html:80 .\templates\sidebar.html:356
 msgid "Work Type Request"
 msgstr ""
 
@@ -5749,8 +5862,8 @@ msgstr ""
 #: .\base\templates\shift_request\htmx\shift_request_create_form.html:29
 #: .\base\templates\shift_request\shift_request_export.html:78
 #: .\base\templates\shift_request\shift_request_nav.html:140
-#: .\employee\templates\tabs\shift-tab.html:891 .\templates\dashboard.html:747
-#: .\templates\sidebar.html:344
+#: .\employee\templates\tabs\shift-tab.html:891 .\templates\dashboard.html:809
+#: .\templates\sidebar.html:349
 msgid "Shift Request"
 msgstr ""
 
@@ -5758,7 +5871,7 @@ msgstr ""
 msgid "Shift Requests"
 msgstr ""
 
-#: .\base\models.py:827 .\base\views.py:2472 .\base\views.py:3000
+#: .\base\models.py:827 .\base\views.py:2488 .\base\views.py:3016
 msgid "A shift request already exists during this time period."
 msgstr ""
 
@@ -5867,6 +5980,112 @@ msgstr ""
 msgid "User"
 msgstr ""
 
+#: .\base\templates\announcement\announcement.html:172
+#, fuzzy
+#| msgid "recruitment"
+msgid "Announcements"
+msgstr "Recruitment"
+
+#: .\base\templates\announcement\announcement.html:197
+#: .\base\templates\announcement\announcement_one.html:67
+msgid "Posted on"
+msgstr ""
+
+#: .\base\templates\announcement\announcement.html:218
+#: .\base\templates\announcement\announcement_one.html:46
+msgid "Are you sure you want to delete this announcement?"
+msgstr ""
+
+#: .\base\templates\announcement\announcement.html:275
+#: .\base\templates\announcement\announcement_one.html:110
+#, fuzzy
+#| msgid "recruitment"
+msgid "View Attachment"
+msgstr "Recruitment"
+
+#: .\base\templates\announcement\announcement.html:374
+#: .\templates\announcement_single_view.html:54
+#, fuzzy
+#| msgid "recruitment"
+msgid "Create Announcements."
+msgstr "Recruitment"
+
+#: .\base\templates\announcement\announcement.html:396
+#: .\templates\announcement_single_view.html:84
+msgid "Edit Announcement."
+msgstr ""
+
+#: .\base\templates\announcement\announcement.html:420
+#: .\templates\announcement_single_view.html:116
+#, fuzzy
+#| msgid "employee"
+msgid "Add Comment."
+msgstr "Employee"
+
+#: .\base\templates\announcement\announcement.html:445
+#: .\templates\announcement_single_view.html:149
+#, fuzzy
+#| msgid "recruitment"
+msgid "Comments."
+msgstr "Recruitment"
+
+#: .\base\templates\announcement\announcement_form.html:25
+#: .\base\templates\announcement\announcement_update_form.html:25
+msgid "Post"
+msgstr ""
+
+#: .\base\templates\announcement\announcement_one.html:8
+msgid "Announcement."
+msgstr ""
+
+#: .\base\templates\announcement\announcement_one.html:89
+#, fuzzy
+#| msgid "job-position-view"
+msgid "Jobpositions"
+msgstr "Job Position"
+
+#: .\base\templates\announcement\expiry_day.html:6
+msgid "Announcement Expire"
+msgstr ""
+
+#: .\base\templates\base\action_type\action_type.html:7
+msgid "Action Type"
+msgstr ""
+
+#: .\base\templates\base\action_type\action_type.html:38
+#, fuzzy
+#| msgid "create-allowance"
+msgid "Create Action Type"
+msgstr "Creation"
+
+#: .\base\templates\base\action_type\action_type.html:59
+#, fuzzy
+#| msgid "type-update"
+msgid "Action Type Update"
+msgstr "Update"
+
+#: .\base\templates\base\action_type\action_type_view.html:9
+#: .\employee\templates\disciplinary_actions\disciplinary_records.html:21
+#: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_group_by.html:218
+#: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_list.html:176
+#: .\leave\templates\leave\leave_request\group_by.html:62
+#: .\leave\templates\leave\leave_request\leave_requests.html:80
+#: .\leave\templates\leave\user_leave\group_by.html:68
+#: .\leave\templates\leave\user_leave\user_requests.html:74
+#: .\offboarding\templates\offboarding\stage\offboarding_body.html:68
+#: .\onboarding\templates\onboarding\onboarding_table.html:155
+#: .\recruitment\forms.py:618
+#: .\recruitment\templates\candidate\candidate_card.html:56
+#: .\recruitment\templates\skill_zone_cand\skill_zone_cand_card.html:52
+#: .\recruitment\templates\survey\filter.html:29
+#: .\recruitment\templates\survey\view_single_template.html:24
+msgid "Options"
+msgstr ""
+
+#: .\base\templates\base\action_type\action_type_view.html:38
+msgid "Are you sure you want to delete this action type?"
+msgstr ""
+
 #: .\base\templates\base\audit_tag\audit_tag_view.html:7
 msgid "Highlight"
 msgstr ""
@@ -5941,7 +6160,7 @@ msgid "Are you sure you want to delete this group?"
 msgstr ""
 
 #: .\base\templates\base\auth\password_change_form.html:14
-#: .\templates\index.html:546
+#: .\templates\index.html:548
 msgid "Change Password"
 msgstr ""
 
@@ -5985,7 +6204,8 @@ msgstr ""
 #: .\base\templates\base\rotating_work_type\rotating_work_type_assign_nav.html:172
 #: .\leave\templates\leave\leave_assign\assign_view.html:260
 #: .\leave\templates\leave\leave_type\leave_type_individual_view.html:142
-#: .\offboarding\templates\offboarding\task\table_body.html:74
+#: .\offboarding\templates\offboarding\pipeline\employee_task.html:32
+#: .\offboarding\templates\offboarding\task\table_body.html:137
 #: .\onboarding\templates\onboarding\candidate_task.html:24
 #: .\onboarding\templates\onboarding\candidate_task.html:57
 msgid "Assign"
@@ -6031,7 +6251,7 @@ msgstr ""
 #: .\employee\templates\tabs\personal-tab.html:393 .\onboarding\forms.py:324
 #: .\onboarding\templates\onboarding\employee_bank_details.html:100
 #: .\onboarding\templates\onboarding\employee_creation.html:86
-#: .\payroll\forms\component_forms.py:326 .\payroll\models\models.py:644
+#: .\payroll\forms\component_forms.py:326 .\payroll\models\models.py:663
 #: .\recruitment\models.py:284
 #: .\recruitment\templates\candidate\application_form.html:243
 #: .\recruitment\templates\candidate\candidate_create_form.html:128
@@ -6051,7 +6271,7 @@ msgstr ""
 #: .\employee\templates\tabs\personal-tab.html:46 .\onboarding\forms.py:325
 #: .\onboarding\templates\onboarding\employee_bank_details.html:109
 #: .\onboarding\templates\onboarding\employee_creation.html:95
-#: .\payroll\forms\component_forms.py:327 .\payroll\models\models.py:645
+#: .\payroll\forms\component_forms.py:327 .\payroll\models\models.py:664
 #: .\recruitment\models.py:288
 #: .\recruitment\templates\candidate\application_form.html:258
 #: .\recruitment\templates\candidate\candidate_create_form.html:143
@@ -6196,7 +6416,7 @@ msgstr ""
 
 #: .\base\templates\base\company\payroll_settings.html:6
 #: .\payroll\templates\payroll\settings\payroll_settings.html:6
-#: .\templates\settings.html:225
+#: .\templates\settings.html:244
 msgid "Currency"
 msgstr ""
 
@@ -6252,7 +6472,7 @@ msgid "Mail Servers"
 msgstr ""
 
 #: .\base\templates\base\mail_server\mail_server.html:35
-#: .\templates\settings.html:255
+#: .\templates\settings.html:274
 msgid "Mail Server"
 msgstr ""
 
@@ -6611,6 +6831,8 @@ msgstr ""
 
 #: .\base\templates\base\shift\schedule_form.html:23
 #: .\base\templates\base\shift\schedule_view.html:11
+#: .\employee\templates\disciplinary_actions\form.html:16
+#: .\employee\templates\disciplinary_actions\update_form.html:29
 #: .\leave\templates\leave\leave_request\one_request_view.html:47
 #: .\leave\templates\leave\user_leave\user_request_one.html:46
 msgid "Days"
@@ -6803,14 +7025,14 @@ msgstr ""
 #: .\employee\templates\tabs\leave-tab.html:199
 #: .\employee\templates\tabs\payroll-tab.html:34
 #: .\employee\templates\tabs\personal-tab.html:212 .\leave\models.py:207
-#: .\leave\models.py:397 .\leave\templates\leave\holiday\holiday.html:42
-#: .\leave\templates\leave\holiday\holiday_form.html:43
-#: .\leave\templates\leave\holiday\holiday_update_form.html:44
+#: .\leave\models.py:397 .\leave\templates\leave\holiday\holiday.html:43
+#: .\leave\templates\leave\holiday\holiday_form.html:44
+#: .\leave\templates\leave\holiday\holiday_update_form.html:46
+#: .\leave\templates\leave\leave_request\filter_leave_requests.html:27
 #: .\leave\templates\leave\leave_request\group_by.html:56
 #: .\leave\templates\leave\leave_request\leave_requests.html:74
 #: .\leave\templates\leave\leave_request\leave_requests_export_filter.html:55
 #: .\leave\templates\leave\leave_request\one_request_view.html:40
-#: .\leave\templates\leave\leave_request\request_view.html:112
 #: .\leave\templates\leave\user_leave\group_by.html:64
 #: .\leave\templates\leave\user_leave\user_request_one.html:39
 #: .\leave\templates\leave\user_leave\user_request_view.html:92
@@ -6962,6 +7184,8 @@ msgstr ""
 
 #: .\base\templates\shift_request\shift_request.html:15
 #: .\base\templates\work_type_request\work_type_request.html:15
+#: .\employee\templates\disciplinary_actions\form.html:33
+#: .\employee\templates\disciplinary_actions\update_form.html:47
 #: .\employee\templates\employee_personal_info\employee_create_form.html:101
 #: .\employee\templates\employee_personal_info\employee_personal_info.html:81
 #: .\employee\templates\employee_personal_info\employee_work_info.html:82
@@ -6989,7 +7213,7 @@ msgstr ""
 #: .\onboarding\templates\onboarding\candidate_creation.html:70
 #: .\onboarding\templates\onboarding\candidate_update.html:84
 #: .\onboarding\templates\onboarding\employee_creation.html:118
-#: .\payroll\models\models.py:643 .\recruitment\models.py:297
+#: .\payroll\models\models.py:662 .\recruitment\models.py:297
 #: .\recruitment\templates\candidate\application_form.html:220
 #: .\recruitment\templates\candidate\candidate_create_form.html:112
 #: .\recruitment\templates\candidate\export_filter.html:56
@@ -7330,7 +7554,7 @@ msgstr ""
 msgid "Pay frequency"
 msgstr ""
 
-#: .\base\translator.py:82 .\payroll\models\models.py:79
+#: .\base\translator.py:82 .\payroll\models\models.py:80
 #: .\payroll\models\tax_models.py:44
 msgid "Filing status"
 msgstr ""
@@ -7435,7 +7659,7 @@ msgstr ""
 msgid "Schedule date"
 msgstr ""
 
-#: .\base\translator.py:120 .\payroll\models\models.py:141
+#: .\base\translator.py:120 .\payroll\models\models.py:142
 msgid "End date"
 msgstr ""
 
@@ -7475,7 +7699,9 @@ msgstr ""
 msgid "Employee last name"
 msgstr ""
 
-#: .\base\translator.py:130 .\payroll\templates\payroll\loan\filter.html:31
+#: .\base\translator.py:130
+#: .\offboarding\templates\offboarding\resignation\filter.html:27
+#: .\payroll\templates\payroll\loan\filter.html:31
 #: .\payroll\templates\payroll\reimbursement\filter.html:27
 msgid "Reporting manager"
 msgstr ""
@@ -8122,10 +8348,8 @@ msgid "company"
 msgstr "Company"
 
 #: .\base\translator.py:300
-#, fuzzy
-#| msgid "employee-permission-assign"
 msgid "employee-create-personal-info"
-msgstr "Employee Permissions"
+msgstr "Personal Info"
 
 #: .\base\translator.py:301
 msgid "offboarding"
@@ -8139,419 +8363,465 @@ msgstr "Pipeline"
 msgid "pagination-settings-view"
 msgstr "Records per page"
 
-#: .\base\views.py:171
+#: .\base\translator.py:304
+msgid "organisation-chart"
+msgstr "Organizational Chart"
+
+#: .\base\translator.py:305
+msgid "document-request-view"
+msgstr "Document Request"
+
+#: .\base\translator.py:306
+msgid "disciplinary-actions"
+msgstr "Disciplinary Actions"
+
+#: .\base\translator.py:307
+msgid "view-policies"
+msgstr "Policies"
+
+#: .\base\translator.py:308
+msgid "resignation-requests-view"
+msgstr "Resignation Letters"
+
+#: .\base\translator.py:309
+msgid "action-type"
+msgstr "Disciplinary Action Type"
+
+#: .\base\translator.py:310
+msgid "general-settings"
+msgstr "General Settings"
+
+#: .\base\views.py:175
 msgid "Invalid username or password."
 msgstr ""
 
-#: .\base\views.py:177
+#: .\base\views.py:181
 msgid "This user is archived. Please contact the manager for more information."
 msgstr ""
 
-#: .\base\views.py:182
+#: .\base\views.py:186
 msgid "Login Success"
 msgstr ""
 
-#: .\base\views.py:224
+#: .\base\views.py:228
 msgid "No email found."
 msgstr ""
 
-#: .\base\views.py:248
+#: .\base\views.py:252
 #, python-brace-format
 msgid "Link sended to {recipient}"
 msgstr ""
 
-#: .\base\views.py:264
+#: .\base\views.py:268
 msgid "Password reset success"
 msgstr ""
 
-#: .\base\views.py:268
+#: .\base\views.py:272
 msgid "Link Expired..."
 msgstr ""
 
-#: .\base\views.py:285
+#: .\base\views.py:289
 msgid "Password changed successfully"
 msgstr ""
 
-#: .\base\views.py:441
+#: .\base\views.py:457
 msgid "User group created."
 msgstr ""
 
-#: .\base\views.py:546
+#: .\base\views.py:562
 msgid "User group assigned."
 msgstr ""
 
-#: .\base\views.py:632
+#: .\base\views.py:648
 msgid "User group updated."
 msgstr ""
 
-#: .\base\views.py:649
+#: .\base\views.py:665
 msgid "The {} has been deleted successfully."
 msgstr ""
 
-#: .\base\views.py:652
+#: .\base\views.py:668
 msgid "{} not found."
 msgstr ""
 
-#: .\base\views.py:661
+#: .\base\views.py:677
 msgid "This {} is already in use for {}."
 msgstr ""
 
-#: .\base\views.py:750
+#: .\base\views.py:766
 msgid "Company has been created successfully!"
 msgstr ""
 
-#: .\base\views.py:786
+#: .\base\views.py:802
 msgid "Company updated"
 msgstr ""
 
-#: .\base\views.py:806
+#: .\base\views.py:822
 msgid "Department has been created successfully!"
 msgstr ""
 
-#: .\base\views.py:846
+#: .\base\views.py:862
 msgid "Department updated."
 msgstr ""
 
-#: .\base\views.py:868 .\base\views.py:888
+#: .\base\views.py:884 .\base\views.py:904
 msgid "Job Position has been created successfully!"
 msgstr ""
 
-#: .\base\views.py:915
+#: .\base\views.py:931
 msgid "Job position updated."
 msgstr ""
 
-#: .\base\views.py:938
+#: .\base\views.py:954
 msgid "Job role has been created successfully!"
 msgstr ""
 
-#: .\base\views.py:980
+#: .\base\views.py:996
 msgid "Job role updated."
 msgstr ""
 
-#: .\base\views.py:1008
+#: .\base\views.py:1024
 msgid "Work Type has been created successfully!"
 msgstr ""
 
-#: .\base\views.py:1049
+#: .\base\views.py:1065
 msgid "Work type updated."
 msgstr ""
 
-#: .\base\views.py:1072
+#: .\base\views.py:1088
 msgid "Rotating work type created."
 msgstr ""
 
-#: .\base\views.py:1113
+#: .\base\views.py:1129
 msgid "Rotating work type updated."
 msgstr ""
 
-#: .\base\views.py:1197
+#: .\base\views.py:1213
 msgid "Rotating work type assigned."
 msgstr ""
 
-#: .\base\views.py:1297
+#: .\base\views.py:1313
 msgid "Rotating work type assign updated."
 msgstr ""
 
-#: .\base\views.py:1340 .\base\views.py:1364 .\base\views.py:1923
-#: .\base\views.py:1947 .\employee\views.py:1700 .\pms\views.py:1976
+#: .\base\views.py:1356 .\base\views.py:1380 .\base\views.py:1939
+#: .\base\views.py:1963 .\employee\views.py:1722 .\pms\views.py:1976
 #: .\pms\views.py:2034 .\recruitment\views\actions.py:250
 #: .\recruitment\views\actions.py:265
 msgid "un-archived"
 msgstr ""
 
-#: .\base\views.py:1343 .\base\views.py:1367 .\base\views.py:1927
-#: .\base\views.py:1950 .\employee\views.py:1698 .\pms\views.py:1979
+#: .\base\views.py:1359 .\base\views.py:1383 .\base\views.py:1943
+#: .\base\views.py:1966 .\employee\views.py:1720 .\pms\views.py:1979
 #: .\pms\views.py:2037 .\recruitment\views\actions.py:250
 #: .\recruitment\views\actions.py:268
 msgid "archived"
 msgstr ""
 
-#: .\base\views.py:1348 .\base\views.py:1931
+#: .\base\views.py:1364 .\base\views.py:1947
 #, python-brace-format
 msgid "Rotating shift assign is {message}"
 msgstr ""
 
-#: .\base\views.py:1386
+#: .\base\views.py:1402
 #, python-brace-format
 msgid "Rotating work type for {employee_id} is {message}"
 msgstr ""
 
-#: .\base\views.py:1393
+#: .\base\views.py:1409
 #, python-brace-format
 msgid "Rotating work type for {employee_id} is already exists"
 msgstr ""
 
-#: .\base\views.py:1414
+#: .\base\views.py:1430
 #, python-brace-format
 msgid "{employee} deleted."
 msgstr ""
 
-#: .\base\views.py:1417
+#: .\base\views.py:1433
 #, python-brace-format
 msgid "{rwork_type_assign} not found."
 msgstr ""
 
-#: .\base\views.py:1421
+#: .\base\views.py:1437
 #, python-brace-format
 msgid "You cannot delete {rwork_type_assign}"
 msgstr ""
 
-#: .\base\views.py:1439
+#: .\base\views.py:1455
 msgid "Rotating work type assign deleted."
 msgstr ""
 
-#: .\base\views.py:1441
+#: .\base\views.py:1457
 msgid "Rotating work type assign not found."
 msgstr ""
 
-#: .\base\views.py:1443
+#: .\base\views.py:1459
 msgid "You cannot delete this rotating work type."
 msgstr ""
 
-#: .\base\views.py:1479
+#: .\base\views.py:1495
 msgid "Employee type created."
 msgstr ""
 
-#: .\base\views.py:1504
+#: .\base\views.py:1520
 msgid "Employee type updated."
 msgstr ""
 
-#: .\base\views.py:1542
+#: .\base\views.py:1558
 msgid "Employee Shift has been created successfully!"
 msgstr ""
 
-#: .\base\views.py:1567
+#: .\base\views.py:1583
 msgid "Shift updated"
 msgstr ""
 
-#: .\base\views.py:1601
+#: .\base\views.py:1617
 msgid "Employee Shift Schedule has been created successfully!"
 msgstr ""
 
-#: .\base\views.py:1627
+#: .\base\views.py:1643
 msgid "Shift schedule created."
 msgstr ""
 
-#: .\base\views.py:1663
+#: .\base\views.py:1679
 msgid "Rotating shift created."
 msgstr ""
 
-#: .\base\views.py:1689
+#: .\base\views.py:1705
 msgid "Rotating shift updated."
 msgstr ""
 
-#: .\base\views.py:1778
+#: .\base\views.py:1794
 msgid "Rotating shift assigned."
 msgstr ""
 
-#: .\base\views.py:1877
+#: .\base\views.py:1893
 msgid "Rotating shift assign updated."
 msgstr ""
 
-#: .\base\views.py:1969
+#: .\base\views.py:1985
 #, python-brace-format
 msgid "Rotating shift for {employee} is {message}"
 msgstr ""
 
-#: .\base\views.py:1976
+#: .\base\views.py:1992
 #, python-brace-format
 msgid "Rotating shift for {employee} is already exists"
 msgstr ""
 
-#: .\base\views.py:1997
+#: .\base\views.py:2013
 #, python-brace-format
 msgid "{employee} assign deleted."
 msgstr ""
 
-#: .\base\views.py:2002
+#: .\base\views.py:2018
 #, python-brace-format
 msgid "{rshift_assign} not found."
 msgstr ""
 
-#: .\base\views.py:2006
+#: .\base\views.py:2022
 #, python-brace-format
 msgid "You cannot delete {rshift_assign}"
 msgstr ""
 
-#: .\base\views.py:2024
+#: .\base\views.py:2040
 msgid "Rotating shift assign deleted."
 msgstr ""
 
-#: .\base\views.py:2026
+#: .\base\views.py:2042
 msgid "Rotating shift assign not found."
 msgstr ""
 
-#: .\base\views.py:2028
+#: .\base\views.py:2044
 msgid "You cannot delete this rotating shift assign."
 msgstr ""
 
-#: .\base\views.py:2177
+#: .\base\views.py:2193
 msgid "Employee permission assigned."
 msgstr ""
 
-#: .\base\views.py:2347
+#: .\base\views.py:2363
 msgid "Work type request added."
 msgstr ""
 
-#: .\base\views.py:2379 .\base\views.py:2419
+#: .\base\views.py:2395 .\base\views.py:2435
 msgid "Work type request has been canceled."
 msgstr ""
 
-#: .\base\views.py:2455 .\base\views.py:2503
+#: .\base\views.py:2471 .\base\views.py:2519
 msgid "Work type request has been approved."
 msgstr ""
 
-#: .\base\views.py:2545 .\base\views.py:2871
+#: .\base\views.py:2561 .\base\views.py:2887
 msgid "Request Updated Successfully"
 msgstr ""
 
-#: .\base\views.py:2566 .\base\views.py:2626
+#: .\base\views.py:2582 .\base\views.py:2642
 msgid "Work type request deleted."
 msgstr ""
 
-#: .\base\views.py:2579 .\base\views.py:2639
+#: .\base\views.py:2595 .\base\views.py:2655
 msgid "Work type request not found."
 msgstr ""
 
-#: .\base\views.py:2581
+#: .\base\views.py:2597
 msgid "You cannot delete this work type request."
 msgstr ""
 
-#: .\base\views.py:2644
+#: .\base\views.py:2660
 #, python-brace-format
 msgid "You cannot delete {employee} work type request for the date {date}."
 msgstr ""
 
-#: .\base\views.py:2701
+#: .\base\views.py:2717
 msgid "Request Added"
 msgstr ""
 
-#: .\base\views.py:2902 .\base\views.py:2944
+#: .\base\views.py:2918 .\base\views.py:2960
 msgid "Shift request canceled"
 msgstr ""
 
-#: .\base\views.py:2985
+#: .\base\views.py:3001
 msgid "Shift has been approved."
 msgstr ""
 
-#: .\base\views.py:3033
+#: .\base\views.py:3049
 msgid "Shifts have been approved."
 msgstr ""
 
-#: .\base\views.py:3076 .\base\views.py:3113
+#: .\base\views.py:3092 .\base\views.py:3129
 msgid "Shift request not found."
 msgstr ""
 
-#: .\base\views.py:3078
+#: .\base\views.py:3094
 msgid "You cannot delete this shift request."
 msgstr ""
 
-#: .\base\views.py:3100
+#: .\base\views.py:3116
 msgid "Shift request deleted."
 msgstr ""
 
-#: .\base\views.py:3118
+#: .\base\views.py:3134
 #, python-brace-format
 msgid "You cannot delete {employee} shift request for the date {date}."
 msgstr ""
 
-#: .\base\views.py:3148
+#: .\base\views.py:3164
 msgid "Unread notifications removed."
 msgstr ""
 
-#: .\base\views.py:3166
+#: .\base\views.py:3182
 msgid "Notification deleted."
 msgstr ""
 
-#: .\base\views.py:3182
+#: .\base\views.py:3198
 msgid "Notifications marked as read"
 msgstr ""
 
-#: .\base\views.py:3218 .\payroll\views\views.py:306
+#: .\base\views.py:3234 .\payroll\views\views.py:306
 msgid "Payroll settings updated."
 msgstr ""
 
-#: .\base\views.py:3239
+#: .\base\views.py:3250
+#, fuzzy
+#| msgid "rotating-shift-update"
+msgid "Settings updated."
+msgstr "Update"
+
+#: .\base\views.py:3272
 msgid "Please select a valid date format."
 msgstr ""
 
-#: .\base\views.py:3257
+#: .\base\views.py:3290
 msgid "Date format saved successfully."
 msgstr ""
 
-#: .\base\views.py:3260
+#: .\base\views.py:3293
 msgid "Date format cannot saved. You are not in the company."
 msgstr ""
 
-#: .\base\views.py:3301
+#: .\base\views.py:3334
 msgid "Please select a valid time format."
 msgstr ""
 
-#: .\base\views.py:3319
+#: .\base\views.py:3352
 msgid "Time format saved successfully."
 msgstr ""
 
-#: .\base\views.py:3322
+#: .\base\views.py:3355
 msgid "Time format cannot saved. You are not in the company."
 msgstr ""
 
-#: .\base\views.py:3382
+#: .\base\views.py:3415
 msgid "Attendance Break-point settings created."
 msgstr ""
 
-#: .\base\views.py:3405
+#: .\base\views.py:3438
 msgid "Attendance Break-point settings updated."
 msgstr ""
 
-#: .\base\views.py:3613
+#: .\base\views.py:3646
 msgid "Ticket type has been created successfully!"
 msgstr ""
 
-#: .\base\views.py:3636
+#: .\base\views.py:3669
 msgid "Ticket type has been updated successfully!"
 msgstr ""
 
-#: .\base\views.py:3648
+#: .\base\views.py:3681
 msgid "Ticket type has been deleted successfully!"
 msgstr ""
 
-#: .\base\views.py:3678 .\base\views.py:3728 .\base\views.py:3778
+#: .\base\views.py:3711 .\base\views.py:3761 .\base\views.py:3811
 msgid "Tag has been created successfully!"
 msgstr ""
 
-#: .\base\views.py:3701 .\base\views.py:3751 .\base\views.py:3801
+#: .\base\views.py:3734 .\base\views.py:3784 .\base\views.py:3834
 msgid "Tag has been updated successfully!"
 msgstr ""
 
-#: .\base\views.py:3713 .\base\views.py:3763 .\base\views.py:3813
+#: .\base\views.py:3746 .\base\views.py:3796 .\base\views.py:3846
 msgid "Tag has been deleted successfully!"
 msgstr ""
 
-#: .\base\views.py:3884
+#: .\base\views.py:3917
 msgid "Approval Manager {}"
 msgstr ""
 
-#: .\base\views.py:4189 .\base\views.py:4196
+#: .\base\views.py:4222 .\base\views.py:4229
 msgid "Default pagination updated."
 msgstr ""
 
-#: .\employee\filters.py:35
+#: .\base\views.py:4255
+msgid "Action has been created successfully!"
+msgstr ""
+
+#: .\base\views.py:4278
+msgid "Action has been updated successfully!"
+msgstr ""
+
+#: .\base\views.py:4293
+msgid "Action has been deleted successfully!"
+msgstr ""
+
+#: .\employee\filters.py:34
 msgid "Search in : Employee"
 msgstr ""
 
-#: .\employee\filters.py:36
+#: .\employee\filters.py:35
 msgid "Search in : Reporting manager"
 msgstr ""
 
-#: .\employee\filters.py:221
+#: .\employee\filters.py:220
 msgid "Not Set"
 msgstr ""
 
-#: .\employee\forms.py:276
+#: .\employee\forms.py:278
 msgid "Create New {} "
 msgstr ""
 
-#: .\employee\forms.py:429
+#: .\employee\forms.py:431
 msgid "Select Fields to Update"
 msgstr ""
 
@@ -8603,6 +8873,18 @@ msgstr ""
 msgid "less than or equal"
 msgstr ""
 
+#: .\employee\policies.py:187
+msgid "Disciplinary action taken."
+msgstr ""
+
+#: .\employee\policies.py:226
+msgid "Disciplinary action updated."
+msgstr ""
+
+#: .\employee\policies.py:252
+msgid "Disciplinary action deleted."
+msgstr ""
+
 #: .\employee\templates\dashboard\not_in_yet.html:11
 msgid "Not In Yet"
 msgstr ""
@@ -8610,7 +8892,7 @@ msgstr ""
 #: .\employee\templates\dashboard\not_in_yet.html:39
 #: .\employee\templates\dashboard\not_out_yet.html:26
 #: .\employee\templates\employee\send_mail.html:65
-#: .\offboarding\templates\offboarding\task\table_body.html:29
+#: .\offboarding\templates\offboarding\task\table_body.html:50
 #: .\onboarding\templates\onboarding\kanban\kanban.html:210
 #: .\onboarding\templates\onboarding\kanban\kanban.html:356
 #: .\recruitment\templates\pipeline\footer_components.html:10
@@ -8618,7 +8900,7 @@ msgstr ""
 #: .\recruitment\templates\pipeline\pipeline_card.html:243
 #: .\recruitment\templates\pipeline\pipeline_components\kanban_tabs.html:132
 #: .\recruitment\templates\pipeline\pipeline_components\send_mail.html:65
-#: .\templates\dashboard.html:873
+#: .\templates\dashboard.html:1075
 msgid "Send Mail"
 msgstr ""
 
@@ -8626,6 +8908,89 @@ msgstr ""
 msgid "Not Out Yet"
 msgstr ""
 
+#: .\employee\templates\disciplinary_actions\disciplinary_nav.html:6
+#: .\templates\sidebar.html:381
+msgid "Disciplinary Actions"
+msgstr ""
+
+#: .\employee\templates\disciplinary_actions\disciplinary_nav.html:41
+msgid "Disciplinary Action"
+msgstr ""
+
+#: .\employee\templates\disciplinary_actions\disciplinary_nav.html:51
+#: .\employee\templates\disciplinary_actions\disciplinary_records.html:16
+msgid "Action Taken"
+msgstr ""
+
+#: .\employee\templates\disciplinary_actions\disciplinary_nav.html:67
+#: .\employee\templates\tabs\personal-tab.html:133
+#: .\employee\templates\tabs\personal-tab.html:154
+msgid "Work Information"
+msgstr ""
+
+#: .\employee\templates\disciplinary_actions\disciplinary_nav.html:124
+msgid "Take An Action"
+msgstr ""
+
+#: .\employee\templates\disciplinary_actions\disciplinary_nav.html:157
+msgid "Take An Action."
+msgstr ""
+
+#: .\employee\templates\disciplinary_actions\disciplinary_nav.html:180
+msgid "Edit Action."
+msgstr ""
+
+#: .\employee\templates\disciplinary_actions\disciplinary_records.html:17
+#: .\employee\templates\disciplinary_actions\form.html:20
+#: .\employee\templates\disciplinary_actions\update_form.html:34
+msgid "Action Date"
+msgstr ""
+
+#: .\employee\templates\disciplinary_actions\disciplinary_records.html:18
+#: .\onboarding\templates\onboarding\candidates_view.html:104
+#: .\payroll\templates\payroll\reimbursement\attachments.html:2
+#, fuzzy
+#| msgid "recruitment"
+msgid "Attachments"
+msgstr "Recruitment"
+
+#: .\employee\templates\disciplinary_actions\disciplinary_records.html:40
+msgid "Suspended for"
+msgstr ""
+
+#: .\employee\templates\disciplinary_actions\disciplinary_records.html:40
+msgid "days."
+msgstr ""
+
+#: .\employee\templates\disciplinary_actions\disciplinary_records.html:61
+#: .\employee\templates\documents\requests.html:14
+#: .\employee\templates\tabs\document_tab.html:169
+#, fuzzy
+#| msgid "employee"
+msgid "View File"
+msgstr "Employee"
+
+#: .\employee\templates\disciplinary_actions\disciplinary_records.html:65
+msgid "No file has been uploaded."
+msgstr ""
+
+#: .\employee\templates\disciplinary_actions\disciplinary_records.html:78
+msgid "Are you sure you want to delete this disciplinary action?"
+msgstr ""
+
+#: .\employee\templates\disciplinary_actions\form.html:12
+#: .\employee\templates\disciplinary_actions\update_form.html:25
+#, fuzzy
+#| msgid "update-deduction"
+msgid "Action"
+msgstr "Update"
+
+#: .\employee\templates\disciplinary_actions\form.html:29
+#: .\employee\templates\disciplinary_actions\update_form.html:43
+#: .\leave\models.py:412
+msgid "Attachment"
+msgstr ""
+
 #: .\employee\templates\documents\document_nav.html:9
 #, fuzzy
 #| msgid "recruitment"
@@ -8633,7 +8998,7 @@ msgid "Document Requests"
 msgstr "Recruitment"
 
 #: .\employee\templates\documents\document_nav.html:125
-#: .\templates\sidebar.html:336
+#: .\templates\sidebar.html:341
 #, fuzzy
 #| msgid "recruitment"
 msgid "Document Request"
@@ -8677,13 +9042,6 @@ msgstr ""
 msgid "Selected Documents"
 msgstr "Recruitment"
 
-#: .\employee\templates\documents\requests.html:14
-#: .\employee\templates\tabs\document_tab.html:169
-#, fuzzy
-#| msgid "employee"
-msgid "View File"
-msgstr "Employee"
-
 #: .\employee\templates\documents\requests.html:39
 #: .\employee\templates\documents\requests.html:65
 #: .\employee\templates\tabs\document_tab.html:194
@@ -8732,13 +9090,14 @@ msgstr ""
 
 #: .\employee\templates\employee\create_form\personal_info.html:81
 #: .\employee\templates\employee\profile\personal_info.html:40
-#: .\employee\templates\employee\profile\profile_view.html:134
+#: .\employee\templates\employee\profile\profile_view.html:142
 #: .\employee\templates\employee\update_form\personal_info.html:63
 #: .\employee\templates\employee\view\individual.html:153
 #: .\employee\templates\employee_export_filter.html:36
 #: .\employee\templates\employee_filters.html:14
 #: .\employee\templates\employee_personal_info\employee_list.html:69
 #: .\employee\templates\employee_personal_info\group_by.html:60
+#: .\offboarding\templates\offboarding\pipeline\individual_view.html:23
 #: .\onboarding\forms.py:199
 #: .\onboarding\templates\onboarding\candidate_creation.html:51
 #: .\onboarding\templates\onboarding\candidate_update.html:62
@@ -8764,7 +9123,7 @@ msgstr ""
 
 #: .\employee\templates\employee\create_form\personal_info.html:86
 #: .\employee\templates\employee\profile\personal_info.html:45
-#: .\employee\templates\employee\profile\profile_view.html:149
+#: .\employee\templates\employee\profile\profile_view.html:157
 #: .\employee\templates\employee\update_form\personal_info.html:68
 #: .\employee\templates\employee\view\individual.html:173
 #: .\employee\templates\employee_export_filter.html:50
@@ -8831,7 +9190,7 @@ msgstr ""
 #: .\employee\templates\employee\update_form\personal_info.html:140
 #: .\employee\templates\tabs\personal-tab.html:69 .\onboarding\forms.py:328
 #: .\onboarding\templates\onboarding\employee_creation.html:132
-#: .\payroll\models\models.py:641
+#: .\payroll\models\models.py:660
 msgid "Experience"
 msgstr ""
 
@@ -8846,7 +9205,7 @@ msgstr ""
 #: .\employee\templates\employee\profile\personal_info.html:130
 #: .\employee\templates\employee\update_form\personal_info.html:153
 #: .\employee\templates\tabs\personal-tab.html:87
-#: .\payroll\models\models.py:639
+#: .\payroll\models\models.py:658
 msgid "Children"
 msgstr ""
 
@@ -8915,76 +9274,76 @@ msgstr ""
 msgid "Bank Info"
 msgstr ""
 
-#: .\employee\templates\employee\profile\profile_view.html:126
+#: .\employee\templates\employee\profile\profile_view.html:134
 #: .\employee\templates\employee\profile\work_info.html:69
 #: .\employee\templates\employee\update_form\work_details.html:153
 #: .\employee\templates\employee\view\individual.html:146
 #: .\employee\templates\employee_personal_info\employee_list.html:92
 #: .\employee\templates\employee_personal_info\group_by.html:70
-#: .\employee\views.py:1022
+#: .\employee\views.py:1044
 msgid "Work Email"
 msgstr ""
 
-#: .\employee\templates\employee\profile\profile_view.html:141
+#: .\employee\templates\employee\profile\profile_view.html:149
 #: .\employee\templates\employee\view\individual.html:166
-#: .\employee\views.py:1024
+#: .\employee\views.py:1046
 msgid "Work Phone"
 msgstr ""
 
-#: .\employee\templates\employee\profile\profile_view.html:182
+#: .\employee\templates\employee\profile\profile_view.html:190
 #: .\employee\templates\employee\view\individual.html:210
 #: .\recruitment\templates\candidate\individual.html:157
 msgid "About"
 msgstr ""
 
-#: .\employee\templates\employee\profile\profile_view.html:185
+#: .\employee\templates\employee\profile\profile_view.html:193
 msgid "Work type & Shift"
 msgstr ""
 
-#: .\employee\templates\employee\profile\profile_view.html:193
+#: .\employee\templates\employee\profile\profile_view.html:201
 #: .\employee\templates\employee\view\individual.html:214
 #: .\employee\templates\employee\view\individual.html:222
 msgid "Work Type & Shift"
 msgstr ""
 
-#: .\employee\templates\employee\profile\profile_view.html:208
-#: .\employee\templates\employee\profile\profile_view.html:214
+#: .\employee\templates\employee\profile\profile_view.html:216
+#: .\employee\templates\employee\profile\profile_view.html:222
 #: .\employee\templates\employee\view\individual.html:240
 #: .\employee\templates\employee\view\individual.html:246
-#: .\templates\sidebar.html:585
+#: .\templates\sidebar.html:600
 msgid "Leave"
 msgstr ""
 
-#: .\employee\templates\employee\profile\profile_view.html:217
-#: .\employee\templates\employee\profile\profile_view.html:223
+#: .\employee\templates\employee\profile\profile_view.html:225
+#: .\employee\templates\employee\profile\profile_view.html:231
 #: .\employee\templates\employee\view\individual.html:251
 #: .\employee\templates\employee\view\individual.html:257
-#: .\templates\sidebar.html:401
+#: .\templates\sidebar.html:414
 msgid "Payroll"
 msgstr ""
 
-#: .\employee\templates\employee\profile\profile_view.html:226
 #: .\employee\templates\employee\profile\profile_view.html:234
+#: .\employee\templates\employee\profile\profile_view.html:242
 #: .\employee\templates\employee\view\individual.html:262
 #: .\employee\templates\employee\view\individual.html:270
 msgid "Allowance & Deduction"
 msgstr ""
 
-#: .\employee\templates\employee\profile\profile_view.html:237
-#: .\employee\templates\employee\profile\profile_view.html:244
+#: .\employee\templates\employee\profile\profile_view.html:245
+#: .\employee\templates\employee\profile\profile_view.html:252
 msgid "Penalty Account"
 msgstr ""
 
-#: .\employee\templates\employee\profile\profile_view.html:259
-#: .\employee\templates\employee\profile\profile_view.html:268
+#: .\employee\templates\employee\profile\profile_view.html:267
+#: .\employee\templates\employee\profile\profile_view.html:276
 #: .\employee\templates\employee\view\individual.html:310
 #: .\employee\templates\employee\view\individual.html:318
-#: .\templates\sidebar.html:688
+#: .\templates\sidebar.html:703
 msgid "Performance"
 msgstr ""
 
-#: .\employee\templates\employee\profile\profile_view.html:271
 #: .\employee\templates\employee\profile\profile_view.html:279
+#: .\employee\templates\employee\profile\profile_view.html:287
 #: .\employee\templates\employee\view\individual.html:349
 #: .\employee\templates\employee\view\individual.html:357
 #: .\helpdesk\templates\helpdesk\ticket\ticket_detail.html:379
@@ -8993,13 +9352,18 @@ msgstr ""
 msgid "Documents"
 msgstr "Recruitment"
 
-#: .\employee\templates\employee\profile\profile_view.html:282
 #: .\employee\templates\employee\profile\profile_view.html:290
+#: .\employee\templates\employee\profile\profile_view.html:298
 #: .\employee\templates\employee\view\individual.html:370
 #: .\employee\templates\tabs\bonus_points.html:7
 msgid "Bonus Points"
 msgstr ""
 
+#: .\employee\templates\employee\profile\profile_view.html:301
+#: .\employee\templates\employee\profile\profile_view.html:309
+msgid "Resignation"
+msgstr ""
+
 #: .\employee\templates\employee\profile\work_info.html:7
 msgid "Job Title"
 msgstr ""
@@ -9030,7 +9394,7 @@ msgstr ""
 #: .\employee\templates\employee\profile\work_info.html:91
 #: .\employee\templates\employee\update_form\work_details.html:180
 #: .\employee\templates\tabs\contract-tab.html:18
-#: .\payroll\models\models.py:156
+#: .\payroll\models\models.py:157
 #: .\payroll\templates\payroll\contract\contract_list.html:24
 #: .\payroll\templates\payroll\contract\group_by.html:40
 msgid "Basic Salary"
@@ -9228,7 +9592,7 @@ msgstr ""
 msgid "Selected Employees"
 msgstr ""
 
-#: .\employee\templates\policies\nav.html:4 .\templates\sidebar.html:375
+#: .\employee\templates\policies\nav.html:4 .\templates\sidebar.html:388
 msgid "Policies"
 msgstr ""
 
@@ -9272,7 +9636,7 @@ msgid "Deductions"
 msgstr ""
 
 #: .\employee\templates\tabs\allowance_deduction-tab.html:52
-#: .\payroll\forms\component_forms.py:43 .\payroll\models\models.py:904
+#: .\payroll\forms\component_forms.py:43 .\payroll\models\models.py:923
 #: .\payroll\templates\payroll\allowance\filter_allowance.html:14
 #: .\payroll\templates\payroll\allowance\list_allowance.html:13
 msgid "Allowance"
@@ -9410,17 +9774,17 @@ msgid "Redeem bonus points"
 msgstr ""
 
 #: .\employee\templates\tabs\contract-tab.html:14
-#: .\payroll\models\models.py:131
+#: .\payroll\models\models.py:132
 #: .\payroll\templates\payroll\contract\contract_export_filter.html:27
 #: .\payroll\templates\payroll\contract\contract_list.html:19
 #: .\payroll\templates\payroll\contract\filter_contract.html:6
 #: .\payroll\templates\payroll\contract\group_by.html:35
-#: .\templates\sidebar.html:423
+#: .\templates\sidebar.html:438
 msgid "Contract"
 msgstr ""
 
 #: .\employee\templates\tabs\contract-tab.html:17
-#: .\payroll\models\models.py:147 .\payroll\models\models.py:647
+#: .\payroll\models\models.py:148 .\payroll\models\models.py:666
 #: .\payroll\templates\payroll\contract\contract_export_filter.html:46
 #: .\payroll\templates\payroll\contract\contract_list.html:23
 #: .\payroll\templates\payroll\contract\contract_single_view.html:51
@@ -9430,7 +9794,7 @@ msgid "Wage Type"
 msgstr ""
 
 #: .\employee\templates\tabs\contract-tab.html:19
-#: .\payroll\models\models.py:163
+#: .\payroll\models\models.py:164
 #: .\payroll\templates\payroll\contract\contract_export_filter.html:52
 #: .\payroll\templates\payroll\contract\contract_list.html:25
 #: .\payroll\templates\payroll\contract\contract_single_view.html:100
@@ -9533,13 +9897,13 @@ msgid "No Leave requests have been generated."
 msgstr ""
 
 #: .\employee\templates\tabs\leave-tab.html:329
+#: .\leave\templates\leave\leave_request\filter_leave_requests.html:8
 #: .\leave\templates\leave\leave_request\leave_requests_export_filter.html:36
-#: .\leave\templates\leave\leave_request\request_view.html:93
 #: .\leave\templates\leave\user_leave\user_leave_view.html:72
 #: .\leave\templates\leave\user_leave\user_request_form.html:19
 #: .\leave\templates\leave\user_leave\user_request_view.html:73
-#: .\leave\templates\leave\user_leave\user_request_view.html:358
-#: .\templates\dashboard.html:731
+#: .\leave\templates\leave\user_leave\user_request_view.html:373
+#: .\templates\dashboard.html:793
 msgid "Leave Request"
 msgstr ""
 
@@ -9576,7 +9940,7 @@ msgid "No notes have been added for this employee"
 msgstr ""
 
 #: .\employee\templates\tabs\payroll-tab.html:16
-#: .\payroll\models\models.py:1258
+#: .\payroll\models\models.py:1277
 #: .\payroll\templates\payroll\dashboard.html:56
 #: .\payroll\templates\payroll\dashboard.html:125
 #: .\payroll\templates\payroll\payslip\generate_payslip_list.html:26
@@ -9589,7 +9953,7 @@ msgid "Review Ongoing"
 msgstr ""
 
 #: .\employee\templates\tabs\payroll-tab.html:20
-#: .\payroll\models\models.py:1259
+#: .\payroll\models\models.py:1278
 #: .\payroll\templates\payroll\dashboard.html:43
 #: .\payroll\templates\payroll\dashboard.html:126
 #: .\payroll\templates\payroll\payslip\generate_payslip_list.html:27
@@ -9602,7 +9966,7 @@ msgid "Confirmed"
 msgstr ""
 
 #: .\employee\templates\tabs\payroll-tab.html:24 .\leave\models.py:95
-#: .\payroll\models\models.py:1260
+#: .\payroll\models\models.py:1279
 #: .\payroll\templates\payroll\dashboard.html:30
 #: .\payroll\templates\payroll\dashboard.html:127
 #: .\payroll\templates\payroll\payslip\generate_payslip_list.html:28
@@ -9614,9 +9978,9 @@ msgid "Paid"
 msgstr ""
 
 #: .\employee\templates\tabs\payroll-tab.html:36
-#: .\payroll\forms\component_forms.py:317 .\payroll\models\models.py:73
-#: .\payroll\models\models.py:992 .\payroll\models\models.py:997
-#: .\payroll\models\models.py:1085
+#: .\payroll\forms\component_forms.py:317 .\payroll\models\models.py:74
+#: .\payroll\models\models.py:1011 .\payroll\models\models.py:1016
+#: .\payroll\models\models.py:1104
 #: .\payroll\templates\payroll\payslip\generate_payslip_list.html:61
 #: .\payroll\templates\payroll\payslip\group_payslips.html:51
 #: .\payroll\templates\payroll\payslip\payslip_table.html:47
@@ -9624,8 +9988,8 @@ msgid "Gross Pay"
 msgstr ""
 
 #: .\employee\templates\tabs\payroll-tab.html:38
-#: .\payroll\forms\component_forms.py:319 .\payroll\models\models.py:999
-#: .\payroll\models\models.py:1086
+#: .\payroll\forms\component_forms.py:319 .\payroll\models\models.py:1018
+#: .\payroll\models\models.py:1105
 #: .\payroll\templates\payroll\payslip\generate_payslip_list.html:63
 #: .\payroll\templates\payroll\payslip\group_payslips.html:53
 #: .\payroll\templates\payroll\payslip\payslip_table.html:49
@@ -9678,17 +10042,12 @@ msgstr ""
 msgid "Emergency Contact Name"
 msgstr ""
 
-#: .\employee\templates\tabs\personal-tab.html:133
-#: .\employee\templates\tabs\personal-tab.html:154
-msgid "Work Information"
-msgstr ""
-
 #: .\employee\templates\tabs\personal-tab.html:145
 msgid "Contract details"
 msgstr ""
 
 #: .\employee\templates\tabs\personal-tab.html:244
-#: .\payroll\models\models.py:108
+#: .\payroll\models\models.py:109
 msgid "Salary"
 msgstr ""
 
@@ -9793,175 +10152,175 @@ msgstr ""
 msgid "Update Note"
 msgstr ""
 
-#: .\employee\views.py:194 .\employee\views.py:893
+#: .\employee\views.py:199 .\employee\views.py:915
 msgid "Profile updated."
 msgstr ""
 
-#: .\employee\views.py:202
+#: .\employee\views.py:207
 msgid "Bank details updated."
 msgstr ""
 
-#: .\employee\views.py:643
+#: .\employee\views.py:656
 msgid "Document created successfully."
 msgstr ""
 
-#: .\employee\views.py:679
+#: .\employee\views.py:697
 msgid "Document {} deleted successfully"
 msgstr ""
 
-#: .\employee\views.py:682
+#: .\employee\views.py:701
 msgid "You cannot delete this document."
 msgstr ""
 
-#: .\employee\views.py:785
+#: .\employee\views.py:803
 #, fuzzy
 #| msgid "shift-request-view"
 msgid "Document request approved"
 msgstr "Shift Requests"
 
-#: .\employee\views.py:787 .\employee\views.py:818
+#: .\employee\views.py:805 .\employee\views.py:834
 msgid "No document uploaded"
 msgstr ""
 
-#: .\employee\views.py:814 .\employee\views.py:858
+#: .\employee\views.py:830 .\employee\views.py:880
 msgid "Document request rejected"
 msgstr ""
 
-#: .\employee\views.py:838
+#: .\employee\views.py:860
 msgid "{len(document_obj)} Document request approved"
 msgstr ""
 
-#: .\employee\views.py:875
+#: .\employee\views.py:897
 msgid "Bank details updated"
 msgstr ""
 
-#: .\employee\views.py:1065
+#: .\employee\views.py:1087
 msgid "Bank Country"
 msgstr ""
 
-#: .\employee\views.py:1067
+#: .\employee\views.py:1089
 msgid "Bank State"
 msgstr ""
 
-#: .\employee\views.py:1190
+#: .\employee\views.py:1212
 msgid "Employee personal information updated."
 msgstr ""
 
-#: .\employee\views.py:1215
+#: .\employee\views.py:1237
 msgid "Employee work information updated."
 msgstr ""
 
-#: .\employee\views.py:1232
+#: .\employee\views.py:1254
 msgid "Employee bank details updated."
 msgstr ""
 
-#: .\employee\views.py:1255 .\employee\views.py:1277
+#: .\employee\views.py:1277 .\employee\views.py:1299
 msgid "Profile image updated."
 msgstr ""
 
-#: .\employee\views.py:1257
+#: .\employee\views.py:1279
 msgid "No image chosen."
 msgstr ""
 
-#: .\employee\views.py:1297 .\employee\views.py:1328
+#: .\employee\views.py:1319 .\employee\views.py:1350
 msgid "No profile image to remove."
 msgstr ""
 
-#: .\employee\views.py:1310 .\employee\views.py:1342
+#: .\employee\views.py:1332 .\employee\views.py:1364
 #: .\recruitment\views\views.py:1101
 msgid "Profile image removed."
 msgstr ""
 
-#: .\employee\views.py:1364
+#: .\employee\views.py:1386
 msgid "New Employee Added."
 msgstr ""
 
-#: .\employee\views.py:1618
+#: .\employee\views.py:1640
 msgid "Employee updated."
 msgstr ""
 
-#: .\employee\views.py:1641
+#: .\employee\views.py:1663
 msgid "Employee deleted"
 msgstr ""
 
-#: .\employee\views.py:1643 .\employee\views.py:1672
+#: .\employee\views.py:1665 .\employee\views.py:1694
 msgid "Employee not found."
 msgstr ""
 
-#: .\employee\views.py:1650
+#: .\employee\views.py:1672
 msgid "This employee already related in {}."
 msgstr ""
 
-#: .\employee\views.py:1669
+#: .\employee\views.py:1691
 #, python-format
 msgid "%(employee)s deleted."
 msgstr ""
 
-#: .\employee\views.py:1675
+#: .\employee\views.py:1697
 #, python-format
 msgid "You cannot delete %(employee)s."
 msgstr ""
 
-#: .\employee\views.py:1723
+#: .\employee\views.py:1745
 msgid "Employee archived"
 msgstr ""
 
-#: .\employee\views.py:1730
+#: .\employee\views.py:1752
 #, python-brace-format
 msgid "Can't archive.Employee assigned as {related_models}"
 msgstr ""
 
-#: .\employee\views.py:1796
+#: .\employee\views.py:1818
 msgid "Created work information"
 msgstr ""
 
-#: .\employee\views.py:1825
+#: .\employee\views.py:1847
 msgid "Work Information Updated Successfully"
 msgstr ""
 
-#: .\employee\views.py:1855
+#: .\employee\views.py:1877
 msgid "Bank Details Created Successfully"
 msgstr ""
 
-#: .\employee\views.py:1882
+#: .\employee\views.py:1904
 msgid "Bank Details Updated Successfully"
 msgstr ""
 
-#: .\employee\views.py:1902
+#: .\employee\views.py:1924
 msgid "Employee work information deleted"
 msgstr ""
 
-#: .\employee\views.py:1904
+#: .\employee\views.py:1926
 msgid "Employee work information not found."
 msgstr ""
 
-#: .\employee\views.py:1906
+#: .\employee\views.py:1928
 msgid "You cannot delete this Employee work information"
 msgstr ""
 
-#: .\employee\views.py:2356
+#: .\employee\views.py:2378
 msgid "In-Active"
 msgstr ""
 
-#: .\employee\views.py:2418
+#: .\employee\views.py:2440
 msgid "No Data Found..."
 msgstr ""
 
-#: .\employee\views.py:2562 .\recruitment\views\views.py:584
+#: .\employee\views.py:2584 .\recruitment\views\views.py:584
 #: .\recruitment\views\views.py:620
 msgid "Note added successfully.."
 msgstr ""
 
-#: .\employee\views.py:2592 .\recruitment\views\views.py:646
+#: .\employee\views.py:2614 .\recruitment\views\views.py:646
 #: .\recruitment\views\views.py:669
 msgid "Note updated successfully..."
 msgstr ""
 
-#: .\employee\views.py:2621
+#: .\employee\views.py:2643
 msgid "Note deleted successfully..."
 msgstr ""
 
-#: .\employee\views.py:2689
+#: .\employee\views.py:2714
 msgid "Added {} points to the bonus account"
 msgstr ""
 
@@ -10040,7 +10399,7 @@ msgid "Create Tag"
 msgstr ""
 
 #: .\helpdesk\templates\helpdesk\faq\faq_nav.html:4
-#: .\templates\sidebar.html:874
+#: .\templates\sidebar.html:898
 msgid "FAQs"
 msgstr ""
 
@@ -10212,7 +10571,7 @@ msgstr ""
 
 #: .\helpdesk\templates\helpdesk\ticket\ticket_filter.html:62
 #: .\helpdesk\templates\helpdesk\ticket\ticket_nav.html:5
-#: .\templates\sidebar.html:881
+#: .\templates\sidebar.html:905
 msgid "Tickets"
 msgstr ""
 
@@ -10232,7 +10591,7 @@ msgid "Ticket Id"
 msgstr ""
 
 #: .\helpdesk\templates\helpdesk\ticket\ticket_nav.html:67
-#: .\offboarding\templates\offboarding\task\table_body.html:39
+#: .\offboarding\templates\offboarding\task\table_body.html:76
 #: .\recruitment\templates\skill_zone\skill_zone_card.html:53
 msgid "Un Archive"
 msgstr ""
@@ -10286,18 +10645,6 @@ msgstr ""
 msgid "All Tickets"
 msgstr ""
 
-#: .\helpdesk\tests.py:23 .\helpdesk\views.py:879
-msgid "The comment updated successfully."
-msgstr ""
-
-#: .\helpdesk\tests.py:26 .\helpdesk\views.py:882
-msgid "The comment needs to be atleast 2 charactors."
-msgstr ""
-
-#: .\helpdesk\tests.py:37 .\helpdesk\views.py:893
-msgid "The comment \"{}\" has been deleted successfully."
-msgstr ""
-
 #: .\helpdesk\views.py:74
 msgid "The FAQ Category created successfully."
 msgstr ""
@@ -10378,6 +10725,18 @@ msgstr ""
 msgid "A new comment has been created."
 msgstr ""
 
+#: .\helpdesk\views.py:879
+msgid "The comment updated successfully."
+msgstr ""
+
+#: .\helpdesk\views.py:882
+msgid "The comment needs to be atleast 2 charactors."
+msgstr ""
+
+#: .\helpdesk\views.py:893
+msgid "The comment \"{}\" has been deleted successfully."
+msgstr ""
+
 #: .\helpdesk\views.py:1047
 msgid "The department manager created successfully."
 msgstr ""
@@ -10402,31 +10761,31 @@ msgstr ""
 msgid "You dont have permission."
 msgstr ""
 
-#: .\leave\forms.py:244 .\leave\views.py:1621 .\leave\views.py:2456
+#: .\leave\forms.py:244 .\leave\views.py:1633 .\leave\views.py:2464
 msgid "An attachment is required for this leave request"
 msgstr ""
 
-#: .\leave\forms.py:248 .\leave\forms.py:334 .\leave\forms.py:497
-#: .\leave\forms.py:640
+#: .\leave\forms.py:248 .\leave\forms.py:334 .\leave\forms.py:501
+#: .\leave\forms.py:644
 msgid "End date should not be less than start date."
 msgstr ""
 
-#: .\leave\forms.py:253 .\leave\forms.py:339 .\leave\forms.py:493
-#: .\leave\forms.py:645
+#: .\leave\forms.py:253 .\leave\forms.py:339 .\leave\forms.py:497
+#: .\leave\forms.py:649
 msgid "There is a mismatch in the breakdown of the start date and end date."
 msgstr ""
 
-#: .\leave\forms.py:258 .\leave\forms.py:344 .\leave\forms.py:650
+#: .\leave\forms.py:258 .\leave\forms.py:344 .\leave\forms.py:654
 msgid "Employee has no leave type.."
 msgstr ""
 
-#: .\leave\forms.py:262 .\leave\forms.py:347 .\leave\forms.py:501
-#: .\leave\forms.py:654
+#: .\leave\forms.py:262 .\leave\forms.py:347 .\leave\forms.py:505
+#: .\leave\forms.py:658
 msgid "Employee has already a leave request for this date range.."
 msgstr ""
 
-#: .\leave\forms.py:276 .\leave\forms.py:360 .\leave\forms.py:514
-#: .\leave\forms.py:667
+#: .\leave\forms.py:276 .\leave\forms.py:360 .\leave\forms.py:518
+#: .\leave\forms.py:671
 msgid "Employee doesn't have enough leave days.."
 msgstr ""
 
@@ -10434,7 +10793,7 @@ msgstr ""
 msgid "End date should not be earlier than the start date."
 msgstr ""
 
-#: .\leave\forms.py:596 .\leave\forms.py:712
+#: .\leave\forms.py:600 .\leave\forms.py:716
 msgid "Rejection Reason"
 msgstr ""
 
@@ -10486,11 +10845,11 @@ msgstr ""
 msgid "Require Attachment"
 msgstr ""
 
-#: .\leave\models.py:208 .\leave\templates\leave\holiday\holiday.html:43
-#: .\leave\templates\leave\holiday\holiday_export_filter.html:36
+#: .\leave\models.py:208 .\leave\templates\leave\holiday\holiday.html:44
+#: .\leave\templates\leave\holiday\holiday_export_filter.html:47
 #: .\leave\templates\leave\holiday\holiday_filter.html:28
 #: .\leave\templates\leave\holiday\holiday_form.html:48
-#: .\leave\templates\leave\holiday\holiday_update_form.html:49
+#: .\leave\templates\leave\holiday\holiday_update_form.html:51
 msgid "Recurring"
 msgstr ""
 
@@ -10519,10 +10878,6 @@ msgstr ""
 msgid "End Date Breakdown"
 msgstr ""
 
-#: .\leave\models.py:412
-msgid "Attachment"
-msgstr ""
-
 #: .\leave\models.py:429
 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_group_by.html:35
 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_group_by.html:213
@@ -10574,7 +10929,7 @@ msgstr ""
 #: .\leave\templates\leave\company_leave\company_leave_creation_form.html:23
 #: .\leave\templates\leave\company_leave\company_leave_update_form.html:23
 #: .\leave\templates\leave\holiday\holiday_form.html:54
-#: .\leave\templates\leave\holiday\holiday_update_form.html:55
+#: .\leave\templates\leave\holiday\holiday_update_form.html:57
 #: .\leave\templates\leave\leave_assign\available_update_form.html:23
 #: .\leave\templates\leave\leave_assign\leave_assign_form.html:16
 #: .\leave\templates\leave\leave_assign\leave_assign_one_form.html:19
@@ -10586,7 +10941,7 @@ msgid "Apply"
 msgstr ""
 
 #: .\leave\templates\leave\company_leave\company_leave_view.html:8
-#: .\templates\sidebar.html:662
+#: .\templates\sidebar.html:677
 msgid "Company Leaves"
 msgstr ""
 
@@ -10615,12 +10970,12 @@ msgid "Update Company Leaves"
 msgstr ""
 
 #: .\leave\templates\leave\company_leave\company_leave_view.html:143
-#: .\leave\templates\leave\holiday\holiday.html:91
-#: .\leave\templates\leave\holiday\holiday_view.html:362
+#: .\leave\templates\leave\holiday\holiday.html:92
+#: .\leave\templates\leave\holiday\holiday_view.html:343
 #: .\leave\templates\leave\leave_assign\assign_view.html:396
-#: .\leave\templates\leave\leave_request\request_view.html:452
+#: .\leave\templates\leave\leave_request\request_view.html:383
 #: .\leave\templates\leave\leave_type\leave_type_view.html:152
-#: .\leave\templates\leave\user_leave\user_request_view.html:402
+#: .\leave\templates\leave\user_leave\user_request_view.html:417
 #: .\onboarding\templates\onboarding\candidates_view.html:183
 msgid "Are you sure you want to delete?"
 msgstr ""
@@ -10648,7 +11003,7 @@ msgstr ""
 msgid "next"
 msgstr ""
 
-#: .\leave\templates\leave\dashboard.html:92 .\templates\dashboard.html:690
+#: .\leave\templates\leave\dashboard.html:92 .\templates\dashboard.html:890
 msgid "On Leave"
 msgstr ""
 
@@ -10718,17 +11073,17 @@ msgid "Unselect All Holidays"
 msgstr ""
 
 #: .\leave\templates\leave\holiday\holiday.html:23
-#: .\leave\templates\leave\holiday\holiday_view.html:307
+#: .\leave\templates\leave\holiday\holiday_view.html:288
 msgid "Export Holidays"
 msgstr ""
 
-#: .\leave\templates\leave\holiday\holiday.html:40
-#: .\leave\templates\leave\holiday\holiday_form.html:33
-#: .\leave\templates\leave\holiday\holiday_update_form.html:34
+#: .\leave\templates\leave\holiday\holiday.html:41
+#: .\leave\templates\leave\holiday\holiday_form.html:36
+#: .\leave\templates\leave\holiday\holiday_update_form.html:36
 msgid "Holiday Name"
 msgstr ""
 
-#: .\leave\templates\leave\holiday\holiday.html:184
+#: .\leave\templates\leave\holiday\holiday.html:185
 msgid "There are no holidays at the moments."
 msgstr ""
 
@@ -10737,44 +11092,41 @@ msgstr ""
 msgid "Holiday"
 msgstr ""
 
-#: .\leave\templates\leave\holiday\holiday_export_filter.html:23
+#: .\leave\templates\leave\holiday\holiday_export_filter.html:26
 #: .\leave\templates\leave\holiday\holiday_filter.html:16
-#: .\leave\templates\leave\leave_request\leave_requests_export_filter.html:79
-#: .\leave\templates\leave\leave_request\request_view.html:136
+#: .\leave\templates\leave\leave_request\filter_leave_requests.html:99
+#: .\leave\templates\leave\leave_request\leave_requests_export_filter.html:127
 #: .\leave\templates\leave\user_leave\user_request_view.html:117
 msgid "From Date"
 msgstr ""
 
-#: .\leave\templates\leave\holiday\holiday_export_filter.html:30
+#: .\leave\templates\leave\holiday\holiday_export_filter.html:37
 #: .\leave\templates\leave\holiday\holiday_filter.html:22
-#: .\leave\templates\leave\leave_request\leave_requests_export_filter.html:86
-#: .\leave\templates\leave\leave_request\request_view.html:143
+#: .\leave\templates\leave\leave_request\filter_leave_requests.html:106
+#: .\leave\templates\leave\leave_request\leave_requests_export_filter.html:134
 #: .\leave\templates\leave\user_leave\user_request_view.html:124
 msgid "To Date"
 msgstr ""
 
-#: .\leave\templates\leave\holiday\holiday_view.html:21
-#: .\templates\sidebar.html:654
-msgid "Holidays"
-msgstr ""
-
-#: .\leave\templates\leave\holiday\holiday_view.html:150
-msgid "Selected Holidays"
-msgstr ""
-
-#: .\leave\templates\leave\holiday\holiday_view.html:176
-msgid "There are no holidays at the moment."
-msgstr ""
-
-#: .\leave\templates\leave\holiday\holiday_view.html:196
+#: .\leave\templates\leave\holiday\holiday_form.html:19
+#: .\leave\templates\leave\holiday\holiday_update_form.html:19
 msgid "Create Holiday"
 msgstr ""
 
-#: .\leave\templates\leave\holiday\holiday_view.html:221
-msgid "Update Holiday"
+#: .\leave\templates\leave\holiday\holiday_view.html:21
+#: .\templates\sidebar.html:669
+msgid "Holidays"
 msgstr ""
 
-#: .\leave\templates\leave\holiday\holiday_view.html:245
+#: .\leave\templates\leave\holiday\holiday_view.html:153
+msgid "Selected Holidays"
+msgstr ""
+
+#: .\leave\templates\leave\holiday\holiday_view.html:179
+msgid "There are no holidays at the moment."
+msgstr ""
+
+#: .\leave\templates\leave\holiday\holiday_view.html:226
 msgid "Import Holidays"
 msgstr ""
 
@@ -10787,22 +11139,6 @@ msgstr ""
 msgid "You have No leave requests for this filter."
 msgstr ""
 
-#: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_group_by.html:218
-#: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_list.html:176
-#: .\leave\templates\leave\leave_request\group_by.html:62
-#: .\leave\templates\leave\leave_request\leave_requests.html:80
-#: .\leave\templates\leave\user_leave\group_by.html:68
-#: .\leave\templates\leave\user_leave\user_requests.html:74
-#: .\offboarding\templates\offboarding\stage\offboarding_body.html:66
-#: .\onboarding\templates\onboarding\onboarding_table.html:155
-#: .\recruitment\forms.py:618
-#: .\recruitment\templates\candidate\candidate_card.html:56
-#: .\recruitment\templates\skill_zone_cand\skill_zone_cand_card.html:52
-#: .\recruitment\templates\survey\filter.html:29
-#: .\recruitment\templates\survey\view_single_template.html:24
-msgid "Options"
-msgstr ""
-
 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_reject_form.html:18
 #: .\leave\templates\leave\leave_request\cancel_form.html:16
 msgid "Rejection reason"
@@ -10829,7 +11165,7 @@ msgid "View attachment"
 msgstr ""
 
 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_view.html:36
-#: .\templates\sidebar.html:624
+#: .\templates\sidebar.html:639
 msgid "Leave Allocation Requests"
 msgstr ""
 
@@ -10958,6 +11294,11 @@ msgstr ""
 msgid "Penalties"
 msgstr ""
 
+#: .\leave\templates\leave\leave_request\leave_request_form.html:19
+#: .\leave\templates\leave\user_leave\user_request_view.html:351
+msgid "Leave Request Create"
+msgstr ""
+
 #: .\leave\templates\leave\leave_request\leave_requests.html:14
 #: .\leave\templates\leave\user_leave\user_requests.html:12
 msgid "Cancelled & rejected"
@@ -11009,7 +11350,7 @@ msgid "Add more managers.."
 msgstr ""
 
 #: .\leave\templates\leave\leave_request\request_view.html:20
-#: .\templates\sidebar.html:645
+#: .\templates\sidebar.html:660
 msgid "Leave Requests"
 msgstr ""
 
@@ -11021,30 +11362,26 @@ msgstr ""
 msgid "Search in : Status"
 msgstr ""
 
-#: .\leave\templates\leave\leave_request\request_view.html:267
-#: .\leave\templates\leave\user_leave\user_request_view.html:242
+#: .\leave\templates\leave\leave_request\request_view.html:197
+#: .\leave\templates\leave\user_leave\user_request_view.html:243
 msgid "Selected Requests"
 msgstr ""
 
-#: .\leave\templates\leave\leave_request\request_view.html:291
-#: .\leave\templates\leave\user_leave\user_request_view.html:268
+#: .\leave\templates\leave\leave_request\request_view.html:221
+#: .\leave\templates\leave\user_leave\user_request_view.html:269
 msgid "There are no leave requests at the moment."
 msgstr ""
 
-#: .\leave\templates\leave\leave_request\request_view.html:311
-#: .\leave\templates\leave\user_leave\user_request_view.html:336
-msgid "Leave Request Create"
-msgstr ""
-
-#: .\leave\templates\leave\leave_request\request_view.html:332
+#: .\leave\templates\leave\leave_request\request_view.html:263
+#: .\leave\templates\leave\user_leave\user_request_update.html:18
 msgid "Leave Request Update"
 msgstr ""
 
-#: .\leave\templates\leave\leave_request\request_view.html:370
+#: .\leave\templates\leave\leave_request\request_view.html:301
 msgid "Reason for rejection"
 msgstr ""
 
-#: .\leave\templates\leave\leave_request\request_view.html:394
+#: .\leave\templates\leave\leave_request\request_view.html:325
 msgid "Export Leave Requests"
 msgstr ""
 
@@ -11143,7 +11480,7 @@ msgstr ""
 
 #: .\leave\templates\leave\leave_type\leave_type_empty_view.html:20
 #: .\leave\templates\leave\leave_type\leave_type_view.html:17
-#: .\templates\sidebar.html:630
+#: .\templates\sidebar.html:645
 msgid "Leave Types"
 msgstr ""
 
@@ -11242,7 +11579,7 @@ msgid "User Leave"
 msgstr ""
 
 #: .\leave\templates\leave\user_leave\user_request_view.html:11
-#: .\templates\sidebar.html:617
+#: .\templates\sidebar.html:632
 msgid "My Leave Requests"
 msgstr ""
 
@@ -11266,39 +11603,39 @@ msgstr ""
 msgid "This leave types are already in use for {}"
 msgstr ""
 
-#: .\leave\views.py:319 .\leave\views.py:1690 .\leave\views.py:2490
+#: .\leave\views.py:320 .\leave\views.py:1702 .\leave\views.py:2498
 msgid "Leave request created successfully.."
 msgstr ""
 
-#: .\leave\views.py:482
+#: .\leave\views.py:480
 msgid "Leave request is updated successfully.."
 msgstr ""
 
-#: .\leave\views.py:525 .\leave\views.py:1828
+#: .\leave\views.py:523 .\leave\views.py:1832
 msgid "Leave request deleted successfully.."
 msgstr ""
 
-#: .\leave\views.py:527 .\leave\views.py:3040 .\leave\views.py:3118
+#: .\leave\views.py:525 .\leave\views.py:3058 .\leave\views.py:3136
 msgid "Leave request not found."
 msgstr ""
 
-#: .\leave\views.py:529 .\leave\views.py:1053 .\leave\views.py:1395
-#: .\leave\views.py:1573 .\leave\views.py:1832 .\leave\views.py:2930
+#: .\leave\views.py:527 .\leave\views.py:1053 .\leave\views.py:1406
+#: .\leave\views.py:1584 .\leave\views.py:1836 .\leave\views.py:2948
 #: .\pms\views.py:1339 .\pms\views.py:1580 .\pms\views.py:1709
 #: .\pms\views.py:1802 .\pms\views.py:2241 .\recruitment\views\views.py:1372
 #: .\recruitment\views\views.py:1528 .\recruitment\views\views.py:1609
 msgid "Related entries exists"
 msgstr ""
 
-#: .\leave\views.py:598
+#: .\leave\views.py:596
 msgid "Leave request approved successfully.."
 msgstr ""
 
-#: .\leave\views.py:620
+#: .\leave\views.py:618
 msgid "Leave request already approved"
 msgstr ""
 
-#: .\leave\views.py:681 .\leave\views.py:735
+#: .\leave\views.py:679 .\leave\views.py:733
 msgid "Leave request cancelled successfully.."
 msgstr ""
 
@@ -11354,140 +11691,140 @@ msgstr ""
 msgid "Leave type has already been assigned to the employee."
 msgstr ""
 
-#: .\leave\views.py:1195
+#: .\leave\views.py:1201
 msgid "New holiday created successfully.."
 msgstr ""
 
-#: .\leave\views.py:1243
+#: .\leave\views.py:1249
 msgid "Invalid start date format {}"
 msgstr ""
 
-#: .\leave\views.py:1250
+#: .\leave\views.py:1256
 msgid "Invalid end date format {}"
 msgstr ""
 
-#: .\leave\views.py:1257
+#: .\leave\views.py:1263
 msgid "Recurring must be {} or {}"
 msgstr ""
 
-#: .\leave\views.py:1370
+#: .\leave\views.py:1381
 msgid "Holiday updated successfully.."
 msgstr ""
 
-#: .\leave\views.py:1391
+#: .\leave\views.py:1402
 msgid "Holiday deleted successfully.."
 msgstr ""
 
-#: .\leave\views.py:1393 .\leave\views.py:1413
+#: .\leave\views.py:1404 .\leave\views.py:1424
 msgid "Holiday not found."
 msgstr ""
 
-#: .\leave\views.py:1415
+#: .\leave\views.py:1426
 msgid "{} Holidays have been successfully deleted."
 msgstr ""
 
-#: .\leave\views.py:1439
+#: .\leave\views.py:1450
 msgid "New company leave created successfully.."
 msgstr ""
 
-#: .\leave\views.py:1537
+#: .\leave\views.py:1548
 msgid "Company leave updated successfully.."
 msgstr ""
 
-#: .\leave\views.py:1569
+#: .\leave\views.py:1580
 msgid "Company leave deleted successfully.."
 msgstr ""
 
-#: .\leave\views.py:1571
+#: .\leave\views.py:1582
 msgid "Company leave not found."
 msgstr ""
 
-#: .\leave\views.py:1651
+#: .\leave\views.py:1663
 msgid "There is already a leave request for this date range.."
 msgstr ""
 
-#: .\leave\views.py:1705 .\leave\views.py:1801
+#: .\leave\views.py:1717 .\leave\views.py:1805
 msgid "You dont have enough leave days to make the request.."
 msgstr ""
 
-#: .\leave\views.py:1787
+#: .\leave\views.py:1800
 msgid "Leave request updated successfully.."
 msgstr ""
 
-#: .\leave\views.py:1809 .\leave\views.py:1830 .\leave\views.py:2029
+#: .\leave\views.py:1813 .\leave\views.py:1834 .\leave\views.py:2033
 msgid "User has no leave request.."
 msgstr ""
 
-#: .\leave\views.py:1868 .\leave\views.py:1899 .\leave\views.py:1942
-#: .\leave\views.py:1996
+#: .\leave\views.py:1872 .\leave\views.py:1903 .\leave\views.py:1946
+#: .\leave\views.py:2000
 msgid "User is not an employee.."
 msgstr ""
 
-#: .\leave\views.py:2216
+#: .\leave\views.py:2220
 msgid "Total leaves available"
 msgstr ""
 
-#: .\leave\views.py:2223
+#: .\leave\views.py:2227
 msgid "Oops!! No leaves available for you this month..."
 msgstr ""
 
-#: .\leave\views.py:2288
+#: .\leave\views.py:2292
 msgid "No leave request this month"
 msgstr ""
 
-#: .\leave\views.py:2403
+#: .\leave\views.py:2407
 msgid "Leave Trends"
 msgstr ""
 
-#: .\leave\views.py:2509
+#: .\leave\views.py:2523
 msgid "You don't have permission"
 msgstr ""
 
-#: .\leave\views.py:2632
+#: .\leave\views.py:2650
 msgid "New Leave allocation request is created"
 msgstr ""
 
-#: .\leave\views.py:2760
+#: .\leave\views.py:2778
 msgid "Leave allocation request is updated successfully."
 msgstr ""
 
-#: .\leave\views.py:2825
+#: .\leave\views.py:2843
 msgid "Leave allocation request approved successfully"
 msgstr ""
 
-#: .\leave\views.py:2839
+#: .\leave\views.py:2857
 msgid "The leave allocation request can't be approved"
 msgstr ""
 
-#: .\leave\views.py:2882
+#: .\leave\views.py:2900
 msgid "Leave allocation request rejected successfully"
 msgstr ""
 
-#: .\leave\views.py:2903
+#: .\leave\views.py:2921
 msgid "The leave allocation request can't be rejected"
 msgstr ""
 
-#: .\leave\views.py:2925
+#: .\leave\views.py:2943
 msgid "Leave allocation request deleted successfully.."
 msgstr ""
 
-#: .\leave\views.py:2928
+#: .\leave\views.py:2946
 msgid "Leave allocation request not found."
 msgstr ""
 
-#: .\leave\views.py:2932
+#: .\leave\views.py:2950
 msgid "Approved request cant't delete."
 msgstr ""
 
-#: .\leave\views.py:3037
+#: .\leave\views.py:3055
 msgid "{}'s leave request deleted."
 msgstr ""
 
-#: .\leave\views.py:3110
+#: .\leave\views.py:3128
 msgid "Leave request deleted."
 msgstr ""
 
-#: .\leave\views.py:3115
+#: .\leave\views.py:3133
 msgid "You cannot delete leave request with status {}."
 msgstr ""
 
@@ -11497,15 +11834,23 @@ msgstr ""
 msgid "Add note"
 msgstr "Employee"
 
-#: .\offboarding\templates\offboarding\pipeline\nav.html:4
-#: .\templates\sidebar.html:760
-#, fuzzy
-#| msgid "onboarding"
-msgid "Offboarding"
-msgstr "Onboarding"
+#: .\offboarding\templates\offboarding\pipeline\individual_view.html:34
+#: .\onboarding\templates\onboarding\single_view.html:39
+#: .\recruitment\templates\pipeline\pipeline.html:259
+msgid "Contact"
+msgstr ""
 
-#: .\offboarding\templates\offboarding\pipeline\offboardings.html:57
-#: .\offboarding\templates\offboarding\stage\offboarding_body.html:65
+#: .\offboarding\templates\offboarding\pipeline\individual_view.html:38
+msgid "Notice Period start Date"
+msgstr ""
+
+#: .\offboarding\templates\offboarding\pipeline\individual_view.html:44
+msgid "Notice Period end Date"
+msgstr ""
+
+#: .\offboarding\templates\offboarding\pipeline\individual_view.html:50
+#: .\offboarding\templates\offboarding\pipeline\offboardings.html:72
+#: .\offboarding\templates\offboarding\stage\offboarding_body.html:66
 #: .\onboarding\templates\onboarding\kanban\kanban.html:123
 #: .\onboarding\templates\onboarding\onboarding_table.html:154
 #: .\onboarding\templates\onboarding\onboarding_view.html:154
@@ -11527,6 +11872,72 @@ msgstr "Onboarding"
 msgid "Stage"
 msgstr ""
 
+#: .\offboarding\templates\offboarding\pipeline\individual_view.html:63
+#: .\onboarding\templates\onboarding\kanban\kanban.html:223
+#: .\onboarding\templates\onboarding\single_view.html:88
+msgid "Tasks"
+msgstr ""
+
+#: .\offboarding\templates\offboarding\pipeline\nav.html:4
+#: .\templates\sidebar.html:775
+#, fuzzy
+#| msgid "onboarding"
+msgid "Offboarding"
+msgstr "Onboarding"
+
+#: .\offboarding\templates\offboarding\resignation\filter.html:14
+#: .\payroll\templates\payroll\reimbursement\filter.html:14
+#: .\payroll\templates\payroll\reimbursement\request_cards.html:22
+msgid "Reimbursement"
+msgstr ""
+
+#: .\offboarding\templates\offboarding\resignation\filter.html:37
+msgid "Planned to resign"
+msgstr ""
+
+#: .\offboarding\templates\offboarding\resignation\filter.html:41
+#: .\onboarding\templates\onboarding\candidates.html:22
+#: .\onboarding\templates\onboarding\kanban\kanban.html:58
+#: .\onboarding\templates\onboarding\onboarding_view.html:86
+#: .\payroll\templates\payroll\loan\filter.html:45
+#: .\payroll\templates\payroll\reimbursement\filter.html:41 .\pms\forms.py:58
+#: .\recruitment\templates\pipeline\nav.html:121
+#: .\recruitment\templates\pipeline\pipeline_empty.html:26
+msgid "Job position"
+msgstr ""
+
+#: .\offboarding\templates\offboarding\resignation\nav.html:4
+msgid "Resignations"
+msgstr ""
+
+#: .\offboarding\templates\offboarding\resignation\request_cards.html:44
+msgid "Do you want to delete this record"
+msgstr ""
+
+#: .\offboarding\templates\offboarding\resignation\request_cards.html:69
+msgid "Do You really want to reject the request?"
+msgstr ""
+
+#: .\offboarding\templates\offboarding\resignation\request_cards.html:76
+msgid "Do You really want to approve the request"
+msgstr ""
+
+#: .\offboarding\templates\offboarding\resignation\request_cards.html:147
+#, fuzzy
+#| msgid "offboarding"
+msgid "Add to offboarding"
+msgstr "Offboarding"
+
+#: .\offboarding\templates\offboarding\settings\settings.html:4
+#, fuzzy
+#| msgid "attendance"
+msgid "Resignation Request"
+msgstr "Attendance"
+
+#: .\offboarding\templates\offboarding\settings\settings.html:6
+msgid "By enabling this normal users can request for their resignation"
+msgstr ""
+
 #: .\offboarding\templates\offboarding\stage\offboarding_body.html:15
 msgid "Toggle Archived"
 msgstr ""
@@ -11541,24 +11952,62 @@ msgstr "Employee"
 msgid "Notice Period"
 msgstr ""
 
-#: .\offboarding\templates\offboarding\stage\offboarding_body.html:82
+#: .\offboarding\templates\offboarding\stage\offboarding_body.html:84
 #, fuzzy
 #| msgid "employee"
 msgid "Add Task"
 msgstr "Employee"
 
 #: .\offboarding\templates\offboarding\stage\stages.html:22
-#: .\offboarding\templates\offboarding\task\table_body.html:33
+#: .\offboarding\templates\offboarding\task\table_body.html:62
 #: .\recruitment\templates\candidate\individual.html:184
 #: .\recruitment\templates\pipeline\pipeline_components\candidate_remark_view.html:22
 #: .\recruitment\templates\pipeline\pipeline_components\view_note.html:54
 msgid "Notes"
 msgstr ""
 
-#: .\offboarding\templates\offboarding\task\table_body.html:13
+#: .\offboarding\templates\offboarding\task\table_body.html:32
 msgid "In"
 msgstr ""
 
+#: .\offboarding\views.py:77
+#, fuzzy
+#| msgid "onboarding"
+msgid "Offboarding saved"
+msgstr "Onboarding"
+
+#: .\offboarding\views.py:97
+#, fuzzy
+#| msgid "onboarding"
+msgid "Offboarding deleted"
+msgstr "Onboarding"
+
+#: .\offboarding\views.py:122
+msgid "Stage saved"
+msgstr ""
+
+#: .\offboarding\views.py:147
+#, fuzzy
+#| msgid "employee"
+msgid "Employee added to the stage"
+msgstr "Employee"
+
+#: .\offboarding\views.py:173
+msgid "Offboarding employee deleted"
+msgstr ""
+
+#: .\offboarding\views.py:198
+msgid "Stage deleted"
+msgstr ""
+
+#: .\offboarding\views.py:244
+msgid "stage changed successfully."
+msgstr ""
+
+#: .\offboarding\views.py:411
+msgid "Task status changed successfully."
+msgstr ""
+
 #: .\onboarding\forms.py:198
 #: .\onboarding\templates\onboarding\candidate_creation.html:31
 #: .\onboarding\templates\onboarding\candidate_update.html:38
@@ -11730,16 +12179,6 @@ msgstr ""
 msgid "Probation ends"
 msgstr ""
 
-#: .\onboarding\templates\onboarding\candidates.html:22
-#: .\onboarding\templates\onboarding\kanban\kanban.html:58
-#: .\onboarding\templates\onboarding\onboarding_view.html:86
-#: .\payroll\templates\payroll\loan\filter.html:45
-#: .\payroll\templates\payroll\reimbursement\filter.html:41 .\pms\forms.py:58
-#: .\recruitment\templates\pipeline\nav.html:121
-#: .\recruitment\templates\pipeline\pipeline_empty.html:26
-msgid "Job position"
-msgstr ""
-
 #: .\onboarding\templates\onboarding\candidates.html:67
 #: .\onboarding\templates\onboarding\candidates_view.html:44
 msgid "Send Portal"
@@ -11751,7 +12190,7 @@ msgstr ""
 
 #: .\onboarding\templates\onboarding\candidates_view.html:20
 #: .\recruitment\templates\dashboard\dashboard.html:52
-#: .\templates\dashboard.html:233
+#: .\templates\dashboard.html:240
 msgid "Hired Candidates"
 msgstr ""
 
@@ -11767,13 +12206,6 @@ msgstr ""
 msgid "At present, There are no Candidates onboarding."
 msgstr ""
 
-#: .\onboarding\templates\onboarding\candidates_view.html:104
-#: .\payroll\templates\payroll\reimbursement\attachments.html:2
-#, fuzzy
-#| msgid "recruitment"
-msgid "Attachments"
-msgstr "Recruitment"
-
 #: .\onboarding\templates\onboarding\candidates_view.html:105
 msgid "Optional"
 msgstr ""
@@ -11792,7 +12224,7 @@ msgstr ""
 #: .\onboarding\templates\onboarding\kanban\kanban.html:22
 #: .\onboarding\templates\onboarding\onboarding_view.html:48
 #: .\recruitment\templates\candidate\individual.html:214
-#: .\templates\sidebar.html:248
+#: .\templates\sidebar.html:247
 msgid "Onboarding"
 msgstr ""
 
@@ -11900,11 +12332,6 @@ msgstr ""
 msgid "Add task"
 msgstr ""
 
-#: .\onboarding\templates\onboarding\kanban\kanban.html:223
-#: .\onboarding\templates\onboarding\single_view.html:88
-msgid "Tasks"
-msgstr ""
-
 #: .\onboarding\templates\onboarding\kanban\kanban.html:247
 #: .\recruitment\templates\pipeline\nav.html:185
 #: .\recruitment\templates\stage\nav.html:90
@@ -11932,7 +12359,7 @@ msgstr ""
 #: .\recruitment\templates\pipeline\pipeline_tabs.html:47
 #: .\recruitment\templates\recruitment\recruitment_component.html:181
 #: .\recruitment\templates\recruitment\recruitment_component.html:203
-#: .\templates\index.html:371
+#: .\templates\index.html:373
 msgid "Close"
 msgstr ""
 
@@ -12012,11 +12439,6 @@ msgstr ""
 msgid "Send"
 msgstr ""
 
-#: .\onboarding\templates\onboarding\single_view.html:39
-#: .\recruitment\templates\pipeline\pipeline.html:259
-msgid "Contact"
-msgstr ""
-
 #: .\onboarding\templates\onboarding\single_view.html:49
 msgid "Onboarding portal stage"
 msgstr ""
@@ -12222,19 +12644,19 @@ msgstr ""
 msgid "Contract Wage"
 msgstr ""
 
-#: .\payroll\forms\component_forms.py:316 .\payroll\models\models.py:72
-#: .\payroll\models\models.py:682 .\payroll\models\models.py:690
-#: .\payroll\models\models.py:991 .\payroll\models\models.py:996
+#: .\payroll\forms\component_forms.py:316 .\payroll\models\models.py:73
+#: .\payroll\models\models.py:701 .\payroll\models\models.py:709
+#: .\payroll\models\models.py:1010 .\payroll\models\models.py:1015
 #: .\payroll\templates\payroll\payslip\individual_payslip.html:144
 #: .\payroll\templates\payroll\payslip\individual_pdf.html:141
 msgid "Basic Pay"
 msgstr ""
 
-#: .\payroll\models\models.py:74 .\payroll\models\models.py:998
+#: .\payroll\models\models.py:75 .\payroll\models\models.py:1017
 msgid "Taxable Gross Pay"
 msgstr ""
 
-#: .\payroll\models\models.py:87
+#: .\payroll\models\models.py:88
 #: .\pms\templates\anonymous\anonymous_feedback_form.html:41
 #: .\pms\templates\anonymous\single_view.html:27
 #: .\pms\templates\feedback\feedback_list.html:512
@@ -12242,407 +12664,411 @@ msgstr ""
 msgid "Based on"
 msgstr ""
 
-#: .\payroll\models\models.py:110
+#: .\payroll\models\models.py:111
 msgid "Commission"
 msgstr ""
 
-#: .\payroll\models\models.py:131
+#: .\payroll\models\models.py:132
 msgid "Contract Title"
 msgstr ""
 
-#: .\payroll\models\models.py:154 .\payroll\models\models.py:646
+#: .\payroll\models\models.py:155 .\payroll\models\models.py:665
 #: .\payroll\templates\payroll\contract\contract_export_filter.html:60
 #: .\payroll\templates\payroll\contract\contract_single_view.html:106
 #: .\payroll\templates\payroll\contract\filter_contract.html:39
 msgid "Pay Frequency"
 msgstr ""
 
-#: .\payroll\models\models.py:214
+#: .\payroll\models\models.py:215
 msgid "Calculate Daily Leave Amount"
 msgstr ""
 
-#: .\payroll\models\models.py:220
+#: .\payroll\models\models.py:221
 msgid "Deduction For One Leave Amount"
 msgstr ""
 
-#: .\payroll\models\models.py:223
+#: .\payroll\models\models.py:224
 #: .\payroll\templates\payroll\contract\contract_single_view.html:70
 msgid "Deduct From Basic Pay"
 msgstr ""
 
-#: .\payroll\models\models.py:237
+#: .\payroll\models\models.py:238
 msgid "End date must be greater than start date"
 msgstr ""
 
-#: .\payroll\models\models.py:249 .\payroll\models\models.py:301
+#: .\payroll\models\models.py:250 .\payroll\models\models.py:302
 msgid "An active contract already exists for this employee."
 msgstr ""
 
-#: .\payroll\models\models.py:261 .\payroll\models\models.py:314
+#: .\payroll\models\models.py:262 .\payroll\models\models.py:315
 msgid "A draft contract already exists for this employee."
 msgstr ""
 
-#: .\payroll\models\models.py:334
+#: .\payroll\models\models.py:335 .\payroll\models\models.py:461
 msgid "Present"
 msgstr ""
 
-#: .\payroll\models\models.py:335
+#: .\payroll\models\models.py:336
 msgid "Half Day Present"
 msgstr ""
 
-#: .\payroll\models\models.py:336
+#: .\payroll\models\models.py:337
 msgid "Absent"
 msgstr ""
 
-#: .\payroll\models\models.py:337
+#: .\payroll\models\models.py:338
 msgid "Holiday/Company Leave"
 msgstr ""
 
-#: .\payroll\models\models.py:338
+#: .\payroll\models\models.py:339
 msgid "Conflict"
 msgstr ""
 
-#: .\payroll\models\models.py:397
+#: .\payroll\models\models.py:385
 msgid "Day percentage must be between 0.0 and 1.0"
 msgstr ""
 
-#: .\payroll\models\models.py:445
+#: .\payroll\models\models.py:436
 msgid "Validate the attendance"
 msgstr ""
 
-#: .\payroll\models\models.py:455
+#: .\payroll\models\models.py:446
 msgid "Work record already exists"
 msgstr ""
 
-#: .\payroll\models\models.py:457
+#: .\payroll\models\models.py:448
 msgid "Incomplete minimum hour"
 msgstr ""
 
-#: .\payroll\models\models.py:462
+#: .\payroll\models\models.py:458
 msgid "Half day leave"
 msgstr ""
 
-#: .\payroll\models\models.py:563
+#: .\payroll\models\models.py:505
+msgid "Currently working"
+msgstr ""
+
+#: .\payroll\models\models.py:582
 #, fuzzy
 #| msgid "attendance-view"
 msgid "Half day Attendance need to validate"
 msgstr "Attendances"
 
-#: .\payroll\models\models.py:608
+#: .\payroll\models\models.py:627
 msgid "Rate must be greater than 0"
 msgstr ""
 
-#: .\payroll\models\models.py:610
+#: .\payroll\models\models.py:629
 msgid "Rate must be less than 100"
 msgstr ""
 
-#: .\payroll\models\models.py:618
+#: .\payroll\models\models.py:637
 msgid "Value must be greater than zero"
 msgstr ""
 
-#: .\payroll\models\models.py:640
+#: .\payroll\models\models.py:659
 msgid "Marital Status"
 msgstr ""
 
-#: .\payroll\models\models.py:642
+#: .\payroll\models\models.py:661
 msgid "Company Experience"
 msgstr ""
 
-#: .\payroll\models\models.py:648
+#: .\payroll\models\models.py:667
 msgid "Department on Contract"
 msgstr ""
 
-#: .\payroll\models\models.py:667 .\payroll\models\models.py:751
-#: .\payroll\models\models.py:1074
+#: .\payroll\models\models.py:686 .\payroll\models\models.py:770
+#: .\payroll\models\models.py:1093
 msgid "The value must be like the data stored in the database"
 msgstr ""
 
-#: .\payroll\models\models.py:677
+#: .\payroll\models\models.py:696
 msgid "Exclude the allowance"
 msgstr ""
 
-#: .\payroll\models\models.py:678 .\payroll\models\models.py:1004
+#: .\payroll\models\models.py:697 .\payroll\models\models.py:1023
 msgid "Provide max amount"
 msgstr ""
 
-#: .\payroll\models\models.py:693
+#: .\payroll\models\models.py:712
 msgid "Title of the allowance"
 msgstr ""
 
-#: .\payroll\models\models.py:699
+#: .\payroll\models\models.py:718
 msgid ""
 "The one-time allowance in which the allowance will apply to the "
 "payslips             if the date between the payslip period"
 msgstr ""
 
-#: .\payroll\models\models.py:705 .\payroll\models\models.py:1018
+#: .\payroll\models\models.py:724 .\payroll\models\models.py:1037
 msgid "Include all active employees"
 msgstr ""
 
-#: .\payroll\models\models.py:706
+#: .\payroll\models\models.py:725
 msgid "Target allowance to all active employees in the company"
 msgstr ""
 
-#: .\payroll\models\models.py:710 .\payroll\models\models.py:1023
+#: .\payroll\models\models.py:729 .\payroll\models\models.py:1042
 msgid "Employees Specific"
 msgstr ""
 
-#: .\payroll\models\models.py:713
+#: .\payroll\models\models.py:732
 msgid "Target allowance to the specific employees"
 msgstr ""
 
-#: .\payroll\models\models.py:717 .\payroll\models\models.py:1030
+#: .\payroll\models\models.py:736 .\payroll\models\models.py:1049
 msgid "Exclude Employees"
 msgstr ""
 
-#: .\payroll\models\models.py:721
+#: .\payroll\models\models.py:740
 msgid ""
 "To ignore the allowance to the employees when target them by all "
 "employees             or through condition-based"
 msgstr ""
 
-#: .\payroll\models\models.py:727
+#: .\payroll\models\models.py:746
 msgid "This field is used to calculate the taxable allowances"
 msgstr ""
 
-#: .\payroll\models\models.py:732
+#: .\payroll\models\models.py:751
 msgid ""
 "This field is used to target allowance         to the specific employees "
 "when the condition satisfies with the employee's information"
 msgstr ""
 
-#: .\payroll\models\models.py:742 .\payroll\models\models.py:1065
+#: .\payroll\models\models.py:761 .\payroll\models\models.py:1084
 msgid "The related field of the employees"
 msgstr ""
 
-#: .\payroll\models\models.py:755
+#: .\payroll\models\models.py:774
 msgid "To specify, the allowance is fixed or not"
 msgstr ""
 
-#: .\payroll\models\models.py:761
+#: .\payroll\models\models.py:780
 msgid "Fixed amount for this allowance"
 msgstr ""
 
-#: .\payroll\models\models.py:771
+#: .\payroll\models\models.py:790
 msgid "If the allowance is not fixed then specifies how the allowance provided"
 msgstr ""
 
-#: .\payroll\models\models.py:780 .\payroll\models\models.py:1121
+#: .\payroll\models\models.py:799 .\payroll\models\models.py:1140
 msgid "The percentage of based on"
 msgstr ""
 
-#: .\payroll\models\models.py:788
+#: .\payroll\models\models.py:807
 msgid "The attendance fixed amount for one validated attendance"
 msgstr ""
 
-#: .\payroll\models\models.py:803
+#: .\payroll\models\models.py:822
 msgid "The fixed amount for one validated attendance with that shift"
 msgstr ""
 
-#: .\payroll\models\models.py:811
+#: .\payroll\models\models.py:830
 msgid ""
 "The fixed amount for one hour overtime that are validated             and "
 "approved the overtime attendance"
 msgstr ""
 
-#: .\payroll\models\models.py:828
+#: .\payroll\models\models.py:847
 msgid "The fixed amount for one validated attendance with that work type"
 msgstr ""
 
-#: .\payroll\models\models.py:834
+#: .\payroll\models\models.py:853
 msgid "Has max limit for allowance"
 msgstr ""
 
-#: .\payroll\models\models.py:835
+#: .\payroll\models\models.py:854
 msgid "Limit the allowance amount"
 msgstr ""
 
-#: .\payroll\models\models.py:841
+#: .\payroll\models\models.py:860
 msgid "The maximum amount for the allowance"
 msgstr ""
 
-#: .\payroll\models\models.py:850 .\payroll\models\models.py:1147
+#: .\payroll\models\models.py:869 .\payroll\models\models.py:1166
 msgid "For working days on month"
 msgstr ""
 
-#: .\payroll\models\models.py:860 .\payroll\models\models.py:1156
+#: .\payroll\models\models.py:879 .\payroll\models\models.py:1175
 msgid "The pay head for the if condition"
 msgstr ""
 
-#: .\payroll\models\models.py:866 .\payroll\models\models.py:1162
+#: .\payroll\models\models.py:885 .\payroll\models\models.py:1181
 msgid "Apply for those, if the pay-head conditions satisfy"
 msgstr ""
 
-#: .\payroll\models\models.py:869 .\payroll\models\models.py:1165
+#: .\payroll\models\models.py:888 .\payroll\models\models.py:1184
 msgid "The amount of the pay-head"
 msgstr ""
 
-#: .\payroll\models\models.py:934
+#: .\payroll\models\models.py:953
 msgid ""
 "If condition based, all fields (field, value, condition) must be filled."
 msgstr ""
 
-#: .\payroll\models\models.py:941
+#: .\payroll\models\models.py:960
 msgid ""
 "If based on is attendance,                         then per attendance fixed "
 "amount must be filled."
 msgstr ""
 
-#: .\payroll\models\models.py:947
+#: .\payroll\models\models.py:966
 msgid "If based on is shift, then shift must be filled."
 msgstr ""
 
-#: .\payroll\models\models.py:950
+#: .\payroll\models\models.py:969
 msgid "If based on is work type, then work type must be filled."
 msgstr ""
 
-#: .\payroll\models\models.py:954
+#: .\payroll\models\models.py:973
 msgid "Amount should be greater than zero."
 msgstr ""
 
-#: .\payroll\models\models.py:1003
+#: .\payroll\models\models.py:1022
 msgid "Exclude the deduction"
 msgstr ""
 
-#: .\payroll\models\models.py:1007
+#: .\payroll\models\models.py:1026
 msgid "Title of the deduction"
 msgstr ""
 
-#: .\payroll\models\models.py:1012
+#: .\payroll\models\models.py:1031
 msgid ""
 "The one-time deduction in which the deduction will apply to the "
 "payslips             if the date between the payslip period"
 msgstr ""
 
-#: .\payroll\models\models.py:1019
+#: .\payroll\models\models.py:1038
 msgid "Target deduction to all active employees in the company"
 msgstr ""
 
-#: .\payroll\models\models.py:1025
+#: .\payroll\models\models.py:1044
 msgid "Target deduction to the specific employees"
 msgstr ""
 
-#: .\payroll\models\models.py:1034
+#: .\payroll\models\models.py:1053
 msgid ""
 "To ignore the deduction to the employees when target them by all "
 "employees             or through condition-based"
 msgstr ""
 
-#: .\payroll\models\models.py:1041
+#: .\payroll\models\models.py:1060
 msgid "To specify the deduction is tax or normal deduction"
 msgstr ""
 
-#: .\payroll\models\models.py:1047
+#: .\payroll\models\models.py:1066
 msgid ""
 "To find taxable gross,             taxable_gross = (basic_pay + "
 "taxable_deduction)-pre_tax_deductions "
 msgstr ""
 
-#: .\payroll\models\models.py:1055
+#: .\payroll\models\models.py:1074
 msgid ""
 "This field is used to target deduction         to the specific employees "
 "when the condition satisfies with the employee's information"
 msgstr ""
 
-#: .\payroll\models\models.py:1083
+#: .\payroll\models\models.py:1102
 msgid "Basic pay"
 msgstr ""
 
-#: .\payroll\models\models.py:1089
+#: .\payroll\models\models.py:1108
 msgid ""
 "Update compensation is used to update                    pay-head before any "
 "other deduction calculation starts"
 msgstr ""
 
-#: .\payroll\models\models.py:1095
+#: .\payroll\models\models.py:1114
 msgid "To specify, the deduction is fixed or not"
 msgstr ""
 
-#: .\payroll\models\models.py:1102
+#: .\payroll\models\models.py:1121
 msgid "Fixed amount for this deduction"
 msgstr ""
 
-#: .\payroll\models\models.py:1110
+#: .\payroll\models\models.py:1129
 msgid "If the deduction is not fixed then specifies how the deduction provided"
 msgstr ""
 
-#: .\payroll\models\models.py:1120
+#: .\payroll\models\models.py:1139
 msgid "Employee rate"
 msgstr ""
 
-#: .\payroll\models\models.py:1132
+#: .\payroll\models\models.py:1151
 msgid "Has max limit for deduction"
 msgstr ""
 
-#: .\payroll\models\models.py:1133
+#: .\payroll\models\models.py:1152
 msgid "Limit the deduction"
 msgstr ""
 
-#: .\payroll\models\models.py:1139
+#: .\payroll\models\models.py:1158
 msgid "The maximum amount for the deduction"
 msgstr ""
 
-#: .\payroll\models\models.py:1150
+#: .\payroll\models\models.py:1169
 msgid "The maximum amount for ?"
 msgstr ""
 
-#: .\payroll\models\models.py:1191
+#: .\payroll\models\models.py:1210
 msgid " Don't choose taxable gross pay when pretax is enabled."
 msgstr ""
 
-#: .\payroll\models\models.py:1197
+#: .\payroll\models\models.py:1216
 msgid " Don't choose net pay when pretax is enabled."
 msgstr ""
 
-#: .\payroll\models\models.py:1201
+#: .\payroll\models\models.py:1220
 msgid " Don't choose net pay when the tax is enabled."
 msgstr ""
 
-#: .\payroll\models\models.py:1211
+#: .\payroll\models\models.py:1230
 msgid "This fields required"
 msgstr ""
 
-#: .\payroll\models\models.py:1218
+#: .\payroll\models\models.py:1237
 msgid ""
 "If condition based, all fields                             (field, value, "
 "condition) must be filled."
 msgstr ""
 
-#: .\payroll\models\models.py:1292
+#: .\payroll\models\models.py:1311
 msgid "The end date must be greater than or equal to the start date"
 msgstr ""
 
-#: .\payroll\models\models.py:1297
+#: .\payroll\models\models.py:1316
 msgid "The end date cannot be in the future."
 msgstr ""
 
-#: .\payroll\models\models.py:1299
+#: .\payroll\models\models.py:1318
 msgid "The start date cannot be in the future."
 msgstr ""
 
-#: .\payroll\models\models.py:1310
+#: .\payroll\models\models.py:1329
 msgid "Employee ,start and end date must be unique"
 msgstr ""
 
-#: .\payroll\models\models.py:1313
+#: .\payroll\models\models.py:1332
 msgid "The data must be in dictionary or querydict type"
 msgstr ""
 
-#: .\payroll\models\models.py:1362
+#: .\payroll\models\models.py:1381
 #: .\payroll\templates\payroll\loan\records.html:9
 msgid "Loan"
 msgstr ""
 
-#: .\payroll\models\models.py:1363
+#: .\payroll\models\models.py:1382
 #: .\payroll\templates\payroll\loan\records.html:13
 msgid "Advanced Salary"
 msgstr ""
 
-#: .\payroll\models\models.py:1364
+#: .\payroll\models\models.py:1383
 msgid "Penalty / Fine"
 msgstr ""
 
-#: .\payroll\models\models.py:1380
+#: .\payroll\models\models.py:1399
 msgid "Total installments"
 msgstr ""
 
@@ -12874,7 +13300,7 @@ msgid "Number of contracts expiring in "
 msgstr ""
 
 #: .\payroll\templates\payroll\dashboard.html:187
-#: .\templates\dashboard.html:394
+#: .\templates\dashboard.html:401
 msgid "Department Chart"
 msgstr ""
 
@@ -12949,7 +13375,7 @@ msgstr ""
 #: .\payroll\templates\payroll\payslip\payslip_export_filter.html:27
 #: .\payroll\templates\payroll\payslip\payslips_empty.html:63
 #: .\payroll\templates\payroll\payslip\view_payslips.html:115
-#: .\templates\sidebar.html:445
+#: .\templates\sidebar.html:460
 msgid "Payslip"
 msgstr ""
 
@@ -13106,7 +13532,7 @@ msgstr ""
 
 #: .\payroll\templates\payroll\payslip\individual_payslip.html:229
 #: .\payroll\templates\payroll\payslip\individual_pdf.html:216
-#: .\templates\sidebar.html:465
+#: .\templates\sidebar.html:480
 msgid "Federal Tax"
 msgstr ""
 
@@ -13229,11 +13655,6 @@ msgstr ""
 msgid "Bulk Status Update"
 msgstr ""
 
-#: .\payroll\templates\payroll\reimbursement\filter.html:14
-#: .\payroll\templates\payroll\reimbursement\request_cards.html:22
-msgid "Reimbursement"
-msgstr ""
-
 #: .\payroll\templates\payroll\reimbursement\form.html:12
 msgid " Carry Forward Days"
 msgstr ""
@@ -13302,6 +13723,10 @@ msgstr ""
 msgid "save"
 msgstr ""
 
+#: .\payroll\templates\payroll\work_record\work_record_employees_view.html:38
+msgid "Month:"
+msgstr ""
+
 #: .\payroll\templates\payroll\work_record\work_record_employees_view.html:59
 msgid "A"
 msgstr ""
@@ -13406,7 +13831,7 @@ msgstr ""
 msgid "Contract deleted"
 msgstr ""
 
-#: .\payroll\views\views.py:114 .\payroll\views\views.py:1045
+#: .\payroll\views\views.py:114 .\payroll\views\views.py:1046
 msgid "Contract not found."
 msgstr ""
 
@@ -13418,34 +13843,34 @@ msgstr ""
 msgid "Payslip deleted"
 msgstr ""
 
-#: .\payroll\views\views.py:411 .\payroll\views\views.py:992
+#: .\payroll\views\views.py:411 .\payroll\views\views.py:993
 msgid "Payslip not found."
 msgstr ""
 
-#: .\payroll\views\views.py:541 .\payroll\views\views.py:630
+#: .\payroll\views\views.py:542 .\payroll\views\views.py:631
 msgid "No payslips generated for this month."
 msgstr ""
 
-#: .\payroll\views\views.py:661
+#: .\payroll\views\views.py:662
 msgid "No contracts ending this month"
 msgstr ""
 
-#: .\payroll\views\views.py:987
+#: .\payroll\views\views.py:988
 #, python-brace-format
 msgid "{employee} {period} payslip deleted."
 msgstr ""
 
-#: .\payroll\views\views.py:996
+#: .\payroll\views\views.py:997
 #, python-brace-format
 msgid "You cannot delete {payslip}"
 msgstr ""
 
-#: .\payroll\views\views.py:1042
+#: .\payroll\views\views.py:1043
 #, python-brace-format
 msgid "{name} deleted."
 msgstr ""
 
-#: .\payroll\views\views.py:1049
+#: .\payroll\views\views.py:1050
 #, python-brace-format
 msgid "You cannot delete {contract}"
 msgstr ""
@@ -13612,7 +14037,7 @@ msgid "No Key Results are available."
 msgstr ""
 
 #: .\pms\templates\dashboard\pms_dashboard.html:115
-#: .\templates\dashboard.html:473
+#: .\templates\dashboard.html:480
 msgid "Feedback Status"
 msgstr ""
 
@@ -13630,7 +14055,7 @@ msgid "No OKRs are currently At-Risk."
 msgstr ""
 
 #: .\pms\templates\feedback\answer\feedback_answer.html:13
-#: .\templates\dashboard.html:633
+#: .\templates\dashboard.html:640
 msgid "Feedback Answer"
 msgstr ""
 
@@ -13756,7 +14181,7 @@ msgstr ""
 #: .\pms\templates\okr\key_result\key_result_creation.html:93
 #: .\pms\templates\okr\objective_creation.html:47
 #: .\pms\templates\period\period_empty.html:26
-#: .\pms\templates\period\period_view.html:23 .\templates\sidebar.html:724
+#: .\pms\templates\period\period_view.html:23 .\templates\sidebar.html:739
 msgid "Period"
 msgstr ""
 
@@ -13768,7 +14193,7 @@ msgstr ""
 #: .\pms\templates\feedback\question_template\question_template_view.html:23
 #: .\pms\templates\feedback\question_template\question_template_view.html:103
 #: .\pms\templates\feedback\question_template\question_template_view.html:135
-#: .\templates\sidebar.html:732
+#: .\templates\sidebar.html:747
 msgid "Question Template"
 msgstr ""
 
@@ -13864,7 +14289,7 @@ msgstr ""
 
 #: .\pms\templates\feedback\feedback_list_view.html:107
 #: .\pms\templates\okr\objective_list_view.html:135
-#: .\templates\dashboard.html:210
+#: .\templates\dashboard.html:217
 msgid "Today"
 msgstr ""
 
@@ -13875,13 +14300,13 @@ msgstr ""
 
 #: .\pms\templates\feedback\feedback_list_view.html:117
 #: .\pms\templates\okr\objective_list_view.html:155
-#: .\templates\dashboard.html:211
+#: .\templates\dashboard.html:218
 msgid "This Week"
 msgstr ""
 
 #: .\pms\templates\feedback\feedback_list_view.html:122
 #: .\pms\templates\okr\objective_list_view.html:165
-#: .\templates\dashboard.html:212
+#: .\templates\dashboard.html:219
 msgid "This Month"
 msgstr ""
 
@@ -14038,7 +14463,7 @@ msgstr ""
 
 #: .\pms\templates\okr\objective_creation.html:29
 #: .\pms\templates\okr\objective_detailed_view.html:11
-#: .\pms\templates\okr\objective_empty.html:14 .\templates\sidebar.html:709
+#: .\pms\templates\okr\objective_empty.html:14 .\templates\sidebar.html:724
 msgid "Objectives"
 msgstr ""
 
@@ -14247,7 +14672,7 @@ msgstr ""
 msgid "Feedback archived successfully!."
 msgstr ""
 
-#: .\pms\views.py:1409 .\templates\dashboard.html:855
+#: .\pms\views.py:1409 .\templates\dashboard.html:1057
 msgid "Completed"
 msgstr ""
 
@@ -14457,7 +14882,7 @@ msgstr ""
 
 #: .\recruitment\models.py:561
 #: .\recruitment\templates\skill_zone\skill_zone_nav.html:5
-#: .\templates\sidebar.html:212
+#: .\templates\sidebar.html:211
 msgid "Skill Zone"
 msgstr ""
 
@@ -14785,7 +15210,7 @@ msgstr ""
 #: .\recruitment\templates\pipeline\form\candidate_drop_down_form.html:56
 #: .\recruitment\templates\pipeline\pipeline_card.html:123
 #: .\recruitment\templates\pipeline\pipeline_components\kanban_tabs.html:63
-#: .\templates\sidebar.html:322
+#: .\templates\sidebar.html:327
 msgid "Profile"
 msgstr ""
 
@@ -14854,7 +15279,7 @@ msgid "At present, there is no ongoing recruitment."
 msgstr ""
 
 #: .\recruitment\templates\pipeline\pipeline_tabs.html:12
-#: .\templates\sidebar.html:221
+#: .\templates\sidebar.html:220
 msgid "Stages"
 msgstr ""
 
@@ -15282,113 +15707,125 @@ msgstr ""
 msgid "Candidate added successfully.."
 msgstr ""
 
-#: .\templates\dashboard.html:91
+#: .\templates\dashboard.html:98
 msgid "New Joining Today"
 msgstr ""
 
-#: .\templates\dashboard.html:123
+#: .\templates\dashboard.html:130
 msgid "New Joining This Week"
 msgstr ""
 
-#: .\templates\dashboard.html:147
+#: .\templates\dashboard.html:154
 msgid "Total Strength"
 msgstr ""
 
-#: .\templates\dashboard.html:203
+#: .\templates\dashboard.html:210
 msgid "Overall Leave"
 msgstr ""
 
-#: .\templates\dashboard.html:213
+#: .\templates\dashboard.html:220
 msgid "This Year"
 msgstr ""
 
-#: .\templates\dashboard.html:252
+#: .\templates\dashboard.html:259
 msgid "Candidate Started Onboarding"
 msgstr ""
 
-#: .\templates\dashboard.html:275
+#: .\templates\dashboard.html:282
 msgid "Recruitment Analytic"
 msgstr ""
 
-#: .\templates\dashboard.html:375
+#: .\templates\dashboard.html:382
 msgid "Employees Chart"
 msgstr ""
 
-#: .\templates\dashboard.html:413
+#: .\templates\dashboard.html:420
 msgid "Gender Chart"
 msgstr ""
 
-#: .\templates\dashboard.html:433
+#: .\templates\dashboard.html:440
 msgid "Objective status"
 msgstr ""
 
-#: .\templates\dashboard.html:453
+#: .\templates\dashboard.html:460
 msgid "Key result status"
 msgstr ""
 
-#: .\templates\dashboard.html:496
+#: .\templates\dashboard.html:503
 #, fuzzy
 #| msgid "shift-request-view"
 msgid "Shift Request Approve"
 msgstr "Shift Requests"
 
-#: .\templates\dashboard.html:521
+#: .\templates\dashboard.html:528
 msgid "Work Type Request Approve"
 msgstr ""
 
-#: .\templates\dashboard.html:546
+#: .\templates\dashboard.html:553
 msgid "Overtime Approve"
 msgstr ""
 
-#: .\templates\dashboard.html:585
+#: .\templates\dashboard.html:592
 #, fuzzy
 #| msgid "shift-request-view"
 msgid "Leave request Approve"
 msgstr "Shift Requests"
 
-#: .\templates\dashboard.html:609
+#: .\templates\dashboard.html:616
 #, fuzzy
 #| msgid "leave-allocation-request-view"
 msgid "Leave Allocation Request Approve"
 msgstr "Leave Allocation Requests"
 
-#: .\templates\dashboard.html:657
+#: .\templates\dashboard.html:664
 #, fuzzy
 #| msgid "shift-request-view"
 msgid "Asset Request Approve"
 msgstr "Shift Requests"
 
+#: .\templates\dashboard.html:694
+#, fuzzy
+#| msgid "recruitment"
+msgid "Announcements."
+msgstr "Recruitment"
+
 #: .\templates\dashboard.html:698
+#, fuzzy
+#| msgid "recruitment"
+msgid "Create Announcement."
+msgstr "Recruitment"
+
+#: .\templates\dashboard.html:760
 msgid "Quick Actions"
 msgstr ""
 
-#: .\templates\dashboard.html:715
+#: .\templates\dashboard.html:777
 #, fuzzy
 #| msgid "attendance"
 msgid "Attendance Request"
 msgstr "Attendance"
 
-#: .\templates\dashboard.html:763
+#: .\templates\dashboard.html:825
 #, fuzzy
 #| msgid "work-type-request-view"
 msgid "Worktype Request"
 msgstr "Work Type Requests"
 
-#: .\templates\dashboard.html:776
+#: .\templates\dashboard.html:839
 msgid "Reimbursement Request"
 msgstr ""
 
-#: .\templates\dashboard.html:808
+#: .\templates\dashboard.html:871
 #, fuzzy
 #| msgid "type-update"
 msgid "Ticket Creation"
 msgstr "Update"
 
-#: .\templates\dashboard.html:826
+#: .\templates\dashboard.html:1028
 msgid "Employee Work Information"
 msgstr ""
 
-#: .\templates\dashboard.html:840
+#: .\templates\dashboard.html:1042
 msgid "Progress"
 msgstr ""
 
@@ -15416,15 +15853,15 @@ msgstr ""
 msgid "Send Link"
 msgstr ""
 
-#: .\templates\index.html:379
+#: .\templates\index.html:381
 msgid "All Notifications"
 msgstr ""
 
-#: .\templates\index.html:543
+#: .\templates\index.html:545
 msgid "My Profile"
 msgstr ""
 
-#: .\templates\index.html:553
+#: .\templates\index.html:555
 msgid "Logout"
 msgstr ""
 
@@ -15517,11 +15954,21 @@ msgstr ""
 msgid "User Group"
 msgstr ""
 
-#: .\templates\settings.html:236
+#: .\templates\settings.html:213
+msgid "Disciplinary Action Type"
+msgstr ""
+
+#: .\templates\settings.html:222
+#, fuzzy
+#| msgid "settings"
+msgid "General Settings"
+msgstr "Settings"
+
+#: .\templates\settings.html:255
 msgid "Date & Time Format"
 msgstr ""
 
-#: .\templates\settings.html:245
+#: .\templates\settings.html:264
 msgid "Records per page"
 msgstr ""
 
@@ -15530,10 +15977,10 @@ msgid "My Company"
 msgstr ""
 
 #: .\templates\sidebar.html:82 .\templates\sidebar.html:147
-#: .\templates\sidebar.html:264 .\templates\sidebar.html:415
-#: .\templates\sidebar.html:506 .\templates\sidebar.html:600
-#: .\templates\sidebar.html:608 .\templates\sidebar.html:702
-#: .\templates\sidebar.html:817
+#: .\templates\sidebar.html:263 .\templates\sidebar.html:429
+#: .\templates\sidebar.html:521 .\templates\sidebar.html:615
+#: .\templates\sidebar.html:623 .\templates\sidebar.html:717
+#: .\templates\sidebar.html:841
 msgid "Dashboard"
 msgstr ""
 
@@ -15551,77 +15998,85 @@ msgstr ""
 msgid "Open Recruitments"
 msgstr "Recruitment"
 
-#: .\templates\sidebar.html:272
+#: .\templates\sidebar.html:271
 msgid "Onboarding View"
 msgstr ""
 
-#: .\templates\sidebar.html:280
+#: .\templates\sidebar.html:279
 msgid "Candidate View"
 msgstr ""
 
-#: .\templates\sidebar.html:431
+#: .\templates\sidebar.html:319
+msgid "Staff Organogram"
+msgstr ""
+
+#: .\templates\sidebar.html:446
 msgid "Allowance view"
 msgstr ""
 
-#: .\templates\sidebar.html:439
+#: .\templates\sidebar.html:454
 msgid "Deduction view"
 msgstr ""
 
-#: .\templates\sidebar.html:451
+#: .\templates\sidebar.html:466
 msgid "Loan / Advance Salary"
 msgstr ""
 
-#: .\templates\sidebar.html:457
+#: .\templates\sidebar.html:472
 msgid "Encashments & Reimbursements"
 msgstr ""
 
-#: .\templates\sidebar.html:523
+#: .\templates\sidebar.html:538
 msgid "Attendance Requests"
 msgstr ""
 
-#: .\templates\sidebar.html:538
+#: .\templates\sidebar.html:553
 msgid "Work records"
 msgstr ""
 
-#: .\templates\sidebar.html:553
+#: .\templates\sidebar.html:568
 msgid "Late Come Early Out"
 msgstr ""
 
-#: .\templates\sidebar.html:560
+#: .\templates\sidebar.html:575
 msgid "My Attendance"
 msgstr ""
 
-#: .\templates\sidebar.html:636
+#: .\templates\sidebar.html:651
 msgid "Assigned Leaves"
 msgstr ""
 
-#: .\templates\sidebar.html:716
+#: .\templates\sidebar.html:731
 msgid "360 Feedback"
 msgstr ""
 
-#: .\templates\sidebar.html:774
+#: .\templates\sidebar.html:789
 #, fuzzy
 #| msgid "pipeline"
 msgid "Pipeline"
 msgstr "Pipeline"
 
-#: .\templates\sidebar.html:826
+#: .\templates\sidebar.html:797
+msgid "Resignation Letters"
+msgstr ""
+
+#: .\templates\sidebar.html:850
 msgid "Asset view"
 msgstr ""
 
-#: .\templates\sidebar.html:834
+#: .\templates\sidebar.html:858
 msgid "Request and Allocation"
 msgstr ""
 
-#: .\templates\sidebar.html:859
+#: .\templates\sidebar.html:883
 msgid "Help Desk"
 msgstr ""
 
-#: .\templates\sidebar.html:934
+#: .\templates\sidebar.html:959
 msgid "Configuration"
 msgstr ""
 
-#: .\templates\sidebar.html:949
+#: .\templates\sidebar.html:974
 msgid "Multiple Approvals "
 msgstr ""
 
@@ -15667,9 +16122,6 @@ msgstr ""
 #~ msgid "employee-shift-schedule-update"
 #~ msgstr "Update"
 
-#~ msgid "rotating-shift-update"
-#~ msgstr "Update"
-
 #~ msgid "user-group-update"
 #~ msgstr "Update"
 
diff --git a/horilla_crumbs/context_processors.py b/horilla_crumbs/context_processors.py
index a1a7ebbfe..bfa9fd891 100644
--- a/horilla_crumbs/context_processors.py
+++ b/horilla_crumbs/context_processors.py
@@ -96,6 +96,12 @@ sidebar_urls = [
     "date-settings",
     "offboarding-pipeline",
     "pagination-settings-view",
+    "organisation-chart",
+    "disciplinary-actions",
+    "view-policies",
+    "resignation-requests-view",
+    "action-type",
+    "general-settings",
 ]
 remove_urls = [
     "objective-detailed-view",
diff --git a/offboarding/urls.py b/offboarding/urls.py
index a410aadf3..16817d07f 100644
--- a/offboarding/urls.py
+++ b/offboarding/urls.py
@@ -39,7 +39,7 @@ urlpatterns = [
         views.offboarding_individual_view,
         name="offboarding-individual-view",
     ),
-    path("requests-view", views.request_view, name="resignation-request-view"),
+    path("resignation-requests-view/", views.request_view, name="resignation-request-view"),
     path(
         "create-resignation-request",
         views.create_resignation_request,