diff --git a/base/translator.py b/base/translator.py index 526fc04d3..e884d668b 100644 --- a/base/translator.py +++ b/base/translator.py @@ -282,3 +282,5 @@ _("ticket-detail"), _("ticket-type-view"), _("tag-view"), _("mail-server-conf"), +_("configuration"), +_("multiple-approval-condition"), \ No newline at end of file diff --git a/horilla/decorators.py b/horilla/decorators.py index 6315f771a..e2e0d9991 100755 --- a/horilla/decorators.py +++ b/horilla/decorators.py @@ -4,11 +4,13 @@ from django.http import HttpResponse, HttpResponseRedirect, Http404 from django.core.exceptions import ObjectDoesNotExist from django.shortcuts import redirect from django.urls import reverse +from base.models import MultipleApprovalManagers from employee.models import Employee, EmployeeWorkInformation from django.contrib import messages from django.shortcuts import render from horilla.settings import TEMPLATES, BASE_DIR from horilla import settings +from leave.models import LeaveRequestConditionApproval logger = logging.getLogger(__name__) @@ -81,8 +83,19 @@ def manager_can_enter(function, perm): """ def _function(request, *args, **kwargs): + leave_perm = [ + "leave.view_leaverequest", + "leave.change_leaverequest", + "leave.delete_leaverequest", + ] user = request.user employee = Employee.objects.filter(employee_user_id=user).first() + if perm in leave_perm: + is_approval_manager = MultipleApprovalManagers.objects.filter( + employee_id=employee.id + ).exists() + if is_approval_manager: + return function(request, *args, **kwargs) is_manager = EmployeeWorkInformation.objects.filter( reporting_manager_id=employee ).exists() @@ -116,7 +129,7 @@ def login_required(view_func): except Exception as e: logger.exception(e) if not settings.DEBUG: - return render(request,"went_wrong.html") + return render(request, "went_wrong.html") return view_func(request, *args, **kwargs) return func diff --git a/horilla/locale/en/LC_MESSAGES/django.po b/horilla/locale/en/LC_MESSAGES/django.po index 7ff134d04..8dccb372e 100644 --- a/horilla/locale/en/LC_MESSAGES/django.po +++ b/horilla/locale/en/LC_MESSAGES/django.po @@ -3,13 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -#: .\leave\views.py:2288 +#: .\leave\views.py:2341 #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-01-09 09:40+0530\n" +"POT-Creation-Date: 2024-01-12 10:28+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -62,9 +62,9 @@ msgstr "" #: .\attendance\templates\attendance\late_come_early_out\export_filter.html:50 #: .\attendance\templates\attendance\late_come_early_out\late_come_early_out_filters.html:30 #: .\attendance\templates\requests\attendance\filter.html:31 -#: .\base\models.py:58 .\base\models.py:78 .\base\models.py:123 -#: .\base\models.py:146 .\base\models.py:169 .\base\models.py:350 -#: .\base\models.py:395 .\base\models.py:432 .\base\models.py:488 +#: .\base\models.py:59 .\base\models.py:74 .\base\models.py:119 +#: .\base\models.py:142 .\base\models.py:165 .\base\models.py:346 +#: .\base\models.py:391 .\base\models.py:428 .\base\models.py:484 #: .\base\templates\base\company\company.html:7 #: .\base\templates\base\company\company_form.html:15 #: .\base\templates\base\company\company_view.html:6 @@ -81,7 +81,7 @@ 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:393 +#: .\employee\models.py:402 #: .\employee\templates\employee\profile\work_info.html:55 #: .\employee\templates\employee\update_form\work_details.html:60 #: .\employee\templates\employee_export_filter.html:67 @@ -91,7 +91,7 @@ msgstr "" #: .\employee\templates\tabs\personal-tab.html:259 .\pms\models.py:21 #: .\pms\models.py:163 #: .\pms\templates\feedback\question_template\question_template_update.html:11 -#: .\pms\templates\feedback\question_template\question_template_view.html:106 +#: .\pms\templates\feedback\question_template\question_template_view.html:117 #: .\pms\templates\period\period_create.html:44 #: .\pms\templates\period\period_update.html:44 .\recruitment\models.py:106 #: .\recruitment\templates\candidate\export_filter.html:117 @@ -100,7 +100,7 @@ msgstr "" #: .\recruitment\templates\recruitment\filters.html:22 #: .\recruitment\templates\recruitment\recruitment_form.html:77 #: .\recruitment\templates\recruitment\recruitment_update_form.html:83 -#: .\recruitment\templates\stage\filters.html:34 .\templates\settings.html:164 +#: .\recruitment\templates\stage\filters.html:34 .\templates\settings.html:214 msgid "Company" msgstr "" @@ -138,8 +138,8 @@ msgstr "" #: .\asset\models.py:137 #: .\attendance\templates\attendance\own_attendance\attendances.html:45 -#: .\base\methods.py:357 .\employee\templates\tabs\leave-tab.html:59 -#: .\leave\models.py:95 .\leave\models.py:103 +#: .\base\methods.py:358 .\employee\templates\tabs\leave-tab.html:59 +#: .\leave\models.py:106 .\leave\models.py:114 #: .\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 @@ -148,26 +148,29 @@ msgstr "" #: .\asset\models.py:138 #: .\attendance\templates\attendance\attendance\group_by.html:144 -#: .\base\methods.py:358 .\base\models.py:664 .\base\models.py:773 +#: .\base\methods.py:359 .\base\models.py:660 .\base\models.py:769 #: .\base\templates\shift_request\shift_request_export.html:87 #: .\base\templates\shift_request\shift_request_nav.html:153 #: .\base\templates\work_type_request\work_type_request_export.html:87 #: .\base\templates\work_type_request\work_type_request_nav.html:121 -#: .\employee\templates\tabs\leave-tab.html:66 .\leave\models.py:96 -#: .\leave\models.py:104 -#: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_single_view.html:135 +#: .\employee\templates\tabs\leave-tab.html:66 .\leave\models.py:107 +#: .\leave\models.py:115 +#: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_single_view.html:136 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_view.html:261 #: .\leave\templates\leave\leave_request\leave_requests.html:26 +#: .\leave\templates\leave\leave_request\leave_requests.html:120 +#: .\leave\templates\leave\leave_request\one_request_view.html:71 #: .\leave\templates\leave\user_leave\user_requests.html:24 msgid "Approved" msgstr "" -#: .\asset\models.py:139 .\base\methods.py:360 -#: .\employee\templates\tabs\leave-tab.html:45 .\leave\models.py:98 -#: .\leave\models.py:105 -#: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_single_view.html:155 +#: .\asset\models.py:139 .\base\methods.py:361 +#: .\employee\templates\tabs\leave-tab.html:45 .\leave\models.py:109 +#: .\leave\models.py:116 +#: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_single_view.html:156 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_view.html:239 #: .\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 msgid "Rejected" msgstr "" @@ -179,8 +182,8 @@ msgstr "" #: .\asset\templates\asset\asset_creation.html:41 #: .\asset\templates\asset\asset_information.html:6 #: .\asset\templates\asset\asset_update.html:72 -#: .\asset\templates\category\asset_category_view.html:118 -#: .\asset\templates\category\asset_category_view.html:199 +#: .\asset\templates\category\asset_category_view.html:120 +#: .\asset\templates\category\asset_category_view.html:201 #: .\asset\templates\request_allocation\asset_request_allocation_view.html:79 msgid "Asset Name" msgstr "" @@ -192,33 +195,33 @@ msgstr "" #: .\asset\templates\batch\asset_batch_number_update.html:35 #: .\asset\templates\category\asset_category_creation.html:26 #: .\asset\templates\category\asset_category_update.html:41 -#: .\asset\templates\category\asset_category_view.html:181 +#: .\asset\templates\category\asset_category_view.html:183 #: .\asset\templates\request_allocation\asset_request_creation.html:28 -#: .\attendance\templates\requests\attendance\individual_view.html:119 -#: .\base\models.py:663 .\base\models.py:769 +#: .\attendance\templates\requests\attendance\individual_view.html:120 +#: .\base\models.py:659 .\base\models.py:765 #: .\base\templates\shift_request\htmx\group_by.html:67 -#: .\base\templates\shift_request\htmx\requests.html:51 -#: .\base\templates\shift_request\htmx\shift_request_detail.html:57 +#: .\base\templates\shift_request\htmx\requests.html:49 +#: .\base\templates\shift_request\htmx\shift_request_detail.html:70 #: .\base\templates\work_type_request\htmx\group_by.html:67 -#: .\base\templates\work_type_request\htmx\requests.html:51 -#: .\base\templates\work_type_request\htmx\work_type_request_single_view.html:57 -#: .\base\translator.py:96 .\employee\models.py:520 +#: .\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:530 #: .\employee\templates\tabs\shift-tab.html:150 #: .\employee\templates\tabs\shift-tab.html:614 .\leave\forms.py:470 -#: .\leave\models.py:395 +#: .\leave\models.py:406 #: .\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:198 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_list.html:18 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_list.html:156 -#: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_single_view.html:62 +#: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_single_view.html:63 #: .\leave\templates\leave\user_leave\user_request_one.html:54 #: .\onboarding\templates\onboarding\candidate_creation_form.html:4 -#: .\payroll\models\models.py:84 +#: .\payroll\models\models.py:87 #: .\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 -#: .\recruitment\forms.py:208 .\recruitment\forms.py:428 -#: .\recruitment\models.py:411 +#: .\recruitment\forms.py:213 .\recruitment\forms.py:433 +#: .\recruitment\models.py:411 .\recruitment\models.py:521 #: .\recruitment\templates\pipeline\form\recruitment_update.html:25 #: .\recruitment\templates\recruitment\recruitment_form.html:11 #: .\recruitment\templates\recruitment\recruitment_update_form.html:18 @@ -229,15 +232,15 @@ msgstr "" #: .\asset\templates\asset\asset_information.html:22 #: .\asset\templates\asset\asset_list.html:23 #: .\asset\templates\asset\asset_update.html:84 -#: .\asset\templates\category\asset_category_view.html:128 -#: .\asset\templates\category\asset_category_view.html:203 +#: .\asset\templates\category\asset_category_view.html:130 +#: .\asset\templates\category\asset_category_view.html:205 msgid "Tracking Id" msgstr "" #: .\asset\templates\asset\asset_creation.html:61 #: .\asset\templates\asset\asset_information.html:28 #: .\asset\templates\asset\asset_update.html:100 -#: .\asset\templates\category\asset_category_view.html:210 +#: .\asset\templates\category\asset_category_view.html:212 msgid "Purchase Date" msgstr "" @@ -251,8 +254,9 @@ msgstr "" #: .\asset\templates\asset\asset_information.html:42 #: .\asset\templates\asset\asset_list.html:22 #: .\asset\templates\asset\asset_update.html:116 -#: .\asset\templates\category\asset_category_view.html:122 -#: .\asset\templates\category\asset_category_view.html:232 +#: .\asset\templates\asset\dashboard_asset_requests.html:9 +#: .\asset\templates\category\asset_category_view.html:124 +#: .\asset\templates\category\asset_category_view.html:234 #: .\asset\templates\request_allocation\asset_request_allocation_list.html:51 #: .\asset\templates\request_allocation\asset_request_allocation_list.html:175 #: .\asset\templates\request_allocation\asset_request_allocation_view.html:86 @@ -275,7 +279,7 @@ msgstr "" #: .\helpdesk\templates\helpdesk\ticket\ticket_list.html:25 #: .\helpdesk\templates\helpdesk\ticket\ticket_list.html:220 #: .\helpdesk\templates\helpdesk\ticket\ticket_list.html:438 -#: .\leave\models.py:406 +#: .\leave\models.py:417 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_group_by.html:36 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_group_by.html:197 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_list.html:17 @@ -288,13 +292,14 @@ msgstr "" #: .\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:259 .\payroll\models\models.py:162 +#: .\payroll\forms\component_forms.py:259 .\payroll\models\models.py:165 #: .\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 #: .\payroll\templates\payroll\contract\filter_contract.html:45 #: .\payroll\templates\payroll\contract\group_by.html:42 #: .\payroll\templates\payroll\dashboard.html:122 +#: .\payroll\templates\payroll\loan\installments.html:23 #: .\payroll\templates\payroll\payslip\filter_payslips.html:37 #: .\payroll\templates\payroll\payslip\generate_payslip_list.html:59 #: .\payroll\templates\payroll\payslip\group_payslips.html:50 @@ -323,14 +328,14 @@ msgstr "" #: .\asset\templates\asset\asset_information.html:49 #: .\asset\templates\asset\asset_list.html:24 #: .\asset\templates\asset\asset_update.html:123 -#: .\asset\templates\category\asset_category_view.html:73 +#: .\asset\templates\category\asset_category_view.html:74 #: .\asset\templates\category\asset_empty.html:44 msgid "Batch No" msgstr "" #: .\asset\templates\asset\asset_creation.html:93 #: .\asset\templates\asset\asset_report_form.html:65 -#: .\asset\templates\asset\asset_return_form.html:32 +#: .\asset\templates\asset\asset_return_form.html:44 #: .\asset\templates\asset\asset_update.html:146 #: .\asset\templates\batch\asset_batch_number_creation.html:27 #: .\asset\templates\batch\asset_batch_number_update.html:41 @@ -342,10 +347,13 @@ msgstr "" #: .\attendance\templates\attendance\attendance_account\form.html:7 #: .\attendance\templates\attendance\attendance_account\update_form.html:11 #: .\attendance\templates\attendance_form.html:52 +#: .\base\templates\base\audit_tag\audit_tag_form.html:29 +#: .\base\templates\base\employee_tag\employee_tag_form.html:29 #: .\base\templates\base\job_position\job_position_form.html:31 #: .\base\templates\base\tags\tags_form.html:29 #: .\base\templates\base\ticket_type\ticket_type_form.html:18 #: .\employee\templates\tabs\update_note.html:15 +#: .\helpdesk\templates\department_managers\department_managers_form.html:44 #: .\helpdesk\templates\helpdesk\faq\faq_category_create.html:28 #: .\helpdesk\templates\helpdesk\faq\faq_create.html:28 #: .\helpdesk\templates\helpdesk\faq\faq_list_view.html:111 @@ -365,10 +373,10 @@ msgstr "" #: .\pms\templates\feedback\answer\feedback_answer.html:176 #: .\pms\templates\feedback\feedback_creation.html:137 #: .\pms\templates\feedback\feedback_update.html:103 -#: .\pms\templates\feedback\question\question_all.html:103 -#: .\pms\templates\feedback\question_template\question_template_empty.html:66 +#: .\pms\templates\feedback\question\question_all.html:108 +#: .\pms\templates\feedback\question_template\question_template_empty.html:68 #: .\pms\templates\feedback\question_template\question_template_update.html:18 -#: .\pms\templates\feedback\question_template\question_template_view.html:112 +#: .\pms\templates\feedback\question_template\question_template_view.html:123 #: .\pms\templates\okr\create_period.html:52 #: .\pms\templates\okr\key_result\key_result_creation.html:131 #: .\pms\templates\okr\key_result\key_result_creation_htmx.html:106 @@ -382,6 +390,9 @@ msgstr "" #: .\recruitment\templates\pipeline\pipeline_components\update_note.html:15 #: .\recruitment\templates\pipeline\pipeline_components\update_note_individual.html:15 #: .\recruitment\templates\recruitment\recruitment_update_form.html:90 +#: .\recruitment\templates\skill_zone\skill_zone_create.html:29 +#: .\recruitment\templates\skill_zone\skill_zone_update.html:29 +#: .\recruitment\templates\skill_zone_cand\skill_zone_cand_form.html:30 #: .\recruitment\templates\survey\question_template_organized_form.html:49 #: .\recruitment\templates\survey_form.html:183 msgid "Save" @@ -397,11 +408,11 @@ msgstr "" #: .\asset\templates\asset\asset_information.html:55 #: .\asset\templates\asset\asset_update.html:91 -#: .\asset\templates\category\asset_category_view.html:138 -#: .\asset\templates\category\asset_category_view.html:226 +#: .\asset\templates\category\asset_category_view.html:140 +#: .\asset\templates\category\asset_category_view.html:228 #: .\asset\templates\request_allocation\group_by.html:209 #: .\asset\templates\request_allocation\group_by.html:354 -#: .\asset\templates\request_allocation\individual_request.html:65 +#: .\asset\templates\request_allocation\individual_request.html:66 #: .\employee\templates\tabs\asset-request-tab.html:110 msgid "Category" msgstr "" @@ -426,9 +437,10 @@ msgstr "Assigned Leaves" #: .\asset\templates\asset\asset_list.html:21 #: .\asset\templates\asset\asset_report_form.html:49 +#: .\asset\templates\asset\dashboard_allocated_assets.html:8 #: .\asset\templates\category\asset_category.html:34 -#: .\asset\templates\category\asset_category_view.html:113 -#: .\asset\templates\category\asset_category_view.html:193 +#: .\asset\templates\category\asset_category_view.html:115 +#: .\asset\templates\category\asset_category_view.html:195 #: .\asset\templates\request_allocation\asset_allocation_creation.html:12 #: .\asset\templates\request_allocation\asset_approve.html:12 #: .\asset\templates\request_allocation\asset_request_allocation_list.html:50 @@ -442,21 +454,21 @@ msgstr "Assigned Leaves" #: .\asset\templates\request_allocation\group_by.html:550 #: .\asset\templates\request_allocation\group_by.html:611 #: .\asset\templates\request_allocation\group_by.html:703 -#: .\asset\templates\request_allocation\individual allocation.html:93 +#: .\asset\templates\request_allocation\individual allocation.html:94 #: .\employee\templates\tabs\asset-tab.html:21 #: .\employee\templates\tabs\profile-asset-tab.html:8 msgid "Asset" msgstr "" -#: .\asset\templates\asset\asset_list.html:57 -#: .\asset\templates\asset\asset_list.html:67 -#: .\asset\templates\asset\asset_list.html:85 -#: .\asset\templates\batch\asset_batch_number_list.html:23 -#: .\asset\templates\category\asset_category.html:59 +#: .\asset\templates\asset\asset_list.html:61 +#: .\asset\templates\asset\asset_list.html:71 +#: .\asset\templates\asset\asset_list.html:90 +#: .\asset\templates\batch\asset_batch_number_list.html:27 +#: .\asset\templates\category\asset_category.html:62 #: .\base\templates\base\rotating_shift\htmx\group_by.html:135 -#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:119 +#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:117 #: .\base\templates\base\rotating_work_type\htmx\group_by.html:135 -#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:118 +#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:116 #: .\employee\templates\employee_nav.html:162 #: .\employee\templates\employee_personal_info\bulk_update.html:27 #: .\employee\templates\tabs\allowance_deduction-tab.html:96 @@ -474,24 +486,24 @@ msgstr "" #: .\payroll\templates\payroll\deduction\list_deduction.html:78 #: .\payroll\templates\payroll\tax\filing_status_list.html:72 #: .\payroll\templates\payroll\tax\tax_bracket_view.html:40 -#: .\pms\templates\feedback\question_template\question_template_view.html:74 -#: .\pms\templates\period\period_view.html:63 +#: .\pms\templates\feedback\question_template\question_template_view.html:81 +#: .\pms\templates\period\period_view.html:69 msgid "Update" msgstr "" -#: .\asset\templates\asset\asset_list.html:73 -#: .\asset\templates\asset\asset_list.html:103 +#: .\asset\templates\asset\asset_list.html:77 +#: .\asset\templates\asset\asset_list.html:113 msgid "Do you want to delete this asset?" msgstr "" -#: .\asset\templates\asset\asset_list.html:75 -#: .\asset\templates\asset\asset_list.html:105 -#: .\asset\templates\batch\asset_batch_number_list.html:33 -#: .\asset\templates\category\asset_category.html:62 +#: .\asset\templates\asset\asset_list.html:79 +#: .\asset\templates\asset\asset_list.html:115 +#: .\asset\templates\batch\asset_batch_number_list.html:39 +#: .\asset\templates\category\asset_category.html:67 #: .\attendance\templates\attendance\attendance\attendance_nav.html:346 -#: .\attendance\templates\attendance\attendance\attendance_request_one.html:149 -#: .\attendance\templates\attendance\attendance\attendance_request_one.html:190 -#: .\attendance\templates\attendance\attendance\attendance_request_one.html:222 +#: .\attendance\templates\attendance\attendance\attendance_request_one.html:150 +#: .\attendance\templates\attendance\attendance\attendance_request_one.html:191 +#: .\attendance\templates\attendance\attendance\attendance_request_one.html:223 #: .\attendance\templates\attendance\attendance_account\nav.html:199 #: .\attendance\templates\attendance\attendance_activity\nav.html:171 #: .\attendance\templates\attendance\late_come_early_out\nav.html:159 @@ -524,13 +536,14 @@ msgstr "" #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_group_by.html:255 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_list.html:74 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_list.html:213 -#: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_single_view.html:109 -#: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_single_view.html:116 +#: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_single_view.html:110 +#: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_single_view.html:117 #: .\leave\templates\leave\leave_assign\assign_view.html:240 #: .\leave\templates\leave\leave_assign\assigned_leave.html:58 #: .\leave\templates\leave\leave_assign\group_by.html:71 #: .\leave\templates\leave\leave_request\group_by.html:141 -#: .\leave\templates\leave\leave_request\leave_requests.html:177 +#: .\leave\templates\leave\leave_request\leave_requests.html:186 +#: .\leave\templates\leave\leave_request\penalty\create.html:50 #: .\leave\templates\leave\leave_request\request_view.html:235 #: .\leave\templates\leave\leave_type\leave_type_individual_view.html:146 #: .\leave\templates\leave\leave_type\leave_types.html:54 @@ -560,32 +573,36 @@ msgstr "" #: .\pms\templates\feedback\feedback_list.html:275 #: .\pms\templates\feedback\feedback_list.html:415 #: .\pms\templates\feedback\feedback_list_view.html:170 -#: .\pms\templates\feedback\question\question_all.html:98 -#: .\pms\templates\feedback\question_template\question_template_view.html:76 +#: .\pms\templates\feedback\question\question_all.html:102 +#: .\pms\templates\feedback\question_template\question_template_view.html:85 #: .\pms\templates\okr\group_by.html:223 .\pms\templates\okr\group_by.html:475 #: .\pms\templates\okr\objective_detailed_view.html:23 #: .\pms\templates\okr\objective_list.html:202 #: .\pms\templates\okr\objective_list.html:421 #: .\pms\templates\okr\objective_list_view.html:265 -#: .\pms\templates\period\period_view.html:66 +#: .\pms\templates\period\period_view.html:74 #: .\recruitment\templates\candidate\candidate_card.html:80 #: .\recruitment\templates\candidate\candidate_nav.html:208 #: .\recruitment\templates\candidate\individual.html:369 -#: .\recruitment\templates\pipeline\pipeline.html:215 +#: .\recruitment\templates\pipeline\pipeline.html:214 #: .\recruitment\templates\pipeline\pipeline_card.html:80 #: .\recruitment\templates\pipeline\pipeline_card.html:291 #: .\recruitment\templates\pipeline\pipeline_components\view_note.html:57 #: .\recruitment\templates\pipeline\pipeline_tabs.html:69 #: .\recruitment\templates\recruitment\recruitment_component.html:149 +#: .\recruitment\templates\skill_zone\skill_zone_card.html:60 +#: .\recruitment\templates\skill_zone\skill_zone_nav.html:120 +#: .\recruitment\templates\skill_zone_cand\skill_zone_cand_card.html:81 +#: .\recruitment\templates\skill_zone_cand\skill_zone_cand_list.html:65 #: .\recruitment\templates\survey\survey_card.html:56 #: .\recruitment\templates\survey\view_single_template.html:84 #: .\recruitment\templates\survey\view_single_template.html:114 msgid "Delete" msgstr "" -#: .\asset\templates\asset\asset_list.html:122 -#: .\asset\templates\batch\asset_batch_number_list.html:49 -#: .\asset\templates\category\asset_category.html:81 +#: .\asset\templates\asset\asset_list.html:133 +#: .\asset\templates\batch\asset_batch_number_list.html:57 +#: .\asset\templates\category\asset_category.html:88 #: .\asset\templates\request_allocation\asset_request_allocation_list.html:109 #: .\asset\templates\request_allocation\asset_request_allocation_list.html:268 #: .\asset\templates\request_allocation\asset_request_allocation_list.html:451 @@ -650,20 +667,20 @@ msgstr "" #: .\base\templates\base\auth\permission_view.html:66 #: .\base\templates\base\rotating_shift\htmx\group_by.html:187 #: .\base\templates\base\rotating_shift\htmx\group_by.html:191 -#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:167 -#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:171 +#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:165 +#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:169 #: .\base\templates\base\rotating_work_type\htmx\group_by.html:187 #: .\base\templates\base\rotating_work_type\htmx\group_by.html:192 -#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:165 -#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:170 +#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:163 +#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:168 #: .\base\templates\shift_request\htmx\group_by.html:153 #: .\base\templates\shift_request\htmx\group_by.html:157 -#: .\base\templates\shift_request\htmx\requests.html:138 -#: .\base\templates\shift_request\htmx\requests.html:142 +#: .\base\templates\shift_request\htmx\requests.html:136 +#: .\base\templates\shift_request\htmx\requests.html:140 #: .\base\templates\work_type_request\htmx\group_by.html:152 #: .\base\templates\work_type_request\htmx\group_by.html:156 -#: .\base\templates\work_type_request\htmx\requests.html:141 -#: .\base\templates\work_type_request\htmx\requests.html:145 +#: .\base\templates\work_type_request\htmx\requests.html:139 +#: .\base\templates\work_type_request\htmx\requests.html:143 #: .\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:248 @@ -700,8 +717,8 @@ msgstr "" #: .\leave\templates\leave\leave_assign\group_by.html:95 #: .\leave\templates\leave\leave_request\group_by.html:160 #: .\leave\templates\leave\leave_request\group_by.html:164 -#: .\leave\templates\leave\leave_request\leave_requests.html:210 -#: .\leave\templates\leave\leave_request\leave_requests.html:214 +#: .\leave\templates\leave\leave_request\leave_requests.html:219 +#: .\leave\templates\leave\leave_request\leave_requests.html:223 #: .\leave\templates\leave\leave_type\leave_types.html:67 #: .\leave\templates\leave\leave_type\leave_types.html:71 #: .\leave\templates\leave\user_leave\group_by.html:152 @@ -726,6 +743,8 @@ msgstr "" #: .\payroll\templates\payroll\deduction\card_deduction.html:63 #: .\payroll\templates\payroll\deduction\list_deduction.html:112 #: .\payroll\templates\payroll\deduction\list_deduction.html:117 +#: .\payroll\templates\payroll\loan\records.html:50 +#: .\payroll\templates\payroll\loan\records.html:54 #: .\payroll\templates\payroll\payslip\group_payslips.html:142 #: .\payroll\templates\payroll\payslip\group_payslips.html:147 #: .\payroll\templates\payroll\payslip\payslip_table.html:130 @@ -738,16 +757,22 @@ msgstr "" #: .\pms\templates\okr\objective_list.html:448 #: .\recruitment\templates\candidate\candidate_card.html:102 #: .\recruitment\templates\candidate\candidate_card.html:107 -#: .\recruitment\templates\candidate\candidate_list.html:175 -#: .\recruitment\templates\candidate\candidate_list.html:179 +#: .\recruitment\templates\candidate\candidate_list.html:185 +#: .\recruitment\templates\candidate\candidate_list.html:189 #: .\recruitment\templates\candidate\group_by.html:128 #: .\recruitment\templates\candidate\group_by.html:132 -#: .\recruitment\templates\pipeline\pipeline.html:452 -#: .\recruitment\templates\pipeline\pipeline.html:458 +#: .\recruitment\templates\pipeline\pipeline.html:451 +#: .\recruitment\templates\pipeline\pipeline.html:457 #: .\recruitment\templates\pipeline\pipeline_card.html:338 #: .\recruitment\templates\pipeline\pipeline_card.html:344 #: .\recruitment\templates\recruitment\recruitment_component.html:198 #: .\recruitment\templates\recruitment\recruitment_component.html:204 +#: .\recruitment\templates\skill_zone\skill_zone_card.html:75 +#: .\recruitment\templates\skill_zone\skill_zone_card.html:80 +#: .\recruitment\templates\skill_zone\skill_zone_list.html:235 +#: .\recruitment\templates\skill_zone\skill_zone_list.html:239 +#: .\recruitment\templates\skill_zone_cand\skill_zone_cand_card.html:102 +#: .\recruitment\templates\skill_zone_cand\skill_zone_cand_card.html:107 #: .\recruitment\templates\stage\stage_component.html:144 #: .\recruitment\templates\stage\stage_component.html:149 #: .\recruitment\templates\survey\survey_card.html:94 @@ -755,9 +780,9 @@ msgstr "" msgid "Page" msgstr "" -#: .\asset\templates\asset\asset_list.html:125 -#: .\asset\templates\batch\asset_batch_number_list.html:52 -#: .\asset\templates\category\asset_category.html:84 +#: .\asset\templates\asset\asset_list.html:136 +#: .\asset\templates\batch\asset_batch_number_list.html:60 +#: .\asset\templates\category\asset_category.html:91 #: .\asset\templates\request_allocation\asset_request_allocation_list.html:120 #: .\asset\templates\request_allocation\asset_request_allocation_list.html:279 #: .\asset\templates\request_allocation\asset_request_allocation_list.html:462 @@ -822,20 +847,20 @@ msgstr "" #: .\base\templates\base\auth\permission_view.html:69 #: .\base\templates\base\rotating_shift\htmx\group_by.html:187 #: .\base\templates\base\rotating_shift\htmx\group_by.html:202 -#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:167 -#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:182 +#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:165 +#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:180 #: .\base\templates\base\rotating_work_type\htmx\group_by.html:187 #: .\base\templates\base\rotating_work_type\htmx\group_by.html:203 -#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:165 -#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:181 +#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:163 +#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:179 #: .\base\templates\shift_request\htmx\group_by.html:153 #: .\base\templates\shift_request\htmx\group_by.html:160 -#: .\base\templates\shift_request\htmx\requests.html:138 -#: .\base\templates\shift_request\htmx\requests.html:145 +#: .\base\templates\shift_request\htmx\requests.html:136 +#: .\base\templates\shift_request\htmx\requests.html:143 #: .\base\templates\work_type_request\htmx\group_by.html:152 #: .\base\templates\work_type_request\htmx\group_by.html:159 -#: .\base\templates\work_type_request\htmx\requests.html:141 -#: .\base\templates\work_type_request\htmx\requests.html:148 +#: .\base\templates\work_type_request\htmx\requests.html:139 +#: .\base\templates\work_type_request\htmx\requests.html:146 #: .\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:248 @@ -872,8 +897,8 @@ msgstr "" #: .\leave\templates\leave\leave_assign\group_by.html:98 #: .\leave\templates\leave\leave_request\group_by.html:160 #: .\leave\templates\leave\leave_request\group_by.html:167 -#: .\leave\templates\leave\leave_request\leave_requests.html:210 -#: .\leave\templates\leave\leave_request\leave_requests.html:217 +#: .\leave\templates\leave\leave_request\leave_requests.html:219 +#: .\leave\templates\leave\leave_request\leave_requests.html:226 #: .\leave\templates\leave\leave_type\leave_types.html:67 #: .\leave\templates\leave\leave_type\leave_types.html:74 #: .\leave\templates\leave\user_leave\group_by.html:152 @@ -901,6 +926,8 @@ msgstr "" #: .\payroll\templates\payroll\deduction\view_single_deduction.html:65 #: .\payroll\templates\payroll\deduction\view_single_deduction.html:71 #: .\payroll\templates\payroll\deduction\view_single_deduction.html:72 +#: .\payroll\templates\payroll\loan\records.html:50 +#: .\payroll\templates\payroll\loan\records.html:57 #: .\payroll\templates\payroll\payslip\group_payslips.html:142 #: .\payroll\templates\payroll\payslip\group_payslips.html:157 #: .\payroll\templates\payroll\payslip\payslip_table.html:130 @@ -913,16 +940,22 @@ msgstr "" #: .\pms\templates\okr\objective_list.html:459 #: .\recruitment\templates\candidate\candidate_card.html:102 #: .\recruitment\templates\candidate\candidate_card.html:118 -#: .\recruitment\templates\candidate\candidate_list.html:175 -#: .\recruitment\templates\candidate\candidate_list.html:183 +#: .\recruitment\templates\candidate\candidate_list.html:185 +#: .\recruitment\templates\candidate\candidate_list.html:193 #: .\recruitment\templates\candidate\group_by.html:128 #: .\recruitment\templates\candidate\group_by.html:135 -#: .\recruitment\templates\pipeline\pipeline.html:452 -#: .\recruitment\templates\pipeline\pipeline.html:468 +#: .\recruitment\templates\pipeline\pipeline.html:451 +#: .\recruitment\templates\pipeline\pipeline.html:467 #: .\recruitment\templates\pipeline\pipeline_card.html:338 #: .\recruitment\templates\pipeline\pipeline_card.html:354 #: .\recruitment\templates\recruitment\recruitment_component.html:198 #: .\recruitment\templates\recruitment\recruitment_component.html:214 +#: .\recruitment\templates\skill_zone\skill_zone_card.html:75 +#: .\recruitment\templates\skill_zone\skill_zone_card.html:90 +#: .\recruitment\templates\skill_zone\skill_zone_list.html:235 +#: .\recruitment\templates\skill_zone\skill_zone_list.html:249 +#: .\recruitment\templates\skill_zone_cand\skill_zone_cand_card.html:102 +#: .\recruitment\templates\skill_zone_cand\skill_zone_cand_card.html:118 #: .\recruitment\templates\stage\stage_component.html:144 #: .\recruitment\templates\stage\stage_component.html:159 #: .\recruitment\templates\survey\survey_card.html:94 @@ -930,9 +963,9 @@ msgstr "" msgid "of" msgstr "" -#: .\asset\templates\asset\asset_list.html:131 -#: .\asset\templates\batch\asset_batch_number_list.html:58 -#: .\asset\templates\category\asset_category.html:90 +#: .\asset\templates\asset\asset_list.html:142 +#: .\asset\templates\batch\asset_batch_number_list.html:66 +#: .\asset\templates\category\asset_category.html:97 #: .\asset\templates\request_allocation\asset_request_allocation_list.html:130 #: .\asset\templates\request_allocation\asset_request_allocation_list.html:289 #: .\asset\templates\request_allocation\asset_request_allocation_list.html:472 @@ -968,13 +1001,13 @@ msgstr "" #: .\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 -#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:192 +#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:190 #: .\base\templates\base\rotating_work_type\htmx\group_by.html:213 -#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:191 +#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:189 #: .\base\templates\shift_request\htmx\group_by.html:166 -#: .\base\templates\shift_request\htmx\requests.html:151 +#: .\base\templates\shift_request\htmx\requests.html:149 #: .\base\templates\work_type_request\htmx\group_by.html:165 -#: .\base\templates\work_type_request\htmx\requests.html:154 +#: .\base\templates\work_type_request\htmx\requests.html:152 #: .\employee\templates\employee_personal_info\employee_card.html:124 #: .\employee\templates\employee_personal_info\employee_list.html:273 #: .\employee\templates\employee_personal_info\group_by.html:271 @@ -993,7 +1026,7 @@ msgstr "" #: .\leave\templates\leave\leave_assign\assigned_leave.html:87 #: .\leave\templates\leave\leave_assign\group_by.html:104 #: .\leave\templates\leave\leave_request\group_by.html:173 -#: .\leave\templates\leave\leave_request\leave_requests.html:223 +#: .\leave\templates\leave\leave_request\leave_requests.html:232 #: .\leave\templates\leave\leave_type\leave_types.html:80 #: .\leave\templates\leave\user_leave\group_by.html:165 #: .\leave\templates\leave\user_leave\user_requests.html:171 @@ -1005,6 +1038,7 @@ msgstr "" #: .\payroll\templates\payroll\contract\group_by.html:141 #: .\payroll\templates\payroll\deduction\card_deduction.html:78 #: .\payroll\templates\payroll\deduction\list_deduction.html:132 +#: .\payroll\templates\payroll\loan\records.html:63 #: .\payroll\templates\payroll\payslip\group_payslips.html:162 #: .\payroll\templates\payroll\payslip\payslip_table.html:150 #: .\pms\templates\feedback\feedback_list.html:169 @@ -1014,19 +1048,22 @@ msgstr "" #: .\pms\templates\okr\objective_list.html:250 #: .\pms\templates\okr\objective_list.html:469 #: .\recruitment\templates\candidate\candidate_card.html:124 -#: .\recruitment\templates\candidate\candidate_list.html:190 +#: .\recruitment\templates\candidate\candidate_list.html:200 #: .\recruitment\templates\candidate\group_by.html:141 -#: .\recruitment\templates\pipeline\pipeline.html:474 +#: .\recruitment\templates\pipeline\pipeline.html:473 #: .\recruitment\templates\pipeline\pipeline_card.html:360 #: .\recruitment\templates\recruitment\recruitment_component.html:220 +#: .\recruitment\templates\skill_zone\skill_zone_card.html:95 +#: .\recruitment\templates\skill_zone\skill_zone_list.html:254 +#: .\recruitment\templates\skill_zone_cand\skill_zone_cand_card.html:124 #: .\recruitment\templates\stage\stage_component.html:165 #: .\recruitment\templates\survey\survey_card.html:122 msgid "First" msgstr "" -#: .\asset\templates\asset\asset_list.html:135 -#: .\asset\templates\batch\asset_batch_number_list.html:62 -#: .\asset\templates\category\asset_category.html:94 +#: .\asset\templates\asset\asset_list.html:146 +#: .\asset\templates\batch\asset_batch_number_list.html:70 +#: .\asset\templates\category\asset_category.html:101 #: .\asset\templates\request_allocation\asset_request_allocation_list.html:138 #: .\asset\templates\request_allocation\asset_request_allocation_list.html:297 #: .\asset\templates\request_allocation\asset_request_allocation_list.html:480 @@ -1062,13 +1099,13 @@ msgstr "" #: .\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 -#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:200 +#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:198 #: .\base\templates\base\rotating_work_type\htmx\group_by.html:221 -#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:199 +#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:197 #: .\base\templates\shift_request\htmx\group_by.html:171 -#: .\base\templates\shift_request\htmx\requests.html:156 +#: .\base\templates\shift_request\htmx\requests.html:154 #: .\base\templates\work_type_request\htmx\group_by.html:170 -#: .\base\templates\work_type_request\htmx\requests.html:159 +#: .\base\templates\work_type_request\htmx\requests.html:157 #: .\employee\templates\employee_personal_info\employee_card.html:127 #: .\employee\templates\employee_personal_info\employee_list.html:281 #: .\employee\templates\employee_personal_info\group_by.html:280 @@ -1088,7 +1125,7 @@ msgstr "" #: .\leave\templates\leave\leave_assign\assigned_leave.html:92 #: .\leave\templates\leave\leave_assign\group_by.html:110 #: .\leave\templates\leave\leave_request\group_by.html:178 -#: .\leave\templates\leave\leave_request\leave_requests.html:228 +#: .\leave\templates\leave\leave_request\leave_requests.html:237 #: .\leave\templates\leave\leave_type\leave_types.html:85 #: .\leave\templates\leave\user_leave\group_by.html:171 #: .\leave\templates\leave\user_leave\user_requests.html:176 @@ -1101,6 +1138,7 @@ msgstr "" #: .\payroll\templates\payroll\contract\group_by.html:144 #: .\payroll\templates\payroll\deduction\card_deduction.html:81 #: .\payroll\templates\payroll\deduction\list_deduction.html:135 +#: .\payroll\templates\payroll\loan\records.html:66 #: .\payroll\templates\payroll\payslip\group_payslips.html:165 #: .\payroll\templates\payroll\payslip\payslip_table.html:153 #: .\pms\templates\feedback\feedback_list.html:174 @@ -1110,19 +1148,22 @@ msgstr "" #: .\pms\templates\okr\objective_list.html:258 #: .\pms\templates\okr\objective_list.html:477 #: .\recruitment\templates\candidate\candidate_card.html:127 -#: .\recruitment\templates\candidate\candidate_list.html:195 +#: .\recruitment\templates\candidate\candidate_list.html:205 #: .\recruitment\templates\candidate\group_by.html:147 -#: .\recruitment\templates\pipeline\pipeline.html:477 +#: .\recruitment\templates\pipeline\pipeline.html:476 #: .\recruitment\templates\pipeline\pipeline_card.html:363 #: .\recruitment\templates\recruitment\recruitment_component.html:223 +#: .\recruitment\templates\skill_zone\skill_zone_card.html:98 +#: .\recruitment\templates\skill_zone\skill_zone_list.html:257 +#: .\recruitment\templates\skill_zone_cand\skill_zone_cand_card.html:127 #: .\recruitment\templates\stage\stage_component.html:168 #: .\recruitment\templates\survey\survey_card.html:130 msgid "Previous" msgstr "" -#: .\asset\templates\asset\asset_list.html:141 -#: .\asset\templates\batch\asset_batch_number_list.html:68 -#: .\asset\templates\category\asset_category.html:100 +#: .\asset\templates\asset\asset_list.html:152 +#: .\asset\templates\batch\asset_batch_number_list.html:76 +#: .\asset\templates\category\asset_category.html:107 #: .\asset\templates\request_allocation\asset_request_allocation_list.html:148 #: .\asset\templates\request_allocation\asset_request_allocation_list.html:307 #: .\asset\templates\request_allocation\asset_request_allocation_list.html:490 @@ -1158,13 +1199,13 @@ msgstr "" #: .\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 -#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:208 +#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:206 #: .\base\templates\base\rotating_work_type\htmx\group_by.html:230 -#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:208 +#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:206 #: .\base\templates\shift_request\htmx\group_by.html:178 -#: .\base\templates\shift_request\htmx\requests.html:163 +#: .\base\templates\shift_request\htmx\requests.html:161 #: .\base\templates\work_type_request\htmx\group_by.html:177 -#: .\base\templates\work_type_request\htmx\requests.html:166 +#: .\base\templates\work_type_request\htmx\requests.html:164 #: .\employee\templates\employee_personal_info\employee_card.html:132 #: .\employee\templates\employee_personal_info\employee_list.html:290 #: .\employee\templates\employee_personal_info\group_by.html:290 @@ -1183,7 +1224,7 @@ msgstr "" #: .\leave\templates\leave\leave_assign\assigned_leave.html:99 #: .\leave\templates\leave\leave_assign\group_by.html:118 #: .\leave\templates\leave\leave_request\group_by.html:185 -#: .\leave\templates\leave\leave_request\leave_requests.html:235 +#: .\leave\templates\leave\leave_request\leave_requests.html:244 #: .\leave\templates\leave\leave_type\leave_types.html:92 #: .\leave\templates\leave\user_leave\group_by.html:179 #: .\leave\templates\leave\user_leave\user_requests.html:183 @@ -1196,6 +1237,7 @@ msgstr "" #: .\payroll\templates\payroll\contract\group_by.html:149 #: .\payroll\templates\payroll\deduction\card_deduction.html:86 #: .\payroll\templates\payroll\deduction\list_deduction.html:140 +#: .\payroll\templates\payroll\loan\records.html:71 #: .\payroll\templates\payroll\payslip\group_payslips.html:170 #: .\payroll\templates\payroll\payslip\payslip_table.html:158 #: .\pms\templates\feedback\feedback_list.html:180 @@ -1205,19 +1247,22 @@ msgstr "" #: .\pms\templates\okr\objective_list.html:267 #: .\pms\templates\okr\objective_list.html:486 #: .\recruitment\templates\candidate\candidate_card.html:132 -#: .\recruitment\templates\candidate\candidate_list.html:201 +#: .\recruitment\templates\candidate\candidate_list.html:211 #: .\recruitment\templates\candidate\group_by.html:154 -#: .\recruitment\templates\pipeline\pipeline.html:482 +#: .\recruitment\templates\pipeline\pipeline.html:481 #: .\recruitment\templates\pipeline\pipeline_card.html:368 #: .\recruitment\templates\recruitment\recruitment_component.html:228 +#: .\recruitment\templates\skill_zone\skill_zone_card.html:103 +#: .\recruitment\templates\skill_zone\skill_zone_list.html:262 +#: .\recruitment\templates\skill_zone_cand\skill_zone_cand_card.html:132 #: .\recruitment\templates\stage\stage_component.html:173 #: .\recruitment\templates\survey\survey_card.html:139 msgid "Next" msgstr "" -#: .\asset\templates\asset\asset_list.html:145 -#: .\asset\templates\batch\asset_batch_number_list.html:72 -#: .\asset\templates\category\asset_category.html:104 +#: .\asset\templates\asset\asset_list.html:156 +#: .\asset\templates\batch\asset_batch_number_list.html:80 +#: .\asset\templates\category\asset_category.html:111 #: .\asset\templates\request_allocation\asset_request_allocation_list.html:156 #: .\asset\templates\request_allocation\asset_request_allocation_list.html:315 #: .\asset\templates\request_allocation\asset_request_allocation_list.html:498 @@ -1253,13 +1298,13 @@ msgstr "" #: .\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 -#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:216 +#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:214 #: .\base\templates\base\rotating_work_type\htmx\group_by.html:238 -#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:216 +#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:214 #: .\base\templates\shift_request\htmx\group_by.html:183 -#: .\base\templates\shift_request\htmx\requests.html:168 +#: .\base\templates\shift_request\htmx\requests.html:166 #: .\base\templates\work_type_request\htmx\group_by.html:182 -#: .\base\templates\work_type_request\htmx\requests.html:171 +#: .\base\templates\work_type_request\htmx\requests.html:169 #: .\employee\templates\employee_personal_info\employee_card.html:135 #: .\employee\templates\employee_personal_info\employee_list.html:298 #: .\employee\templates\employee_personal_info\group_by.html:299 @@ -1278,7 +1323,7 @@ msgstr "" #: .\leave\templates\leave\leave_assign\assigned_leave.html:104 #: .\leave\templates\leave\leave_assign\group_by.html:124 #: .\leave\templates\leave\leave_request\group_by.html:190 -#: .\leave\templates\leave\leave_request\leave_requests.html:240 +#: .\leave\templates\leave\leave_request\leave_requests.html:249 #: .\leave\templates\leave\leave_type\leave_types.html:97 #: .\leave\templates\leave\user_leave\group_by.html:185 #: .\leave\templates\leave\user_leave\user_requests.html:188 @@ -1291,6 +1336,7 @@ msgstr "" #: .\payroll\templates\payroll\contract\group_by.html:152 #: .\payroll\templates\payroll\deduction\card_deduction.html:89 #: .\payroll\templates\payroll\deduction\list_deduction.html:143 +#: .\payroll\templates\payroll\loan\records.html:74 #: .\payroll\templates\payroll\payslip\group_payslips.html:173 #: .\payroll\templates\payroll\payslip\payslip_table.html:161 #: .\pms\templates\feedback\feedback_list.html:184 @@ -1300,27 +1346,32 @@ msgstr "" #: .\pms\templates\okr\objective_list.html:275 #: .\pms\templates\okr\objective_list.html:494 #: .\recruitment\templates\candidate\candidate_card.html:135 -#: .\recruitment\templates\candidate\candidate_list.html:206 +#: .\recruitment\templates\candidate\candidate_list.html:216 #: .\recruitment\templates\candidate\group_by.html:160 -#: .\recruitment\templates\pipeline\pipeline.html:485 +#: .\recruitment\templates\pipeline\pipeline.html:484 #: .\recruitment\templates\pipeline\pipeline_card.html:371 #: .\recruitment\templates\recruitment\recruitment_component.html:231 +#: .\recruitment\templates\skill_zone\skill_zone_card.html:106 +#: .\recruitment\templates\skill_zone\skill_zone_list.html:265 +#: .\recruitment\templates\skill_zone_cand\skill_zone_cand_card.html:135 #: .\recruitment\templates\stage\stage_component.html:176 #: .\recruitment\templates\survey\survey_card.html:147 msgid "Last" msgstr "" #: .\asset\templates\asset\asset_report_form.html:41 +#: .\base\templates\base\audit_tag\audit_tag_view.html:6 +#: .\base\templates\base\employee_tag\employee_tag_view.html:6 #: .\base\templates\base\rotating_shift\htmx\group_by.html:64 -#: .\base\templates\base\rotating_shift\individual_view.html:43 -#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:48 +#: .\base\templates\base\rotating_shift\individual_view.html:44 +#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:46 #: .\base\templates\base\rotating_shift\rotating_shift_view.html:6 #: .\base\templates\base\rotating_work_type\htmx\group_by.html:63 -#: .\base\templates\base\rotating_work_type\individual_view.html:41 -#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:46 +#: .\base\templates\base\rotating_work_type\individual_view.html:42 +#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:44 #: .\base\templates\base\rotating_work_type\rotating_work_type_view.html:6 -#: .\base\templates\base\tags\tags_view.html:6 .\employee\models.py:519 -#: .\employee\templates\tabs\performance-tab.html:8 +#: .\base\templates\base\tags\tags_view.html:6 .\employee\models.py:335 +#: .\employee\models.py:529 .\employee\templates\tabs\performance-tab.html:8 #: .\employee\templates\tabs\shift-tab.html:303 #: .\employee\templates\tabs\shift-tab.html:445 #: .\helpdesk\templates\helpdesk\ticket\ticket_group.html:43 @@ -1333,10 +1384,10 @@ msgstr "" #: .\pms\templates\feedback\feedback_list.html:80 #: .\pms\templates\feedback\feedback_list.html:217 #: .\pms\templates\feedback\feedback_list.html:358 -#: .\pms\templates\feedback\question_template\question_template_empty.html:59 +#: .\pms\templates\feedback\question_template\question_template_empty.html:61 #: .\pms\templates\feedback\question_template\question_template_update.html:6 -#: .\pms\templates\feedback\question_template\question_template_view.html:50 -#: .\pms\templates\feedback\question_template\question_template_view.html:101 +#: .\pms\templates\feedback\question_template\question_template_view.html:52 +#: .\pms\templates\feedback\question_template\question_template_view.html:112 #: .\pms\templates\okr\create_period.html:23 #: .\pms\templates\okr\key_result\key_result_creation.html:53 #: .\pms\templates\okr\key_result\key_result_creation_htmx.html:32 @@ -1344,7 +1395,7 @@ msgstr "" #: .\pms\templates\okr\objective_creation.html:33 #: .\pms\templates\period\period_create.html:22 #: .\pms\templates\period\period_update.html:22 -#: .\pms\templates\period\period_view.html:45 .\recruitment\models.py:410 +#: .\pms\templates\period\period_view.html:47 .\recruitment\models.py:410 #: .\recruitment\templates\pipeline\form\recruitment_update.html:21 #: .\recruitment\templates\recruitment\recruitment_form.html:7 #: .\recruitment\templates\recruitment\recruitment_update_form.html:14 @@ -1383,6 +1434,10 @@ msgstr "" msgid "Add Report" msgstr "Employee" +#: .\asset\templates\asset\asset_return_form.html:40 +msgid "Add Fine" +msgstr "" + #: .\asset\templates\asset\asset_update.html:58 msgid "Asset Update" msgstr "" @@ -1391,38 +1446,136 @@ msgstr "" msgid "Asset Description" msgstr "" +#: .\asset\templates\asset\dashboard.html:23 +#: .\leave\templates\leave\dashboard.html:30 +#: .\leave\templates\leave\employee_dashboard.html:27 +#: .\onboarding\templates\onboarding\dashboard.html:18 +#: .\payroll\templates\payroll\dashboard.html:19 +#: .\pms\templates\dashboard\pms_dashboard.html:24 +#: .\templates\dashboard.html:50 +msgid "Back" +msgstr "" + +#: .\asset\templates\asset\dashboard.html:33 +#: .\employee\templates\employee\profile\profile_view.html:202 +#: .\employee\templates\employee\view\individual.html:251 +#: .\templates\sidebar.html:679 +msgid "Assets" +msgstr "" + +#: .\asset\templates\asset\dashboard.html:48 +#, fuzzy +#| msgid "user-request-view" +msgid "Asset request" +msgstr "My Leave Requests" + +#: .\asset\templates\asset\dashboard.html:62 +msgid "Assets in use" +msgstr "" + +#: .\asset\templates\asset\dashboard.html:78 +#: .\asset\templates\asset\dashboard.html:100 +msgid "Asset Chart" +msgstr "" + +#: .\asset\templates\asset\dashboard.html:89 +msgid "Asset requests to approve" +msgstr "" + +#: .\asset\templates\asset\dashboard.html:111 +msgid "Allocated Assets" +msgstr "" + +#: .\asset\templates\asset\dashboard_allocated_assets.html:7 +#: .\asset\templates\request_allocation\asset_request_allocation_list.html:331 +#: .\asset\templates\request_allocation\asset_request_allocation_view.html:138 +#: .\asset\templates\request_allocation\group_by.html:457 +#: .\asset\templates\request_allocation\group_by.html:533 +#: .\asset\templates\request_allocation\group_by.html:610 +#: .\asset\templates\request_allocation\group_by.html:686 +#: .\asset\templates\request_allocation\individual allocation.html:66 +msgid "Allocated User" +msgstr "" + +#: .\asset\templates\asset\dashboard_allocated_assets.html:9 +#: .\asset\templates\request_allocation\asset_request_allocation_list.html:333 +#: .\asset\templates\request_allocation\group_by.html:459 +#: .\asset\templates\request_allocation\group_by.html:612 +#: .\employee\templates\tabs\asset-tab.html:23 +#: .\employee\templates\tabs\profile-asset-tab.html:10 .\leave\models.py:256 +#: .\leave\templates\leave\leave_assign\assigned_leave.html:19 +#: .\leave\templates\leave\leave_assign\assigned_leaves_export_filter.html:66 +#: .\leave\templates\leave\leave_assign\assigned_leaves_filter.html:49 +#: .\leave\templates\leave\leave_assign\group_by.html:34 +#: .\payroll\templates\payroll\contribution\contribution_deduction_employees.html:25 +msgid "Assigned Date" +msgstr "" + +#: .\asset\templates\asset\dashboard_asset_requests.html:6 +#: .\asset\templates\request_allocation\asset_request_allocation_list.html:172 +#: .\asset\templates\request_allocation\group_by.html:111 +#: .\asset\templates\request_allocation\group_by.html:256 +#: .\employee\templates\tabs\asset-request-tab.html:12 +msgid "Request User" +msgstr "" + +#: .\asset\templates\asset\dashboard_asset_requests.html:7 +#: .\asset\templates\category\asset_category_view.html:48 +#: .\asset\templates\category\asset_category_view.html:171 +#: .\asset\templates\category\asset_empty.html:38 +#: .\asset\templates\request_allocation\asset_request_allocation_list.html:173 +#: .\asset\templates\request_allocation\asset_request_allocation_view.html:108 +#: .\asset\templates\request_allocation\asset_request_creation.html:23 +#: .\asset\templates\request_allocation\group_by.html:112 +#: .\asset\templates\request_allocation\group_by.html:257 +#: .\employee\templates\tabs\asset-request-tab.html:13 +msgid "Asset Category" +msgstr "" + +#: .\asset\templates\asset\dashboard_asset_requests.html:8 +#: .\asset\templates\request_allocation\asset_request_allocation_list.html:174 +#: .\asset\templates\request_allocation\group_by.html:113 +#: .\asset\templates\request_allocation\group_by.html:258 +#: .\employee\templates\tabs\asset-request-tab.html:14 +msgid "Request Date" +msgstr "" + #: .\asset\templates\batch\asset_batch_empty.html:24 #: .\asset\templates\batch\asset_batch_number_view.html:24 -#: .\asset\templates\category\asset_category_view.html:220 +#: .\asset\templates\category\asset_category_view.html:222 msgid "Asset Batch Number" msgstr "" -#: .\asset\templates\batch\asset_batch_empty.html:35 -#: .\asset\templates\batch\asset_batch_number_view.html:46 -#: .\asset\templates\category\asset_category.html:53 -#: .\asset\templates\category\asset_category_view.html:255 -#: .\asset\templates\category\asset_empty.html:81 +#: .\asset\templates\batch\asset_batch_empty.html:36 +#: .\asset\templates\batch\asset_batch_number_view.html:47 +#: .\asset\templates\category\asset_category.html:54 +#: .\asset\templates\category\asset_category_view.html:258 +#: .\asset\templates\category\asset_empty.html:82 #: .\attendance\templates\attendance\attendance\attendance_empty.html:134 #: .\attendance\templates\attendance\attendance\attendance_nav.html:361 #: .\attendance\templates\attendance\attendance_account\nav.html:218 #: .\attendance\templates\attendance\attendance_account\overtime_empty.html:48 #: .\attendance\templates\attendance\break_point\condition.html:8 -#: .\base\templates\base\company\company.html:16 -#: .\base\templates\base\department\department.html:16 -#: .\base\templates\base\employee_type\employee_type.html:16 -#: .\base\templates\base\job_position\job_position.html:14 -#: .\base\templates\base\job_role\job_role.html:14 -#: .\base\templates\base\mail_server\mail_server.html:16 -#: .\base\templates\base\rotating_shift\rotating_shift.html:17 -#: .\base\templates\base\rotating_work_type\rotating_work_type.html:16 -#: .\base\templates\base\shift\schedule.html:16 -#: .\base\templates\base\shift\shift.html:16 -#: .\base\templates\base\tags\tags.html:16 -#: .\base\templates\base\ticket_type\ticket_type.html:16 -#: .\base\templates\base\work_type\work_type.html:16 +#: .\base\templates\base\auth\group_accordion.html:29 +#: .\base\templates\base\company\company.html:17 +#: .\base\templates\base\department\department.html:17 +#: .\base\templates\base\employee_type\employee_type.html:17 +#: .\base\templates\base\job_position\job_position.html:15 +#: .\base\templates\base\job_role\job_role.html:15 +#: .\base\templates\base\mail_server\mail_server.html:17 +#: .\base\templates\base\rotating_shift\rotating_shift.html:18 +#: .\base\templates\base\rotating_work_type\rotating_work_type.html:17 +#: .\base\templates\base\shift\schedule.html:17 +#: .\base\templates\base\shift\shift.html:17 +#: .\base\templates\base\tags\tags.html:20 +#: .\base\templates\base\tags\tags.html:90 +#: .\base\templates\base\tags\tags.html:159 +#: .\base\templates\base\ticket_type\ticket_type.html:17 +#: .\base\templates\base\work_type\work_type.html:17 #: .\base\templates\shift_request\shift_request_nav.html:332 #: .\base\templates\work_type_request\work_type_request_nav.html:268 #: .\employee\templates\employee_nav.html:401 +#: .\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 @@ -1444,6 +1597,7 @@ msgstr "" #: .\payroll\templates\payroll\contribution\contribution_deduction_view.html:31 #: .\payroll\templates\payroll\deduction\deduction_empty.html:24 #: .\payroll\templates\payroll\deduction\view_deduction.html:90 +#: .\payroll\templates\payroll\loan\nav.html:19 #: .\payroll\templates\payroll\payslip\payslips_empty.html:107 #: .\payroll\templates\payroll\payslip\view_payslips.html:289 #: .\payroll\templates\payroll\tax\filing_status_empty.html:20 @@ -1451,22 +1605,24 @@ msgstr "" #: .\payroll\templates\payroll\tax\filing_status_view.html:54 #: .\pms\templates\feedback\feedback_empty.html:31 #: .\pms\templates\feedback\feedback_list_view.html:186 -#: .\pms\templates\feedback\question_template\question_template_empty.html:34 -#: .\pms\templates\feedback\question_template\question_template_view.html:37 +#: .\pms\templates\feedback\question_template\question_template_empty.html:35 +#: .\pms\templates\feedback\question_template\question_template_view.html:38 #: .\pms\templates\okr\objective_empty.html:28 #: .\pms\templates\okr\objective_list_view.html:284 -#: .\pms\templates\period\period_empty.html:35 -#: .\pms\templates\period\period_view.html:32 +#: .\pms\templates\period\period_empty.html:36 +#: .\pms\templates\period\period_view.html:33 #: .\recruitment\templates\candidate\candidate_empty.html:33 #: .\recruitment\templates\candidate\candidate_nav.html:223 #: .\recruitment\templates\recruitment\nav.html:68 #: .\recruitment\templates\recruitment\recruitment_empty.html:32 +#: .\recruitment\templates\skill_zone\skill_zone_nav.html:141 +#: .\recruitment\templates\skill_zone_cand\skill_zone_cand_nav.html:195 #: .\recruitment\templates\stage\nav.html:69 #: .\recruitment\templates\stage\stage_empty.html:25 msgid "Create" msgstr "" -#: .\asset\templates\batch\asset_batch_empty.html:57 +#: .\asset\templates\batch\asset_batch_empty.html:59 msgid "No Asset Batches have been created." msgstr "" @@ -1474,15 +1630,15 @@ msgstr "" #: .\asset\templates\batch\asset_batch_number_creation.html:16 #: .\asset\templates\batch\asset_batch_number_list.html:6 #: .\asset\templates\batch\asset_batch_number_update.html:31 -#: .\asset\templates\category\asset_category_view.html:145 +#: .\asset\templates\category\asset_category_view.html:147 msgid "Batch Number" msgstr "" -#: .\asset\templates\batch\asset_batch_number_list.html:18 +#: .\asset\templates\batch\asset_batch_number_list.html:20 msgid "Batch Description is not added" msgstr "" -#: .\asset\templates\batch\asset_batch_number_list.html:29 +#: .\asset\templates\batch\asset_batch_number_list.html:35 msgid "Do you want to delete this batch number ?" msgstr "" @@ -1526,6 +1682,8 @@ msgstr "" #: .\recruitment\templates\candidate\candidate_nav.html:70 #: .\recruitment\templates\pipeline\nav.html:88 #: .\recruitment\templates\recruitment\nav.html:34 +#: .\recruitment\templates\skill_zone\skill_zone_nav.html:35 +#: .\recruitment\templates\skill_zone_cand\skill_zone_cand_nav.html:71 #: .\recruitment\templates\stage\nav.html:34 #: .\recruitment\templates\survey\view_question_templates.html:94 msgid "Search" @@ -1539,11 +1697,13 @@ msgstr "" #: .\attendance\templates\attendance\late_come_early_out\nav.html:133 #: .\attendance\templates\requests\attendance\group_by.html:60 #: .\attendance\templates\requests\attendance\request_lines.html:42 +#: .\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 #: .\base\templates\base\rotating_shift\rotating_shift_assign_nav.html:108 #: .\base\templates\base\rotating_work_type\rotating_work_type_assign_nav.html:108 -#: .\base\templates\base\tags\tags_view.html:8 -#: .\base\templates\base\ticket_type\ticket_type_view.html:9 +#: .\base\templates\base\tags\tags_view.html:9 +#: .\base\templates\base\ticket_type\ticket_type_view.html:10 #: .\base\templates\shift_request\shift_request_nav.html:268 #: .\base\templates\work_type_request\work_type_request_nav.html:215 #: .\employee\templates\employee_nav.html:326 @@ -1552,6 +1712,7 @@ msgstr "" #: .\employee\templates\tabs\allowance_deduction-tab.html:162 #: .\employee\templates\tabs\attendance-tab.html:62 #: .\employee\templates\tabs\attendance-tab.html:170 +#: .\helpdesk\templates\department_managers\department_managers_view.html:9 #: .\helpdesk\templates\helpdesk\ticket\ticket_card.html:101 #: .\helpdesk\templates\helpdesk\ticket\ticket_card.html:338 #: .\helpdesk\templates\helpdesk\ticket\ticket_card.html:591 @@ -1574,6 +1735,7 @@ msgstr "" #: .\leave\templates\leave\leave_assign\group_by.html:36 #: .\leave\templates\leave\leave_request\group_by.html:69 #: .\leave\templates\leave\leave_request\leave_requests.html:81 +#: .\leave\templates\leave\leave_request\penalty\create.html:15 #: .\leave\templates\leave\leave_request\request_view.html:212 #: .\leave\templates\leave\leave_type\leave_types.html:36 #: .\leave\templates\leave\user_leave\group_by.html:68 @@ -1596,17 +1758,23 @@ msgstr "" #: .\pms\templates\feedback\feedback_list_view.html:143 #: .\pms\templates\okr\objective_list_view.html:236 #: .\recruitment\templates\candidate\candidate_card.html:55 +#: .\recruitment\templates\candidate\candidate_list.html:45 #: .\recruitment\templates\candidate\candidate_nav.html:165 -#: .\recruitment\templates\pipeline\pipeline.html:182 +#: .\recruitment\templates\pipeline\pipeline.html:181 #: .\recruitment\templates\pipeline\pipeline_card.html:65 #: .\recruitment\templates\pipeline\pipeline_card.html:220 #: .\recruitment\templates\pipeline\pipeline_tabs.html:23 #: .\recruitment\templates\recruitment\recruitment_component.html:59 +#: .\recruitment\templates\skill_zone\skill_zone_card.html:25 +#: .\recruitment\templates\skill_zone\skill_zone_list.html:99 +#: .\recruitment\templates\skill_zone\skill_zone_nav.html:90 +#: .\recruitment\templates\skill_zone_cand\skill_zone_cand_card.html:51 +#: .\recruitment\templates\skill_zone_cand\skill_zone_cand_list.html:14 #: .\recruitment\templates\survey\survey_card.html:27 msgid "Actions" msgstr "" -#: .\asset\templates\category\asset_category.html:62 +#: .\asset\templates\category\asset_category.html:67 msgid "Do you want to delete this category?" msgstr "" @@ -1616,12 +1784,12 @@ msgstr "" #: .\asset\templates\category\asset_category_creation.html:21 #: .\asset\templates\category\asset_category_update.html:36 -#: .\leave\forms.py:127 .\leave\forms.py:439 .\leave\models.py:193 +#: .\leave\forms.py:127 .\leave\forms.py:439 .\leave\models.py:204 #: .\leave\templates\leave\leave_type\leave_type_creation.html:38 #: .\leave\templates\leave\leave_type\leave_type_filter.html:9 #: .\leave\templates\leave\leave_type\leave_type_update.html:34 -#: .\onboarding\templates\onboarding\table.html:10 .\recruitment\forms.py:322 -#: .\recruitment\forms.py:462 .\recruitment\models.py:227 +#: .\onboarding\templates\onboarding\table.html:10 .\recruitment\forms.py:327 +#: .\recruitment\forms.py:467 .\recruitment\models.py:227 #: .\recruitment\templates\candidate\application_form.html:99 #: .\recruitment\templates\pipeline\form\candidate_drop_down_form.html:19 #: .\recruitment\templates\pipeline\pipeline_card.html:100 @@ -1633,18 +1801,6 @@ msgstr "" msgid "Asset Category Update" msgstr "" -#: .\asset\templates\category\asset_category_view.html:48 -#: .\asset\templates\category\asset_category_view.html:169 -#: .\asset\templates\category\asset_empty.html:38 -#: .\asset\templates\request_allocation\asset_request_allocation_list.html:173 -#: .\asset\templates\request_allocation\asset_request_allocation_view.html:108 -#: .\asset\templates\request_allocation\asset_request_creation.html:23 -#: .\asset\templates\request_allocation\group_by.html:112 -#: .\asset\templates\request_allocation\group_by.html:257 -#: .\employee\templates\tabs\asset-request-tab.html:13 -msgid "Asset Category" -msgstr "" - #: .\asset\templates\category\asset_category_view.html:65 msgid "Search in :Asset" msgstr "" @@ -1653,12 +1809,12 @@ msgstr "" msgid "Search in :Asset Category" msgstr "" -#: .\asset\templates\category\asset_category_view.html:79 +#: .\asset\templates\category\asset_category_view.html:81 #: .\asset\templates\category\asset_empty.html:50 msgid "Do you want to download template ?" msgstr "" -#: .\asset\templates\category\asset_category_view.html:79 +#: .\asset\templates\category\asset_category_view.html:81 #: .\asset\templates\category\asset_empty.html:50 #: .\attendance\templates\attendance\attendance\attendance_empty.html:119 #: .\attendance\templates\attendance\attendance\attendance_nav.html:312 @@ -1668,7 +1824,7 @@ msgstr "" msgid "Import" msgstr "" -#: .\asset\templates\category\asset_category_view.html:91 +#: .\asset\templates\category\asset_category_view.html:93 #: .\asset\templates\category\asset_empty.html:62 #: .\attendance\templates\attendance\attendance\attendance_empty.html:67 #: .\attendance\templates\attendance\attendance\attendance_nav.html:112 @@ -1678,7 +1834,7 @@ msgstr "" msgid "Upload a File" msgstr "" -#: .\asset\templates\category\asset_category_view.html:92 +#: .\asset\templates\category\asset_category_view.html:94 #: .\asset\templates\category\asset_empty.html:63 #: .\attendance\templates\attendance\attendance\attendance_empty.html:70 #: .\attendance\templates\attendance\attendance\attendance_nav.html:115 @@ -1688,7 +1844,7 @@ msgstr "" msgid "Drag and drop files here" msgstr "" -#: .\asset\templates\category\asset_category_view.html:97 +#: .\asset\templates\category\asset_category_view.html:99 #: .\asset\templates\category\asset_empty.html:68 #: .\attendance\templates\attendance\attendance\attendance_empty.html:79 #: .\attendance\templates\attendance\attendance\attendance_nav.html:124 @@ -1698,8 +1854,8 @@ msgstr "" msgid "Upload" msgstr "" -#: .\asset\templates\category\asset_category_view.html:105 -#: .\asset\templates\category\asset_category_view.html:154 +#: .\asset\templates\category\asset_category_view.html:107 +#: .\asset\templates\category\asset_category_view.html:156 #: .\attendance\templates\attendance\attendance\attendance_nav.html:159 #: .\attendance\templates\attendance\attendance\attendance_nav.html:322 #: .\attendance\templates\attendance\attendance_account\nav.html:54 @@ -1715,7 +1871,7 @@ msgstr "" #: .\base\templates\shift_request\shift_request_nav.html:283 #: .\base\templates\shift_request\shift_request_nav.html:370 #: .\base\templates\work_type_request\work_type_request_nav.html:226 -#: .\base\templates\work_type_request\work_type_request_nav.html:339 +#: .\base\templates\work_type_request\work_type_request_nav.html:351 #: .\employee\templates\employee_nav.html:126 #: .\employee\templates\employee_nav.html:354 #: .\leave\templates\leave\holiday\holiday_view.html:106 @@ -1732,16 +1888,17 @@ msgstr "" #: .\payroll\templates\payroll\payslip\view_payslips.html:258 #: .\recruitment\templates\candidate\candidate_nav.html:30 #: .\recruitment\templates\candidate\candidate_nav.html:179 +#: .\recruitment\templates\skill_zone_cand\skill_zone_cand_nav.html:30 msgid "Export" msgstr "" -#: .\asset\templates\category\asset_category_view.html:132 +#: .\asset\templates\category\asset_category_view.html:134 msgid "Purchased Date" msgstr "" -#: .\asset\templates\category\asset_category_view.html:163 -#: .\asset\templates\category\asset_category_view.html:187 -#: .\asset\templates\category\asset_category_view.html:238 +#: .\asset\templates\category\asset_category_view.html:165 +#: .\asset\templates\category\asset_category_view.html:189 +#: .\asset\templates\category\asset_category_view.html:240 #: .\asset\templates\request_allocation\asset_request_allocation_view.html:62 #: .\asset\templates\request_allocation\asset_request_allocation_view.html:184 #: .\attendance\templates\attendance\attendance\attendance_filters.html:158 @@ -1811,6 +1968,9 @@ msgstr "" #: .\recruitment\templates\pipeline\pipeline_empty.html:38 #: .\recruitment\templates\recruitment\filters.html:62 #: .\recruitment\templates\recruitment\nav.html:47 +#: .\recruitment\templates\skill_zone\skill_zone_nav.html:66 +#: .\recruitment\templates\skill_zone\skill_zone_nav.html:79 +#: .\recruitment\templates\skill_zone_cand\skill_zone_cand_nav.html:112 #: .\recruitment\templates\stage\filters.html:52 #: .\recruitment\templates\stage\nav.html:48 #: .\recruitment\templates\survey\filter.html:48 @@ -1818,20 +1978,20 @@ msgstr "" msgid "Filter" msgstr "" -#: .\asset\templates\category\asset_category_view.html:175 +#: .\asset\templates\category\asset_category_view.html:177 msgid "Category Name" msgstr "" -#: .\asset\templates\category\asset_category_view.html:214 +#: .\asset\templates\category\asset_category_view.html:216 msgid "Purchase Cost" msgstr "" -#: .\asset\templates\category\asset_category_view.html:288 +#: .\asset\templates\category\asset_category_view.html:292 #: .\asset\templates\request_allocation\asset_request_allocation_view.html:357 msgid "Add Asset Report" msgstr "" -#: .\asset\templates\category\asset_empty.html:119 +#: .\asset\templates\category\asset_empty.html:121 msgid "There is no Asset category and no Assets has been created." msgstr "" @@ -1867,44 +2027,30 @@ msgstr "" #: .\asset\templates\request_allocation\group_by.html:574 #: .\asset\templates\request_allocation\group_by.html:643 #: .\asset\templates\request_allocation\group_by.html:727 -#: .\asset\templates\request_allocation\individual allocation.html:121 +#: .\asset\templates\request_allocation\individual allocation.html:122 msgid "Return" msgstr "" -#: .\asset\templates\request_allocation\asset_request_allocation_list.html:172 -#: .\asset\templates\request_allocation\group_by.html:111 -#: .\asset\templates\request_allocation\group_by.html:256 -#: .\employee\templates\tabs\asset-request-tab.html:12 -msgid "Request User" -msgstr "" - -#: .\asset\templates\request_allocation\asset_request_allocation_list.html:174 -#: .\asset\templates\request_allocation\group_by.html:113 -#: .\asset\templates\request_allocation\group_by.html:258 -#: .\employee\templates\tabs\asset-request-tab.html:14 -msgid "Request Date" -msgstr "" - #: .\asset\templates\request_allocation\asset_request_allocation_list.html:236 #: .\asset\templates\request_allocation\group_by.html:166 #: .\asset\templates\request_allocation\group_by.html:229 #: .\asset\templates\request_allocation\group_by.html:311 #: .\asset\templates\request_allocation\group_by.html:373 -#: .\asset\templates\request_allocation\individual_request.html:95 -#: .\attendance\templates\attendance\attendance\attendance_request_one.html:132 -#: .\attendance\templates\attendance\attendance\attendance_request_one.html:136 +#: .\asset\templates\request_allocation\individual_request.html:96 +#: .\attendance\templates\attendance\attendance\attendance_request_one.html:133 +#: .\attendance\templates\attendance\attendance\attendance_request_one.html:137 #: .\attendance\templates\attendance\attendance\group_by.html:152 #: .\attendance\templates\attendance\attendance\tab_content.html:633 #: .\attendance\templates\attendance\attendance\tab_content.html:641 #: .\attendance\templates\requests\attendance\individual_view.html:38 #: .\base\templates\shift_request\htmx\group_by.html:127 #: .\base\templates\shift_request\htmx\group_by.html:129 +#: .\base\templates\shift_request\htmx\requests.html:114 #: .\base\templates\shift_request\htmx\requests.html:116 -#: .\base\templates\shift_request\htmx\requests.html:118 #: .\base\templates\work_type_request\htmx\group_by.html:127 #: .\base\templates\work_type_request\htmx\group_by.html:129 +#: .\base\templates\work_type_request\htmx\requests.html:115 #: .\base\templates\work_type_request\htmx\requests.html:117 -#: .\base\templates\work_type_request\htmx\requests.html:119 #: .\employee\templates\tabs\asset-request-tab.html:67 #: .\employee\templates\tabs\asset-request-tab.html:129 #: .\employee\templates\tabs\leave-tab.html:263 @@ -1917,15 +2063,15 @@ msgstr "" #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_group_by.html:275 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_list.html:229 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_list.html:234 -#: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_single_view.html:129 -#: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_single_view.html:131 -#: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_single_view.html:138 +#: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_single_view.html:130 +#: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_single_view.html:132 +#: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_single_view.html:139 #: .\leave\templates\leave\leave_request\group_by.html:106 #: .\leave\templates\leave\leave_request\group_by.html:111 -#: .\leave\templates\leave\leave_request\leave_requests.html:127 -#: .\leave\templates\leave\leave_request\leave_requests.html:132 -#: .\leave\templates\leave\leave_request\one_request_view.html:99 -#: .\leave\templates\leave\leave_request\one_request_view.html:104 +#: .\leave\templates\leave\leave_request\leave_requests.html:136 +#: .\leave\templates\leave\leave_request\leave_requests.html:141 +#: .\leave\templates\leave\leave_request\one_request_view.html:119 +#: .\leave\templates\leave\leave_request\one_request_view.html:124 msgid "Approve" msgstr "" @@ -1934,7 +2080,7 @@ msgstr "" #: .\asset\templates\request_allocation\group_by.html:233 #: .\asset\templates\request_allocation\group_by.html:316 #: .\asset\templates\request_allocation\group_by.html:378 -#: .\asset\templates\request_allocation\individual_request.html:104 +#: .\asset\templates\request_allocation\individual_request.html:105 #: .\employee\templates\tabs\asset-request-tab.html:72 #: .\employee\templates\tabs\asset-request-tab.html:134 #: .\employee\templates\tabs\leave-tab.html:282 @@ -1942,41 +2088,18 @@ msgstr "" #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_group_by.html:290 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_list.html:244 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_list.html:249 -#: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_single_view.html:148 -#: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_single_view.html:151 -#: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_single_view.html:158 +#: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_single_view.html:149 +#: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_single_view.html:152 +#: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_single_view.html:159 #: .\leave\templates\leave\leave_request\group_by.html:119 #: .\leave\templates\leave\leave_request\group_by.html:125 -#: .\leave\templates\leave\leave_request\leave_requests.html:140 -#: .\leave\templates\leave\leave_request\leave_requests.html:146 -#: .\leave\templates\leave\leave_request\one_request_view.html:112 -#: .\leave\templates\leave\leave_request\one_request_view.html:118 +#: .\leave\templates\leave\leave_request\leave_requests.html:149 +#: .\leave\templates\leave\leave_request\leave_requests.html:155 +#: .\leave\templates\leave\leave_request\one_request_view.html:132 +#: .\leave\templates\leave\leave_request\one_request_view.html:138 msgid "Reject" msgstr "" -#: .\asset\templates\request_allocation\asset_request_allocation_list.html:331 -#: .\asset\templates\request_allocation\asset_request_allocation_view.html:138 -#: .\asset\templates\request_allocation\group_by.html:457 -#: .\asset\templates\request_allocation\group_by.html:533 -#: .\asset\templates\request_allocation\group_by.html:610 -#: .\asset\templates\request_allocation\group_by.html:686 -#: .\asset\templates\request_allocation\individual allocation.html:65 -msgid "Allocated User" -msgstr "" - -#: .\asset\templates\request_allocation\asset_request_allocation_list.html:333 -#: .\asset\templates\request_allocation\group_by.html:459 -#: .\asset\templates\request_allocation\group_by.html:612 -#: .\employee\templates\tabs\asset-tab.html:23 -#: .\employee\templates\tabs\profile-asset-tab.html:10 .\leave\models.py:245 -#: .\leave\templates\leave\leave_assign\assigned_leave.html:19 -#: .\leave\templates\leave\leave_assign\assigned_leaves_export_filter.html:66 -#: .\leave\templates\leave\leave_assign\assigned_leaves_filter.html:49 -#: .\leave\templates\leave\leave_assign\group_by.html:34 -#: .\payroll\templates\payroll\contribution\contribution_deduction_employees.html:25 -msgid "Assigned Date" -msgstr "" - #: .\asset\templates\request_allocation\asset_request_allocation_list.html:408 #: .\asset\templates\request_allocation\group_by.html:497 #: .\asset\templates\request_allocation\group_by.html:650 @@ -2058,7 +2181,7 @@ msgstr "" #: .\attendance\templates\attendance\attendance_account\nav.html:144 #: .\attendance\templates\attendance\attendance_activity\nav.html:117 #: .\attendance\templates\attendance\late_come_early_out\nav.html:104 -#: .\attendance\templates\requests\attendance\individual_view.html:69 +#: .\attendance\templates\requests\attendance\individual_view.html:70 #: .\attendance\templates\requests\attendance\nav.html:175 #: .\base\templates\base\rotating_shift\rotating_shift_assign_nav.html:80 #: .\base\templates\base\rotating_work_type\rotating_work_type_assign_nav.html:80 @@ -2086,14 +2209,14 @@ msgstr "" #: .\asset\templates\request_allocation\group_by.html:205 #: .\asset\templates\request_allocation\group_by.html:350 -#: .\asset\templates\request_allocation\individual_request.html:58 -#: .\base\models.py:655 .\base\models.py:764 +#: .\asset\templates\request_allocation\individual_request.html:59 +#: .\base\models.py:651 .\base\models.py:760 #: .\base\templates\shift_request\htmx\group_by.html:65 -#: .\base\templates\shift_request\htmx\requests.html:49 +#: .\base\templates\shift_request\htmx\requests.html:47 #: .\base\templates\shift_request\shift_request_export.html:83 #: .\base\templates\shift_request\shift_request_nav.html:147 #: .\base\templates\work_type_request\htmx\group_by.html:65 -#: .\base\templates\work_type_request\htmx\requests.html:49 +#: .\base\templates\work_type_request\htmx\requests.html:47 #: .\base\templates\work_type_request\work_type_request_export.html:83 #: .\base\templates\work_type_request\work_type_request_nav.html:117 #: .\employee\templates\tabs\asset-request-tab.html:106 @@ -2104,32 +2227,32 @@ msgstr "" #: .\asset\templates\request_allocation\group_by.html:216 #: .\asset\templates\request_allocation\group_by.html:361 -#: .\asset\templates\request_allocation\individual_request.html:75 +#: .\asset\templates\request_allocation\individual_request.html:76 #: .\employee\templates\tabs\asset-request-tab.html:117 msgid "Request Description" msgstr "" #: .\asset\templates\request_allocation\group_by.html:529 #: .\asset\templates\request_allocation\group_by.html:682 -#: .\asset\templates\request_allocation\individual allocation.html:57 +#: .\asset\templates\request_allocation\individual allocation.html:58 msgid "Returned Status" msgstr "" #: .\asset\templates\request_allocation\group_by.html:540 #: .\asset\templates\request_allocation\group_by.html:693 -#: .\asset\templates\request_allocation\individual allocation.html:76 +#: .\asset\templates\request_allocation\individual allocation.html:77 msgid "Allocated Date" msgstr "" #: .\asset\templates\request_allocation\group_by.html:544 #: .\asset\templates\request_allocation\group_by.html:697 -#: .\asset\templates\request_allocation\individual allocation.html:84 +#: .\asset\templates\request_allocation\individual allocation.html:85 msgid "Returned Date" msgstr "" #: .\asset\templates\request_allocation\group_by.html:557 #: .\asset\templates\request_allocation\group_by.html:710 -#: .\asset\templates\request_allocation\individual allocation.html:103 +#: .\asset\templates\request_allocation\individual allocation.html:104 msgid "Return Description" msgstr "" @@ -2145,115 +2268,127 @@ msgstr "" msgid "Asset created successfully" msgstr "" -#: .\asset\views.py:156 +#: .\asset\views.py:159 msgid "Asset Updated" msgstr "" -#: .\asset\views.py:198 .\asset\views.py:369 +#: .\asset\views.py:201 .\asset\views.py:372 msgid "Asset not found" msgstr "" -#: .\asset\views.py:220 .\asset\views.py:236 +#: .\asset\views.py:223 .\asset\views.py:239 msgid "Asset is in use" msgstr "" -#: .\asset\views.py:225 .\asset\views.py:241 +#: .\asset\views.py:228 .\asset\views.py:244 msgid "Asset is used in allocation!." msgstr "" -#: .\asset\views.py:319 +#: .\asset\views.py:322 msgid "Asset category created successfully" msgstr "" -#: .\asset\views.py:347 +#: .\asset\views.py:350 msgid "Asset category updated successfully" msgstr "" -#: .\asset\views.py:378 +#: .\asset\views.py:381 #, python-format msgid "There are assets in use in the %(asset_category)s category." msgstr "" -#: .\asset\views.py:384 +#: .\asset\views.py:387 msgid "Asset Category Deleted" msgstr "" -#: .\asset\views.py:386 +#: .\asset\views.py:389 msgid "You cannot delete this asset category." msgstr "" -#: .\asset\views.py:492 +#: .\asset\views.py:495 msgid "Asset request created!" msgstr "" -#: .\asset\views.py:532 +#: .\asset\views.py:535 msgid "Asset request approved successfully!." msgstr "" -#: .\asset\views.py:575 +#: .\asset\views.py:578 msgid "Asset request rejected" msgstr "" -#: .\asset\views.py:609 +#: .\asset\views.py:612 msgid "Asset allocated successfully!." msgstr "" -#: .\asset\views.py:649 +#: .\asset\views.py:655 msgid "Asset Return Successful !." msgstr "" -#: .\asset\views.py:662 +#: .\asset\views.py:668 msgid "Asset Return Successful!." msgstr "" -#: .\asset\views.py:897 +#: .\asset\views.py:904 msgid "Successfully imported Assets" msgstr "" -#: .\asset\views.py:899 +#: .\asset\views.py:906 msgid "File Error" msgstr "" -#: .\asset\views.py:939 +#: .\asset\views.py:946 msgid "There are no assets to export." msgstr "" -#: .\asset\views.py:1057 +#: .\asset\views.py:1064 msgid "Batch number created successfully." msgstr "" -#: .\asset\views.py:1122 +#: .\asset\views.py:1129 msgid "This batch number is already in-use" msgstr "" -#: .\asset\views.py:1127 +#: .\asset\views.py:1134 msgid "Batch updated successfully." msgstr "" -#: .\asset\views.py:1149 +#: .\asset\views.py:1156 msgid "Batch number not found" msgstr "" -#: .\asset\views.py:1153 +#: .\asset\views.py:1160 msgid "Batch number in-use" msgstr "" -#: .\asset\views.py:1157 +#: .\asset\views.py:1164 msgid "Batch number deleted" msgstr "" -#: .\asset\views.py:1159 +#: .\asset\views.py:1166 msgid "You cannot delete this Batch number." msgstr "" -#: .\asset\views.py:1222 +#: .\asset\views.py:1228 msgid "Asset category deleted." msgstr "" -#: .\asset\views.py:1224 +#: .\asset\views.py:1230 msgid "Assets are located within this category." msgstr "" +#: .\asset\views.py:1265 .\base\translator.py:249 +msgid "asset" +msgstr "Asset" + +#: .\asset\views.py:1273 .\asset\views.py:1302 +msgid "Oops!! No Asset found..." +msgstr "" + +#: .\asset\views.py:1294 +msgid "assets in use" +msgstr "" + #: .\attendance\filters.py:59 .\base\translator.py:50 #: .\recruitment\views\dashboard.py:203 msgid "January" @@ -2275,7 +2410,7 @@ msgid "April" msgstr "" #: .\attendance\filters.py:63 .\base\translator.py:54 .\base\translator.py:109 -#: .\leave\models.py:35 .\recruitment\views\dashboard.py:207 +#: .\leave\models.py:46 .\recruitment\views\dashboard.py:207 msgid "May" msgstr "" @@ -2314,9 +2449,9 @@ msgstr "" msgid "December" msgstr "" -#: .\attendance\forms.py:73 .\base\forms.py:171 .\base\forms.py:215 -#: .\payroll\forms\tax_forms.py:39 .\recruitment\forms.py:71 -#: .\recruitment\forms.py:115 +#: .\attendance\forms.py:73 .\base\forms.py:173 .\base\forms.py:217 +#: .\payroll\forms\tax_forms.py:39 .\recruitment\forms.py:76 +#: .\recruitment\forms.py:120 #, python-brace-format msgid "---Choose {label}---" msgstr "" @@ -2333,12 +2468,12 @@ msgstr "" #: .\base\templates\base\auth\group_assign_view.html:10 #: .\base\templates\base\auth\group_assign_view.html:37 #: .\base\templates\base\auth\permission_assign.html:3 -#: .\employee\templates\employee_nav.html:178 .\employee\views.py:1974 -#: .\employee\views.py:1997 +#: .\employee\templates\employee_nav.html:178 .\employee\views.py:1975 +#: .\employee\views.py:1998 #: .\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 -#: .\templates\sidebar.html:261 +#: .\templates\sidebar.html:269 msgid "Employees" msgstr "" @@ -2347,7 +2482,7 @@ msgstr "" msgid "Attendance for the date is already exist for %(emp)s" msgstr "" -#: .\attendance\forms.py:343 .\base\forms.py:864 +#: .\attendance\forms.py:343 .\base\forms.py:866 msgid "Employee not chosen" msgstr "" @@ -2356,7 +2491,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:17 -#: .\employee\templates\tabs\attendance-tab.html:165 .\leave\models.py:81 +#: .\employee\templates\tabs\attendance-tab.html:165 .\leave\models.py:92 msgid "Month" msgstr "" @@ -2391,26 +2526,26 @@ msgstr "" #: .\attendance\templates\requests\attendance\group_by.html:317 #: .\attendance\templates\requests\attendance\request_lines.html:30 #: .\attendance\templates\requests\attendance\request_lines.html:180 -#: .\base\models.py:225 .\base\models.py:272 .\base\models.py:517 -#: .\base\models.py:555 .\base\models.py:638 .\base\models.py:747 +#: .\base\models.py:221 .\base\models.py:268 .\base\models.py:513 +#: .\base\models.py:551 .\base\models.py:634 .\base\models.py:743 #: .\base\templates\base\auth\permission_view.html:10 #: .\base\templates\base\rotating_shift\filters.html:10 #: .\base\templates\base\rotating_shift\htmx\group_by.html:63 #: .\base\templates\base\rotating_shift\rotating_shift_assign_export.html:32 -#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:46 +#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:44 #: .\base\templates\base\rotating_work_type\filters.html:10 #: .\base\templates\base\rotating_work_type\htmx\group_by.html:61 #: .\base\templates\base\rotating_work_type\rotating_work_type_assign_export.html:32 -#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:44 +#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:42 #: .\base\templates\shift_request\htmx\group_by.html:61 -#: .\base\templates\shift_request\htmx\requests.html:45 +#: .\base\templates\shift_request\htmx\requests.html:43 #: .\base\templates\shift_request\shift_request_export.html:32 #: .\base\templates\shift_request\shift_request_nav.html:78 #: .\base\templates\work_type_request\htmx\group_by.html:61 -#: .\base\templates\work_type_request\htmx\requests.html:45 +#: .\base\templates\work_type_request\htmx\requests.html:43 #: .\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:343 .\employee\models.py:468 +#: .\employee\models.py:352 .\employee\models.py:478 #: .\employee\templates\employee_export_filter.html:27 #: .\employee\templates\employee_filters.html:5 #: .\employee\templates\employee_personal_info\employee_list.html:54 @@ -2424,8 +2559,8 @@ msgstr "" #: .\employee\templates\tabs\shift-tab.html:126 #: .\employee\templates\tabs\shift-tab.html:299 #: .\employee\templates\tabs\shift-tab.html:441 -#: .\employee\templates\tabs\shift-tab.html:590 .\leave\models.py:229 -#: .\leave\models.py:373 +#: .\employee\templates\tabs\shift-tab.html:590 .\leave\models.py:240 +#: .\leave\models.py:384 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_group_by.html:32 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_group_by.html:193 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_list.html:13 @@ -2435,13 +2570,15 @@ msgstr "" #: .\leave\templates\leave\leave_assign\group_by.html:29 #: .\leave\templates\leave\leave_request\group_by.html:61 #: .\leave\templates\leave\leave_request\leave_requests.html:71 -#: .\payroll\forms\component_forms.py:250 .\payroll\models\models.py:130 -#: .\payroll\models\models.py:338 .\payroll\models\models.py:1191 +#: .\payroll\forms\component_forms.py:250 .\payroll\models\models.py:133 +#: .\payroll\models\models.py:341 .\payroll\models\models.py:1201 +#: .\payroll\models\models.py:1305 #: .\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 #: .\payroll\templates\payroll\contribution\contribution_deduction_employees.html:24 #: .\payroll\templates\payroll\dashboard.html:116 +#: .\payroll\templates\payroll\loan\filter.html:19 #: .\payroll\templates\payroll\payslip\filter_payslips.html:14 #: .\payroll\templates\payroll\payslip\generate_payslip_list.html:55 #: .\payroll\templates\payroll\payslip\group_payslips.html:47 @@ -2460,7 +2597,7 @@ msgstr "" #: .\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:501 -#: .\templates\sidebar.html:282 +#: .\templates\sidebar.html:290 msgid "Employee" msgstr "" @@ -2469,7 +2606,7 @@ msgstr "" #: .\attendance\templates\attendance\attendance_account\attendance_account_filter.html:62 #: .\attendance\templates\attendance\attendance_account\group_by.html:34 #: .\attendance\templates\attendance\attendance_account\overtime_list.html:18 -#: .\employee\templates\tabs\attendance-tab.html:166 .\leave\models.py:81 +#: .\employee\templates\tabs\attendance-tab.html:166 .\leave\models.py:92 msgid "Year" msgstr "" @@ -2495,7 +2632,7 @@ msgstr "" #: .\attendance\forms.py:421 .\attendance\models.py:209 #: .\attendance\templates\attendance\attendance\attendance_on_time.html:35 -#: .\attendance\templates\attendance\attendance\attendance_request_one.html:91 +#: .\attendance\templates\attendance\attendance\attendance_request_one.html:92 #: .\attendance\templates\attendance\attendance\group_by.html:79 #: .\attendance\templates\attendance\attendance\group_by.html:344 #: .\attendance\templates\attendance\attendance\group_by.html:602 @@ -2515,7 +2652,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:624 +#: .\payroll\models\models.py:627 msgid "Overtime" msgstr "" @@ -2541,8 +2678,8 @@ msgstr "" msgid "Request description" msgstr "" -#: .\attendance\models.py:62 .\base\forms.py:52 .\base\forms.py:58 -#: .\base\forms.py:60 .\base\models.py:22 +#: .\attendance\models.py:62 .\base\forms.py:54 .\base\forms.py:60 +#: .\base\forms.py:62 .\base\models.py:23 msgid "Invalid format, it should be HH:MM format" msgstr "" @@ -2669,7 +2806,7 @@ msgstr "" #: .\attendance\models.py:165 #: .\attendance\templates\attendance\attendance\attendance_filters.html:17 #: .\attendance\templates\attendance\attendance\attendance_on_time.html:31 -#: .\attendance\templates\attendance\attendance\attendance_request_one.html:69 +#: .\attendance\templates\attendance\attendance\attendance_request_one.html:70 #: .\attendance\templates\attendance\attendance\export_filter.html:40 #: .\attendance\templates\attendance\attendance\group_by.html:74 #: .\attendance\templates\attendance\attendance\group_by.html:339 @@ -2690,7 +2827,7 @@ msgstr "" #: .\attendance\templates\requests\attendance\group_by.html:333 #: .\attendance\templates\requests\attendance\request_lines.html:37 #: .\attendance\templates\requests\attendance\request_lines.html:187 -#: .\base\models.py:480 .\base\templates\base\rotating_shift\filters.html:53 +#: .\base\models.py:476 .\base\templates\base\rotating_shift\filters.html:53 #: .\base\templates\base\rotating_shift\rotating_shift_assign_export.html:75 #: .\base\templates\base\rotating_work_type\filters.html:53 #: .\base\templates\base\rotating_work_type\rotating_work_type_assign_export.html:75 @@ -2703,15 +2840,15 @@ 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:403 .\employee\templates\employee_export_filter.html:75 +#: .\employee\models.py:413 .\employee\templates\employee_export_filter.html:75 #: .\employee\templates\employee_filters.html:54 #: .\employee\templates\employee_personal_info\employee_list.html:69 #: .\employee\templates\employee_personal_info\group_by.html:65 #: .\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:194 .\payroll\models\models.py:623 -#: .\payroll\models\models.py:735 +#: .\payroll\models\models.py:197 .\payroll\models\models.py:626 +#: .\payroll\models\models.py:738 #: .\payroll\templates\payroll\contract\contract_single_view.html:90 msgid "Shift" msgstr "" @@ -2719,7 +2856,7 @@ msgstr "" #: .\attendance\models.py:172 #: .\attendance\templates\attendance\attendance\attendance_filters.html:35 #: .\attendance\templates\attendance\attendance\attendance_on_time.html:32 -#: .\attendance\templates\attendance\attendance\attendance_request_one.html:73 +#: .\attendance\templates\attendance\attendance\attendance_request_one.html:74 #: .\attendance\templates\attendance\attendance\export_filter.html:58 #: .\attendance\templates\attendance\attendance\group_by.html:75 #: .\attendance\templates\attendance\attendance\group_by.html:340 @@ -2740,33 +2877,33 @@ msgstr "" #: .\attendance\templates\requests\attendance\group_by.html:335 #: .\attendance\templates\requests\attendance\request_lines.html:38 #: .\attendance\templates\requests\attendance\request_lines.html:188 -#: .\base\models.py:178 .\base\templates\base\rotating_shift\filters.html:67 +#: .\base\models.py:174 .\base\templates\base\rotating_shift\filters.html:67 #: .\base\templates\base\rotating_shift\rotating_shift_assign_export.html:89 #: .\base\templates\base\rotating_work_type\filters.html:67 #: .\base\templates\base\rotating_work_type\rotating_work_type_assign_export.html:89 #: .\base\templates\base\work_type\work_type.html:7 -#: .\base\templates\base\work_type\work_type.html:37 +#: .\base\templates\base\work_type\work_type.html:39 #: .\base\templates\base\work_type\work_type_form.html:16 #: .\base\templates\base\work_type\work_type_view.html:6 #: .\base\templates\shift_request\shift_request_export.html:62 #: .\base\templates\shift_request\shift_request_nav.html:120 #: .\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:364 +#: .\employee\models.py:373 #: .\employee\templates\employee\profile\work_info.html:27 #: .\employee\templates\employee\update_form\work_details.html:32 #: .\employee\templates\employee_export_filter.html:89 -#: .\employee\templates\employee_filters.html:69 +#: .\employee\templates\employee_filters.html:73 #: .\employee\templates\employee_personal_info\employee_list.html:70 #: .\employee\templates\employee_personal_info\group_by.html:66 #: .\employee\templates\tabs\attendance-tab.html:57 #: .\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:202 .\payroll\models\models.py:625 -#: .\payroll\models\models.py:759 +#: .\payroll\models\models.py:205 .\payroll\models\models.py:628 +#: .\payroll\models\models.py:762 #: .\payroll\templates\payroll\contract\contract_single_view.html:96 -#: .\templates\settings.html:75 +#: .\templates\settings.html:82 msgid "Work Type" msgstr "" @@ -2882,14 +3019,14 @@ msgstr "" #: .\attendance\models.py:702 #: .\attendance\templates\attendance\late_come_early_out\group_by.html:68 #: .\attendance\templates\attendance\late_come_early_out\report_list.html:51 -#: .\attendance\views\dashboard.py:249 .\base\methods.py:362 +#: .\attendance\views\dashboard.py:249 .\base\methods.py:363 msgid "Late Come" msgstr "" #: .\attendance\models.py:703 #: .\attendance\templates\attendance\late_come_early_out\group_by.html:70 #: .\attendance\templates\attendance\late_come_early_out\report_list.html:53 -#: .\attendance\views\dashboard.py:250 .\base\methods.py:363 +#: .\attendance\views\dashboard.py:250 .\base\methods.py:364 msgid "Early Out" msgstr "" @@ -2900,7 +3037,7 @@ msgstr "" #: .\attendance\templates\requests\attendance\filter.html:51 #: .\employee\templates\employee\profile\profile_view.html:151 #: .\employee\templates\employee\view\individual.html:181 -#: .\payroll\models\models.py:622 .\templates\sidebar.html:432 +#: .\payroll\models\models.py:625 .\templates\sidebar.html:447 msgid "Attendance" msgstr "" @@ -2916,8 +3053,9 @@ msgstr "" #: .\helpdesk\templates\helpdesk\ticket\ticket_list.html:22 #: .\helpdesk\templates\helpdesk\ticket\ticket_list.html:217 #: .\helpdesk\templates\helpdesk\ticket\ticket_list.html:435 -#: .\payroll\templates\payroll\payslip\individual_payslip.html:274 -#: .\recruitment\forms.py:553 +#: .\payroll\templates\payroll\loan\filter.html:27 +#: .\payroll\templates\payroll\payslip\individual_payslip.html:290 +#: .\recruitment\forms.py:558 #: .\recruitment\templates\stage\stage_component.html:34 msgid "Type" msgstr "" @@ -2947,7 +3085,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:417 +#: .\templates\sidebar.html:432 msgid "Attendances" msgstr "" @@ -2993,7 +3131,7 @@ msgstr "" #: .\attendance\templates\attendance\late_come_early_out\export_filter.html:36 #: .\attendance\templates\attendance\late_come_early_out\late_come_early_out_filters.html:14 #: .\attendance\templates\requests\attendance\filter.html:15 -#: .\base\models.py:83 .\base\models.py:121 +#: .\base\models.py:79 .\base\models.py:117 #: .\base\templates\base\department\department.html:7 #: .\base\templates\base\department\department_form.html:14 #: .\base\templates\base\department\department_view.html:6 @@ -3007,7 +3145,7 @@ 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:357 +#: .\employee\models.py:366 #: .\employee\templates\employee\profile\work_info.html:13 #: .\employee\templates\employee\update_form\work_details.html:18 #: .\employee\templates\employee_export_filter.html:71 @@ -3015,14 +3153,16 @@ msgstr "" #: .\employee\templates\employee_personal_info\employee_list.html:68 #: .\employee\templates\employee_personal_info\group_by.html:64 #: .\employee\templates\tabs\personal-tab.html:164 -#: .\payroll\models\models.py:170 +#: .\leave\templates\leave\leave_request\penalty\create.html:9 +#: .\payroll\models\models.py:173 #: .\payroll\templates\payroll\contract\contract_single_view.html:76 -#: .\payroll\templates\payroll\payslip\individual_payslip.html:75 +#: .\payroll\templates\payroll\loan\filter.html:37 +#: .\payroll\templates\payroll\payslip\individual_payslip.html:80 #: .\pms\forms.py:57 .\pms\templates\okr\objective_creation.html:83 #: .\recruitment\templates\candidate\export_filter.html:112 #: .\recruitment\templates\candidate\filters.html:96 #: .\recruitment\templates\candidate\individual.html:283 -#: .\recruitment\templates\stage\filters.html:18 .\templates\settings.html:51 +#: .\recruitment\templates\stage\filters.html:18 .\templates\settings.html:52 msgid "Department" msgstr "" @@ -3043,11 +3183,11 @@ msgstr "" #: .\base\templates\shift_request\shift_request_nav.html:126 #: .\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:386 +#: .\base\translator.py:103 .\employee\models.py:395 #: .\employee\templates\employee\profile\work_info.html:49 #: .\employee\templates\employee\update_form\work_details.html:54 #: .\employee\templates\employee_export_filter.html:81 -#: .\employee\templates\employee_filters.html:61 +#: .\employee\templates\employee_filters.html:65 #: .\employee\templates\employee_personal_info\employee_list.html:77 #: .\employee\templates\employee_personal_info\group_by.html:68 #: .\employee\templates\tabs\personal-tab.html:193 @@ -3063,9 +3203,9 @@ msgstr "" #: .\attendance\templates\attendance\late_come_early_out\export_filter.html:54 #: .\attendance\templates\attendance\late_come_early_out\late_come_early_out_filters.html:34 #: .\attendance\templates\requests\attendance\filter.html:35 -#: .\base\models.py:132 .\base\models.py:143 +#: .\base\models.py:128 .\base\models.py:139 #: .\base\templates\base\job_position\job_position.html:5 -#: .\base\templates\base\job_position\job_position.html:29 +#: .\base\templates\base\job_position\job_position.html:31 #: .\base\templates\base\job_position\job_position_form.html:22 #: .\base\templates\base\job_position\job_position_view.html:12 #: .\base\templates\base\job_role\job_role_form.html:17 @@ -3078,18 +3218,18 @@ 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:350 .\employee\templates\employee_export_filter.html:85 -#: .\employee\templates\employee_filters.html:65 +#: .\employee\models.py:359 .\employee\templates\employee_export_filter.html:85 +#: .\employee\templates\employee_filters.html:69 #: .\employee\templates\employee_personal_info\employee_list.html:67 #: .\employee\templates\employee_personal_info\group_by.html:63 -#: .\employee\templates\tabs\personal-tab.html:226 .\leave\models.py:91 +#: .\employee\templates\tabs\personal-tab.html:226 .\leave\models.py:102 #: .\onboarding\templates\onboarding\candidate_filter.html:22 #: .\onboarding\templates\onboarding\onboarding_table.html:91 #: .\onboarding\templates\onboarding\single_view.html:32 #: .\onboarding\templates\onboarding\task_view.html:10 -#: .\payroll\models\models.py:178 +#: .\payroll\models\models.py:181 #: .\payroll\templates\payroll\contract\contract_single_view.html:80 -#: .\pms\templates\okr\objective_creation.html:78 .\recruitment\forms.py:465 +#: .\pms\templates\okr\objective_creation.html:78 .\recruitment\forms.py:470 #: .\recruitment\models.py:97 .\recruitment\models.py:242 #: .\recruitment\models.py:484 #: .\recruitment\templates\candidate\candidate_create_form.html:84 @@ -3101,7 +3241,7 @@ msgstr "" #: .\recruitment\templates\pipeline\form\candidate_drop_down_form.html:29 #: .\recruitment\templates\pipeline\form\recruitment_update.html:47 #: .\recruitment\templates\pipeline\form\recruitment_update.html:51 -#: .\recruitment\templates\pipeline\pipeline.html:250 +#: .\recruitment\templates\pipeline\pipeline.html:249 #: .\recruitment\templates\pipeline\pipeline_card.html:109 #: .\recruitment\templates\recruitment\recruitment_form.html:50 #: .\recruitment\templates\recruitment\recruitment_form.html:57 @@ -3148,7 +3288,7 @@ msgstr "" #: .\attendance\templates\attendance\attendance\attendance_filters.html:68 #: .\attendance\templates\attendance\attendance\attendance_on_time.html:33 -#: .\attendance\templates\attendance\attendance\attendance_request_one.html:80 +#: .\attendance\templates\attendance\attendance\attendance_request_one.html:81 #: .\attendance\templates\attendance\attendance\export_filter.html:89 #: .\attendance\templates\attendance\attendance\group_by.html:76 #: .\attendance\templates\attendance\attendance\group_by.html:341 @@ -3210,7 +3350,7 @@ msgstr "" #: .\base\templates\shift_request\shift_request_nav.html:183 #: .\base\templates\work_type_request\work_type_request_export.html:109 #: .\base\templates\work_type_request\work_type_request_nav.html:144 -#: .\employee\templates\employee_filters.html:77 +#: .\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 @@ -3347,7 +3487,7 @@ msgid "Export Attendances" msgstr "" #: .\attendance\templates\attendance\attendance\attendance_nav.html:329 -#: .\attendance\templates\attendance\attendance\attendance_request_one.html:178 +#: .\attendance\templates\attendance\attendance\attendance_request_one.html:179 #: .\attendance\templates\attendance\attendance\group_by.html:411 #: .\attendance\templates\attendance\attendance\tab_content.html:391 #: .\employee\templates\tabs\attendance-tab.html:322 @@ -3372,15 +3512,15 @@ msgstr "" #: .\attendance\templates\attendance\late_come_early_out\report_list.html:10 #: .\base\templates\base\rotating_shift\htmx\group_by.html:59 #: .\base\templates\base\rotating_shift\rotating_shift_assign_export.html:10 -#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:41 +#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:39 #: .\base\templates\base\rotating_work_type\htmx\group_by.html:56 #: .\base\templates\base\rotating_work_type\rotating_work_type_assign_export.html:10 -#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:39 +#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:37 #: .\base\templates\shift_request\htmx\group_by.html:56 -#: .\base\templates\shift_request\htmx\requests.html:40 +#: .\base\templates\shift_request\htmx\requests.html:38 #: .\base\templates\shift_request\shift_request_export.html:10 #: .\base\templates\work_type_request\htmx\group_by.html:56 -#: .\base\templates\work_type_request\htmx\requests.html:40 +#: .\base\templates\work_type_request\htmx\requests.html:38 #: .\base\templates\work_type_request\work_type_request_export.html:10 #: .\employee\templates\employee_export_filter.html:10 #: .\employee\templates\employee_personal_info\employee_list.html:44 @@ -3417,7 +3557,7 @@ msgid "Select All" msgstr "" #: .\attendance\templates\attendance\attendance\attendance_on_time.html:25 -#: .\attendance\templates\attendance\attendance\attendance_request_one.html:36 +#: .\attendance\templates\attendance\attendance\attendance_request_one.html:37 #: .\attendance\templates\attendance\attendance\group_by.html:68 #: .\attendance\templates\attendance\attendance\group_by.html:333 #: .\attendance\templates\attendance\attendance\group_by.html:591 @@ -3438,7 +3578,7 @@ msgid "Date" msgstr "" #: .\attendance\templates\attendance\attendance\attendance_on_time.html:26 -#: .\attendance\templates\attendance\attendance\attendance_request_one.html:40 +#: .\attendance\templates\attendance\attendance\attendance_request_one.html:41 #: .\attendance\templates\attendance\attendance\group_by.html:69 #: .\attendance\templates\attendance\attendance\group_by.html:334 #: .\attendance\templates\attendance\attendance\group_by.html:592 @@ -3453,12 +3593,12 @@ msgstr "" #: .\attendance\templates\requests\attendance\request_lines.html:182 #: .\employee\templates\tabs\attendance-tab.html:51 #: .\employee\templates\tabs\attendance-tab.html:235 -#: .\employee\templates\tabs\profile-attendance-tab.html:9 .\leave\models.py:81 +#: .\employee\templates\tabs\profile-attendance-tab.html:9 .\leave\models.py:92 msgid "Day" msgstr "" #: .\attendance\templates\attendance\attendance\attendance_on_time.html:34 -#: .\attendance\templates\attendance\attendance\attendance_request_one.html:84 +#: .\attendance\templates\attendance\attendance\attendance_request_one.html:85 #: .\attendance\templates\attendance\attendance\group_by.html:77 #: .\attendance\templates\attendance\attendance\group_by.html:342 #: .\attendance\templates\attendance\attendance\group_by.html:600 @@ -3480,10 +3620,10 @@ msgid "At Work" msgstr "" #: .\attendance\templates\attendance\attendance\attendance_on_time.html:98 -#: .\attendance\templates\attendance\attendance\attendance_request_one.html:111 -#: .\attendance\templates\attendance\attendance\attendance_request_one.html:128 -#: .\attendance\templates\attendance\attendance\attendance_request_one.html:169 -#: .\attendance\templates\attendance\attendance\attendance_request_one.html:210 +#: .\attendance\templates\attendance\attendance\attendance_request_one.html:112 +#: .\attendance\templates\attendance\attendance\attendance_request_one.html:129 +#: .\attendance\templates\attendance\attendance\attendance_request_one.html:170 +#: .\attendance\templates\attendance\attendance\attendance_request_one.html:211 #: .\attendance\templates\attendance\attendance\group_by.html:166 #: .\attendance\templates\attendance\attendance\group_by.html:425 #: .\attendance\templates\attendance\attendance\group_by.html:669 @@ -3493,28 +3633,30 @@ msgstr "" #: .\attendance\templates\attendance\attendance\validate_attendance.html:144 #: .\attendance\templates\attendance\attendance_account\group_by.html:77 #: .\attendance\templates\attendance\attendance_account\overtime_list.html:69 -#: .\attendance\templates\attendance\break_point\condition.html:36 -#: .\attendance\templates\requests\attendance\individual_view.html:146 +#: .\attendance\templates\attendance\break_point\condition.html:39 +#: .\attendance\templates\requests\attendance\individual_view.html:147 +#: .\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 #: .\base\templates\base\company\condition_view.html:26 -#: .\base\templates\base\department\department_view.html:24 -#: .\base\templates\base\employee_type\type_view.html:24 +#: .\base\templates\base\department\department_view.html:27 +#: .\base\templates\base\employee_tag\employee_tag_view.html:37 +#: .\base\templates\base\employee_type\type_view.html:25 #: .\base\templates\base\job_position\job_position_view.html:73 #: .\base\templates\base\job_role\job_role_view.html:70 -#: .\base\templates\base\rotating_shift\rotating_shift_view.html:28 -#: .\base\templates\base\rotating_work_type\rotating_work_type_view.html:28 +#: .\base\templates\base\rotating_shift\rotating_shift_view.html:29 +#: .\base\templates\base\rotating_work_type\rotating_work_type_view.html:31 #: .\base\templates\base\shift\schedule_view.html:68 -#: .\base\templates\base\shift\shift_view.html:28 -#: .\base\templates\base\tags\tags_view.html:34 -#: .\base\templates\base\ticket_type\ticket_type_view.html:28 -#: .\base\templates\base\work_type\work_type_view.html:24 +#: .\base\templates\base\shift\shift_view.html:31 +#: .\base\templates\base\tags\tags_view.html:37 +#: .\base\templates\base\ticket_type\ticket_type_view.html:31 +#: .\base\templates\base\work_type\work_type_view.html:27 #: .\base\templates\shift_request\htmx\group_by.html:110 -#: .\base\templates\shift_request\htmx\requests.html:94 -#: .\base\templates\shift_request\htmx\shift_request_detail.html:74 +#: .\base\templates\shift_request\htmx\requests.html:92 +#: .\base\templates\shift_request\htmx\shift_request_detail.html:87 #: .\base\templates\work_type_request\htmx\group_by.html:110 -#: .\base\templates\work_type_request\htmx\requests.html:95 -#: .\base\templates\work_type_request\htmx\work_type_request_single_view.html:72 +#: .\base\templates\work_type_request\htmx\requests.html:93 +#: .\base\templates\work_type_request\htmx\work_type_request_single_view.html:85 #: .\employee\templates\employee\profile\profile_view.html:45 #: .\employee\templates\employee\update_form\form_view.html:7 #: .\employee\templates\employee\view\individual.html:65 @@ -3525,6 +3667,7 @@ msgstr "" #: .\employee\templates\tabs\attendance-tab.html:306 #: .\employee\templates\tabs\shift-tab.html:208 #: .\employee\templates\tabs\shift-tab.html:672 +#: .\helpdesk\templates\department_managers\department_managers_view.html:31 #: .\helpdesk\templates\helpdesk\faq\faq_category_list.html:34 #: .\helpdesk\templates\helpdesk\faq\faq_list.html:21 #: .\helpdesk\templates\helpdesk\ticket\ticket_card.html:132 @@ -3543,12 +3686,13 @@ msgstr "" #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_group_by.html:238 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_list.html:57 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_list.html:196 -#: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_single_view.html:90 -#: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_single_view.html:97 +#: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_single_view.html:91 +#: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_single_view.html:98 #: .\leave\templates\leave\leave_assign\assigned_leave.html:52 #: .\leave\templates\leave\leave_assign\group_by.html:65 #: .\leave\templates\leave\leave_request\group_by.html:135 -#: .\leave\templates\leave\leave_request\leave_requests.html:171 +#: .\leave\templates\leave\leave_request\leave_requests.html:180 +#: .\leave\templates\leave\leave_request\penalty\create.html:42 #: .\leave\templates\leave\leave_type\leave_type_individual_view.html:137 #: .\leave\templates\leave\leave_type\leave_types.html:49 #: .\leave\templates\leave\user_leave\group_by.html:116 @@ -3564,15 +3708,19 @@ msgstr "" #: .\payroll\templates\payroll\deduction\card_deduction.html:36 #: .\payroll\templates\payroll\deduction\view_single_deduction.html:101 #: .\pms\templates\feedback\feedback_detailed_view.html:70 -#: .\pms\templates\feedback\question\question_all.html:92 +#: .\pms\templates\feedback\question\question_all.html:94 #: .\pms\templates\okr\key_result\key_result_view.html:41 #: .\pms\templates\okr\objective_detailed_view.html:61 #: .\pms\templates\okr\objective_detailed_view.html:152 #: .\recruitment\templates\candidate\individual.html:50 -#: .\recruitment\templates\pipeline\pipeline.html:199 +#: .\recruitment\templates\pipeline\pipeline.html:198 #: .\recruitment\templates\pipeline\pipeline_card.html:73 #: .\recruitment\templates\pipeline\pipeline_card.html:279 #: .\recruitment\templates\pipeline\pipeline_tabs.html:38 +#: .\recruitment\templates\skill_zone\skill_zone_card.html:40 +#: .\recruitment\templates\skill_zone\skill_zone_list.html:27 +#: .\recruitment\templates\skill_zone\skill_zone_list.html:140 +#: .\recruitment\templates\skill_zone_cand\skill_zone_cand_list.html:54 #: .\recruitment\templates\survey\survey_card.html:46 #: .\recruitment\templates\survey\view_single_template.html:73 #: .\recruitment\templates\survey\view_single_template.html:101 @@ -3580,9 +3728,9 @@ msgid "Edit" msgstr "" #: .\attendance\templates\attendance\attendance\attendance_on_time.html:101 -#: .\attendance\templates\attendance\attendance\attendance_request_one.html:140 -#: .\attendance\templates\attendance\attendance\attendance_request_one.html:181 -#: .\attendance\templates\attendance\attendance\attendance_request_one.html:213 +#: .\attendance\templates\attendance\attendance\attendance_request_one.html:141 +#: .\attendance\templates\attendance\attendance\attendance_request_one.html:182 +#: .\attendance\templates\attendance\attendance\attendance_request_one.html:214 #: .\attendance\templates\attendance\attendance\tab_content.html:169 #: .\attendance\templates\attendance\attendance\tab_content.html:413 #: .\attendance\templates\attendance\attendance\tab_content.html:663 @@ -3611,36 +3759,38 @@ msgstr "" #: .\attendance\templates\attendance\attendance_activity\group_by.html:76 #: .\attendance\templates\attendance\late_come_early_out\group_by.html:88 #: .\attendance\templates\attendance\late_come_early_out\report_list.html:87 +#: .\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 #: .\base\templates\base\auth\group_view.html:85 #: .\base\templates\base\auth\permission_view.html:38 #: .\base\templates\base\company\company_view.html:58 -#: .\base\templates\base\department\department_view.html:38 -#: .\base\templates\base\employee_type\type_view.html:37 +#: .\base\templates\base\department\department_view.html:41 +#: .\base\templates\base\employee_tag\employee_tag_view.html:52 +#: .\base\templates\base\employee_type\type_view.html:38 #: .\base\templates\base\job_position\job_position_view.html:97 #: .\base\templates\base\job_role\job_role_view.html:91 #: .\base\templates\base\rotating_shift\htmx\group_by.html:166 -#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:150 -#: .\base\templates\base\rotating_shift\rotating_shift_view.html:42 +#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:148 +#: .\base\templates\base\rotating_shift\rotating_shift_view.html:43 #: .\base\templates\base\rotating_work_type\htmx\group_by.html:166 -#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:149 -#: .\base\templates\base\rotating_work_type\rotating_work_type_view.html:43 +#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:147 +#: .\base\templates\base\rotating_work_type\rotating_work_type_view.html:46 #: .\base\templates\base\shift\schedule_view.html:90 -#: .\base\templates\base\shift\shift_view.html:41 -#: .\base\templates\base\tags\tags_view.html:49 -#: .\base\templates\base\ticket_type\ticket_type_view.html:43 -#: .\base\templates\base\work_type\work_type_view.html:37 +#: .\base\templates\base\shift\shift_view.html:44 +#: .\base\templates\base\tags\tags_view.html:52 +#: .\base\templates\base\ticket_type\ticket_type_view.html:46 +#: .\base\templates\base\work_type\work_type_view.html:40 #: .\base\templates\shift_request\htmx\group_by.html:117 -#: .\base\templates\shift_request\htmx\requests.html:101 -#: .\base\templates\shift_request\htmx\requests.html:106 -#: .\base\templates\shift_request\htmx\shift_request_detail.html:85 -#: .\base\templates\shift_request\htmx\shift_request_detail.html:90 +#: .\base\templates\shift_request\htmx\requests.html:99 +#: .\base\templates\shift_request\htmx\requests.html:104 +#: .\base\templates\shift_request\htmx\shift_request_detail.html:98 +#: .\base\templates\shift_request\htmx\shift_request_detail.html:103 #: .\base\templates\work_type_request\htmx\group_by.html:117 -#: .\base\templates\work_type_request\htmx\requests.html:102 -#: .\base\templates\work_type_request\htmx\requests.html:107 -#: .\base\templates\work_type_request\htmx\work_type_request_single_view.html:79 -#: .\base\templates\work_type_request\htmx\work_type_request_single_view.html:84 +#: .\base\templates\work_type_request\htmx\requests.html:100 +#: .\base\templates\work_type_request\htmx\requests.html:105 +#: .\base\templates\work_type_request\htmx\work_type_request_single_view.html:92 +#: .\base\templates\work_type_request\htmx\work_type_request_single_view.html:97 #: .\employee\templates\employee_personal_info\employee_list.html:232 #: .\employee\templates\employee_personal_info\group_by.html:227 #: .\employee\templates\tabs\attendance-tab.html:204 @@ -3649,26 +3799,28 @@ msgstr "" #: .\employee\templates\tabs\shift-tab.html:404 #: .\employee\templates\tabs\shift-tab.html:551 #: .\employee\templates\tabs\shift-tab.html:689 +#: .\helpdesk\templates\department_managers\department_managers_view.html:46 #: .\payroll\templates\payroll\payslip\group_payslips.html:121 #: .\payroll\templates\payroll\payslip\payslip_table.html:115 #: .\recruitment\templates\recruitment\recruitment_component.html:90 +#: .\recruitment\templates\skill_zone\skill_zone_list.html:68 #: .\recruitment\templates\stage\stage_component.html:66 msgid "Remove" msgstr "" -#: .\attendance\templates\attendance\attendance\attendance_request_one.html:47 +#: .\attendance\templates\attendance\attendance\attendance_request_one.html:48 msgid "Check_In" msgstr "" -#: .\attendance\templates\attendance\attendance\attendance_request_one.html:51 +#: .\attendance\templates\attendance\attendance\attendance_request_one.html:52 msgid "Check_In Date" msgstr "" -#: .\attendance\templates\attendance\attendance\attendance_request_one.html:58 +#: .\attendance\templates\attendance\attendance\attendance_request_one.html:59 msgid "Check_Out" msgstr "" -#: .\attendance\templates\attendance\attendance\attendance_request_one.html:62 +#: .\attendance\templates\attendance\attendance\attendance_request_one.html:63 msgid "Check_Out Date" msgstr "" @@ -3721,6 +3873,10 @@ msgstr "" #: .\attendance\templates\attendance\own_attendance\attendances.html:297 #: .\attendance\templates\requests\attendance\group_by.html:567 #: .\attendance\templates\requests\attendance\request_lines.html:281 +#: .\base\templates\base\rotating_shift\rotating_shift_assign.html:66 +#: .\base\templates\base\rotating_work_type\rotating_work_type_assign.html:78 +#: .\base\templates\shift_request\shift_request_view.html:54 +#: .\base\templates\work_type_request\work_type_request_nav.html:289 #: .\recruitment\templates\survey\survey_card.html:80 msgid "Details" msgstr "" @@ -3797,7 +3953,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:447 +#: .\templates\sidebar.html:462 msgid "Hour Account" msgstr "" @@ -3813,7 +3969,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:454 +#: .\templates\sidebar.html:469 msgid "Attendance Activity" msgstr "" @@ -3887,7 +4043,7 @@ msgstr "" #: .\employee\templates\employee\profile\personal_info.html:149 #: .\employee\templates\employee\update_form\bank_details.html:78 #: .\employee\templates\employee\update_form\personal_info.html:172 -#: .\employee\templates\employee\update_form\work_details.html:111 +#: .\employee\templates\employee\update_form\work_details.html:120 #: .\helpdesk\templates\helpdesk\ticket\forms\add_tag.html:21 #: .\helpdesk\templates\helpdesk\ticket\forms\change.html:92 #: .\helpdesk\templates\helpdesk\ticket\forms\change_assinees.html:20 @@ -3909,7 +4065,7 @@ msgid "Export Late Come Early Out" msgstr "" #: .\attendance\templates\attendance\late_come_early_out\report_list.html:78 -#: .\leave\templates\leave\leave_request\leave_requests.html:165 +#: .\leave\templates\leave\leave_request\leave_requests.html:174 msgid "Penalty" msgstr "" @@ -3923,7 +4079,7 @@ msgstr "" #: .\attendance\templates\attendance\own_attendance\attendances.html:71 #: .\attendance\templates\requests\attendance\view-requests.html:30 -#: .\payroll\models\models.py:413 +#: .\payroll\models\models.py:416 msgid "Validated" msgstr "" @@ -3963,7 +4119,7 @@ msgstr "" msgid "Edit Request" msgstr "" -#: .\attendance\templates\requests\attendance\individual_view.html:70 +#: .\attendance\templates\requests\attendance\individual_view.html:71 #: .\pms\templates\okr\key_result\key_result_creation.html:75 #: .\pms\templates\okr\key_result\key_result_creation_htmx.html:56 #: .\pms\templates\okr\key_result\key_result_update.html:52 @@ -3972,15 +4128,15 @@ msgstr "" msgid "Current Value" msgstr "" -#: .\attendance\templates\requests\attendance\individual_view.html:72 +#: .\attendance\templates\requests\attendance\individual_view.html:73 msgid "Requested Value" msgstr "" -#: .\attendance\templates\requests\attendance\individual_view.html:134 +#: .\attendance\templates\requests\attendance\individual_view.html:135 #: .\base\templates\shift_request\htmx\group_by.html:134 -#: .\base\templates\shift_request\htmx\requests.html:123 +#: .\base\templates\shift_request\htmx\requests.html:121 #: .\base\templates\work_type_request\htmx\group_by.html:134 -#: .\base\templates\work_type_request\htmx\requests.html:124 +#: .\base\templates\work_type_request\htmx\requests.html:122 #: .\employee\templates\tabs\leave-tab.html:293 #: .\employee\templates\tabs\shift-tab.html:261 #: .\employee\templates\tabs\shift-tab.html:726 @@ -3990,7 +4146,7 @@ msgstr "" #: .\leave\templates\leave\user_leave\user_requests.html:113 #: .\leave\templates\leave\user_leave\user_requests.html:114 #: .\leave\templates\leave\user_leave\user_requests.html:118 -#: .\pms\templates\feedback\question\question_all.html:100 +#: .\pms\templates\feedback\question\question_all.html:105 msgid "Cancel" msgstr "" @@ -4184,9 +4340,9 @@ msgstr "" msgid "Attendance validated." msgstr "" -#: .\base\forms.py:556 .\base\forms.py:977 .\base\models.py:918 -#: .\payroll\models\models.py:261 .\payroll\models\models.py:892 -#: .\payroll\models\models.py:903 .\payroll\models\models.py:1152 +#: .\base\forms.py:558 .\base\forms.py:979 .\base\models.py:916 +#: .\payroll\models\models.py:264 .\payroll\models\models.py:896 +#: .\payroll\models\models.py:907 .\payroll\models\models.py:1162 #: .\pms\templates\feedback\feedback_creation.html:45 #: .\pms\templates\feedback\feedback_creation.html:57 #: .\pms\templates\feedback\feedback_creation.html:120 @@ -4195,190 +4351,232 @@ msgstr "" msgid "This field is required" msgstr "" -#: .\base\forms.py:859 +#: .\base\forms.py:861 #, python-brace-format msgid "Shift schedule is already exist for {day}" msgstr "" -#: .\base\forms.py:914 .\payroll\models\models.py:132 +#: .\base\forms.py:916 .\payroll\models\models.py:135 msgid "Start date" msgstr "" -#: .\base\forms.py:1249 +#: .\base\forms.py:1251 msgid "Old password" msgstr "" -#: .\base\forms.py:1254 +#: .\base\forms.py:1256 msgid "Enter Old Password" msgstr "" -#: .\base\forms.py:1258 +#: .\base\forms.py:1260 msgid "Enter your old password." msgstr "" -#: .\base\forms.py:1261 .\base\forms.py:1320 +#: .\base\forms.py:1263 .\base\forms.py:1322 msgid "New password" msgstr "" -#: .\base\forms.py:1266 +#: .\base\forms.py:1268 msgid "Enter New Password" msgstr "" -#: .\base\forms.py:1272 .\base\forms.py:1332 +#: .\base\forms.py:1274 .\base\forms.py:1334 msgid "New password confirmation" msgstr "" -#: .\base\forms.py:1277 .\base\forms.py:1337 +#: .\base\forms.py:1279 .\base\forms.py:1339 msgid "Re-Enter Password" msgstr "" -#: .\base\forms.py:1308 +#: .\base\forms.py:1310 msgid "New password and confirm password do not match" msgstr "" -#: .\base\forms.py:1325 +#: .\base\forms.py:1327 msgid "Enter Strong Password" msgstr "" -#: .\base\forms.py:1329 +#: .\base\forms.py:1331 msgid "Enter your new password." msgstr "" -#: .\base\forms.py:1341 +#: .\base\forms.py:1343 msgid "Enter the same password as before, for verification." msgstr "" -#: .\base\forms.py:1350 +#: .\base\forms.py:1352 msgid "Password must contain at least 8 characters." msgstr "" -#: .\base\forms.py:1353 +#: .\base\forms.py:1355 msgid "Password must contain at least one uppercase letter." msgstr "" -#: .\base\forms.py:1357 +#: .\base\forms.py:1359 msgid "Password must contain at least one lowercase letter." msgstr "" -#: .\base\forms.py:1360 +#: .\base\forms.py:1362 msgid "Password must contain at least one digit." msgstr "" -#: .\base\forms.py:1365 +#: .\base\forms.py:1367 msgid "Password must contain at least one special character." msgstr "" -#: .\base\forms.py:1379 +#: .\base\forms.py:1381 msgid "Password must be same." msgstr "" -#: .\base\methods.py:340 .\employee\views.py:1991 .\recruitment\models.py:225 +#: .\base\forms.py:1552 .\base\models.py:939 .\payroll\models\models.py:583 +#: .\payroll\models\models.py:592 +msgid "Equal (==)" +msgstr "" + +#: .\base\forms.py:1553 .\base\models.py:940 .\payroll\models\models.py:584 +#: .\payroll\models\models.py:593 +msgid "Not Equal (!=)" +msgstr "" + +#: .\base\forms.py:1554 .\base\models.py:941 +msgid "Range" +msgstr "" + +#: .\base\forms.py:1555 .\base\models.py:942 .\payroll\models\models.py:585 +#: .\payroll\models\models.py:594 +msgid "Less Than (<)" +msgstr "" + +#: .\base\forms.py:1556 .\base\models.py:943 .\payroll\models\models.py:586 +#: .\payroll\models\models.py:595 +msgid "Greater Than (>)" +msgstr "" + +#: .\base\forms.py:1557 .\base\models.py:944 .\payroll\models\models.py:587 +#: .\payroll\models\models.py:596 +msgid "Less Than or Equal To (<=)" +msgstr "" + +#: .\base\forms.py:1558 .\base\models.py:945 .\payroll\models\models.py:588 +#: .\payroll\models\models.py:597 +msgid "Greater Than or Equal To (>=)" +msgstr "" + +#: .\base\forms.py:1559 .\base\models.py:946 .\payroll\models\models.py:589 +msgid "Contains" +msgstr "" + +#: .\base\forms.py:1564 +msgid "Approval Manager" +msgstr "" + +#: .\base\methods.py:341 .\employee\views.py:1992 .\recruitment\models.py:225 msgid "Male" msgstr "" -#: .\base\methods.py:341 .\employee\views.py:1991 .\recruitment\models.py:225 +#: .\base\methods.py:342 .\employee\views.py:1992 .\recruitment\models.py:225 msgid "Female" msgstr "" -#: .\base\methods.py:342 .\employee\views.py:1991 .\recruitment\models.py:225 +#: .\base\methods.py:343 .\employee\views.py:1992 .\recruitment\models.py:225 #: .\recruitment\models.py:226 msgid "Other" msgstr "" -#: .\base\methods.py:343 .\employee\templates\tabs\payroll-tab.html:12 -#: .\payroll\models\models.py:117 .\payroll\models\models.py:332 -#: .\payroll\models\models.py:1183 +#: .\base\methods.py:344 .\employee\templates\tabs\payroll-tab.html:12 +#: .\payroll\models\models.py:120 .\payroll\models\models.py:335 +#: .\payroll\models\models.py:1193 #: .\payroll\templates\payroll\contract\contract_view.html:243 #: .\payroll\templates\payroll\dashboard.html:71 #: .\payroll\templates\payroll\payslip\generate_payslip_list.html:25 #: .\payroll\templates\payroll\payslip\group_payslips.html:25 -#: .\payroll\templates\payroll\payslip\individual_payslip.html:19 +#: .\payroll\templates\payroll\payslip\individual_payslip.html:24 #: .\payroll\templates\payroll\payslip\payslips_quick_filter.html:37 #: .\payroll\templates\payroll\payslip\view_payslips.html:243 -#: .\payroll\views\component_views.py:718 .\payroll\views\views.py:34 +#: .\payroll\views\component_views.py:735 .\payroll\views\views.py:34 msgid "Draft" msgstr "" -#: .\base\methods.py:344 +#: .\base\methods.py:345 #: .\employee\templates\employee\profile\profile_view.html:67 #: .\employee\templates\employee\view\individual.html:87 -#: .\employee\views.py:1967 .\payroll\models\models.py:118 +#: .\employee\views.py:1968 .\payroll\models\models.py:121 #: .\payroll\templates\payroll\contract\contract_view.html:254 msgid "Active" msgstr "" -#: .\base\methods.py:345 .\payroll\models\models.py:119 +#: .\base\methods.py:346 .\payroll\models\models.py:122 #: .\payroll\templates\payroll\contract\contract_view.html:232 msgid "Expired" msgstr "" -#: .\base\methods.py:346 .\payroll\models\models.py:120 +#: .\base\methods.py:347 .\payroll\models\models.py:123 #: .\payroll\templates\payroll\contract\contract_view.html:221 msgid "Terminated" msgstr "" -#: .\base\methods.py:347 .\leave\models.py:28 .\payroll\models\models.py:107 +#: .\base\methods.py:348 .\leave\models.py:39 .\payroll\models\models.py:110 msgid "Weekly" msgstr "" -#: .\base\methods.py:348 .\base\methods.py:353 .\base\models.py:259 -#: .\leave\models.py:27 .\payroll\models\models.py:108 -#: .\payroll\models\models.py:114 +#: .\base\methods.py:349 .\base\methods.py:354 .\base\models.py:255 +#: .\leave\models.py:38 .\payroll\models\models.py:111 +#: .\payroll\models\models.py:117 msgid "Monthly" msgstr "" -#: .\base\methods.py:349 .\base\models.py:257 +#: .\base\methods.py:350 .\base\models.py:253 msgid "After" msgstr "" -#: .\base\methods.py:350 .\payroll\models\models.py:109 +#: .\base\methods.py:351 .\payroll\models\models.py:112 msgid "Semi-Monthly" msgstr "" -#: .\base\methods.py:351 .\payroll\models\models.py:102 -#: .\payroll\models\models.py:112 +#: .\base\methods.py:352 .\payroll\models\models.py:105 +#: .\payroll\models\models.py:115 msgid "Hourly" msgstr "" -#: .\base\methods.py:352 .\payroll\models\models.py:113 +#: .\base\methods.py:353 .\payroll\models\models.py:116 msgid "Daily" msgstr "" -#: .\base\methods.py:354 .\leave\models.py:19 +#: .\base\methods.py:355 .\leave\models.py:30 msgid "Full Day" msgstr "" -#: .\base\methods.py:355 .\leave\models.py:20 +#: .\base\methods.py:356 .\leave\models.py:31 msgid "First Half" msgstr "" -#: .\base\methods.py:356 .\leave\models.py:21 +#: .\base\methods.py:357 .\leave\models.py:32 msgid "Second Half" msgstr "" -#: .\base\methods.py:359 .\employee\templates\tabs\leave-tab.html:52 -#: .\leave\models.py:97 +#: .\base\methods.py:360 .\employee\templates\tabs\leave-tab.html:52 +#: .\leave\models.py:108 #: .\leave\templates\leave\leave_request\leave_requests.html:18 #: .\leave\templates\leave\user_leave\user_requests.html:16 msgid "Cancelled" msgstr "" -#: .\base\methods.py:361 .\leave\models.py:99 +#: .\base\methods.py:362 .\leave\models.py:110 msgid "Cancelled & Rejected" msgstr "" -#: .\base\methods.py:399 -#: .\base\templates\shift_request\htmx\shift_request_detail.html:63 -#: .\base\templates\work_type_request\htmx\work_type_request_single_view.html:63 -#: .\employee\views.py:1866 .\leave\forms.py:31 +#: .\base\methods.py:400 .\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:1867 .\leave\forms.py:31 #: .\leave\templates\leave\holiday\holiday.html:67 msgid "Yes" msgstr "" -#: .\base\methods.py:401 -#: .\base\templates\shift_request\htmx\shift_request_detail.html:64 -#: .\base\templates\work_type_request\htmx\work_type_request_single_view.html:64 -#: .\employee\views.py:1868 .\leave\forms.py:31 +#: .\base\methods.py:402 .\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:1869 .\leave\forms.py:31 #: .\leave\templates\leave\holiday\holiday.html:69 #: .\payroll\templates\payroll\allowance\view_single_allowance.html:39 #: .\payroll\templates\payroll\allowance\view_single_allowance.html:49 @@ -4389,139 +4587,139 @@ msgstr "" msgid "No" msgstr "" -#: .\base\models.py:28 +#: .\base\models.py:29 msgid "Invalid time, excepted HH:MM" msgstr "" -#: .\base\models.py:30 +#: .\base\models.py:31 msgid "Invalid format, excepted HH:MM" msgstr "" -#: .\base\models.py:59 +#: .\base\models.py:60 msgid "Companies" msgstr "" -#: .\base\models.py:84 +#: .\base\models.py:80 msgid "Departments" msgstr "" -#: .\base\models.py:133 +#: .\base\models.py:129 #: .\base\templates\base\job_position\job_position_view.html:46 -#: .\recruitment\forms.py:536 .\recruitment\models.py:446 +#: .\recruitment\forms.py:541 .\recruitment\models.py:446 #: .\recruitment\templates\dashboard\dashboard.html:237 -#: .\templates\settings.html:59 +#: .\templates\settings.html:62 msgid "Job Positions" msgstr "" -#: .\base\models.py:155 .\base\templates\base\job_role\job_role.html:5 -#: .\base\templates\base\job_role\job_role.html:32 +#: .\base\models.py:151 .\base\templates\base\job_role\job_role.html:5 +#: .\base\templates\base\job_role\job_role.html:34 #: .\base\templates\base\job_role\job_role_form.html:22 #: .\base\templates\base\job_role\job_role_view.html:13 #: .\base\templates\shift_request\shift_request_export.html:58 #: .\base\templates\shift_request\shift_request_nav.html:114 #: .\base\templates\work_type_request\work_type_request_export.html:58 #: .\base\templates\work_type_request\work_type_request_nav.html:92 -#: .\employee\models.py:378 +#: .\employee\models.py:387 #: .\employee\templates\employee\profile\work_info.html:41 #: .\employee\templates\employee\update_form\work_details.html:46 #: .\employee\templates\employee_personal_info\employee_list.html:71 #: .\employee\templates\employee_personal_info\group_by.html:67 -#: .\leave\models.py:91 .\payroll\models\models.py:186 +#: .\leave\models.py:102 .\payroll\models\models.py:189 #: .\payroll\templates\payroll\contract\contract_single_view.html:86 -#: .\templates\settings.html:67 +#: .\templates\settings.html:72 msgid "Job Role" msgstr "" -#: .\base\models.py:156 .\base\templates\base\job_role\job_role_view.html:44 +#: .\base\models.py:152 .\base\templates\base\job_role\job_role_view.html:44 msgid "Job Roles" msgstr "" -#: .\base\models.py:179 +#: .\base\models.py:175 msgid "Work Types" msgstr "" -#: .\base\models.py:214 +#: .\base\models.py:210 #: .\base\templates\base\rotating_work_type\rotating_work_type_view.html:7 msgid "Work Type 1" msgstr "" -#: .\base\models.py:220 +#: .\base\models.py:216 #: .\base\templates\base\rotating_work_type\rotating_work_type_view.html:8 msgid "Work Type 2" msgstr "" -#: .\base\models.py:234 .\base\models.py:275 +#: .\base\models.py:230 .\base\models.py:271 #: .\base\templates\base\rotating_work_type\filters.html:5 #: .\base\templates\base\rotating_work_type\rotating_work_type.html:7 -#: .\base\templates\base\rotating_work_type\rotating_work_type.html:34 +#: .\base\templates\base\rotating_work_type\rotating_work_type.html:36 #: .\base\templates\base\rotating_work_type\rotating_work_type_assign_export.html:27 -#: .\templates\settings.html:83 +#: .\templates\settings.html:93 msgid "Rotating Work Type" msgstr "" -#: .\base\models.py:235 +#: .\base\models.py:231 msgid "Rotating Work Types" msgstr "" -#: .\base\models.py:242 +#: .\base\models.py:238 msgid "Choose different work type" msgstr "" -#: .\base\models.py:246 .\leave\models.py:46 +#: .\base\models.py:242 .\leave\models.py:57 msgid "Last Day" msgstr "" -#: .\base\models.py:248 .\leave\models.py:118 +#: .\base\models.py:244 .\leave\models.py:129 msgid "Monday" msgstr "" -#: .\base\models.py:249 .\leave\models.py:119 +#: .\base\models.py:245 .\leave\models.py:130 msgid "Tuesday" msgstr "" -#: .\base\models.py:250 .\leave\models.py:120 +#: .\base\models.py:246 .\leave\models.py:131 msgid "Wednesday" msgstr "" -#: .\base\models.py:251 .\leave\models.py:121 +#: .\base\models.py:247 .\leave\models.py:132 msgid "Thursday" msgstr "" -#: .\base\models.py:252 .\leave\models.py:122 +#: .\base\models.py:248 .\leave\models.py:133 msgid "Friday" msgstr "" -#: .\base\models.py:253 .\leave\models.py:123 +#: .\base\models.py:249 .\leave\models.py:134 msgid "Saturday" msgstr "" -#: .\base\models.py:254 .\leave\models.py:124 +#: .\base\models.py:250 .\leave\models.py:135 msgid "Sunday" msgstr "" -#: .\base\models.py:258 +#: .\base\models.py:254 msgid "Weekend" msgstr "" -#: .\base\models.py:278 .\base\models.py:561 +#: .\base\models.py:274 .\base\models.py:557 #: .\base\templates\base\rotating_shift\htmx\group_by.html:67 -#: .\base\templates\base\rotating_shift\individual_view.html:77 -#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:51 +#: .\base\templates\base\rotating_shift\individual_view.html:78 +#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:49 #: .\base\templates\base\rotating_work_type\htmx\group_by.html:66 -#: .\base\templates\base\rotating_work_type\individual_view.html:75 -#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:49 +#: .\base\templates\base\rotating_work_type\individual_view.html:76 +#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:47 #: .\employee\templates\tabs\contract-tab.html:15 #: .\employee\templates\tabs\leave-tab.html:198 #: .\employee\templates\tabs\payroll-tab.html:33 #: .\employee\templates\tabs\shift-tab.html:311 -#: .\employee\templates\tabs\shift-tab.html:453 .\leave\models.py:194 -#: .\leave\models.py:378 .\leave\templates\leave\holiday\holiday.html:41 +#: .\employee\templates\tabs\shift-tab.html:453 .\leave\models.py:205 +#: .\leave\models.py:389 .\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\templates\leave\leave_request\group_by.html:63 #: .\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:35 +#: .\leave\templates\leave\leave_request\one_request_view.html:36 #: .\leave\templates\leave\leave_request\request_view.html:109 #: .\leave\templates\leave\user_leave\group_by.html:63 #: .\leave\templates\leave\user_leave\user_request_one.html:35 @@ -4549,7 +4747,7 @@ msgstr "" #: .\pms\templates\okr\objective_update.html:43 #: .\pms\templates\period\period_create.html:30 #: .\pms\templates\period\period_update.html:30 -#: .\pms\templates\period\period_view.html:46 +#: .\pms\templates\period\period_view.html:48 #: .\recruitment\templates\candidate\export_filter.html:89 #: .\recruitment\templates\candidate\filters.html:73 #: .\recruitment\templates\pipeline\form\recruitment_update.html:59 @@ -4560,47 +4758,47 @@ msgstr "" msgid "Start Date" msgstr "" -#: .\base\models.py:280 .\base\models.py:563 +#: .\base\models.py:276 .\base\models.py:559 #: .\base\templates\base\rotating_shift\filters.html:28 #: .\base\templates\base\rotating_shift\htmx\group_by.html:69 #: .\base\templates\base\rotating_shift\rotating_shift_assign_export.html:50 -#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:53 +#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:51 #: .\base\templates\base\rotating_work_type\filters.html:28 #: .\base\templates\base\rotating_work_type\htmx\group_by.html:68 #: .\base\templates\base\rotating_work_type\rotating_work_type_assign_export.html:50 -#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:51 +#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:49 #: .\employee\templates\tabs\shift-tab.html:321 #: .\employee\templates\tabs\shift-tab.html:463 msgid "Next Switch" msgstr "" -#: .\base\models.py:286 +#: .\base\models.py:282 #: .\base\templates\base\rotating_work_type\htmx\group_by.html:67 -#: .\base\templates\base\rotating_work_type\individual_view.html:81 -#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:50 +#: .\base\templates\base\rotating_work_type\individual_view.html:82 +#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:48 #: .\employee\templates\tabs\shift-tab.html:456 msgid "Current Work Type" msgstr "" -#: .\base\models.py:293 +#: .\base\models.py:289 #: .\base\templates\base\rotating_work_type\htmx\group_by.html:69 -#: .\base\templates\base\rotating_work_type\individual_view.html:85 -#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:52 +#: .\base\templates\base\rotating_work_type\individual_view.html:86 +#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:50 #: .\employee\templates\tabs\shift-tab.html:466 msgid "Next Work Type" msgstr "" -#: .\base\models.py:300 .\base\models.py:583 +#: .\base\models.py:296 .\base\models.py:579 #: .\base\templates\base\rotating_shift\filters.html:14 #: .\base\templates\base\rotating_shift\htmx\group_by.html:65 -#: .\base\templates\base\rotating_shift\individual_view.html:47 +#: .\base\templates\base\rotating_shift\individual_view.html:48 #: .\base\templates\base\rotating_shift\rotating_shift_assign_export.html:36 -#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:49 +#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:47 #: .\base\templates\base\rotating_work_type\filters.html:14 #: .\base\templates\base\rotating_work_type\htmx\group_by.html:64 -#: .\base\templates\base\rotating_work_type\individual_view.html:45 +#: .\base\templates\base\rotating_work_type\individual_view.html:46 #: .\base\templates\base\rotating_work_type\rotating_work_type_assign_export.html:36 -#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:47 +#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:45 #: .\employee\templates\tabs\allowance_deduction-tab.html:61 #: .\employee\templates\tabs\allowance_deduction-tab.html:160 #: .\employee\templates\tabs\shift-tab.html:304 @@ -4610,175 +4808,176 @@ msgstr "" msgid "Based On" msgstr "" -#: .\base\models.py:303 .\base\models.py:586 +#: .\base\models.py:299 .\base\models.py:582 msgid "Rotate After Day" msgstr "" -#: .\base\models.py:311 .\base\models.py:594 +#: .\base\models.py:307 .\base\models.py:590 msgid "Rotate Every Weekend" msgstr "" -#: .\base\models.py:317 .\base\models.py:602 +#: .\base\models.py:313 .\base\models.py:598 msgid "Rotate Every Month" msgstr "" -#: .\base\models.py:328 +#: .\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:312 +#: .\templates\sidebar.html:321 msgid "Rotating Work Type Assign" msgstr "" -#: .\base\models.py:329 +#: .\base\models.py:325 msgid "Rotating Work Type Assigns" msgstr "" -#: .\base\models.py:339 .\base\models.py:623 +#: .\base\models.py:335 .\base\models.py:619 msgid "Only one active record allowed per employee" msgstr "" -#: .\base\models.py:341 .\base\models.py:625 .\base\models.py:726 -#: .\base\models.py:796 +#: .\base\models.py:337 .\base\models.py:621 .\base\models.py:722 +#: .\base\models.py:792 msgid "Date must be greater than or equal to today" msgstr "" -#: .\base\models.py:359 +#: .\base\models.py:355 #: .\base\templates\base\employee_type\employee_type.html:7 -#: .\base\templates\base\employee_type\employee_type.html:36 +#: .\base\templates\base\employee_type\employee_type.html:38 #: .\base\templates\base\employee_type\employee_type_form.html:16 #: .\base\templates\base\employee_type\type_view.html:6 -#: .\employee\models.py:371 +#: .\employee\models.py:380 #: .\employee\templates\employee\profile\work_info.html:35 #: .\employee\templates\employee\update_form\work_details.html:40 -#: .\employee\templates\tabs\personal-tab.html:183 .\templates\settings.html:92 +#: .\employee\templates\tabs\personal-tab.html:183 +#: .\templates\settings.html:104 msgid "Employee Type" msgstr "" -#: .\base\models.py:360 +#: .\base\models.py:356 msgid "Employee Types" msgstr "" -#: .\base\models.py:404 +#: .\base\models.py:400 msgid "Employee Shift Day" msgstr "" -#: .\base\models.py:405 +#: .\base\models.py:401 msgid "Employee Shift Days" msgstr "" -#: .\base\models.py:441 .\base\templates\base\shift\shift.html:34 -#: .\templates\settings.html:100 +#: .\base\models.py:437 .\base\templates\base\shift\shift.html:36 +#: .\templates\settings.html:115 msgid "Employee Shift" msgstr "" -#: .\base\models.py:442 +#: .\base\models.py:438 msgid "Employee Shifts" msgstr "" -#: .\base\models.py:497 .\base\templates\base\shift\schedule.html:34 -#: .\templates\settings.html:108 +#: .\base\models.py:493 .\base\templates\base\shift\schedule.html:36 +#: .\templates\settings.html:126 msgid "Employee Shift Schedule" msgstr "" -#: .\base\models.py:498 +#: .\base\models.py:494 msgid "Employee Shift Schedules" msgstr "" -#: .\base\models.py:523 +#: .\base\models.py:519 #: .\base\templates\base\rotating_shift\rotating_shift_view.html:7 msgid "Shift 1" msgstr "" -#: .\base\models.py:529 +#: .\base\models.py:525 #: .\base\templates\base\rotating_shift\rotating_shift_view.html:8 msgid "Shift 2" msgstr "" -#: .\base\models.py:538 .\base\models.py:558 +#: .\base\models.py:534 .\base\models.py:554 #: .\base\templates\base\rotating_shift\filters.html:5 #: .\base\templates\base\rotating_shift\filters.html:24 #: .\base\templates\base\rotating_shift\rotating_shift.html:8 -#: .\base\templates\base\rotating_shift\rotating_shift.html:35 +#: .\base\templates\base\rotating_shift\rotating_shift.html:37 #: .\base\templates\base\rotating_shift\rotating_shift_assign_export.html:27 #: .\base\templates\base\rotating_shift\rotating_shift_assign_export.html:46 #: .\base\templates\base\rotating_work_type\filters.html:24 #: .\base\templates\base\rotating_work_type\rotating_work_type_assign_export.html:46 -#: .\employee\templates\tabs\shift-tab.html:91 .\templates\settings.html:116 +#: .\employee\templates\tabs\shift-tab.html:91 .\templates\settings.html:137 msgid "Rotating Shift" msgstr "" -#: .\base\models.py:539 +#: .\base\models.py:535 msgid "Rotating Shifts" msgstr "" -#: .\base\models.py:546 +#: .\base\models.py:542 msgid "Choose different shifts" msgstr "" -#: .\base\models.py:569 .\base\templates\base\rotating_shift\filters.html:18 +#: .\base\models.py:565 .\base\templates\base\rotating_shift\filters.html:18 #: .\base\templates\base\rotating_shift\htmx\group_by.html:68 -#: .\base\templates\base\rotating_shift\individual_view.html:83 +#: .\base\templates\base\rotating_shift\individual_view.html:84 #: .\base\templates\base\rotating_shift\rotating_shift_assign_export.html:40 -#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:52 +#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:50 #: .\base\templates\base\rotating_work_type\filters.html:18 #: .\base\templates\base\rotating_work_type\rotating_work_type_assign_export.html:40 #: .\employee\templates\tabs\shift-tab.html:314 msgid "Current Shift" msgstr "" -#: .\base\models.py:576 .\base\templates\base\rotating_shift\filters.html:32 +#: .\base\models.py:572 .\base\templates\base\rotating_shift\filters.html:32 #: .\base\templates\base\rotating_shift\htmx\group_by.html:70 -#: .\base\templates\base\rotating_shift\individual_view.html:87 +#: .\base\templates\base\rotating_shift\individual_view.html:88 #: .\base\templates\base\rotating_shift\rotating_shift_assign_export.html:54 -#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:54 +#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:52 #: .\base\templates\base\rotating_work_type\filters.html:32 #: .\base\templates\base\rotating_work_type\rotating_work_type_assign_export.html:54 #: .\employee\templates\tabs\shift-tab.html:323 msgid "Next Shift" msgstr "" -#: .\base\models.py:612 +#: .\base\models.py:608 #: .\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:304 +#: .\employee\templates\tabs\shift-tab.html:913 .\templates\sidebar.html:312 msgid "Rotating Shift Assign" msgstr "" -#: .\base\models.py:613 +#: .\base\models.py:609 msgid "Rotating Shift Assigns" msgstr "" -#: .\base\models.py:644 +#: .\base\models.py:640 msgid "Requesting Work Type" msgstr "" -#: .\base\models.py:652 +#: .\base\models.py:648 #: .\base\templates\work_type_request\work_type_request_export.html:101 #: .\base\templates\work_type_request\work_type_request_nav.html:135 msgid "Previous Work Type" msgstr "" -#: .\base\models.py:658 .\base\models.py:767 +#: .\base\models.py:654 .\base\models.py:763 #: .\base\templates\shift_request\htmx\group_by.html:66 -#: .\base\templates\shift_request\htmx\requests.html:50 +#: .\base\templates\shift_request\htmx\requests.html:48 #: .\base\templates\work_type_request\htmx\group_by.html:66 -#: .\base\templates\work_type_request\htmx\requests.html:50 +#: .\base\templates\work_type_request\htmx\requests.html:48 #: .\employee\templates\tabs\shift-tab.html:148 #: .\employee\templates\tabs\shift-tab.html:612 msgid "Requested Till" msgstr "" -#: .\base\models.py:661 .\base\models.py:771 +#: .\base\models.py:657 .\base\models.py:767 msgid "Permanent Request" msgstr "" -#: .\base\models.py:665 .\base\models.py:774 +#: .\base\models.py:661 .\base\models.py:770 #: .\base\templates\shift_request\htmx\group_by.html:136 -#: .\base\templates\shift_request\htmx\requests.html:125 +#: .\base\templates\shift_request\htmx\requests.html:123 #: .\base\templates\shift_request\shift_request_export.html:91 #: .\base\templates\shift_request\shift_request_nav.html:159 #: .\base\templates\work_type_request\htmx\group_by.html:136 -#: .\base\templates\work_type_request\htmx\requests.html:126 +#: .\base\templates\work_type_request\htmx\requests.html:124 #: .\base\templates\work_type_request\work_type_request_export.html:91 #: .\base\templates\work_type_request\work_type_request_nav.html:125 #: .\employee\templates\tabs\shift-tab.html:265 @@ -4790,115 +4989,178 @@ msgstr "" msgid "Canceled" msgstr "" -#: .\base\models.py:675 +#: .\base\models.py:671 #: .\base\templates\work_type_request\work_type_request_export.html:78 #: .\base\templates\work_type_request\work_type_request_nav.html:112 -#: .\base\templates\work_type_request\work_type_request_nav.html:300 -#: .\employee\templates\tabs\shift-tab.html:870 .\templates\sidebar.html:296 +#: .\base\templates\work_type_request\work_type_request_nav.html:312 +#: .\employee\templates\tabs\shift-tab.html:870 .\templates\sidebar.html:304 msgid "Work Type Request" msgstr "" -#: .\base\models.py:676 +#: .\base\models.py:672 #: .\base\templates\work_type_request\work_type_request_nav.html:10 msgid "Work Type Requests" msgstr "" -#: .\base\models.py:729 .\base\models.py:799 +#: .\base\models.py:725 .\base\models.py:795 msgid "End date must be greater than or equal to start date" msgstr "" -#: .\base\models.py:733 +#: .\base\models.py:729 msgid "A work type request already exists during this time period." msgstr "" -#: .\base\models.py:753 +#: .\base\models.py:749 msgid "Requesting Shift" msgstr "" -#: .\base\models.py:761 +#: .\base\models.py:757 #: .\base\templates\shift_request\shift_request_export.html:101 #: .\base\templates\shift_request\shift_request_nav.html:173 msgid "Previous Shift" msgstr "" -#: .\base\models.py:784 +#: .\base\models.py:780 #: .\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\sidebar.html:289 +#: .\employee\templates\tabs\shift-tab.html:891 .\templates\sidebar.html:297 msgid "Shift Request" msgstr "" -#: .\base\models.py:785 .\base\templates\shift_request\shift_request_nav.html:9 +#: .\base\models.py:781 .\base\templates\shift_request\shift_request_nav.html:9 msgid "Shift Requests" msgstr "" -#: .\base\models.py:803 .\base\views.py:2417 .\base\views.py:2941 +#: .\base\models.py:799 .\base\views.py:2420 .\base\views.py:2944 msgid "A shift request already exists during this time period." msgstr "" -#: .\base\models.py:869 .\base\templates\email_config.html:13 +#: .\base\models.py:867 .\base\templates\email_config.html:13 msgid "Email Host" msgstr "" -#: .\base\models.py:872 .\base\templates\email_config.html:17 +#: .\base\models.py:870 .\base\templates\email_config.html:17 msgid "Email Port" msgstr "" -#: .\base\models.py:875 +#: .\base\models.py:873 msgid "Default From Email" msgstr "" -#: .\base\models.py:882 +#: .\base\models.py:880 msgid "Email Host Username" msgstr "" -#: .\base\models.py:889 +#: .\base\models.py:887 msgid "Email Authentication Password" msgstr "" -#: .\base\models.py:892 +#: .\base\models.py:890 msgid "Use TLS" msgstr "" -#: .\base\models.py:894 +#: .\base\models.py:892 msgid "Use SSL" msgstr "" -#: .\base\models.py:896 +#: .\base\models.py:894 msgid "Fail Silently" msgstr "" -#: .\base\models.py:899 +#: .\base\models.py:897 msgid "Email Send Timeout (seconds)" msgstr "" -#: .\base\models.py:909 +#: .\base\models.py:907 msgid "" "\"Use TLS\" and \"Use SSL\" are mutually exclusive, so only set one of those " "settings to True." msgstr "" -#: .\base\models.py:933 .\base\templates\email_config.html:8 +#: .\base\models.py:931 .\base\templates\email_config.html:8 msgid "Email Configuration" msgstr "" +#: .\base\models.py:936 +msgid "Leave Requested Days" +msgstr "" + +#: .\base\models.py:963 +#: .\leave\templates\leave\leave_request\penalty\create.html:12 +msgid "Condition Value" +msgstr "" + +#: .\base\models.py:969 +msgid "Starting Value" +msgstr "" + +#: .\base\models.py:975 +msgid "Ending Value" +msgstr "" + +#: .\base\models.py:991 +msgid "A condition with the provided fields already exists" +msgstr "" + +#: .\base\models.py:999 +msgid "Please enter a numeric value for condition value" +msgstr "" + +#: .\base\models.py:1009 +msgid "" +"Please enter a valid numeric value for the condition value when the " +"condition field is Leave Requested Days." +msgstr "" + +#: .\base\models.py:1018 +msgid "Please specify condition value range" +msgstr "" + +#: .\base\models.py:1028 +msgid "" +"Please enter a valid numeric value for the starting value when the condition " +"field is Leave Requested Days." +msgstr "" + +#: .\base\models.py:1038 +msgid "" +"Please enter a valid numeric value for the ending value when the condition " +"field is Leave Requested Days." +msgstr "" + +#: .\base\models.py:1047 +msgid "End value must be different from the start value in a range." +msgstr "" + +#: .\base\models.py:1055 +msgid "End value must be greater than the start value in a range." +msgstr "" + +#: .\base\templates\base\audit_tag\audit_tag_view.html:7 +msgid "Highlight" +msgstr "" + +#: .\base\templates\base\audit_tag\audit_tag_view.html:42 +msgid "Are you sure you want to delete this audit tag ?" +msgstr "" + #: .\base\templates\base\auth\group_accordion.html:20 -#: .\base\templates\base\auth\group_accordion.html:84 +#: .\base\templates\base\auth\group_accordion.html:92 msgid "Group Permissions" msgstr "" -#: .\base\templates\base\auth\group_accordion.html:48 +#: .\base\templates\base\auth\group_accordion.html:50 #: .\employee\templates\tabs\group_permissions.html:24 msgid "Total" msgstr "" -#: .\base\templates\base\auth\group_accordion.html:48 +#: .\base\templates\base\auth\group_accordion.html:50 #: .\employee\templates\tabs\group_permissions.html:24 msgid "users in this group" msgstr "" -#: .\base\templates\base\auth\group_accordion.html:112 +#: .\base\templates\base\auth\group_accordion.html:120 msgid "Group Assign" msgstr "" @@ -4908,7 +5170,7 @@ msgid "Group" msgstr "" #: .\base\templates\base\auth\group_assign_view.html:9 -#: .\employee\templates\employee_filters.html:83 +#: .\employee\templates\employee_filters.html:87 msgid "Groups" msgstr "" @@ -4937,10 +5199,10 @@ msgstr "" #: .\base\templates\base\auth\group_view.html:11 #: .\base\templates\base\auth\group_view.html:39 #: .\base\templates\base\auth\permission_accordion.html:8 -#: .\base\templates\base\auth\permission_accordion.html:67 +#: .\base\templates\base\auth\permission_accordion.html:71 #: .\base\templates\base\auth\permission_view.html:11 #: .\base\templates\base\auth\permission_view.html:29 -#: .\employee\templates\employee_filters.html:94 +#: .\employee\templates\employee_filters.html:98 msgid "Permissions" msgstr "" @@ -4988,7 +5250,7 @@ msgstr "" msgid "Forgot password" msgstr "" -#: .\base\templates\base\auth\permission_accordion.html:23 +#: .\base\templates\base\auth\permission_accordion.html:24 #: .\base\templates\base\rotating_shift\rotating_shift_assign_nav.html:171 #: .\base\templates\base\rotating_work_type\rotating_work_type_assign_nav.html:172 #: .\leave\templates\leave\leave_assign\assign_view.html:260 @@ -4996,11 +5258,11 @@ msgstr "" msgid "Assign" msgstr "" -#: .\base\templates\base\company\company.html:33 +#: .\base\templates\base\company\company.html:35 msgid "Create Company" msgstr "" -#: .\base\templates\base\company\company.html:53 +#: .\base\templates\base\company\company.html:55 msgid "Update Company" msgstr "" @@ -5016,7 +5278,7 @@ msgstr "" #: .\employee\templates\tabs\personal-tab.html:32 .\onboarding\forms.py:271 #: .\onboarding\templates\onboarding\employee_bank_details.html:93 #: .\onboarding\templates\onboarding\employee_creation.html:79 -#: .\recruitment\forms.py:325 .\recruitment\models.py:276 +#: .\recruitment\forms.py:330 .\recruitment\models.py:276 #: .\recruitment\templates\candidate\application_form.html:228 #: .\recruitment\templates\candidate\candidate_create_form.html:118 #: .\recruitment\templates\candidate\individual.html:222 @@ -5033,10 +5295,10 @@ msgstr "" #: .\employee\templates\employee_export_filter.html:40 #: .\employee\templates\employee_filters.html:18 #: .\employee\templates\tabs\personal-tab.html:39 -#: .\employee\templates\tabs\personal-tab.html:376 .\onboarding\forms.py:272 +#: .\employee\templates\tabs\personal-tab.html:393 .\onboarding\forms.py:272 #: .\onboarding\templates\onboarding\employee_bank_details.html:100 #: .\onboarding\templates\onboarding\employee_creation.html:86 -#: .\payroll\forms\component_forms.py:265 .\payroll\models\models.py:602 +#: .\payroll\forms\component_forms.py:265 .\payroll\models\models.py:605 #: .\recruitment\models.py:278 #: .\recruitment\templates\candidate\application_form.html:243 #: .\recruitment\templates\candidate\candidate_create_form.html:128 @@ -5056,7 +5318,7 @@ msgstr "" #: .\employee\templates\tabs\personal-tab.html:46 .\onboarding\forms.py:273 #: .\onboarding\templates\onboarding\employee_bank_details.html:109 #: .\onboarding\templates\onboarding\employee_creation.html:95 -#: .\payroll\forms\component_forms.py:266 .\payroll\models\models.py:603 +#: .\payroll\forms\component_forms.py:266 .\payroll\models\models.py:606 #: .\recruitment\models.py:282 #: .\recruitment\templates\candidate\application_form.html:258 #: .\recruitment\templates\candidate\candidate_create_form.html:143 @@ -5083,7 +5345,7 @@ msgstr "" #: .\base\templates\base\company\company_form.html:49 #: .\base\templates\base\company\company_view.html:12 .\onboarding\forms.py:274 #: .\onboarding\templates\onboarding\employee_creation.html:104 -#: .\recruitment\forms.py:326 +#: .\recruitment\forms.py:331 msgid "Zip" msgstr "" @@ -5105,121 +5367,132 @@ msgstr "" msgid "Date Format" msgstr "" -#: .\base\templates\base\company\date.html:10 +#: .\base\templates\base\company\date.html:11 msgid "Select Date Format:" msgstr "" -#: .\base\templates\base\company\date.html:13 -#: .\base\templates\base\company\date.html:68 +#: .\base\templates\base\company\date.html:14 +#: .\base\templates\base\company\date.html:75 msgid "Day, Month, Year (e.g., 30-12-2023)" msgstr "" -#: .\base\templates\base\company\date.html:14 -#: .\base\templates\base\company\date.html:69 +#: .\base\templates\base\company\date.html:15 +#: .\base\templates\base\company\date.html:76 msgid "Day, Month, Year (e.g., 30.12.2023)" msgstr "" -#: .\base\templates\base\company\date.html:15 -#: .\base\templates\base\company\date.html:70 +#: .\base\templates\base\company\date.html:16 +#: .\base\templates\base\company\date.html:77 msgid "Day, Month, Year (e.g., 30/12/2023)" msgstr "" -#: .\base\templates\base\company\date.html:16 -#: .\base\templates\base\company\date.html:71 +#: .\base\templates\base\company\date.html:17 +#: .\base\templates\base\company\date.html:78 msgid "Month, Day, Year (e.g., 12/30/2023)" msgstr "" -#: .\base\templates\base\company\date.html:17 -#: .\base\templates\base\company\date.html:72 +#: .\base\templates\base\company\date.html:18 +#: .\base\templates\base\company\date.html:79 msgid "Year, Month, Day (e.g., 2023-12-30)" msgstr "" -#: .\base\templates\base\company\date.html:18 -#: .\base\templates\base\company\date.html:73 +#: .\base\templates\base\company\date.html:19 +#: .\base\templates\base\company\date.html:80 msgid "Year, Month, Day (e.g., 2023/12/30)" msgstr "" -#: .\base\templates\base\company\date.html:19 -#: .\base\templates\base\company\date.html:74 +#: .\base\templates\base\company\date.html:20 +#: .\base\templates\base\company\date.html:81 msgid "Full Month Name, Day, Year (e.g., January 1, 2023)" msgstr "" -#: .\base\templates\base\company\date.html:20 -#: .\base\templates\base\company\date.html:75 +#: .\base\templates\base\company\date.html:21 +#: .\base\templates\base\company\date.html:82 msgid "Day, Full Month Name, Year (e.g., 1 January, 2023)" msgstr "" -#: .\base\templates\base\company\date.html:21 -#: .\base\templates\base\company\date.html:76 +#: .\base\templates\base\company\date.html:22 +#: .\base\templates\base\company\date.html:83 msgid "Abbreviated Month Name, Day, Year (e.g., Jan. 1, 2023)" msgstr "" -#: .\base\templates\base\company\date.html:22 -#: .\base\templates\base\company\date.html:77 +#: .\base\templates\base\company\date.html:23 +#: .\base\templates\base\company\date.html:84 msgid "Day, Abbreviated Month Name, Year (e.g., 1 Jan. 2023)" msgstr "" -#: .\base\templates\base\company\date.html:23 -#: .\base\templates\base\company\date.html:78 +#: .\base\templates\base\company\date.html:24 +#: .\base\templates\base\company\date.html:85 msgid "" "Full Day Name, Full Month Name, Day, Year (e.g., Monday, January 1, 2023)" msgstr "" -#: .\base\templates\base\company\date.html:29 +#: .\base\templates\base\company\date.html:30 msgid "Save Date Format" msgstr "" -#: .\base\templates\base\company\date.html:32 +#: .\base\templates\base\company\date.html:35 msgid "Current Date Format" msgstr "" -#: .\base\templates\base\company\date.html:39 +#: .\base\templates\base\company\date.html:42 msgid "Time Format" msgstr "" -#: .\base\templates\base\company\date.html:42 +#: .\base\templates\base\company\date.html:47 msgid "Select Time Format:" msgstr "" -#: .\base\templates\base\company\date.html:45 -#: .\base\templates\base\company\date.html:93 +#: .\base\templates\base\company\date.html:50 +#: .\base\templates\base\company\date.html:100 msgid "12 Hr. (e.g., 06:00 AM or 06:00 PM)" msgstr "" -#: .\base\templates\base\company\date.html:46 -#: .\base\templates\base\company\date.html:94 +#: .\base\templates\base\company\date.html:51 +#: .\base\templates\base\company\date.html:101 msgid "24 Hr. (e.g., 06:00 or 18:00)" msgstr "" -#: .\base\templates\base\company\date.html:51 +#: .\base\templates\base\company\date.html:56 msgid "Save Time Format" msgstr "" -#: .\base\templates\base\company\date.html:54 +#: .\base\templates\base\company\date.html:61 msgid "Current Time Format" msgstr "" #: .\base\templates\base\company\payroll_settings.html:6 #: .\payroll\templates\payroll\settings\payroll_settings.html:6 -#: .\templates\settings.html:172 +#: .\templates\settings.html:225 msgid "Currency" msgstr "" -#: .\base\templates\base\department\department.html:36 +#: .\base\templates\base\department\department.html:38 msgid "Create Department" msgstr "" -#: .\base\templates\base\department\department.html:56 +#: .\base\templates\base\department\department.html:58 #, fuzzy #| msgid "department-update" msgid "Department Update" msgstr "Update" -#: .\base\templates\base\department\department_view.html:32 +#: .\base\templates\base\department\department_view.html:35 msgid "Are you sure you want to delete this department?" msgstr "" -#: .\base\templates\base\employee_type\type_view.html:31 +#: .\base\templates\base\employee_tag\employee_tag_view.html:7 +#: .\base\templates\base\tags\tags_view.html:7 +#: .\leave\templates\leave\leave_type\leave_type_creation.html:52 +#: .\leave\templates\leave\leave_type\leave_type_update.html:46 +msgid "Color" +msgstr "" + +#: .\base\templates\base\employee_tag\employee_tag_view.html:46 +msgid "Are you sure you want to delete this employee tag ?" +msgstr "" + +#: .\base\templates\base\employee_type\type_view.html:32 msgid "Are you sure you want to delete this employee type?" msgstr "" @@ -5235,8 +5508,8 @@ msgstr "" msgid "Mail Servers" msgstr "" -#: .\base\templates\base\mail_server\mail_server.html:33 -#: .\templates\settings.html:188 +#: .\base\templates\base\mail_server\mail_server.html:35 +#: .\templates\settings.html:247 msgid "Mail Server" msgstr "" @@ -5297,77 +5570,79 @@ msgstr "" #: .\employee\templates\employee\create_form\personal_info.html:183 #: .\employee\templates\employee\profile\personal_info.html:139 #: .\employee\templates\employee\update_form\personal_info.html:162 -#: .\employee\templates\employee_filters.html:87 +#: .\employee\templates\employee_filters.html:91 #: .\helpdesk\templates\helpdesk\ticket\ticket_filter.html:111 -#: .\recruitment\models.py:299 +#: .\recruitment\models.py:299 .\recruitment\models.py:525 +#: .\recruitment\models.py:565 #: .\recruitment\templates\candidate\candidate_create_form.html:181 #: .\recruitment\templates\candidate\export_filter.html:144 #: .\recruitment\templates\candidate\filters.html:130 #: .\recruitment\templates\recruitment\filters.html:47 +#: .\recruitment\templates\skill_zone\skill_zone_nav.html:75 #: .\recruitment\templates\stage\stage_form.html:30 #: .\recruitment\templates\stage\stage_update_form.html:40 msgid "Is Active" msgstr "" #: .\base\templates\base\rotating_shift\htmx\group_by.html:11 -#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:11 +#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:10 #: .\base\templates\shift_request\htmx\group_by.html:9 -#: .\base\templates\shift_request\htmx\requests.html:12 +#: .\base\templates\shift_request\htmx\requests.html:11 msgid "Select All Shifts" msgstr "" #: .\base\templates\base\rotating_shift\htmx\group_by.html:18 -#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:18 +#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:17 #: .\base\templates\shift_request\htmx\group_by.html:16 -#: .\base\templates\shift_request\htmx\requests.html:19 +#: .\base\templates\shift_request\htmx\requests.html:18 msgid "Unselect All Shifts" msgstr "" #: .\base\templates\base\rotating_shift\htmx\group_by.html:26 -#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:26 +#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:24 #: .\base\templates\shift_request\htmx\group_by.html:24 -#: .\base\templates\shift_request\htmx\requests.html:27 +#: .\base\templates\shift_request\htmx\requests.html:25 msgid "Export Shifts" msgstr "" #: .\base\templates\base\rotating_shift\htmx\group_by.html:66 -#: .\base\templates\base\rotating_shift\individual_view.html:55 -#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:50 +#: .\base\templates\base\rotating_shift\individual_view.html:56 +#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:48 #: .\base\templates\base\rotating_work_type\htmx\group_by.html:65 -#: .\base\templates\base\rotating_work_type\individual_view.html:53 -#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:48 +#: .\base\templates\base\rotating_work_type\individual_view.html:54 +#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:46 #: .\employee\templates\tabs\shift-tab.html:305 #: .\employee\templates\tabs\shift-tab.html:447 msgid "Rotate" msgstr "" #: .\base\templates\base\rotating_shift\htmx\group_by.html:103 -#: .\base\templates\base\rotating_shift\individual_view.html:58 -#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:87 +#: .\base\templates\base\rotating_shift\individual_view.html:59 +#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:85 #: .\base\templates\base\rotating_work_type\htmx\group_by.html:104 -#: .\base\templates\base\rotating_work_type\individual_view.html:56 -#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:87 +#: .\base\templates\base\rotating_work_type\individual_view.html:57 +#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:85 #: .\employee\templates\tabs\shift-tab.html:356 #: .\employee\templates\tabs\shift-tab.html:500 msgid "Rotate after" msgstr "" #: .\base\templates\base\rotating_shift\htmx\group_by.html:103 -#: .\base\templates\base\rotating_shift\individual_view.html:58 -#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:87 +#: .\base\templates\base\rotating_shift\individual_view.html:59 +#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:85 #: .\base\templates\base\rotating_work_type\htmx\group_by.html:104 -#: .\base\templates\base\rotating_work_type\individual_view.html:56 -#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:87 +#: .\base\templates\base\rotating_work_type\individual_view.html:57 +#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:85 #: .\employee\templates\tabs\shift-tab.html:356 msgid "days" msgstr "" #: .\base\templates\base\rotating_shift\htmx\group_by.html:105 -#: .\base\templates\base\rotating_shift\individual_view.html:60 -#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:89 +#: .\base\templates\base\rotating_shift\individual_view.html:61 +#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:87 #: .\base\templates\base\rotating_work_type\htmx\group_by.html:106 -#: .\base\templates\base\rotating_work_type\individual_view.html:58 -#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:89 +#: .\base\templates\base\rotating_work_type\individual_view.html:59 +#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:87 #: .\employee\templates\tabs\shift-tab.html:358 #: .\employee\templates\tabs\shift-tab.html:502 msgid "Weekly every" @@ -5377,26 +5652,26 @@ msgstr "" #: .\base\templates\base\rotating_shift\htmx\group_by.html:110 #: .\base\templates\base\rotating_shift\htmx\group_by.html:112 #: .\base\templates\base\rotating_shift\htmx\group_by.html:116 -#: .\base\templates\base\rotating_shift\individual_view.html:63 -#: .\base\templates\base\rotating_shift\individual_view.html:65 -#: .\base\templates\base\rotating_shift\individual_view.html:67 -#: .\base\templates\base\rotating_shift\individual_view.html:71 +#: .\base\templates\base\rotating_shift\individual_view.html:64 +#: .\base\templates\base\rotating_shift\individual_view.html:66 +#: .\base\templates\base\rotating_shift\individual_view.html:68 +#: .\base\templates\base\rotating_shift\individual_view.html:72 +#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:90 #: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:92 #: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:94 -#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:96 -#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:100 +#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:98 #: .\base\templates\base\rotating_work_type\htmx\group_by.html:109 #: .\base\templates\base\rotating_work_type\htmx\group_by.html:111 #: .\base\templates\base\rotating_work_type\htmx\group_by.html:113 #: .\base\templates\base\rotating_work_type\htmx\group_by.html:117 -#: .\base\templates\base\rotating_work_type\individual_view.html:61 -#: .\base\templates\base\rotating_work_type\individual_view.html:63 -#: .\base\templates\base\rotating_work_type\individual_view.html:65 -#: .\base\templates\base\rotating_work_type\individual_view.html:69 +#: .\base\templates\base\rotating_work_type\individual_view.html:62 +#: .\base\templates\base\rotating_work_type\individual_view.html:64 +#: .\base\templates\base\rotating_work_type\individual_view.html:66 +#: .\base\templates\base\rotating_work_type\individual_view.html:70 +#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:90 #: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:92 #: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:94 -#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:96 -#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:100 +#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:98 #: .\base\translator.py:98 .\employee\templates\tabs\shift-tab.html:507 msgid "Rotate every" msgstr "" @@ -5409,34 +5684,34 @@ msgid "day of month" msgstr "" #: .\base\templates\base\rotating_shift\htmx\group_by.html:114 -#: .\base\templates\base\rotating_shift\individual_view.html:69 -#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:98 +#: .\base\templates\base\rotating_shift\individual_view.html:70 +#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:96 #: .\base\templates\base\rotating_work_type\htmx\group_by.html:115 -#: .\base\templates\base\rotating_work_type\individual_view.html:67 -#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:98 +#: .\base\templates\base\rotating_work_type\individual_view.html:68 +#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:96 #: .\employee\templates\tabs\shift-tab.html:367 msgid "Rotate every last day of month" msgstr "" #: .\base\templates\base\rotating_shift\htmx\group_by.html:142 -#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:126 +#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:124 msgid "Do you Want to archive this rotating shift assign?" msgstr "" #: .\base\templates\base\rotating_shift\htmx\group_by.html:143 -#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:127 +#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:125 #: .\base\templates\base\rotating_work_type\htmx\group_by.html:144 -#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:127 +#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:125 #: .\base\translator.py:184 msgid "False" msgstr "" #: .\base\templates\base\rotating_shift\htmx\group_by.html:144 #: .\base\templates\base\rotating_shift\rotating_shift_assign_nav.html:133 -#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:128 +#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:126 #: .\base\templates\base\rotating_work_type\htmx\group_by.html:143 #: .\base\templates\base\rotating_work_type\rotating_work_type_assign_nav.html:133 -#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:126 +#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:124 #: .\employee\templates\employee_nav.html:359 #: .\employee\templates\employee_personal_info\employee_card.html:71 #: .\employee\templates\employee_personal_info\employee_list.html:211 @@ -5460,20 +5735,24 @@ msgstr "" #: .\recruitment\templates\candidate\candidate_card.html:68 #: .\recruitment\templates\candidate\candidate_nav.html:187 #: .\recruitment\templates\pipeline\pipeline_card.html:284 +#: .\recruitment\templates\skill_zone\skill_zone_card.html:47 +#: .\recruitment\templates\skill_zone\skill_zone_list.html:40 +#: .\recruitment\templates\skill_zone\skill_zone_nav.html:100 +#: .\recruitment\templates\skill_zone_cand\skill_zone_cand_card.html:69 msgid "Archive" msgstr "" #: .\base\templates\base\rotating_shift\htmx\group_by.html:149 -#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:133 +#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:131 msgid "Do you Want to un-archive this rotating shift assign?" msgstr "" #: .\base\templates\base\rotating_shift\htmx\group_by.html:150 #: .\base\templates\base\rotating_shift\rotating_shift_assign_nav.html:143 -#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:134 +#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:132 #: .\base\templates\base\rotating_work_type\htmx\group_by.html:150 #: .\base\templates\base\rotating_work_type\rotating_work_type_assign_nav.html:143 -#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:133 +#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:131 #: .\employee\templates\employee_nav.html:364 #: .\employee\templates\employee_personal_info\employee_card.html:75 #: .\employee\templates\employee_personal_info\employee_list.html:222 @@ -5482,51 +5761,54 @@ msgstr "" #: .\pms\templates\okr\objective_list_view.html:255 #: .\recruitment\templates\candidate\candidate_card.html:72 #: .\recruitment\templates\candidate\candidate_nav.html:197 +#: .\recruitment\templates\skill_zone\skill_zone_list.html:54 +#: .\recruitment\templates\skill_zone\skill_zone_nav.html:109 +#: .\recruitment\templates\skill_zone_cand\skill_zone_cand_card.html:73 msgid "Un-Archive" msgstr "" #: .\base\templates\base\rotating_shift\htmx\group_by.html:159 -#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:143 +#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:141 #: .\employee\templates\tabs\shift-tab.html:398 msgid "Are you sure you want to delete this rotating shift assign?" msgstr "" -#: .\base\templates\base\rotating_shift\individual_view.html:63 -#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:92 +#: .\base\templates\base\rotating_shift\individual_view.html:64 +#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:90 #: .\base\templates\base\rotating_work_type\htmx\group_by.html:109 -#: .\base\templates\base\rotating_work_type\individual_view.html:61 -#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:92 +#: .\base\templates\base\rotating_work_type\individual_view.html:62 +#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:90 msgid "st day of month" msgstr "" -#: .\base\templates\base\rotating_shift\individual_view.html:65 -#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:94 +#: .\base\templates\base\rotating_shift\individual_view.html:66 +#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:92 #: .\base\templates\base\rotating_work_type\htmx\group_by.html:111 -#: .\base\templates\base\rotating_work_type\individual_view.html:63 -#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:94 +#: .\base\templates\base\rotating_work_type\individual_view.html:64 +#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:92 msgid "nd day of month" msgstr "" -#: .\base\templates\base\rotating_shift\individual_view.html:67 -#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:96 +#: .\base\templates\base\rotating_shift\individual_view.html:68 +#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:94 #: .\base\templates\base\rotating_work_type\htmx\group_by.html:113 -#: .\base\templates\base\rotating_work_type\individual_view.html:65 -#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:96 +#: .\base\templates\base\rotating_work_type\individual_view.html:66 +#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:94 #: .\employee\templates\tabs\shift-tab.html:365 #: .\employee\templates\tabs\shift-tab.html:509 msgid "rd day of month" msgstr "" -#: .\base\templates\base\rotating_shift\individual_view.html:71 -#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:100 +#: .\base\templates\base\rotating_shift\individual_view.html:72 +#: .\base\templates\base\rotating_shift\rotating_shift_assign_view.html:98 #: .\base\templates\base\rotating_work_type\htmx\group_by.html:117 -#: .\base\templates\base\rotating_work_type\individual_view.html:69 -#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:100 +#: .\base\templates\base\rotating_work_type\individual_view.html:70 +#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:98 msgid "th day of month" msgstr "" -#: .\base\templates\base\rotating_shift\individual_view.html:96 -#: .\base\templates\base\rotating_work_type\individual_view.html:94 +#: .\base\templates\base\rotating_shift\individual_view.html:97 +#: .\base\templates\base\rotating_work_type\individual_view.html:95 msgid "Next Change Date" msgstr "" @@ -5535,11 +5817,6 @@ msgstr "" msgid "Rotating Shift Assign Update" msgstr "" -#: .\base\templates\base\rotating_shift\rotating_shift_assign.html:66 -#: .\base\templates\base\rotating_work_type\rotating_work_type_assign.html:78 -msgid "Detail" -msgstr "" - #: .\base\templates\base\rotating_shift\rotating_shift_assign.html:79 #: .\base\templates\shift_request\shift_request_view.html:8 msgid "Selected Shifts" @@ -5555,43 +5832,43 @@ msgstr "" msgid "Export Rotating Shift Assigns" msgstr "Rotating Shift Assigns" -#: .\base\templates\base\rotating_shift\rotating_shift_view.html:36 +#: .\base\templates\base\rotating_shift\rotating_shift_view.html:37 msgid "Are you sure you want to delete this rotating shift?" msgstr "" #: .\base\templates\base\rotating_work_type\htmx\group_by.html:9 -#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:11 +#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:10 #: .\base\templates\work_type_request\htmx\group_by.html:9 -#: .\base\templates\work_type_request\htmx\requests.html:12 +#: .\base\templates\work_type_request\htmx\requests.html:11 msgid "Select All Worktypes" msgstr "" #: .\base\templates\base\rotating_work_type\htmx\group_by.html:16 -#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:18 +#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:17 #: .\base\templates\work_type_request\htmx\group_by.html:16 -#: .\base\templates\work_type_request\htmx\requests.html:19 +#: .\base\templates\work_type_request\htmx\requests.html:18 msgid "Unselect All Worktypes" msgstr "" #: .\base\templates\base\rotating_work_type\htmx\group_by.html:24 -#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:26 +#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:24 #: .\base\templates\work_type_request\htmx\group_by.html:24 -#: .\base\templates\work_type_request\htmx\requests.html:27 +#: .\base\templates\work_type_request\htmx\requests.html:25 msgid "Export Worktypes" msgstr "" #: .\base\templates\base\rotating_work_type\htmx\group_by.html:142 -#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:125 +#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:123 msgid "Do you Want to archive this rotating work type assign?" msgstr "" #: .\base\templates\base\rotating_work_type\htmx\group_by.html:149 -#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:132 +#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:130 msgid "Do you Want to un-archive this rotating work type assign?" msgstr "" #: .\base\templates\base\rotating_work_type\htmx\group_by.html:159 -#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:142 +#: .\base\templates\base\rotating_work_type\rotating_work_type_assign_view.html:140 #: .\employee\templates\tabs\shift-tab.html:545 msgid "Are you sure you want to delete this rotating work type assign?" msgstr "" @@ -5616,7 +5893,7 @@ msgstr "" msgid "Export Rotating Work Type Assigns" msgstr "Rotating Work Type Assigns" -#: .\base\templates\base\rotating_work_type\rotating_work_type_view.html:37 +#: .\base\templates\base\rotating_work_type\rotating_work_type_view.html:40 msgid "Are you sure you want to delete this rotating work type?" msgstr "" @@ -5626,7 +5903,7 @@ msgstr "" #: .\base\templates\base\shift\schedule_form.html:23 #: .\base\templates\base\shift\schedule_view.html:11 -#: .\leave\templates\leave\leave_request\one_request_view.html:46 +#: .\leave\templates\leave\leave_request\one_request_view.html:47 #: .\leave\templates\leave\user_leave\user_request_one.html:46 msgid "Days" msgstr "" @@ -5664,61 +5941,74 @@ msgstr "" msgid "Weekly Full Time" msgstr "" -#: .\base\templates\base\shift\shift_view.html:35 +#: .\base\templates\base\shift\shift_view.html:38 msgid "Are you sure you want to delete this shift?" msgstr "" -#: .\base\templates\base\tags\tags.html:7 -#: .\helpdesk\templates\helpdesk\faq\faq_nav.html:66 -#: .\helpdesk\templates\helpdesk\ticket\forms\add_tag.html:13 -#: .\helpdesk\templates\helpdesk\ticket\ticket_filter.html:103 -#: .\helpdesk\templates\helpdesk\ticket\ticket_group.html:49 -#: .\helpdesk\templates\helpdesk\ticket\ticket_group.html:270 -#: .\helpdesk\templates\helpdesk\ticket\ticket_group.html:490 -#: .\helpdesk\templates\helpdesk\ticket\ticket_list.html:26 -#: .\helpdesk\templates\helpdesk\ticket\ticket_list.html:221 -#: .\helpdesk\templates\helpdesk\ticket\ticket_list.html:439 -#: .\templates\settings.html:140 -msgid "Tags" +#: .\base\templates\base\tags\tags.html:10 +#, fuzzy +#| msgid "employee" +msgid "Employee Tags" +msgstr "Employee" + +#: .\base\templates\base\tags\tags.html:41 +#, fuzzy +#| msgid "employee" +msgid "Create Employee Tag" +msgstr "Employee" + +#: .\base\templates\base\tags\tags.html:62 +#, fuzzy +#| msgid "employee-bulk-update" +msgid "Employee Tag Update" +msgstr "Bulk Update" + +#: .\base\templates\base\tags\tags.html:80 +#, fuzzy +#| msgid "helpdesk" +msgid "Helpdesk Tags" +msgstr "Help Desk" + +#: .\base\templates\base\tags\tags.html:111 +msgid "Create Helpdesk Tag" msgstr "" -#: .\base\templates\base\tags\tags.html:37 -#: .\helpdesk\templates\helpdesk\faq\faq_list_view.html:90 -#: .\helpdesk\templates\helpdesk\ticket\forms\add_tag.html:36 -#: .\helpdesk\templates\helpdesk\ticket\forms\add_tag.html:460 -#: .\helpdesk\templates\helpdesk\ticket\ticket_detail.html:431 -msgid "Create Tag" -msgstr "" - -#: .\base\templates\base\tags\tags.html:58 +#: .\base\templates\base\tags\tags.html:132 #, fuzzy #| msgid "type-update" -msgid "Tag Update" +msgid "Helpdesk Tag Update" msgstr "Update" -#: .\base\templates\base\tags\tags_view.html:7 -#: .\leave\templates\leave\leave_type\leave_type_creation.html:52 -#: .\leave\templates\leave\leave_type\leave_type_update.html:46 -msgid "Color" +#: .\base\templates\base\tags\tags.html:149 +msgid "Audit Tags" msgstr "" -#: .\base\templates\base\tags\tags_view.html:43 -#: .\base\templates\base\ticket_type\ticket_type_view.html:37 -msgid "Are you sure you want to delete this ticket type?" +#: .\base\templates\base\tags\tags.html:180 +msgid "Create Audit Tag" +msgstr "" + +#: .\base\templates\base\tags\tags.html:201 +#, fuzzy +#| msgid "type-update" +msgid "Audit Tag Update" +msgstr "Update" + +#: .\base\templates\base\tags\tags_view.html:46 +msgid "Are you sure you want to delete this tag ?" msgstr "" #: .\base\templates\base\ticket_type\ticket_type.html:7 #: .\base\templates\base\ticket_type\ticket_type_view.html:6 #: .\helpdesk\templates\helpdesk\ticket\ticket_filter.html:68 -#: .\templates\settings.html:132 +#: .\templates\settings.html:159 msgid "Ticket Type" msgstr "" -#: .\base\templates\base\ticket_type\ticket_type.html:37 +#: .\base\templates\base\ticket_type\ticket_type.html:39 msgid "Create Ticket Type" msgstr "" -#: .\base\templates\base\ticket_type\ticket_type.html:58 +#: .\base\templates\base\ticket_type\ticket_type.html:60 #, fuzzy #| msgid "type-update" msgid "Ticket Type Update" @@ -5728,7 +6018,12 @@ msgstr "Update" msgid "Prefix" msgstr "" -#: .\base\templates\base\work_type\work_type_view.html:31 +#: .\base\templates\base\ticket_type\ticket_type_view.html:40 +#: .\helpdesk\templates\department_managers\department_managers_view.html:40 +msgid "Are you sure you want to delete this ticket type?" +msgstr "" + +#: .\base\templates\base\work_type\work_type_view.html:34 msgid "Are you sure you want to delete this work type?" msgstr "" @@ -5757,7 +6052,7 @@ msgid "No shift requests have been created yet." msgstr "" #: .\base\templates\shift_request\htmx\group_by.html:63 -#: .\base\templates\shift_request\htmx\requests.html:47 +#: .\base\templates\shift_request\htmx\requests.html:45 #: .\base\templates\shift_request\shift_request_export.html:97 #: .\base\templates\shift_request\shift_request_nav.html:167 #: .\employee\templates\tabs\shift-tab.html:595 @@ -5765,59 +6060,59 @@ msgid "Requested Shift" msgstr "" #: .\base\templates\shift_request\htmx\group_by.html:64 -#: .\base\templates\shift_request\htmx\requests.html:48 +#: .\base\templates\shift_request\htmx\requests.html:46 #: .\employee\templates\tabs\shift-tab.html:598 msgid "Previous/Current Shift" msgstr "" #: .\base\templates\shift_request\htmx\group_by.html:115 -#: .\base\templates\shift_request\htmx\requests.html:99 -#: .\base\templates\shift_request\htmx\requests.html:104 -#: .\base\templates\shift_request\htmx\shift_request_detail.html:83 -#: .\base\templates\shift_request\htmx\shift_request_detail.html:88 +#: .\base\templates\shift_request\htmx\requests.html:97 +#: .\base\templates\shift_request\htmx\requests.html:102 +#: .\base\templates\shift_request\htmx\shift_request_detail.html:96 +#: .\base\templates\shift_request\htmx\shift_request_detail.html:101 #: .\employee\templates\tabs\shift-tab.html:683 msgid "Are you sure you want to delete this shift request?" msgstr "" #: .\base\templates\shift_request\htmx\group_by.html:127 -#: .\base\templates\shift_request\htmx\requests.html:116 +#: .\base\templates\shift_request\htmx\requests.html:114 #: .\base\templates\work_type_request\htmx\group_by.html:127 -#: .\base\templates\work_type_request\htmx\requests.html:117 +#: .\base\templates\work_type_request\htmx\requests.html:115 #: .\employee\templates\tabs\shift-tab.html:243 #: .\employee\templates\tabs\shift-tab.html:709 msgid "Do you want to approve this request?" msgstr "" #: .\base\templates\shift_request\htmx\group_by.html:134 -#: .\base\templates\shift_request\htmx\requests.html:123 +#: .\base\templates\shift_request\htmx\requests.html:121 #: .\base\templates\work_type_request\htmx\group_by.html:134 -#: .\base\templates\work_type_request\htmx\requests.html:124 +#: .\base\templates\work_type_request\htmx\requests.html:122 #: .\employee\templates\tabs\shift-tab.html:259 #: .\employee\templates\tabs\shift-tab.html:725 msgid "Do you want to cancel this request?" msgstr "" -#: .\base\templates\shift_request\htmx\shift_request_detail.html:37 +#: .\base\templates\shift_request\htmx\shift_request_detail.html:50 msgid "Requested shift" msgstr "" -#: .\base\templates\shift_request\htmx\shift_request_detail.html:41 +#: .\base\templates\shift_request\htmx\shift_request_detail.html:54 #: .\base\translator.py:132 msgid "Previous shift" msgstr "" -#: .\base\templates\shift_request\htmx\shift_request_detail.html:47 -#: .\base\templates\work_type_request\htmx\work_type_request_single_view.html:47 +#: .\base\templates\shift_request\htmx\shift_request_detail.html:60 +#: .\base\templates\work_type_request\htmx\work_type_request_single_view.html:60 #: .\base\translator.py:131 msgid "Requested date" msgstr "" -#: .\base\templates\shift_request\htmx\shift_request_detail.html:51 -#: .\base\templates\work_type_request\htmx\work_type_request_single_view.html:51 +#: .\base\templates\shift_request\htmx\shift_request_detail.html:64 +#: .\base\templates\work_type_request\htmx\work_type_request_single_view.html:64 msgid "Requested till" msgstr "" -#: .\base\templates\shift_request\htmx\shift_request_detail.html:61 +#: .\base\templates\shift_request\htmx\shift_request_detail.html:74 msgid "Is permenent shift" msgstr "" @@ -5825,10 +6120,10 @@ msgstr "" #: .\base\templates\work_type_request\work_type_request.html:15 #: .\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:78 -#: .\employee\templates\employee_personal_info\employee_work_info.html:87 -#: .\employee\templates\employee_personal_info\employee_work_info.html:153 -#: .\employee\templates\employee_personal_info\employee_work_info.html:162 +#: .\employee\templates\employee_personal_info\employee_work_info.html:82 +#: .\employee\templates\employee_personal_info\employee_work_info.html:91 +#: .\employee\templates\employee_personal_info\employee_work_info.html:157 +#: .\employee\templates\employee_personal_info\employee_work_info.html:166 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_reject_form.html:22 #: .\leave\templates\leave\leave_request\cancel_form.html:20 #: .\leave\templates\leave\leave_request\user_cancel_form.html:21 @@ -5849,7 +6144,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:601 .\recruitment\models.py:291 +#: .\payroll\models\models.py:604 .\recruitment\models.py:291 #: .\recruitment\templates\candidate\application_form.html:220 #: .\recruitment\templates\candidate\candidate_create_form.html:112 #: .\recruitment\templates\candidate\export_filter.html:56 @@ -5891,7 +6186,7 @@ msgid "No work type requests have been created yet." msgstr "" #: .\base\templates\work_type_request\htmx\group_by.html:63 -#: .\base\templates\work_type_request\htmx\requests.html:47 +#: .\base\templates\work_type_request\htmx\requests.html:45 #: .\base\templates\work_type_request\work_type_request_export.html:97 #: .\base\templates\work_type_request\work_type_request_nav.html:131 #: .\employee\templates\tabs\shift-tab.html:131 @@ -5899,34 +6194,34 @@ msgid "Requested Work Type" msgstr "" #: .\base\templates\work_type_request\htmx\group_by.html:64 -#: .\base\templates\work_type_request\htmx\requests.html:48 +#: .\base\templates\work_type_request\htmx\requests.html:46 #: .\employee\templates\tabs\shift-tab.html:134 msgid "Previous/Current Work Type" msgstr "" #: .\base\templates\work_type_request\htmx\group_by.html:115 -#: .\base\templates\work_type_request\htmx\requests.html:100 -#: .\base\templates\work_type_request\htmx\requests.html:105 -#: .\base\templates\work_type_request\htmx\work_type_request_single_view.html:77 -#: .\base\templates\work_type_request\htmx\work_type_request_single_view.html:82 +#: .\base\templates\work_type_request\htmx\requests.html:98 +#: .\base\templates\work_type_request\htmx\requests.html:103 +#: .\base\templates\work_type_request\htmx\work_type_request_single_view.html:90 +#: .\base\templates\work_type_request\htmx\work_type_request_single_view.html:95 #: .\employee\templates\tabs\shift-tab.html:217 msgid "Are you sure you want to delete this work type request?" msgstr "" -#: .\base\templates\work_type_request\htmx\work_type_request_single_view.html:37 +#: .\base\templates\work_type_request\htmx\work_type_request_single_view.html:50 msgid "Requested work type" msgstr "" -#: .\base\templates\work_type_request\htmx\work_type_request_single_view.html:41 +#: .\base\templates\work_type_request\htmx\work_type_request_single_view.html:54 #: .\base\translator.py:135 msgid "Previous work type" msgstr "" -#: .\base\templates\work_type_request\htmx\work_type_request_single_view.html:61 +#: .\base\templates\work_type_request\htmx\work_type_request_single_view.html:74 msgid "Is permenent work type" msgstr "" -#: .\base\templates\work_type_request\work_type_request_nav.html:321 +#: .\base\templates\work_type_request\work_type_request_nav.html:333 msgid "Export Work Type Requests" msgstr "" @@ -6247,7 +6542,7 @@ msgstr "" msgid "Pay frequency" msgstr "" -#: .\base\translator.py:82 .\payroll\models\models.py:72 +#: .\base\translator.py:82 .\payroll\models\models.py:75 #: .\payroll\models\tax_models.py:44 msgid "Filing status" msgstr "" @@ -6300,47 +6595,47 @@ msgstr "" msgid "Employment Type" msgstr "" -#: .\base\translator.py:105 .\leave\models.py:31 +#: .\base\translator.py:105 .\leave\models.py:42 msgid "Jan" msgstr "" -#: .\base\translator.py:106 .\leave\models.py:32 +#: .\base\translator.py:106 .\leave\models.py:43 msgid "Feb" msgstr "" -#: .\base\translator.py:107 .\leave\models.py:33 +#: .\base\translator.py:107 .\leave\models.py:44 msgid "Mar" msgstr "" -#: .\base\translator.py:108 .\leave\models.py:34 +#: .\base\translator.py:108 .\leave\models.py:45 msgid "Apr" msgstr "" -#: .\base\translator.py:110 .\leave\models.py:36 +#: .\base\translator.py:110 .\leave\models.py:47 msgid "Jun" msgstr "" -#: .\base\translator.py:111 .\leave\models.py:37 +#: .\base\translator.py:111 .\leave\models.py:48 msgid "Jul" msgstr "" -#: .\base\translator.py:112 .\leave\models.py:38 +#: .\base\translator.py:112 .\leave\models.py:49 msgid "Aug" msgstr "" -#: .\base\translator.py:113 .\leave\models.py:39 +#: .\base\translator.py:113 .\leave\models.py:50 msgid "Sep" msgstr "" -#: .\base\translator.py:114 .\leave\models.py:40 +#: .\base\translator.py:114 .\leave\models.py:51 msgid "Oct" msgstr "" -#: .\base\translator.py:115 .\leave\models.py:41 +#: .\base\translator.py:115 .\leave\models.py:52 msgid "Nov" msgstr "" -#: .\base\translator.py:116 .\leave\models.py:42 +#: .\base\translator.py:116 .\leave\models.py:53 msgid "Dec" msgstr "" @@ -6356,7 +6651,7 @@ msgstr "" msgid "Is active" msgstr "" -#: .\base\translator.py:120 .\payroll\models\models.py:134 +#: .\base\translator.py:120 .\payroll\models\models.py:137 msgid "End date" msgstr "" @@ -6396,7 +6691,7 @@ msgstr "" msgid "Employee last name" msgstr "" -#: .\base\translator.py:130 +#: .\base\translator.py:130 .\payroll\templates\payroll\loan\filter.html:31 msgid "Reporting manager" msgstr "" @@ -6504,7 +6799,7 @@ msgstr "" msgid "In till" msgstr "" -#: .\base\translator.py:161 .\leave\models.py:237 +#: .\base\translator.py:161 .\leave\models.py:248 msgid "Leave type" msgstr "" @@ -6844,10 +7139,6 @@ msgstr "Creation" msgid "pms" msgstr "Performance" -#: .\base\translator.py:249 -msgid "asset" -msgstr "Asset" - #: .\base\translator.py:250 msgid "leave" msgstr "Leave" @@ -6984,391 +7275,403 @@ msgstr "Tags" msgid "mail-server-conf" msgstr "Mail Server" -#: .\base\views.py:161 +#: .\base\translator.py:285 +msgid "configuration" +msgstr "Configuration" + +#: .\base\translator.py:286 +msgid "multiple-approval-condition" +msgstr "Multiple Approval Condition" + +#: .\base\views.py:165 msgid "Invalid username or password." msgstr "" -#: .\base\views.py:164 +#: .\base\views.py:168 msgid "Login Success" msgstr "" -#: .\base\views.py:206 +#: .\base\views.py:210 msgid "No email found." msgstr "" -#: .\base\views.py:230 +#: .\base\views.py:234 #, python-brace-format msgid "Link sended to {recipient}" msgstr "" -#: .\base\views.py:246 +#: .\base\views.py:250 msgid "Password reset success" msgstr "" -#: .\base\views.py:250 +#: .\base\views.py:254 msgid "Link Expired..." msgstr "" -#: .\base\views.py:267 +#: .\base\views.py:271 msgid "Password changed successfully" msgstr "" -#: .\base\views.py:423 +#: .\base\views.py:427 msgid "User group created." msgstr "" -#: .\base\views.py:528 +#: .\base\views.py:532 msgid "User group assigned." msgstr "" -#: .\base\views.py:615 +#: .\base\views.py:619 msgid "User group updated." msgstr "" -#: .\base\views.py:632 +#: .\base\views.py:636 msgid "The {} has been deleted successfully." msgstr "" -#: .\base\views.py:635 +#: .\base\views.py:639 msgid "{} not found." msgstr "" -#: .\base\views.py:644 +#: .\base\views.py:648 msgid "This {} is already in use for {}." msgstr "" -#: .\base\views.py:700 +#: .\base\views.py:704 msgid "Company has been created successfully!" msgstr "" -#: .\base\views.py:736 +#: .\base\views.py:740 msgid "Company updated" msgstr "" -#: .\base\views.py:756 +#: .\base\views.py:760 msgid "Department has been created successfully!" msgstr "" -#: .\base\views.py:797 +#: .\base\views.py:800 msgid "Department updated." msgstr "" -#: .\base\views.py:819 .\base\views.py:839 +#: .\base\views.py:822 .\base\views.py:842 msgid "Job Position has been created successfully!" msgstr "" -#: .\base\views.py:865 +#: .\base\views.py:868 msgid "Job position updated." msgstr "" -#: .\base\views.py:888 +#: .\base\views.py:891 msgid "Job role has been created successfully!" msgstr "" -#: .\base\views.py:929 +#: .\base\views.py:932 msgid "Job role updated." msgstr "" -#: .\base\views.py:957 +#: .\base\views.py:960 msgid "Work Type has been created successfully!" msgstr "" -#: .\base\views.py:998 +#: .\base\views.py:1001 msgid "Work type updated." msgstr "" -#: .\base\views.py:1021 +#: .\base\views.py:1024 msgid "Rotating work type created." msgstr "" -#: .\base\views.py:1062 +#: .\base\views.py:1065 msgid "Rotating work type updated." msgstr "" -#: .\base\views.py:1146 +#: .\base\views.py:1149 msgid "Rotating work type assigned." msgstr "" -#: .\base\views.py:1246 +#: .\base\views.py:1249 msgid "Rotating work type assign updated." msgstr "" -#: .\base\views.py:1289 .\base\views.py:1313 .\base\views.py:1868 -#: .\base\views.py:1892 .\employee\views.py:1314 .\pms\views.py:1960 +#: .\base\views.py:1292 .\base\views.py:1316 .\base\views.py:1871 +#: .\base\views.py:1895 .\employee\views.py:1315 .\pms\views.py:1960 #: .\pms\views.py:2018 .\recruitment\views\actions.py:250 #: .\recruitment\views\actions.py:265 msgid "un-archived" msgstr "" -#: .\base\views.py:1292 .\base\views.py:1316 .\base\views.py:1872 -#: .\base\views.py:1895 .\employee\views.py:1312 .\pms\views.py:1963 +#: .\base\views.py:1295 .\base\views.py:1319 .\base\views.py:1875 +#: .\base\views.py:1898 .\employee\views.py:1313 .\pms\views.py:1963 #: .\pms\views.py:2021 .\recruitment\views\actions.py:250 #: .\recruitment\views\actions.py:268 msgid "archived" msgstr "" -#: .\base\views.py:1297 .\base\views.py:1876 +#: .\base\views.py:1300 .\base\views.py:1879 #, python-brace-format msgid "Rotating shift assign is {message}" msgstr "" -#: .\base\views.py:1335 +#: .\base\views.py:1338 #, python-brace-format msgid "Rotating work type for {employee_id} is {message}" msgstr "" -#: .\base\views.py:1342 +#: .\base\views.py:1345 #, python-brace-format msgid "Rotating work type for {employee_id} is already exists" msgstr "" -#: .\base\views.py:1363 +#: .\base\views.py:1366 #, python-brace-format msgid "{employee} deleted." msgstr "" -#: .\base\views.py:1366 +#: .\base\views.py:1369 #, python-brace-format msgid "{rwork_type_assign} not found." msgstr "" -#: .\base\views.py:1370 +#: .\base\views.py:1373 #, python-brace-format msgid "You cannot delete {rwork_type_assign}" msgstr "" -#: .\base\views.py:1388 +#: .\base\views.py:1391 msgid "Rotating work type assign deleted." msgstr "" -#: .\base\views.py:1390 +#: .\base\views.py:1393 msgid "Rotating work type assign not found." msgstr "" -#: .\base\views.py:1392 +#: .\base\views.py:1395 msgid "You cannot delete this rotating work type." msgstr "" -#: .\base\views.py:1428 +#: .\base\views.py:1431 msgid "Employee type created." msgstr "" -#: .\base\views.py:1453 +#: .\base\views.py:1456 msgid "Employee type updated." msgstr "" -#: .\base\views.py:1489 +#: .\base\views.py:1492 msgid "Employee Shift has been created successfully!" msgstr "" -#: .\base\views.py:1512 +#: .\base\views.py:1515 msgid "Shift updated" msgstr "" -#: .\base\views.py:1546 +#: .\base\views.py:1549 msgid "Employee Shift Schedule has been created successfully!" msgstr "" -#: .\base\views.py:1572 +#: .\base\views.py:1575 msgid "Shift schedule created." msgstr "" -#: .\base\views.py:1608 +#: .\base\views.py:1611 msgid "Rotating shift created." msgstr "" -#: .\base\views.py:1634 +#: .\base\views.py:1637 msgid "Rotating shift updated." msgstr "" -#: .\base\views.py:1723 +#: .\base\views.py:1726 msgid "Rotating shift assigned." msgstr "" -#: .\base\views.py:1822 +#: .\base\views.py:1825 msgid "Rotating shift assign updated." msgstr "" -#: .\base\views.py:1914 +#: .\base\views.py:1917 #, python-brace-format msgid "Rotating shift for {employee} is {message}" msgstr "" -#: .\base\views.py:1921 +#: .\base\views.py:1924 #, python-brace-format msgid "Rotating shift for {employee} is already exists" msgstr "" -#: .\base\views.py:1942 +#: .\base\views.py:1945 #, python-brace-format msgid "{employee} assign deleted." msgstr "" -#: .\base\views.py:1947 +#: .\base\views.py:1950 #, python-brace-format msgid "{rshift_assign} not found." msgstr "" -#: .\base\views.py:1951 +#: .\base\views.py:1954 #, python-brace-format msgid "You cannot delete {rshift_assign}" msgstr "" -#: .\base\views.py:1969 +#: .\base\views.py:1972 msgid "Rotating shift assign deleted." msgstr "" -#: .\base\views.py:1971 +#: .\base\views.py:1974 msgid "Rotating shift assign not found." msgstr "" -#: .\base\views.py:1973 +#: .\base\views.py:1976 msgid "You cannot delete this rotating shift assign." msgstr "" -#: .\base\views.py:2122 +#: .\base\views.py:2125 msgid "Employee permission assigned." msgstr "" -#: .\base\views.py:2292 +#: .\base\views.py:2295 msgid "Work type request added." msgstr "" -#: .\base\views.py:2324 .\base\views.py:2364 +#: .\base\views.py:2327 .\base\views.py:2367 msgid "Work type request has been canceled." msgstr "" -#: .\base\views.py:2400 .\base\views.py:2448 +#: .\base\views.py:2403 .\base\views.py:2451 msgid "Work type request has been approved." msgstr "" -#: .\base\views.py:2490 .\base\views.py:2812 +#: .\base\views.py:2493 .\base\views.py:2815 msgid "Request Updated Successfully" msgstr "" -#: .\base\views.py:2511 .\base\views.py:2568 +#: .\base\views.py:2514 .\base\views.py:2571 msgid "Work type request deleted." msgstr "" -#: .\base\views.py:2524 .\base\views.py:2581 +#: .\base\views.py:2527 .\base\views.py:2584 msgid "Work type request not found." msgstr "" -#: .\base\views.py:2526 +#: .\base\views.py:2529 msgid "You cannot delete this work type request." msgstr "" -#: .\base\views.py:2586 +#: .\base\views.py:2589 #, python-brace-format msgid "You cannot delete {employee} work type request for the date {date}." msgstr "" -#: .\base\views.py:2643 +#: .\base\views.py:2646 msgid "Request Added" msgstr "" -#: .\base\views.py:2843 .\base\views.py:2885 +#: .\base\views.py:2846 .\base\views.py:2888 msgid "Shift request canceled" msgstr "" -#: .\base\views.py:2926 +#: .\base\views.py:2929 msgid "Shift has been approved." msgstr "" -#: .\base\views.py:2974 +#: .\base\views.py:2977 msgid "Shifts have been approved." msgstr "" -#: .\base\views.py:3017 .\base\views.py:3054 +#: .\base\views.py:3020 .\base\views.py:3057 msgid "Shift request not found." msgstr "" -#: .\base\views.py:3019 +#: .\base\views.py:3022 msgid "You cannot delete this shift request." msgstr "" -#: .\base\views.py:3041 +#: .\base\views.py:3044 msgid "Shift request deleted." msgstr "" -#: .\base\views.py:3059 +#: .\base\views.py:3062 #, python-brace-format msgid "You cannot delete {employee} shift request for the date {date}." msgstr "" -#: .\base\views.py:3089 +#: .\base\views.py:3092 msgid "Unread notifications removed." msgstr "" -#: .\base\views.py:3107 +#: .\base\views.py:3110 msgid "Notification deleted." msgstr "" -#: .\base\views.py:3123 +#: .\base\views.py:3126 msgid "Notifications marked as read" msgstr "" -#: .\base\views.py:3159 .\payroll\views\views.py:305 +#: .\base\views.py:3162 .\payroll\views\views.py:305 msgid "Payroll settings updated." msgstr "" -#: .\base\views.py:3180 +#: .\base\views.py:3183 msgid "Please select a valid date format." msgstr "" -#: .\base\views.py:3198 +#: .\base\views.py:3201 msgid "Date format saved successfully." msgstr "" -#: .\base\views.py:3201 +#: .\base\views.py:3204 msgid "Date format cannot saved. You are not in the company." msgstr "" -#: .\base\views.py:3242 +#: .\base\views.py:3245 msgid "Please select a valid time format." msgstr "" -#: .\base\views.py:3260 +#: .\base\views.py:3263 msgid "Time format saved successfully." msgstr "" -#: .\base\views.py:3263 +#: .\base\views.py:3266 msgid "Time format cannot saved. You are not in the company." msgstr "" -#: .\base\views.py:3322 +#: .\base\views.py:3325 msgid "Attendance Break-point settings created." msgstr "" -#: .\base\views.py:3345 +#: .\base\views.py:3348 msgid "Attendance Break-point settings updated." msgstr "" -#: .\base\views.py:3528 +#: .\base\views.py:3556 msgid "Ticket type has been created successfully!" msgstr "" -#: .\base\views.py:3550 +#: .\base\views.py:3579 msgid "Ticket type has been updated successfully!" msgstr "" -#: .\base\views.py:3564 +#: .\base\views.py:3591 msgid "Ticket type has been deleted successfully!" msgstr "" -#: .\base\views.py:3590 +#: .\base\views.py:3621 .\base\views.py:3671 .\base\views.py:3721 msgid "Tag has been created successfully!" msgstr "" -#: .\base\views.py:3612 +#: .\base\views.py:3644 .\base\views.py:3694 .\base\views.py:3744 msgid "Tag has been updated successfully!" msgstr "" -#: .\base\views.py:3626 +#: .\base\views.py:3656 .\base\views.py:3706 .\base\views.py:3756 msgid "Tag has been deleted successfully!" msgstr "" -#: .\employee\filters.py:168 +#: .\base\views.py:3827 +msgid "Approval Manager {}" +msgstr "" + +#: .\employee\filters.py:169 msgid "Not Set" msgstr "" @@ -7400,11 +7703,15 @@ msgstr "" msgid "Last Name" msgstr "" -#: .\employee\models.py:503 +#: .\employee\models.py:404 +msgid "tags" +msgstr "" + +#: .\employee\models.py:513 msgid "Bank details for an employee with this account number already exist" msgstr "" -#: .\employee\models.py:523 +#: .\employee\models.py:533 msgid "Created At" msgstr "" @@ -7418,7 +7725,7 @@ msgstr "" #: .\onboarding\templates\onboarding\kanban\kanban.html:205 #: .\onboarding\templates\onboarding\kanban\kanban.html:348 #: .\recruitment\templates\pipeline\footer_components.html:10 -#: .\recruitment\templates\pipeline\pipeline.html:380 +#: .\recruitment\templates\pipeline\pipeline.html:379 #: .\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 @@ -7471,8 +7778,8 @@ msgstr "" #: .\onboarding\templates\onboarding\onboarding_table.html:90 #: .\onboarding\templates\onboarding\onboardings.html:11 #: .\onboarding\templates\onboarding\single_view.html:28 -#: .\onboarding\templates\onboarding\table.html:11 .\recruitment\forms.py:323 -#: .\recruitment\forms.py:463 .\recruitment\models.py:253 +#: .\onboarding\templates\onboarding\table.html:11 .\recruitment\forms.py:328 +#: .\recruitment\forms.py:468 .\recruitment\models.py:253 #: .\recruitment\templates\candidate\application_form.html:157 #: .\recruitment\templates\candidate\candidate_create_form.html:66 #: .\recruitment\templates\candidate\candidate_list.html:38 @@ -7481,7 +7788,7 @@ msgstr "" #: .\recruitment\templates\candidate\group_by.html:31 #: .\recruitment\templates\candidate\individual.html:86 #: .\recruitment\templates\pipeline\form\candidate_drop_down_form.html:23 -#: .\recruitment\templates\pipeline\pipeline.html:247 +#: .\recruitment\templates\pipeline\pipeline.html:246 #: .\recruitment\templates\pipeline\pipeline_card.html:104 #: .\recruitment\templates\pipeline\pipeline_components\kanban_tabs.html:51 msgid "Email" @@ -7556,7 +7863,7 @@ msgstr "" #: .\employee\templates\employee\update_form\personal_info.html:140 #: .\employee\templates\tabs\personal-tab.html:69 .\onboarding\forms.py:276 #: .\onboarding\templates\onboarding\employee_creation.html:132 -#: .\payroll\models\models.py:599 +#: .\payroll\models\models.py:602 msgid "Experience" msgstr "" @@ -7571,13 +7878,13 @@ 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:597 +#: .\payroll\models\models.py:600 msgid "Children" msgstr "" #: .\employee\templates\employee\profile\bank_info.html:10 #: .\employee\templates\employee\update_form\bank_details.html:11 -#: .\employee\templates\tabs\personal-tab.html:318 +#: .\employee\templates\tabs\personal-tab.html:335 #: .\onboarding\templates\onboarding\employee_bank_details.html:72 #: .\payroll\forms\component_forms.py:260 msgid "Bank Name" @@ -7585,14 +7892,14 @@ msgstr "" #: .\employee\templates\employee\profile\bank_info.html:17 #: .\employee\templates\employee\update_form\bank_details.html:17 -#: .\employee\templates\tabs\personal-tab.html:358 +#: .\employee\templates\tabs\personal-tab.html:375 #: .\payroll\forms\component_forms.py:262 msgid "Account Number" msgstr "" #: .\employee\templates\employee\profile\bank_info.html:26 #: .\employee\templates\employee\update_form\bank_details.html:26 -#: .\employee\templates\tabs\personal-tab.html:327 +#: .\employee\templates\tabs\personal-tab.html:344 #: .\onboarding\templates\onboarding\employee_bank_details.html:86 #: .\payroll\forms\component_forms.py:261 msgid "Branch" @@ -7602,8 +7909,8 @@ msgstr "" #: .\employee\templates\employee\profile\bank_info.html:74 #: .\employee\templates\employee\update_form\bank_details.html:32 #: .\employee\templates\employee\update_form\bank_details.html:70 -#: .\employee\templates\tabs\personal-tab.html:345 -#: .\employee\templates\tabs\personal-tab.html:367 +#: .\employee\templates\tabs\personal-tab.html:362 +#: .\employee\templates\tabs\personal-tab.html:384 #: .\onboarding\templates\onboarding\employee_bank_details.html:125 #: .\onboarding\templates\onboarding\employee_bank_details.html:132 msgid "Bank Code" @@ -7611,7 +7918,7 @@ msgstr "" #: .\employee\templates\employee\profile\bank_info.html:42 #: .\employee\templates\employee\update_form\bank_details.html:40 -#: .\employee\templates\tabs\personal-tab.html:336 +#: .\employee\templates\tabs\personal-tab.html:353 msgid "Bank Address" msgstr "" @@ -7630,12 +7937,13 @@ msgstr "" #: .\employee\templates\employee\profile\profile.html:9 #: .\recruitment\templates\candidate\candidate_card.html:62 +#: .\recruitment\templates\skill_zone_cand\skill_zone_cand_card.html:63 msgid "Edit Profile" msgstr "" #: .\employee\templates\employee\profile\profile.html:31 #: .\employee\templates\employee\update_form\form_view.html:18 -#: .\employee\templates\employee_personal_info\employee_work_info.html:101 +#: .\employee\templates\employee_personal_info\employee_work_info.html:105 msgid "Bank Info" msgstr "" @@ -7668,13 +7976,13 @@ msgstr "" #: .\employee\templates\employee\profile\profile_view.html:160 #: .\employee\templates\employee\view\individual.html:192 -#: .\templates\sidebar.html:493 +#: .\templates\sidebar.html:508 msgid "Leave" msgstr "" #: .\employee\templates\employee\profile\profile_view.html:169 #: .\employee\templates\employee\view\individual.html:203 -#: .\templates\sidebar.html:339 +#: .\templates\sidebar.html:348 msgid "Payroll" msgstr "" @@ -7687,15 +7995,9 @@ msgstr "" msgid "Penalty Account" msgstr "" -#: .\employee\templates\employee\profile\profile_view.html:202 -#: .\employee\templates\employee\view\individual.html:251 -#: .\templates\sidebar.html:666 -msgid "Assets" -msgstr "" - #: .\employee\templates\employee\profile\profile_view.html:214 #: .\employee\templates\employee\view\individual.html:264 -#: .\templates\sidebar.html:596 +#: .\templates\sidebar.html:609 msgid "Performance" msgstr "" @@ -7730,7 +8032,7 @@ msgstr "" #: .\employee\templates\employee\profile\work_info.html:91 #: .\employee\templates\employee\update_form\work_details.html:96 #: .\employee\templates\tabs\contract-tab.html:18 -#: .\payroll\models\models.py:149 +#: .\payroll\models\models.py:152 #: .\payroll\templates\payroll\contract\contract_list.html:24 #: .\payroll\templates\payroll\contract\group_by.html:40 msgid "Basic Salary" @@ -7768,6 +8070,13 @@ msgstr "" msgid "Other Attachments" msgstr "" +#: .\employee\templates\employee\update_form\work_details.html:111 +#: .\employee\templates\employee_filters.html:58 +#, fuzzy +#| msgid "employee" +msgid "Employee tag" +msgstr "Employee" + #: .\employee\templates\employee\view\individual.html:237 #: .\recruitment\templates\candidate\individual.html:160 msgid "History" @@ -7805,6 +8114,8 @@ msgstr "" #: .\payroll\templates\payroll\payslip\view_payslips.html:165 #: .\recruitment\templates\candidate\candidate_nav.html:87 #: .\recruitment\templates\pipeline\nav.html:102 +#: .\recruitment\templates\skill_zone\skill_zone_nav.html:48 +#: .\recruitment\templates\skill_zone_cand\skill_zone_cand_nav.html:89 msgid "List" msgstr "" @@ -7816,6 +8127,8 @@ msgstr "" #: .\payroll\templates\payroll\deduction\view_deduction.html:60 #: .\recruitment\templates\candidate\candidate_nav.html:97 #: .\recruitment\templates\pipeline\nav.html:107 +#: .\recruitment\templates\skill_zone\skill_zone_nav.html:57 +#: .\recruitment\templates\skill_zone_cand\skill_zone_cand_nav.html:100 msgid "Card" msgstr "" @@ -7902,6 +8215,7 @@ msgstr "" #: .\recruitment\templates\pipeline\pipeline_components\add_note.html:10 #: .\recruitment\templates\pipeline\pipeline_components\create_note.html:10 #: .\recruitment\templates\recruitment\recruitment_form.html:89 +#: .\recruitment\templates\skill_zone\skill_zone_list.html:87 #: .\recruitment\templates\stage\stage_form.html:43 #: .\recruitment\templates\survey\survey_empty_view.html:92 #: .\recruitment\templates\survey\view_question_templates.html:124 @@ -7911,7 +8225,7 @@ msgstr "" #: .\employee\templates\tabs\allowance_deduction-tab.html:16 #: .\payroll\templates\payroll\allowance\allowance_empty.html:5 #: .\payroll\templates\payroll\allowance\view_allowance.html:15 -#: .\payroll\templates\payroll\payslip\individual_payslip.html:108 +#: .\payroll\templates\payroll\payslip\individual_payslip.html:124 #: .\payroll\templates\payroll\payslip\individual_pdf.html:131 msgid "Allowances" msgstr "" @@ -7920,13 +8234,13 @@ msgstr "" #: .\payroll\templates\payroll\deduction\deduction_empty.html:6 #: .\payroll\templates\payroll\deduction\view_deduction.html:16 #: .\payroll\templates\payroll\payslip\generate_payslip_list.html:62 -#: .\payroll\templates\payroll\payslip\individual_payslip.html:151 +#: .\payroll\templates\payroll\payslip\individual_payslip.html:167 #: .\payroll\templates\payroll\payslip\individual_pdf.html:174 msgid "Deductions" msgstr "" #: .\employee\templates\tabs\allowance_deduction-tab.html:52 -#: .\payroll\forms\component_forms.py:30 .\payroll\models\models.py:839 +#: .\payroll\forms\component_forms.py:30 .\payroll\models\models.py:843 #: .\payroll\templates\payroll\allowance\filter_allowance.html:14 #: .\payroll\templates\payroll\allowance\list_allowance.html:13 msgid "Allowance" @@ -7957,8 +8271,9 @@ msgstr "" #: .\payroll\templates\payroll\allowance\view_single_allowance.html:53 #: .\payroll\templates\payroll\deduction\list_deduction.html:23 #: .\payroll\templates\payroll\deduction\view_single_deduction.html:60 -#: .\payroll\templates\payroll\payslip\individual_payslip.html:109 -#: .\payroll\templates\payroll\payslip\individual_payslip.html:152 +#: .\payroll\templates\payroll\loan\installments.html:22 +#: .\payroll\templates\payroll\payslip\individual_payslip.html:125 +#: .\payroll\templates\payroll\payslip\individual_payslip.html:168 #: .\payroll\templates\payroll\payslip\individual_pdf.html:132 #: .\payroll\templates\payroll\payslip\individual_pdf.html:175 #: .\payroll\views\views.py:43 @@ -8033,26 +8348,26 @@ msgid "The hour account is currently empty." msgstr "" #: .\employee\templates\tabs\contract-tab.html:14 -#: .\payroll\models\models.py:124 +#: .\payroll\models\models.py:127 #: .\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:361 +#: .\templates\sidebar.html:370 msgid "Contract" msgstr "" #: .\employee\templates\tabs\contract-tab.html:16 #: .\employee\templates\tabs\leave-tab.html:199 #: .\employee\templates\tabs\payroll-tab.html:34 -#: .\employee\templates\tabs\personal-tab.html:212 .\leave\models.py:195 -#: .\leave\models.py:385 .\leave\templates\leave\holiday\holiday.html:42 +#: .\employee\templates\tabs\personal-tab.html:212 .\leave\models.py:206 +#: .\leave\models.py:396 .\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\templates\leave\leave_request\group_by.html:64 #: .\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:39 +#: .\leave\templates\leave\leave_request\one_request_view.html:40 #: .\leave\templates\leave\leave_request\request_view.html:115 #: .\leave\templates\leave\user_leave\group_by.html:64 #: .\leave\templates\leave\user_leave\user_request_one.html:39 @@ -8081,7 +8396,7 @@ msgstr "" #: .\pms\templates\okr\objective_update.html:51 #: .\pms\templates\period\period_create.html:37 #: .\pms\templates\period\period_update.html:37 -#: .\pms\templates\period\period_view.html:47 +#: .\pms\templates\period\period_view.html:49 #: .\recruitment\templates\candidate\export_filter.html:126 #: .\recruitment\templates\candidate\filters.html:110 #: .\recruitment\templates\pipeline\form\recruitment_update.html:63 @@ -8093,7 +8408,7 @@ msgid "End Date" msgstr "" #: .\employee\templates\tabs\contract-tab.html:17 -#: .\payroll\models\models.py:140 .\payroll\models\models.py:605 +#: .\payroll\models\models.py:143 .\payroll\models\models.py:608 #: .\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 @@ -8103,7 +8418,7 @@ msgid "Wage Type" msgstr "" #: .\employee\templates\tabs\contract-tab.html:19 -#: .\payroll\models\models.py:156 +#: .\payroll\models\models.py:159 #: .\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 @@ -8140,7 +8455,7 @@ msgid "Carryforward Leave Days" msgstr "" #: .\employee\templates\tabs\leave-tab.html:115 -#: .\employee\templates\tabs\leave-tab.html:170 .\leave\models.py:243 +#: .\employee\templates\tabs\leave-tab.html:170 .\leave\models.py:254 #: .\leave\templates\leave\leave_assign\assigned_leave.html:18 #: .\leave\templates\leave\leave_assign\assigned_leaves_export_filter.html:60 #: .\leave\templates\leave\leave_assign\assigned_leaves_filter.html:43 @@ -8153,12 +8468,12 @@ msgstr "" msgid "No Leave Types have been assigned." msgstr "" -#: .\employee\templates\tabs\leave-tab.html:197 .\leave\models.py:376 +#: .\employee\templates\tabs\leave-tab.html:197 .\leave\models.py:387 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_group_by.html:33 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_group_by.html:194 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_list.html:14 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_list.html:152 -#: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_single_view.html:45 +#: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_single_view.html:46 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_view.html:103 #: .\leave\templates\leave\leave_assign\assigned_leave.html:15 #: .\leave\templates\leave\leave_assign\assigned_leaves_export_filter.html:38 @@ -8167,7 +8482,7 @@ msgstr "" #: .\leave\templates\leave\leave_request\group_by.html:62 #: .\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:50 +#: .\leave\templates\leave\leave_request\one_request_view.html:51 #: .\leave\templates\leave\leave_request\request_view.html:103 #: .\leave\templates\leave\leave_type\leave_type_filter.html:4 #: .\leave\templates\leave\user_leave\group_by.html:62 @@ -8206,7 +8521,7 @@ msgstr "" #: .\recruitment\templates\candidate\individual.html:422 #: .\recruitment\templates\candidate\individual.html:436 #: .\recruitment\templates\pipeline\footer_components.html:27 -#: .\recruitment\templates\pipeline\pipeline.html:393 +#: .\recruitment\templates\pipeline\pipeline.html:392 #: .\recruitment\templates\pipeline\pipeline_card.html:256 #: .\recruitment\templates\pipeline\pipeline_components\kanban_tabs.html:142 #: .\recruitment\templates\pipeline\pipeline_components\view_note.html:26 @@ -8230,47 +8545,47 @@ msgid "No notes have been added for this employee" msgstr "" #: .\employee\templates\tabs\payroll-tab.html:16 -#: .\payroll\models\models.py:1184 +#: .\payroll\models\models.py:1194 #: .\payroll\templates\payroll\dashboard.html:56 #: .\payroll\templates\payroll\dashboard.html:125 #: .\payroll\templates\payroll\payslip\generate_payslip_list.html:26 #: .\payroll\templates\payroll\payslip\group_payslips.html:26 -#: .\payroll\templates\payroll\payslip\individual_payslip.html:21 +#: .\payroll\templates\payroll\payslip\individual_payslip.html:26 #: .\payroll\templates\payroll\payslip\payslips_quick_filter.html:48 #: .\payroll\templates\payroll\payslip\view_payslips.html:244 -#: .\payroll\views\component_views.py:719 .\payroll\views\views.py:35 +#: .\payroll\views\component_views.py:736 .\payroll\views\views.py:35 msgid "Review Ongoing" msgstr "" #: .\employee\templates\tabs\payroll-tab.html:20 -#: .\payroll\models\models.py:1185 +#: .\payroll\models\models.py:1195 #: .\payroll\templates\payroll\dashboard.html:43 #: .\payroll\templates\payroll\dashboard.html:126 #: .\payroll\templates\payroll\payslip\generate_payslip_list.html:27 #: .\payroll\templates\payroll\payslip\group_payslips.html:27 -#: .\payroll\templates\payroll\payslip\individual_payslip.html:22 +#: .\payroll\templates\payroll\payslip\individual_payslip.html:27 #: .\payroll\templates\payroll\payslip\payslips_quick_filter.html:59 #: .\payroll\templates\payroll\payslip\view_payslips.html:245 -#: .\payroll\views\component_views.py:720 .\payroll\views\views.py:36 +#: .\payroll\views\component_views.py:737 .\payroll\views\views.py:36 msgid "Confirmed" msgstr "" -#: .\employee\templates\tabs\payroll-tab.html:24 .\leave\models.py:83 -#: .\payroll\models\models.py:1186 +#: .\employee\templates\tabs\payroll-tab.html:24 .\leave\models.py:94 +#: .\payroll\models\models.py:1196 #: .\payroll\templates\payroll\dashboard.html:30 #: .\payroll\templates\payroll\dashboard.html:127 #: .\payroll\templates\payroll\payslip\generate_payslip_list.html:28 #: .\payroll\templates\payroll\payslip\group_payslips.html:28 #: .\payroll\templates\payroll\payslip\payslips_quick_filter.html:70 #: .\payroll\templates\payroll\payslip\view_payslips.html:246 -#: .\payroll\views\component_views.py:721 .\payroll\views\views.py:37 +#: .\payroll\views\component_views.py:738 .\payroll\views\views.py:37 msgid "Paid" msgstr "" #: .\employee\templates\tabs\payroll-tab.html:36 -#: .\payroll\forms\component_forms.py:256 .\payroll\models\models.py:66 -#: .\payroll\models\models.py:927 .\payroll\models\models.py:932 -#: .\payroll\models\models.py:1020 +#: .\payroll\forms\component_forms.py:256 .\payroll\models\models.py:69 +#: .\payroll\models\models.py:931 .\payroll\models\models.py:936 +#: .\payroll\models\models.py:1024 #: .\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 @@ -8278,8 +8593,8 @@ msgid "Gross Pay" msgstr "" #: .\employee\templates\tabs\payroll-tab.html:38 -#: .\payroll\forms\component_forms.py:258 .\payroll\models\models.py:934 -#: .\payroll\models\models.py:1021 +#: .\payroll\forms\component_forms.py:258 .\payroll\models\models.py:938 +#: .\payroll\models\models.py:1025 #: .\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 @@ -8288,7 +8603,7 @@ msgstr "" #: .\employee\templates\tabs\payroll-tab.html:82 #: .\payroll\templates\payroll\payslip\group_payslips.html:113 -#: .\payroll\templates\payroll\payslip\individual_payslip.html:28 +#: .\payroll\templates\payroll\payslip\individual_payslip.html:33 #: .\payroll\templates\payroll\payslip\payslip_table.html:107 msgid "Download" msgstr "" @@ -8349,11 +8664,25 @@ msgid "Contract details" msgstr "" #: .\employee\templates\tabs\personal-tab.html:244 -#: .\payroll\models\models.py:101 +#: .\payroll\models\models.py:104 msgid "Salary" msgstr "" -#: .\employee\templates\tabs\personal-tab.html:308 +#: .\employee\templates\tabs\personal-tab.html:279 +#: .\helpdesk\templates\helpdesk\faq\faq_nav.html:66 +#: .\helpdesk\templates\helpdesk\ticket\forms\add_tag.html:13 +#: .\helpdesk\templates\helpdesk\ticket\ticket_filter.html:103 +#: .\helpdesk\templates\helpdesk\ticket\ticket_group.html:49 +#: .\helpdesk\templates\helpdesk\ticket\ticket_group.html:270 +#: .\helpdesk\templates\helpdesk\ticket\ticket_group.html:490 +#: .\helpdesk\templates\helpdesk\ticket\ticket_list.html:26 +#: .\helpdesk\templates\helpdesk\ticket\ticket_list.html:221 +#: .\helpdesk\templates\helpdesk\ticket\ticket_list.html:439 +#: .\templates\settings.html:170 +msgid "Tags" +msgstr "" + +#: .\employee\templates\tabs\personal-tab.html:325 msgid "Bank Information" msgstr "" @@ -8464,120 +8793,156 @@ msgstr "" msgid "Employee personal information updated." msgstr "" -#: .\employee\views.py:834 +#: .\employee\views.py:835 msgid "Employee work information updated." msgstr "" -#: .\employee\views.py:846 +#: .\employee\views.py:847 msgid "Employee bank details updated." msgstr "" -#: .\employee\views.py:869 .\employee\views.py:891 +#: .\employee\views.py:870 .\employee\views.py:892 msgid "Profile image updated." msgstr "" -#: .\employee\views.py:871 +#: .\employee\views.py:872 msgid "No image chosen." msgstr "" -#: .\employee\views.py:911 .\employee\views.py:942 +#: .\employee\views.py:912 .\employee\views.py:943 msgid "No profile image to remove." msgstr "" -#: .\employee\views.py:924 .\employee\views.py:956 -#: .\recruitment\views\views.py:1043 +#: .\employee\views.py:925 .\employee\views.py:957 +#: .\recruitment\views\views.py:1054 msgid "Profile image removed." msgstr "" -#: .\employee\views.py:978 +#: .\employee\views.py:979 msgid "New Employee Added." msgstr "" -#: .\employee\views.py:1232 +#: .\employee\views.py:1233 msgid "Employee updated." msgstr "" -#: .\employee\views.py:1255 +#: .\employee\views.py:1256 msgid "Employee deleted" msgstr "" -#: .\employee\views.py:1257 .\employee\views.py:1286 +#: .\employee\views.py:1258 .\employee\views.py:1287 msgid "Employee not found." msgstr "" -#: .\employee\views.py:1264 +#: .\employee\views.py:1265 msgid "This employee already related in {}." msgstr "" -#: .\employee\views.py:1283 +#: .\employee\views.py:1284 #, python-format msgid "%(employee)s deleted." msgstr "" -#: .\employee\views.py:1289 +#: .\employee\views.py:1290 #, python-format msgid "You cannot delete %(employee)s." msgstr "" -#: .\employee\views.py:1337 +#: .\employee\views.py:1338 msgid "Employee archived" msgstr "" -#: .\employee\views.py:1343 +#: .\employee\views.py:1344 #, python-brace-format msgid "Can't archive.Employee assigned as {related_models}" msgstr "" -#: .\employee\views.py:1408 +#: .\employee\views.py:1409 msgid "Created work information" msgstr "" -#: .\employee\views.py:1437 +#: .\employee\views.py:1438 msgid "Work Information Updated Successfully" msgstr "" -#: .\employee\views.py:1467 +#: .\employee\views.py:1468 msgid "Bank Details Created Successfully" msgstr "" -#: .\employee\views.py:1494 +#: .\employee\views.py:1495 msgid "Bank Details Updated Successfully" msgstr "" -#: .\employee\views.py:1514 +#: .\employee\views.py:1515 msgid "Employee work information deleted" msgstr "" -#: .\employee\views.py:1516 +#: .\employee\views.py:1517 msgid "Employee work information not found." msgstr "" -#: .\employee\views.py:1518 +#: .\employee\views.py:1519 msgid "You cannot delete this Employee work information" msgstr "" -#: .\employee\views.py:1968 +#: .\employee\views.py:1969 msgid "In-Active" msgstr "" -#: .\employee\views.py:2030 +#: .\employee\views.py:2031 msgid "No Data Found..." msgstr "" -#: .\employee\views.py:2173 .\recruitment\views\views.py:570 -#: .\recruitment\views\views.py:605 +#: .\employee\views.py:2174 .\recruitment\views\views.py:581 +#: .\recruitment\views\views.py:616 msgid "Note added successfully.." msgstr "" -#: .\employee\views.py:2205 .\recruitment\views\views.py:631 -#: .\recruitment\views\views.py:654 +#: .\employee\views.py:2206 .\recruitment\views\views.py:642 +#: .\recruitment\views\views.py:665 msgid "Note updated successfully..." msgstr "" -#: .\employee\views.py:2233 +#: .\employee\views.py:2234 msgid "Note deleted successfully..." msgstr "" +#: .\helpdesk\templates\department_managers\department_managers.html:7 +#, fuzzy +#| msgid "department-update" +msgid "Department managers" +msgstr "Update" + +#: .\helpdesk\templates\department_managers\department_managers.html:49 +#, fuzzy +#| msgid "department-update" +msgid "mDepartment Manager Update" +msgstr "Update" + +#: .\helpdesk\templates\department_managers\department_managers_form.html:7 +#, fuzzy +#| msgid "type-update" +msgid "update Tag" +msgstr "Update" + +#: .\helpdesk\templates\department_managers\department_managers_form.html:9 +#: .\helpdesk\templates\helpdesk\faq\faq_list_view.html:90 +#: .\helpdesk\templates\helpdesk\ticket\forms\add_tag.html:36 +#: .\helpdesk\templates\helpdesk\ticket\forms\add_tag.html:460 +#: .\helpdesk\templates\helpdesk\ticket\ticket_detail.html:431 +msgid "Create Tag" +msgstr "" + +#: .\helpdesk\templates\department_managers\department_managers_view.html:6 +#, fuzzy +#| msgid "department-view" +msgid "department" +msgstr "Department" + +#: .\helpdesk\templates\department_managers\department_managers_view.html:7 +msgid "manager" +msgstr "" + #: .\helpdesk\templates\helpdesk\faq\faq_category_create.html:6 msgid "FAQ category Update" msgstr "" @@ -8614,7 +8979,7 @@ msgid "There are no FAQs at the moment." msgstr "" #: .\helpdesk\templates\helpdesk\faq\faq_nav.html:4 -#: .\templates\sidebar.html:729 +#: .\templates\sidebar.html:750 msgid "FAQs" msgstr "" @@ -8714,7 +9079,7 @@ msgstr "" #: .\helpdesk\templates\helpdesk\ticket\ticket_detail.html:199 #: .\helpdesk\templates\helpdesk\ticket\ticket_detail.html:207 -#: .\payroll\templates\payroll\payslip\individual_payslip.html:41 +#: .\payroll\templates\payroll\payslip\individual_payslip.html:46 #: .\payroll\templates\payroll\payslip\individual_pdf.html:65 msgid "to" msgstr "" @@ -8792,7 +9157,7 @@ msgstr "Recruitment" #: .\helpdesk\templates\helpdesk\ticket\ticket_filter.html:62 #: .\helpdesk\templates\helpdesk\ticket\ticket_nav.html:5 -#: .\templates\sidebar.html:736 +#: .\templates\sidebar.html:755 msgid "Tickets" msgstr "" @@ -8812,6 +9177,7 @@ msgid "Ticket Id" msgstr "" #: .\helpdesk\templates\helpdesk\ticket\ticket_nav.html:67 +#: .\recruitment\templates\skill_zone\skill_zone_card.html:53 msgid "Un Archive" msgstr "" @@ -8863,15 +9229,15 @@ msgstr "" msgid "All Tickets" msgstr "" -#: .\helpdesk\tests.py:23 .\helpdesk\views.py:876 +#: .\helpdesk\tests.py:23 .\helpdesk\views.py:879 msgid "The comment updated successfully." msgstr "" -#: .\helpdesk\tests.py:26 .\helpdesk\views.py:879 +#: .\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:890 +#: .\helpdesk\tests.py:37 .\helpdesk\views.py:893 msgid "The comment \"{}\" has been deleted successfully." msgstr "" @@ -8911,50 +9277,62 @@ msgstr "" msgid "The Ticket created successfully." msgstr "" -#: .\helpdesk\views.py:458 .\helpdesk\views.py:490 .\helpdesk\views.py:979 +#: .\helpdesk\views.py:459 .\helpdesk\views.py:491 .\helpdesk\views.py:982 msgid "The Ticket updated successfully." msgstr "" -#: .\helpdesk\views.py:519 +#: .\helpdesk\views.py:520 msgid "The Ticket status updated successfully." msgstr "" -#: .\helpdesk\views.py:547 +#: .\helpdesk\views.py:549 msgid "You Don't have the permission." msgstr "" -#: .\helpdesk\views.py:592 .\helpdesk\views.py:1015 +#: .\helpdesk\views.py:595 .\helpdesk\views.py:1019 msgid "The Ticket \"{}\" has been deleted successfully." msgstr "" -#: .\helpdesk\views.py:595 .\helpdesk\views.py:1018 +#: .\helpdesk\views.py:598 .\helpdesk\views.py:1022 msgid "You cannot delete this Ticket." msgstr "" -#: .\helpdesk\views.py:740 +#: .\helpdesk\views.py:743 msgid "The Ticket tag updated successfully." msgstr "" -#: .\helpdesk\views.py:753 +#: .\helpdesk\views.py:756 msgid "Responsibility updated for the Ticket" msgstr "" -#: .\helpdesk\views.py:788 +#: .\helpdesk\views.py:791 msgid "Assinees updated for the Ticket" msgstr "" -#: .\helpdesk\views.py:837 +#: .\helpdesk\views.py:840 msgid "success" msgstr "" -#: .\helpdesk\views.py:840 +#: .\helpdesk\views.py:843 msgid "Failed" msgstr "" -#: .\helpdesk\views.py:864 +#: .\helpdesk\views.py:867 msgid "A new comment has been created." msgstr "" +#: .\helpdesk\views.py:1047 +msgid "The department manager created successfully." +msgstr "" + +#: .\helpdesk\views.py:1064 +msgid "The department manager updated successfully." +msgstr "" + +#: .\helpdesk\views.py:1086 +msgid "The department manager has been deleted successfully" +msgstr "" + #: .\horilla_audit\templates\horilla_audit\horilla_audit_log.html:28 msgid "Why this change?" msgstr "" @@ -8963,7 +9341,7 @@ msgstr "" msgid "You dont have permission." msgstr "" -#: .\leave\forms.py:242 .\leave\views.py:1575 .\leave\views.py:2421 +#: .\leave\forms.py:242 .\leave\views.py:1630 .\leave\views.py:2474 msgid "An attachment is required for this leave request" msgstr "" @@ -8999,47 +9377,47 @@ msgstr "" msgid "Rejection Reason" msgstr "" -#: .\leave\models.py:26 +#: .\leave\models.py:37 msgid "Yearly" msgstr "" -#: .\leave\models.py:83 +#: .\leave\models.py:94 msgid "Unpaid" msgstr "" -#: .\leave\models.py:86 +#: .\leave\models.py:97 msgid "No Carry Forward" msgstr "" -#: .\leave\models.py:87 +#: .\leave\models.py:98 msgid "Carry Forward" msgstr "" -#: .\leave\models.py:88 +#: .\leave\models.py:99 msgid "Carry Forward with Expire" msgstr "" -#: .\leave\models.py:109 +#: .\leave\models.py:120 msgid "First Week" msgstr "" -#: .\leave\models.py:110 +#: .\leave\models.py:121 msgid "Second Week" msgstr "" -#: .\leave\models.py:111 +#: .\leave\models.py:122 msgid "Third Week" msgstr "" -#: .\leave\models.py:112 +#: .\leave\models.py:123 msgid "Fourth Week" msgstr "" -#: .\leave\models.py:113 +#: .\leave\models.py:124 msgid "Fifth Week" msgstr "" -#: .\leave\models.py:164 +#: .\leave\models.py:175 #: .\leave\templates\leave\leave_type\leave_type_creation.html:160 #: .\leave\templates\leave\leave_type\leave_type_filter.html:45 #: .\leave\templates\leave\leave_type\leave_type_individual_view.html:111 @@ -9047,7 +9425,7 @@ msgstr "" msgid "Require Attachment" msgstr "" -#: .\leave\models.py:196 .\leave\templates\leave\holiday\holiday.html:43 +#: .\leave\models.py:207 .\leave\templates\leave\holiday\holiday.html:43 #: .\leave\templates\leave\holiday\holiday_export_filter.html:36 #: .\leave\templates\leave\holiday\holiday_filter.html:28 #: .\leave\templates\leave\holiday\holiday_form.html:48 @@ -9055,7 +9433,7 @@ msgstr "" msgid "Recurring" msgstr "" -#: .\leave\models.py:239 +#: .\leave\models.py:250 #: .\leave\templates\leave\leave_assign\assigned_leave.html:16 #: .\leave\templates\leave\leave_assign\assigned_leaves_export_filter.html:46 #: .\leave\templates\leave\leave_assign\assigned_leaves_filter.html:29 @@ -9064,7 +9442,7 @@ msgstr "" msgid "Available Days" msgstr "" -#: .\leave\models.py:241 +#: .\leave\models.py:252 #: .\leave\templates\leave\leave_assign\assigned_leave.html:17 #: .\leave\templates\leave\leave_assign\assigned_leaves_export_filter.html:52 #: .\leave\templates\leave\leave_assign\assigned_leaves_filter.html:35 @@ -9073,28 +9451,28 @@ msgstr "" msgid "Carryforward Days" msgstr "" -#: .\leave\models.py:248 +#: .\leave\models.py:259 msgid "Leave Reset Date" msgstr "" -#: .\leave\models.py:251 +#: .\leave\models.py:262 msgid "CarryForward Expired Date" msgstr "" -#: .\leave\models.py:383 +#: .\leave\models.py:394 msgid "Start Date Breakdown" msgstr "" -#: .\leave\models.py:390 +#: .\leave\models.py:401 msgid "End Date Breakdown" msgstr "" -#: .\leave\models.py:393 +#: .\leave\models.py:404 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_group_by.html:34 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_group_by.html:195 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_list.html:15 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_list.html:153 -#: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_single_view.html:41 +#: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_single_view.html:42 #: .\leave\templates\leave\leave_request\group_by.html:65 #: .\leave\templates\leave\leave_request\leave_requests.html:75 #: .\leave\templates\leave\user_leave\group_by.html:65 @@ -9102,28 +9480,28 @@ msgstr "" msgid "Requested Days" msgstr "" -#: .\leave\models.py:400 +#: .\leave\models.py:411 msgid "Attachment" msgstr "" -#: .\leave\models.py:409 -#: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_single_view.html:51 -#: .\leave\templates\leave\leave_request\one_request_view.html:56 +#: .\leave\models.py:420 +#: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_single_view.html:52 +#: .\leave\templates\leave\leave_request\one_request_view.html:57 msgid "Created Date" msgstr "" -#: .\leave\models.py:417 +#: .\leave\models.py:428 #: .\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:196 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_list.html:16 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_list.html:154 -#: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_single_view.html:55 +#: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_single_view.html:56 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_view.html:115 -#: .\leave\templates\leave\leave_request\one_request_view.html:60 +#: .\leave\templates\leave\leave_request\one_request_view.html:61 msgid "Created By" msgstr "" -#: .\leave\models.py:422 +#: .\leave\models.py:433 msgid "Reject Reason" msgstr "" @@ -9148,13 +9526,15 @@ msgstr "" #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_group_by.html:254 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_list.html:73 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_list.html:212 -#: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_single_view.html:108 +#: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_single_view.html:109 #: .\leave\templates\leave\leave_assign\assigned_leave.html:57 #: .\leave\templates\leave\leave_assign\group_by.html:70 #: .\leave\templates\leave\leave_request\group_by.html:141 -#: .\leave\templates\leave\leave_request\leave_requests.html:177 +#: .\leave\templates\leave\leave_request\leave_requests.html:186 +#: .\leave\templates\leave\leave_request\penalty\create.html:49 #: .\leave\templates\leave\user_leave\group_by.html:123 #: .\leave\templates\leave\user_leave\user_requests.html:133 +#: .\recruitment\templates\skill_zone_cand\skill_zone_cand_list.html:64 msgid "Are you sure you want to delete ?" msgstr "" @@ -9165,6 +9545,7 @@ msgstr "" #: .\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 +#: .\leave\templates\leave\leave_request\penalty\create.html:75 #: .\onboarding\templates\onboarding\candidate_creation_form.html:9 #: .\onboarding\templates\onboarding\task_form.html:28 #: .\recruitment\templates\candidate\application_form.html:311 @@ -9172,7 +9553,7 @@ msgid "Apply" msgstr "" #: .\leave\templates\leave\company_leave\company_leave_view.html:8 -#: .\templates\sidebar.html:570 +#: .\templates\sidebar.html:584 msgid "Company Leaves" msgstr "" @@ -9211,15 +9592,6 @@ msgstr "" msgid "Are you sure you want to delete?" msgstr "" -#: .\leave\templates\leave\dashboard.html:30 -#: .\leave\templates\leave\employee_dashboard.html:27 -#: .\onboarding\templates\onboarding\dashboard.html:18 -#: .\payroll\templates\payroll\dashboard.html:19 -#: .\pms\templates\dashboard\pms_dashboard.html:24 -#: .\templates\dashboard.html:50 -msgid "Back" -msgstr "" - #: .\leave\templates\leave\dashboard.html:39 #: .\leave\templates\leave\employee_dashboard.html:36 msgid "New Requests" @@ -9349,7 +9721,7 @@ msgid "To Date" msgstr "" #: .\leave\templates\leave\holiday\holiday_view.html:21 -#: .\templates\sidebar.html:562 +#: .\templates\sidebar.html:576 msgid "Holidays" msgstr "" @@ -9377,7 +9749,7 @@ msgstr "" #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_group_by.html:357 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_list.html:136 #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_list.html:310 -#: .\leave\templates\leave\leave_request\leave_requests.html:201 +#: .\leave\templates\leave\leave_request\leave_requests.html:210 #: .\leave\templates\leave\user_leave\user_requests.html:200 msgid "You have No leave requests for this filter." msgstr "" @@ -9389,8 +9761,9 @@ msgstr "" #: .\leave\templates\leave\user_leave\group_by.html:67 #: .\leave\templates\leave\user_leave\user_requests.html:73 #: .\onboarding\templates\onboarding\onboarding_table.html:96 -#: .\recruitment\forms.py:554 +#: .\recruitment\forms.py:559 #: .\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" @@ -9401,20 +9774,20 @@ msgstr "" msgid "Rejection reason" msgstr "" -#: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_single_view.html:70 -#: .\leave\templates\leave\leave_request\one_request_view.html:82 +#: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_single_view.html:71 +#: .\leave\templates\leave\leave_request\one_request_view.html:102 #: .\leave\templates\leave\user_leave\user_request_one.html:62 msgid "Reason for Rejection" msgstr "" -#: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_single_view.html:80 -#: .\leave\templates\leave\leave_request\one_request_view.html:92 +#: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_single_view.html:81 +#: .\leave\templates\leave\leave_request\one_request_view.html:112 #: .\leave\templates\leave\user_leave\user_request_one.html:79 msgid "View attachment" msgstr "" #: .\leave\templates\leave\leave_allocation_request\leave_allocation_request_view.html:36 -#: .\templates\sidebar.html:532 +#: .\templates\sidebar.html:547 msgid "Leave Allocation Requests" msgstr "" @@ -9549,21 +9922,49 @@ msgstr "" msgid "Penalties" msgstr "" -#: .\leave\templates\leave\leave_request\leave_requests.html:194 +#: .\leave\templates\leave\leave_request\leave_requests.html:203 msgid "You have No leave requests for this month." msgstr "" -#: .\leave\templates\leave\leave_request\one_request_view.html:67 +#: .\leave\templates\leave\leave_request\one_request_view.html:68 +msgid "Multiple Approvals" +msgstr "" + +#: .\leave\templates\leave\leave_request\one_request_view.html:76 +msgid "Not Marked" +msgstr "" + +#: .\leave\templates\leave\leave_request\one_request_view.html:87 msgid "Leave Description" msgstr "" -#: .\leave\templates\leave\leave_request\one_request_view.html:75 +#: .\leave\templates\leave\leave_request\one_request_view.html:95 #: .\leave\templates\leave\user_leave\user_request_one.html:69 msgid "Reason for Cancellation" msgstr "" +#: .\leave\templates\leave\leave_request\penalty\condition.html:5 +msgid "Multiple Approval Condition" +msgstr "" + +#: .\leave\templates\leave\leave_request\penalty\create.html:10 +msgid "Condition Field" +msgstr "" + +#: .\leave\templates\leave\leave_request\penalty\create.html:11 +msgid "Condition Operator" +msgstr "" + +#: .\leave\templates\leave\leave_request\penalty\create.html:13 +msgid "Approval Managers" +msgstr "" + +#: .\leave\templates\leave\leave_request\penalty\create.html:72 +msgid "Add more managers.." +msgstr "" + #: .\leave\templates\leave\leave_request\request_view.html:32 -#: .\templates\sidebar.html:553 +#: .\templates\sidebar.html:567 msgid "Leave Requests" msgstr "" @@ -9689,7 +10090,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:538 +#: .\templates\sidebar.html:553 msgid "Leave Types" msgstr "" @@ -9784,7 +10185,7 @@ msgid "User Leave" msgstr "" #: .\leave\templates\leave\user_leave\user_request_view.html:11 -#: .\templates\sidebar.html:525 +#: .\templates\sidebar.html:540 msgid "My Leave Requests" msgstr "" @@ -9812,227 +10213,228 @@ msgstr "" msgid "This leave types are already in use for {}" msgstr "" -#: .\leave\views.py:312 .\leave\views.py:1644 .\leave\views.py:2455 +#: .\leave\views.py:312 .\leave\views.py:1699 .\leave\views.py:2508 msgid "Leave request created successfully.." msgstr "" -#: .\leave\views.py:471 +#: .\leave\views.py:475 msgid "Leave request is updated successfully.." msgstr "" -#: .\leave\views.py:514 .\leave\views.py:1791 +#: .\leave\views.py:518 .\leave\views.py:1846 msgid "Leave request deleted successfully.." msgstr "" -#: .\leave\views.py:516 .\leave\views.py:3000 .\leave\views.py:3070 +#: .\leave\views.py:520 .\leave\views.py:3053 .\leave\views.py:3123 msgid "Leave request not found." msgstr "" -#: .\leave\views.py:518 .\leave\views.py:1003 .\leave\views.py:1347 -#: .\leave\views.py:1527 .\leave\views.py:1795 .\leave\views.py:2898 +#: .\leave\views.py:522 .\leave\views.py:1044 .\leave\views.py:1403 +#: .\leave\views.py:1582 .\leave\views.py:1850 .\leave\views.py:2951 #: .\pms\views.py:1323 .\pms\views.py:1564 .\pms\views.py:1693 -#: .\pms\views.py:1786 +#: .\pms\views.py:1786 .\recruitment\views\views.py:1314 +#: .\recruitment\views\views.py:1470 .\recruitment\views\views.py:1548 msgid "Related entries exists" msgstr "" -#: .\leave\views.py:564 +#: .\leave\views.py:591 msgid "Leave request approved successfully.." msgstr "" -#: .\leave\views.py:586 +#: .\leave\views.py:613 msgid "Leave request already approved" msgstr "" -#: .\leave\views.py:633 .\leave\views.py:687 +#: .\leave\views.py:674 .\leave\views.py:728 msgid "Leave request cancelled successfully.." msgstr "" -#: .\leave\views.py:698 +#: .\leave\views.py:739 msgid "You can't cancel this leave request." msgstr "" -#: .\leave\views.py:700 +#: .\leave\views.py:741 msgid "You don't have the permission." msgstr "" -#: .\leave\views.py:761 +#: .\leave\views.py:802 msgid "Leave type assign is successfull.." msgstr "" -#: .\leave\views.py:776 +#: .\leave\views.py:817 msgid "leave type is already assigned to the employee.." msgstr "" -#: .\leave\views.py:906 +#: .\leave\views.py:947 msgid "Leave type assign is successful.." msgstr "" -#: .\leave\views.py:918 +#: .\leave\views.py:959 msgid "Leave type is already assigned to the employee.." msgstr "" -#: .\leave\views.py:956 +#: .\leave\views.py:997 msgid "Available leaves updated successfully..." msgstr "" -#: .\leave\views.py:999 +#: .\leave\views.py:1040 msgid "Assigned leave is successfully deleted." msgstr "" -#: .\leave\views.py:1001 .\leave\views.py:1025 +#: .\leave\views.py:1042 .\leave\views.py:1066 msgid "Assigned leave not found." msgstr "" -#: .\leave\views.py:1022 +#: .\leave\views.py:1063 msgid "{} assigned to {} deleted." msgstr "" -#: .\leave\views.py:1085 +#: .\leave\views.py:1126 msgid "This badge id does not exist." msgstr "" -#: .\leave\views.py:1089 +#: .\leave\views.py:1130 msgid "This leave type does not exist." msgstr "" -#: .\leave\views.py:1095 +#: .\leave\views.py:1136 msgid "Leave type has already been assigned to the employee." msgstr "" -#: .\leave\views.py:1145 +#: .\leave\views.py:1186 msgid "New holiday created successfully.." msgstr "" -#: .\leave\views.py:1193 +#: .\leave\views.py:1241 msgid "Invalid start date format {}" msgstr "" -#: .\leave\views.py:1200 +#: .\leave\views.py:1248 msgid "Invalid end date format {}" msgstr "" -#: .\leave\views.py:1207 +#: .\leave\views.py:1255 msgid "Recurring must be {} or {}" msgstr "" -#: .\leave\views.py:1322 +#: .\leave\views.py:1369 msgid "Holiday updated successfully.." msgstr "" -#: .\leave\views.py:1343 +#: .\leave\views.py:1399 msgid "Holiday deleted successfully.." msgstr "" -#: .\leave\views.py:1345 .\leave\views.py:1365 +#: .\leave\views.py:1401 .\leave\views.py:1421 msgid "Holiday not found." msgstr "" -#: .\leave\views.py:1367 +#: .\leave\views.py:1423 msgid "{} Holidays have been successfully deleted." msgstr "" -#: .\leave\views.py:1391 +#: .\leave\views.py:1447 msgid "New company leave created successfully.." msgstr "" -#: .\leave\views.py:1491 +#: .\leave\views.py:1546 msgid "Company leave updated successfully.." msgstr "" -#: .\leave\views.py:1523 +#: .\leave\views.py:1578 msgid "Company leave deleted successfully.." msgstr "" -#: .\leave\views.py:1525 +#: .\leave\views.py:1580 msgid "Company leave not found." msgstr "" -#: .\leave\views.py:1605 +#: .\leave\views.py:1660 msgid "There is already a leave request for this date range.." msgstr "" -#: .\leave\views.py:1668 .\leave\views.py:1764 +#: .\leave\views.py:1723 .\leave\views.py:1819 msgid "You dont have enough leave days to make the request.." msgstr "" -#: .\leave\views.py:1750 +#: .\leave\views.py:1805 msgid "Leave request updated successfully.." msgstr "" -#: .\leave\views.py:1772 .\leave\views.py:1793 .\leave\views.py:1994 +#: .\leave\views.py:1827 .\leave\views.py:1848 .\leave\views.py:2047 msgid "User has no leave request.." msgstr "" -#: .\leave\views.py:1831 .\leave\views.py:1862 .\leave\views.py:1906 -#: .\leave\views.py:1961 +#: .\leave\views.py:1886 .\leave\views.py:1917 .\leave\views.py:1960 +#: .\leave\views.py:2014 msgid "User is not an employee.." msgstr "" -#: .\leave\views.py:2181 +#: .\leave\views.py:2234 msgid "Total leaves available" msgstr "" -#: .\leave\views.py:2188 +#: .\leave\views.py:2241 msgid "Oops!! No leaves available for you this month..." msgstr "" -#: .\leave\views.py:2253 +#: .\leave\views.py:2306 msgid "No leave request this month" msgstr "" -#: .\leave\views.py:2368 +#: .\leave\views.py:2421 msgid "Leave Trends" msgstr "" -#: .\leave\views.py:2480 +#: .\leave\views.py:2533 msgid "You don't have permission" msgstr "" -#: .\leave\views.py:2601 +#: .\leave\views.py:2654 msgid "New Leave allocation request is created" msgstr "" -#: .\leave\views.py:2728 +#: .\leave\views.py:2781 msgid "Leave allocation request is updated successfully." msgstr "" -#: .\leave\views.py:2793 +#: .\leave\views.py:2846 msgid "Leave allocation request approved successfully" msgstr "" -#: .\leave\views.py:2807 +#: .\leave\views.py:2860 msgid "The leave allocation request can't be approved" msgstr "" -#: .\leave\views.py:2850 +#: .\leave\views.py:2903 msgid "Leave allocation request rejected successfully" msgstr "" -#: .\leave\views.py:2871 +#: .\leave\views.py:2924 msgid "The leave allocation request can't be rejected" msgstr "" -#: .\leave\views.py:2893 +#: .\leave\views.py:2946 msgid "Leave allocation request deleted successfully.." msgstr "" -#: .\leave\views.py:2896 +#: .\leave\views.py:2949 msgid "Leave allocation request not found." msgstr "" -#: .\leave\views.py:2900 +#: .\leave\views.py:2953 msgid "Approved request cant't delete." msgstr "" -#: .\leave\views.py:2997 +#: .\leave\views.py:3050 msgid "{}'s leave request deleted." msgstr "" -#: .\leave\views.py:3062 +#: .\leave\views.py:3115 msgid "Leave request deleted." msgstr "" -#: .\leave\views.py:3067 +#: .\leave\views.py:3120 msgid "You cannot delete leave request with status {}." msgstr "" @@ -10047,7 +10449,7 @@ msgstr "" #: .\onboarding\templates\onboarding\candidate_update.html:69 #: .\onboarding\templates\onboarding\onboarding_table.html:92 #: .\onboarding\templates\onboarding\onboardings.html:12 -#: .\recruitment\forms.py:324 .\recruitment\forms.py:464 +#: .\recruitment\forms.py:329 .\recruitment\forms.py:469 msgid "Mobile" msgstr "" @@ -10126,7 +10528,7 @@ msgstr "" #: .\onboarding\templates\onboarding\candidate_filter.html:16 #: .\onboarding\templates\onboarding\candidate_update.html:53 #: .\onboarding\templates\onboarding\candidates.html:22 -#: .\recruitment\forms.py:533 .\recruitment\models.py:186 +#: .\recruitment\forms.py:538 .\recruitment\models.py:186 #: .\recruitment\models.py:235 .\recruitment\models.py:442 #: .\recruitment\models.py:478 #: .\recruitment\templates\candidate\candidate_create_form.html:77 @@ -10150,7 +10552,7 @@ msgstr "" #: .\recruitment\templates\stage\stage_update_form.html:22 #: .\recruitment\templates\survey\filter.html:16 #: .\recruitment\templates\survey\view_single_template.html:44 -#: .\templates\sidebar.html:166 +#: .\templates\sidebar.html:163 msgid "Recruitment" msgstr "" @@ -10183,11 +10585,14 @@ msgstr "" #: .\onboarding\templates\onboarding\kanban\kanban.html:227 #: .\onboarding\templates\onboarding\onboarding_table.html:17 #: .\onboarding\templates\onboarding\onboarding_table.html:89 -#: .\recruitment\templates\pipeline\pipeline.html:243 +#: .\recruitment\models.py:551 +#: .\recruitment\templates\pipeline\pipeline.html:242 #: .\recruitment\templates\pipeline\pipeline_card.html:138 #: .\recruitment\templates\pipeline\pipeline_components\kanban_tabs.html:73 #: .\recruitment\templates\pipeline\pipeline_components\kanban_tabs.html:168 -#: .\templates\sidebar.html:157 +#: .\recruitment\templates\skill_zone\skill_zone_list.html:95 +#: .\recruitment\templates\skill_zone_cand\skill_zone_cand_list.html:10 +#: .\templates\sidebar.html:154 msgid "Candidate" msgstr "" @@ -10197,7 +10602,8 @@ msgstr "" #: .\onboarding\templates\onboarding\candidates.html:21 #: .\onboarding\templates\onboarding\kanban\kanban.html:55 -#: .\onboarding\templates\onboarding\onboarding_view.html:86 .\pms\forms.py:56 +#: .\onboarding\templates\onboarding\onboarding_view.html:86 +#: .\payroll\templates\payroll\loan\filter.html:45 .\pms\forms.py:56 #: .\recruitment\templates\pipeline\nav.html:121 #: .\recruitment\templates\pipeline\pipeline_empty.html:26 msgid "Job position" @@ -10226,7 +10632,7 @@ msgstr "" #: .\onboarding\templates\onboarding\kanban\kanban.html:19 #: .\onboarding\templates\onboarding\onboarding_view.html:48 #: .\recruitment\templates\candidate\individual.html:181 -#: .\templates\sidebar.html:202 +#: .\templates\sidebar.html:209 msgid "Onboarding" msgstr "" @@ -10331,13 +10737,13 @@ msgstr "" #: .\onboarding\templates\onboarding\onboarding_view.html:173 #: .\onboarding\templates\onboarding\onboardings.html:14 #: .\onboarding\templates\onboarding\single_view.html:57 -#: .\onboarding\templates\onboarding\table.html:14 .\recruitment\forms.py:256 -#: .\recruitment\forms.py:490 .\recruitment\models.py:248 +#: .\onboarding\templates\onboarding\table.html:14 .\recruitment\forms.py:261 +#: .\recruitment\forms.py:495 .\recruitment\models.py:248 #: .\recruitment\templates\candidate\export_filter.html:108 #: .\recruitment\templates\candidate\filters.html:92 #: .\recruitment\templates\pipeline\form\stage_update.html:7 -#: .\recruitment\templates\pipeline\pipeline.html:131 -#: .\recruitment\templates\pipeline\pipeline.html:260 +#: .\recruitment\templates\pipeline\pipeline.html:130 +#: .\recruitment\templates\pipeline\pipeline.html:259 #: .\recruitment\templates\stage\filters.html:5 #: .\recruitment\templates\stage\nav.html:7 #: .\recruitment\templates\stage\stage_empty.html:10 @@ -10466,7 +10872,7 @@ msgid "Send" msgstr "" #: .\onboarding\templates\onboarding\single_view.html:39 -#: .\recruitment\templates\pipeline\pipeline.html:253 +#: .\recruitment\templates\pipeline\pipeline.html:252 msgid "Contact" msgstr "" @@ -10552,12 +10958,13 @@ msgstr "" msgid "Candidate detail is updated successfully.." msgstr "" -#: .\onboarding\views.py:391 +#: .\onboarding\views.py:391 .\recruitment\views\views.py:1544 msgid "Candidate deleted successfully.." msgstr "" #: .\onboarding\views.py:393 .\recruitment\views\actions.py:198 -#: .\recruitment\views\actions.py:232 +#: .\recruitment\views\actions.py:232 .\recruitment\views\views.py:1525 +#: .\recruitment\views\views.py:1546 .\recruitment\views\views.py:1569 msgid "Candidate not found." msgstr "" @@ -10612,7 +11019,7 @@ msgstr "" msgid "Stage sequence updated" msgstr "" -#: .\onboarding\views.py:1368 .\recruitment\views\views.py:796 +#: .\onboarding\views.py:1368 .\recruitment\views\views.py:807 msgid "The stage title has been updated successfully" msgstr "" @@ -10636,425 +11043,401 @@ msgstr "" msgid "Contract Wage" msgstr "" -#: .\payroll\forms\component_forms.py:255 .\payroll\models\models.py:65 -#: .\payroll\models\models.py:621 .\payroll\models\models.py:629 -#: .\payroll\models\models.py:926 .\payroll\models\models.py:931 -#: .\payroll\templates\payroll\payslip\individual_payslip.html:118 +#: .\payroll\forms\component_forms.py:255 .\payroll\models\models.py:68 +#: .\payroll\models\models.py:624 .\payroll\models\models.py:632 +#: .\payroll\models\models.py:930 .\payroll\models\models.py:935 +#: .\payroll\templates\payroll\payslip\individual_payslip.html:134 #: .\payroll\templates\payroll\payslip\individual_pdf.html:141 msgid "Basic Pay" msgstr "" -#: .\payroll\models\models.py:67 .\payroll\models\models.py:933 +#: .\payroll\models\models.py:70 .\payroll\models\models.py:937 msgid "Taxable Gross Pay" msgstr "" -#: .\payroll\models\models.py:80 +#: .\payroll\models\models.py:83 msgid "Based on" msgstr "" -#: .\payroll\models\models.py:103 +#: .\payroll\models\models.py:106 msgid "Commission" msgstr "" -#: .\payroll\models\models.py:124 +#: .\payroll\models\models.py:127 msgid "Contract Title" msgstr "" -#: .\payroll\models\models.py:147 .\payroll\models\models.py:604 +#: .\payroll\models\models.py:150 .\payroll\models\models.py:607 #: .\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:207 +#: .\payroll\models\models.py:210 msgid "Calculate Daily Leave Amount" msgstr "" -#: .\payroll\models\models.py:213 +#: .\payroll\models\models.py:216 msgid "Deduction For One Leave Amount" msgstr "" -#: .\payroll\models\models.py:216 +#: .\payroll\models\models.py:219 #: .\payroll\templates\payroll\contract\contract_single_view.html:70 msgid "Deduct From Basic Pay" msgstr "" -#: .\payroll\models\models.py:230 +#: .\payroll\models\models.py:233 msgid "End date must be greater than start date" msgstr "" -#: .\payroll\models\models.py:242 .\payroll\models\models.py:294 +#: .\payroll\models\models.py:245 .\payroll\models\models.py:297 msgid "An active contract already exists for this employee." msgstr "" -#: .\payroll\models\models.py:254 .\payroll\models\models.py:307 +#: .\payroll\models\models.py:257 .\payroll\models\models.py:310 msgid "A draft contract already exists for this employee." msgstr "" -#: .\payroll\models\models.py:327 +#: .\payroll\models\models.py:330 msgid "Present" msgstr "" -#: .\payroll\models\models.py:328 +#: .\payroll\models\models.py:331 msgid "Half Day Present" msgstr "" -#: .\payroll\models\models.py:329 +#: .\payroll\models\models.py:332 msgid "Absent" msgstr "" -#: .\payroll\models\models.py:330 +#: .\payroll\models\models.py:333 msgid "Holiday/Company Leave" msgstr "" -#: .\payroll\models\models.py:331 +#: .\payroll\models\models.py:334 msgid "Conflict" msgstr "" -#: .\payroll\models\models.py:379 +#: .\payroll\models\models.py:382 msgid "Day percentage must be between 0.0 and 1.0" msgstr "" -#: .\payroll\models\models.py:413 +#: .\payroll\models\models.py:416 msgid "Validate the attendance" msgstr "" -#: .\payroll\models\models.py:415 +#: .\payroll\models\models.py:418 msgid "Incomplete minimum hour" msgstr "" -#: .\payroll\models\models.py:521 +#: .\payroll\models\models.py:524 msgid "Half day need to validate" msgstr "" -#: .\payroll\models\models.py:566 +#: .\payroll\models\models.py:569 msgid "Rate must be greater than 0" msgstr "" -#: .\payroll\models\models.py:568 +#: .\payroll\models\models.py:571 msgid "Rate must be less than 100" msgstr "" -#: .\payroll\models\models.py:576 +#: .\payroll\models\models.py:579 msgid "Value must be greater than zero" msgstr "" -#: .\payroll\models\models.py:580 .\payroll\models\models.py:589 -msgid "Equal (==)" -msgstr "" - -#: .\payroll\models\models.py:581 .\payroll\models\models.py:590 -msgid "Not Equal (!=)" -msgstr "" - -#: .\payroll\models\models.py:582 .\payroll\models\models.py:591 -msgid "Less Than (<)" -msgstr "" - -#: .\payroll\models\models.py:583 .\payroll\models\models.py:592 -msgid "Greater Than (>)" -msgstr "" - -#: .\payroll\models\models.py:584 .\payroll\models\models.py:593 -msgid "Less Than or Equal To (<=)" -msgstr "" - -#: .\payroll\models\models.py:585 .\payroll\models\models.py:594 -msgid "Greater Than or Equal To (>=)" -msgstr "" - -#: .\payroll\models\models.py:586 -msgid "Contains" -msgstr "" - -#: .\payroll\models\models.py:598 +#: .\payroll\models\models.py:601 msgid "Marital Status" msgstr "" -#: .\payroll\models\models.py:600 +#: .\payroll\models\models.py:603 msgid "Company Experience" msgstr "" -#: .\payroll\models\models.py:606 +#: .\payroll\models\models.py:609 msgid "Department on Contract" msgstr "" -#: .\payroll\models\models.py:616 +#: .\payroll\models\models.py:619 msgid "Exclude the allowance" msgstr "" -#: .\payroll\models\models.py:617 .\payroll\models\models.py:939 +#: .\payroll\models\models.py:620 .\payroll\models\models.py:943 msgid "Provide max amount" msgstr "" -#: .\payroll\models\models.py:632 +#: .\payroll\models\models.py:635 msgid "Title of the allowance" msgstr "" -#: .\payroll\models\models.py:638 +#: .\payroll\models\models.py:641 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:644 .\payroll\models\models.py:953 +#: .\payroll\models\models.py:647 .\payroll\models\models.py:957 msgid "Include all active employees" msgstr "" -#: .\payroll\models\models.py:645 +#: .\payroll\models\models.py:648 msgid "Target allowance to all active employees in the company" msgstr "" -#: .\payroll\models\models.py:649 .\payroll\models\models.py:958 +#: .\payroll\models\models.py:652 .\payroll\models\models.py:962 msgid "Employees Specific" msgstr "" -#: .\payroll\models\models.py:652 +#: .\payroll\models\models.py:655 msgid "Target allowance to the specific employees" msgstr "" -#: .\payroll\models\models.py:656 .\payroll\models\models.py:965 +#: .\payroll\models\models.py:659 .\payroll\models\models.py:969 msgid "Exclude Employees" msgstr "" -#: .\payroll\models\models.py:660 +#: .\payroll\models\models.py:663 msgid "" "To ignore the allowance to the employees when target them by all " "employees or through condition-based" msgstr "" -#: .\payroll\models\models.py:666 +#: .\payroll\models\models.py:669 msgid "This field is used to calculate the taxable allowances" msgstr "" -#: .\payroll\models\models.py:671 +#: .\payroll\models\models.py:674 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:681 .\payroll\models\models.py:1000 +#: .\payroll\models\models.py:684 .\payroll\models\models.py:1004 msgid "The related field of the employees" msgstr "" -#: .\payroll\models\models.py:690 .\payroll\models\models.py:1009 +#: .\payroll\models\models.py:693 .\payroll\models\models.py:1013 msgid "The value must be like the data stored in the database" msgstr "" -#: .\payroll\models\models.py:694 +#: .\payroll\models\models.py:697 msgid "To specify, the allowance is fixed or not" msgstr "" -#: .\payroll\models\models.py:700 +#: .\payroll\models\models.py:703 msgid "Fixed amount for this allowance" msgstr "" -#: .\payroll\models\models.py:710 +#: .\payroll\models\models.py:713 msgid "If the allowance is not fixed then specifies how the allowance provided" msgstr "" -#: .\payroll\models\models.py:719 .\payroll\models\models.py:1056 +#: .\payroll\models\models.py:722 .\payroll\models\models.py:1060 msgid "The percentage of based on" msgstr "" -#: .\payroll\models\models.py:727 +#: .\payroll\models\models.py:730 msgid "The attendance fixed amount for one validated attendance" msgstr "" -#: .\payroll\models\models.py:742 +#: .\payroll\models\models.py:745 msgid "The fixed amount for one validated attendance with that shift" msgstr "" -#: .\payroll\models\models.py:750 +#: .\payroll\models\models.py:753 msgid "" "The fixed amount for one hour overtime that are validated and " "approved the overtime attendance" msgstr "" -#: .\payroll\models\models.py:767 +#: .\payroll\models\models.py:770 msgid "The fixed amount for one validated attendance with that work type" msgstr "" -#: .\payroll\models\models.py:773 +#: .\payroll\models\models.py:776 msgid "Has max limit for allowance" msgstr "" -#: .\payroll\models\models.py:774 +#: .\payroll\models\models.py:777 msgid "Limit the allowance amount" msgstr "" -#: .\payroll\models\models.py:780 +#: .\payroll\models\models.py:783 msgid "The maximum amount for the allowance" msgstr "" -#: .\payroll\models\models.py:789 .\payroll\models\models.py:1082 +#: .\payroll\models\models.py:792 .\payroll\models\models.py:1086 msgid "For working days on month" msgstr "" -#: .\payroll\models\models.py:799 .\payroll\models\models.py:1091 +#: .\payroll\models\models.py:802 .\payroll\models\models.py:1095 msgid "The pay head for the if condition" msgstr "" -#: .\payroll\models\models.py:805 .\payroll\models\models.py:1097 +#: .\payroll\models\models.py:808 .\payroll\models\models.py:1101 msgid "Apply for those, if the pay-head conditions satisfy" msgstr "" -#: .\payroll\models\models.py:808 .\payroll\models\models.py:1100 +#: .\payroll\models\models.py:811 .\payroll\models\models.py:1104 msgid "The amount of the pay-head" msgstr "" -#: .\payroll\models\models.py:869 +#: .\payroll\models\models.py:873 msgid "" "If condition based, all fields (field, value, condition) must be filled." msgstr "" -#: .\payroll\models\models.py:876 +#: .\payroll\models\models.py:880 msgid "" "If based on is attendance, then per attendance fixed " "amount must be filled." msgstr "" -#: .\payroll\models\models.py:882 +#: .\payroll\models\models.py:886 msgid "If based on is shift, then shift must be filled." msgstr "" -#: .\payroll\models\models.py:885 +#: .\payroll\models\models.py:889 msgid "If based on is work type, then work type must be filled." msgstr "" -#: .\payroll\models\models.py:889 +#: .\payroll\models\models.py:893 msgid "Amount should be greater than zero." msgstr "" -#: .\payroll\models\models.py:938 +#: .\payroll\models\models.py:942 msgid "Exclude the deduction" msgstr "" -#: .\payroll\models\models.py:942 +#: .\payroll\models\models.py:946 msgid "Title of the deduction" msgstr "" -#: .\payroll\models\models.py:947 +#: .\payroll\models\models.py:951 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:954 +#: .\payroll\models\models.py:958 msgid "Target deduction to all active employees in the company" msgstr "" -#: .\payroll\models\models.py:960 +#: .\payroll\models\models.py:964 msgid "Target deduction to the specific employees" msgstr "" -#: .\payroll\models\models.py:969 +#: .\payroll\models\models.py:973 msgid "" "To ignore the deduction to the employees when target them by all " "employees or through condition-based" msgstr "" -#: .\payroll\models\models.py:976 +#: .\payroll\models\models.py:980 msgid "To specify the deduction is tax or normal deduction" msgstr "" -#: .\payroll\models\models.py:982 +#: .\payroll\models\models.py:986 msgid "" "To find taxable gross, taxable_gross = (basic_pay + " "taxable_deduction)-pre_tax_deductions " msgstr "" -#: .\payroll\models\models.py:990 +#: .\payroll\models\models.py:994 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:1018 +#: .\payroll\models\models.py:1022 msgid "Basic pay" msgstr "" -#: .\payroll\models\models.py:1024 +#: .\payroll\models\models.py:1028 msgid "" "Update compensation is used to update pay-head before any " "other deduction calculation starts" msgstr "" -#: .\payroll\models\models.py:1030 +#: .\payroll\models\models.py:1034 msgid "To specify, the deduction is fixed or not" msgstr "" -#: .\payroll\models\models.py:1037 +#: .\payroll\models\models.py:1041 msgid "Fixed amount for this deduction" msgstr "" -#: .\payroll\models\models.py:1045 +#: .\payroll\models\models.py:1049 msgid "If the deduction is not fixed then specifies how the deduction provided" msgstr "" -#: .\payroll\models\models.py:1055 +#: .\payroll\models\models.py:1059 msgid "Employee rate" msgstr "" -#: .\payroll\models\models.py:1067 +#: .\payroll\models\models.py:1071 msgid "Has max limit for deduction" msgstr "" -#: .\payroll\models\models.py:1068 +#: .\payroll\models\models.py:1072 msgid "Limit the deduction" msgstr "" -#: .\payroll\models\models.py:1074 +#: .\payroll\models\models.py:1078 msgid "The maximum amount for the deduction" msgstr "" -#: .\payroll\models\models.py:1085 +#: .\payroll\models\models.py:1089 msgid "The maximum amount for ?" msgstr "" -#: .\payroll\models\models.py:1117 +#: .\payroll\models\models.py:1127 msgid " Don't choose taxable gross pay when pretax is enabled." msgstr "" -#: .\payroll\models\models.py:1123 +#: .\payroll\models\models.py:1133 msgid " Don't choose net pay when pretax is enabled." msgstr "" -#: .\payroll\models\models.py:1127 +#: .\payroll\models\models.py:1137 msgid " Don't choose net pay when the tax is enabled." msgstr "" -#: .\payroll\models\models.py:1137 +#: .\payroll\models\models.py:1147 msgid "This fields required" msgstr "" -#: .\payroll\models\models.py:1144 +#: .\payroll\models\models.py:1154 msgid "" "If condition based, all fields (field, value, " "condition) must be filled." msgstr "" -#: .\payroll\models\models.py:1217 +#: .\payroll\models\models.py:1228 msgid "The end date must be greater than or equal to the start date" msgstr "" -#: .\payroll\models\models.py:1222 +#: .\payroll\models\models.py:1233 msgid "The end date cannot be in the future." msgstr "" -#: .\payroll\models\models.py:1224 +#: .\payroll\models\models.py:1235 msgid "The start date cannot be in the future." msgstr "" -#: .\payroll\models\models.py:1235 +#: .\payroll\models\models.py:1246 msgid "Employee ,start and end date must be unique" msgstr "" -#: .\payroll\models\models.py:1238 +#: .\payroll\models\models.py:1249 msgid "The data must be in dictionary or querydict type" msgstr "" +#: .\payroll\models\models.py:1316 +msgid "Total installments" +msgstr "" + #: .\payroll\models\tax_models.py:46 #: .\payroll\templates\payroll\tax\tax_bracket_view.html:6 #: .\payroll\templates\payroll\tax\taxbracket.html:6 @@ -11319,13 +11702,41 @@ msgstr "" msgid "Deduction Eligibility" msgstr "" +#: .\payroll\templates\payroll\loan\filter.html:14 +msgid "Loan Filter" +msgstr "" + +#: .\payroll\templates\payroll\loan\filter.html:23 +msgid "Provided date" +msgstr "" + +#: .\payroll\templates\payroll\loan\filter.html:41 +msgid "Is settled" +msgstr "" + +#: .\payroll\templates\payroll\loan\installments.html:20 +msgid "S/n" +msgstr "" + +#: .\payroll\templates\payroll\loan\installments.html:21 +msgid "One Time Date" +msgstr "" + +#: .\payroll\templates\payroll\loan\nav.html:4 +msgid "Loan / Advanced Salary" +msgstr "" + +#: .\payroll\templates\payroll\loan\records.html:44 +msgid "Installments" +msgstr "" + #: .\payroll\templates\payroll\payslip\filter_payslips.html:8 -#: .\payroll\templates\payroll\payslip\individual_payslip.html:38 +#: .\payroll\templates\payroll\payslip\individual_payslip.html:43 #: .\payroll\templates\payroll\payslip\individual_pdf.html:61 #: .\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:383 +#: .\templates\sidebar.html:392 msgid "Payslip" msgstr "" @@ -11383,7 +11794,7 @@ msgid "Payslips" msgstr "" #: .\payroll\templates\payroll\payslip\group_payslips.html:115 -#: .\payroll\templates\payroll\payslip\individual_payslip.html:30 +#: .\payroll\templates\payroll\payslip\individual_payslip.html:35 #: .\payroll\templates\payroll\payslip\payslip_table.html:109 #: .\payroll\templates\payroll\payslip\view_payslips.html:234 msgid "Send via mail" @@ -11394,69 +11805,93 @@ msgstr "" msgid "Are you sure you want to delete this payslip?" msgstr "" -#: .\payroll\templates\payroll\payslip\individual_payslip.html:23 +#: .\payroll\templates\payroll\payslip\individual_payslip.html:28 msgid "paid" msgstr "" -#: .\payroll\templates\payroll\payslip\individual_payslip.html:56 +#: .\payroll\templates\payroll\payslip\individual_payslip.html:61 #: .\payroll\templates\payroll\payslip\individual_pdf.html:86 msgid "Employee Details" msgstr "" -#: .\payroll\templates\payroll\payslip\individual_payslip.html:61 +#: .\payroll\templates\payroll\payslip\individual_payslip.html:66 msgid "Employee ID" msgstr "" -#: .\payroll\templates\payroll\payslip\individual_payslip.html:69 +#: .\payroll\templates\payroll\payslip\individual_payslip.html:74 msgid "Employee Name" msgstr "" -#: .\payroll\templates\payroll\payslip\individual_payslip.html:83 +#: .\payroll\templates\payroll\payslip\individual_payslip.html:88 msgid "Bank Acc./Cheque No." msgstr "" -#: .\payroll\templates\payroll\payslip\individual_payslip.html:94 +#: .\payroll\templates\payroll\payslip\individual_payslip.html:100 msgid "Employee Net Pay" msgstr "" -#: .\payroll\templates\payroll\payslip\individual_payslip.html:139 +#: .\payroll\templates\payroll\payslip\individual_payslip.html:103 +msgid "Actual Basic Pay" +msgstr "" + +#: .\payroll\templates\payroll\payslip\individual_payslip.html:104 +msgid "Paid Days" +msgstr "" + +#: .\payroll\templates\payroll\payslip\individual_payslip.html:105 +msgid "LOP Days" +msgstr "" + +#: .\payroll\templates\payroll\payslip\individual_payslip.html:107 +msgid "Updated Basic Pay" +msgstr "" + +#: .\payroll\templates\payroll\payslip\individual_payslip.html:110 +msgid "The payslip is calculated based on the updated basic pay" +msgstr "" + +#: .\payroll\templates\payroll\payslip\individual_payslip.html:155 #: .\payroll\templates\payroll\payslip\individual_pdf.html:162 msgid "Total Gross Pay" msgstr "" -#: .\payroll\templates\payroll\payslip\individual_payslip.html:157 +#: .\payroll\templates\payroll\payslip\individual_payslip.html:173 #: .\payroll\templates\payroll\payslip\individual_pdf.html:180 msgid "Loss of Pay" msgstr "" -#: .\payroll\templates\payroll\payslip\individual_payslip.html:193 +#: .\payroll\templates\payroll\payslip\individual_payslip.html:209 #: .\payroll\templates\payroll\payslip\individual_pdf.html:216 -#: .\templates\sidebar.html:391 +#: .\templates\sidebar.html:406 msgid "Federal Tax" msgstr "" -#: .\payroll\templates\payroll\payslip\individual_payslip.html:236 +#: .\payroll\templates\payroll\payslip\individual_payslip.html:237 +msgid "Total Deductions" +msgstr "" + +#: .\payroll\templates\payroll\payslip\individual_payslip.html:252 msgid "Total Net Payable" msgstr "" -#: .\payroll\templates\payroll\payslip\individual_payslip.html:239 +#: .\payroll\templates\payroll\payslip\individual_payslip.html:255 #: .\payroll\templates\payroll\payslip\individual_pdf.html:258 msgid "Gross Earnings - Total Deductions" msgstr "" -#: .\payroll\templates\payroll\payslip\individual_payslip.html:269 +#: .\payroll\templates\payroll\payslip\individual_payslip.html:285 msgid "Type A" msgstr "" -#: .\payroll\templates\payroll\payslip\individual_payslip.html:271 +#: .\payroll\templates\payroll\payslip\individual_payslip.html:287 msgid "Type B" msgstr "" -#: .\payroll\templates\payroll\payslip\individual_payslip.html:276 +#: .\payroll\templates\payroll\payslip\individual_payslip.html:292 msgid "Option #1" msgstr "" -#: .\payroll\templates\payroll\payslip\individual_payslip.html:277 +#: .\payroll\templates\payroll\payslip\individual_payslip.html:293 msgid "Option #2" msgstr "" @@ -11578,43 +12013,43 @@ msgstr "" msgid "record_type_name" msgstr "" -#: .\payroll\views\component_views.py:215 +#: .\payroll\views\component_views.py:230 msgid "Allowance created." msgstr "" -#: .\payroll\views\component_views.py:309 +#: .\payroll\views\component_views.py:324 msgid "Allowance updated." msgstr "" -#: .\payroll\views\component_views.py:322 +#: .\payroll\views\component_views.py:337 msgid "Allowance deleted successfully" msgstr "" -#: .\payroll\views\component_views.py:324 +#: .\payroll\views\component_views.py:339 msgid "Allowance not found" msgstr "" -#: .\payroll\views\component_views.py:327 +#: .\payroll\views\component_views.py:342 msgid "Validation error occurred while deleting the allowance" msgstr "" -#: .\payroll\views\component_views.py:331 +#: .\payroll\views\component_views.py:346 msgid "An error occurred while deleting the allowance" msgstr "" -#: .\payroll\views\component_views.py:347 +#: .\payroll\views\component_views.py:362 msgid "Deduction created." msgstr "" -#: .\payroll\views\component_views.py:439 +#: .\payroll\views\component_views.py:454 msgid "Deduction updated." msgstr "" -#: .\payroll\views\component_views.py:453 +#: .\payroll\views\component_views.py:468 msgid "Deduction deleted successfully" msgstr "" -#: .\payroll\views\component_views.py:563 +#: .\payroll\views\component_views.py:580 msgid "Payslip Saved" msgstr "" @@ -11799,7 +12234,7 @@ msgstr "" #: .\pms\models.py:176 .\recruitment\models.py:437 #: .\recruitment\templates\candidate\candidate_list.html:40 #: .\recruitment\templates\candidate\individual.html:170 -#: .\recruitment\templates\pipeline\pipeline.html:257 +#: .\recruitment\templates\pipeline\pipeline.html:256 msgid "Rating" msgstr "" @@ -11878,7 +12313,7 @@ msgstr "" #: .\pms\templates\feedback\feedback_detailed_view_answer.html:16 #: .\pms\templates\feedback\feedback_detailed_view_answer.html:18 #: .\pms\templates\feedback\feedback_detailed_view_answer.html:20 -#: .\recruitment\templates\candidate\candidate_list.html:89 +#: .\recruitment\templates\candidate\candidate_list.html:87 #: .\recruitment\templates\candidate\individual.html:101 #: .\recruitment\templates\candidate\individual.html:103 #: .\recruitment\templates\candidate\individual.html:105 @@ -11891,8 +12326,8 @@ msgstr "" #: .\recruitment\templates\candidate\rating_tab.html:21 #: .\recruitment\templates\candidate\rating_tab.html:23 #: .\recruitment\templates\candidate\rating_tab.html:25 -#: .\recruitment\templates\pipeline\pipeline.html:335 -#: .\recruitment\templates\pipeline\pipeline.html:349 +#: .\recruitment\templates\pipeline\pipeline.html:334 +#: .\recruitment\templates\pipeline\pipeline.html:348 #: .\recruitment\templates\pipeline\pipeline_card.html:191 #: .\recruitment\templates\pipeline\pipeline_card.html:205 #: .\recruitment\templates\rating_input.html:7 @@ -11988,19 +12423,19 @@ 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:632 +#: .\pms\templates\period\period_view.html:23 .\templates\sidebar.html:645 msgid "Period" msgstr "" #: .\pms\templates\feedback\feedback_creation.html:116 #: .\pms\templates\feedback\feedback_update.html:85 #: .\pms\templates\feedback\question_template\question_template_empty.html:24 -#: .\pms\templates\feedback\question_template\question_template_empty.html:50 -#: .\pms\templates\feedback\question_template\question_template_empty.html:78 +#: .\pms\templates\feedback\question_template\question_template_empty.html:52 +#: .\pms\templates\feedback\question_template\question_template_empty.html:80 #: .\pms\templates\feedback\question_template\question_template_view.html:23 -#: .\pms\templates\feedback\question_template\question_template_view.html:92 -#: .\pms\templates\feedback\question_template\question_template_view.html:124 -#: .\templates\sidebar.html:640 +#: .\pms\templates\feedback\question_template\question_template_view.html:103 +#: .\pms\templates\feedback\question_template\question_template_view.html:135 +#: .\templates\sidebar.html:653 msgid "Question Template" msgstr "" @@ -12115,70 +12550,70 @@ msgstr "" msgid "Review Cycle" msgstr "" -#: .\pms\templates\feedback\question\question_all.html:11 +#: .\pms\templates\feedback\question\question_all.html:12 msgid "Hide Questions" msgstr "" -#: .\pms\templates\feedback\question\question_all.html:16 +#: .\pms\templates\feedback\question\question_all.html:17 msgid "Show Questions" msgstr "" -#: .\pms\templates\feedback\question\question_all.html:36 -#: .\pms\templates\feedback\question_template\question_template_detailed_view.html:45 +#: .\pms\templates\feedback\question\question_all.html:37 +#: .\pms\templates\feedback\question_template\question_template_detailed_view.html:46 #: .\recruitment\templates\survey\filter.html:35 #: .\recruitment\templates\survey\view_single_template.html:30 msgid "Question Type" msgstr "" -#: .\pms\templates\feedback\question\question_all.html:43 -#: .\pms\templates\feedback\question_template\question_template_detailed_view.html:51 -#: .\recruitment\forms.py:551 .\recruitment\templates\survey\filter.html:10 +#: .\pms\templates\feedback\question\question_all.html:44 +#: .\pms\templates\feedback\question_template\question_template_detailed_view.html:52 +#: .\recruitment\forms.py:556 .\recruitment\templates\survey\filter.html:10 #: .\recruitment\templates\survey\view_single_template.html:21 msgid "Question" msgstr "" -#: .\pms\templates\feedback\question\question_all.html:49 -#: .\pms\templates\feedback\question_template\question_template_detailed_view.html:59 +#: .\pms\templates\feedback\question\question_all.html:50 +#: .\pms\templates\feedback\question_template\question_template_detailed_view.html:60 msgid "Show Options" msgstr "" -#: .\pms\templates\feedback\question\question_all.html:54 -#: .\pms\templates\feedback\question_template\question_template_detailed_view.html:64 +#: .\pms\templates\feedback\question\question_all.html:55 +#: .\pms\templates\feedback\question_template\question_template_detailed_view.html:65 msgid "Hide Options" msgstr "" -#: .\pms\templates\feedback\question\question_all.html:61 -#: .\pms\templates\feedback\question\question_all.html:67 -#: .\pms\templates\feedback\question\question_all.html:73 -#: .\pms\templates\feedback\question\question_all.html:79 -#: .\pms\templates\feedback\question_template\question_template_detailed_view.html:70 -#: .\pms\templates\feedback\question_template\question_template_detailed_view.html:77 -#: .\pms\templates\feedback\question_template\question_template_detailed_view.html:84 -#: .\pms\templates\feedback\question_template\question_template_detailed_view.html:91 +#: .\pms\templates\feedback\question\question_all.html:62 +#: .\pms\templates\feedback\question\question_all.html:68 +#: .\pms\templates\feedback\question\question_all.html:74 +#: .\pms\templates\feedback\question\question_all.html:80 +#: .\pms\templates\feedback\question_template\question_template_detailed_view.html:71 +#: .\pms\templates\feedback\question_template\question_template_detailed_view.html:78 +#: .\pms\templates\feedback\question_template\question_template_detailed_view.html:85 +#: .\pms\templates\feedback\question_template\question_template_detailed_view.html:92 msgid "Option" msgstr "" -#: .\pms\templates\feedback\question\question_all.html:98 +#: .\pms\templates\feedback\question\question_all.html:102 msgid "Do you want to delete the question?" msgstr "" -#: .\pms\templates\feedback\question_template\question_template_detailed_view.html:37 +#: .\pms\templates\feedback\question_template\question_template_detailed_view.html:38 msgid "Add A Question" msgstr "" -#: .\pms\templates\feedback\question_template\question_template_detailed_view.html:101 +#: .\pms\templates\feedback\question_template\question_template_detailed_view.html:102 msgid "Add Question" msgstr "" -#: .\pms\templates\feedback\question_template\question_template_empty.html:100 +#: .\pms\templates\feedback\question_template\question_template_empty.html:102 msgid "No Question templates are available." msgstr "" -#: .\pms\templates\feedback\question_template\question_template_view.html:51 +#: .\pms\templates\feedback\question_template\question_template_view.html:53 msgid "Total Question" msgstr "" -#: .\pms\templates\feedback\question_template\question_template_view.html:76 +#: .\pms\templates\feedback\question_template\question_template_view.html:85 msgid "Do you want to delete this question template?" msgstr "" @@ -12264,7 +12699,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:617 +#: .\pms\templates\okr\objective_empty.html:14 .\templates\sidebar.html:630 msgid "Objectives" msgstr "" @@ -12331,7 +12766,7 @@ msgstr "" msgid "Update Objectives" msgstr "" -#: .\pms\templates\period\period_empty.html:68 +#: .\pms\templates\period\period_empty.html:70 msgid "No time periods have been created." msgstr "" @@ -12339,7 +12774,7 @@ msgstr "" msgid "Update Period" msgstr "" -#: .\pms\templates\period\period_view.html:66 +#: .\pms\templates\period\period_view.html:74 msgid "Do you want to delete this period ?" msgstr "" @@ -12560,7 +12995,7 @@ msgstr "" msgid "{feedback} is {message}" msgstr "" -#: .\recruitment\forms.py:208 .\recruitment\forms.py:428 +#: .\recruitment\forms.py:213 .\recruitment\forms.py:433 #: .\recruitment\templates\pipeline\form\recruitment_update.html:67 #: .\recruitment\templates\recruitment\recruitment_component.html:55 #: .\recruitment\templates\recruitment\recruitment_form.html:73 @@ -12568,12 +13003,12 @@ msgstr "" msgid "Vacancy" msgstr "" -#: .\recruitment\forms.py:552 +#: .\recruitment\forms.py:557 #: .\recruitment\templates\survey\view_single_template.html:34 msgid "Sequence" msgstr "" -#: .\recruitment\forms.py:555 +#: .\recruitment\forms.py:560 msgid "Is Mandatory" msgstr "" @@ -12674,6 +13109,16 @@ msgstr "" msgid "Separate choices by ', '" msgstr "" +#: .\recruitment\models.py:542 +#: .\recruitment\templates\skill_zone\skill_zone_nav.html:5 +#: .\templates\sidebar.html:172 +msgid "Skill Zone" +msgstr "" + +#: .\recruitment\models.py:563 +msgid "Reason" +msgstr "" + #: .\recruitment\templates\candidate\application_form.html:94 msgid "Please select profile image" msgstr "" @@ -12698,31 +13143,38 @@ msgstr "" #: .\recruitment\templates\candidate\application_form.html:205 #: .\recruitment\templates\candidate\candidate_create_form.html:163 #: .\recruitment\templates\candidate\candidate_list.html:43 -#: .\recruitment\templates\candidate\candidate_list.html:102 +#: .\recruitment\templates\candidate\candidate_list.html:100 #: .\recruitment\templates\candidate\group_by.html:35 #: .\recruitment\templates\candidate\group_by.html:77 #: .\recruitment\templates\candidate\individual.html:133 #: .\recruitment\templates\pipeline\form\candidate_drop_down_form.html:62 -#: .\recruitment\templates\pipeline\pipeline.html:421 +#: .\recruitment\templates\pipeline\pipeline.html:420 #: .\recruitment\templates\pipeline\pipeline_card.html:127 #: .\recruitment\templates\pipeline\pipeline_card.html:274 #: .\recruitment\templates\pipeline\pipeline_components\kanban_tabs.html:59 #: .\recruitment\templates\pipeline\pipeline_components\kanban_tabs.html:157 +#: .\recruitment\templates\skill_zone\skill_zone_list.html:98 +#: .\recruitment\templates\skill_zone\skill_zone_list.html:130 +#: .\recruitment\templates\skill_zone_cand\skill_zone_cand_list.html:13 +#: .\recruitment\templates\skill_zone_cand\skill_zone_cand_list.html:44 msgid "Resume" msgstr "" #: .\recruitment\templates\candidate\candidate_card.html:68 -#: .\recruitment\templates\candidate\candidate_list.html:137 +#: .\recruitment\templates\candidate\candidate_list.html:147 +#: .\recruitment\templates\skill_zone_cand\skill_zone_cand_card.html:69 msgid "Do you want to archive this candidate?" msgstr "" #: .\recruitment\templates\candidate\candidate_card.html:72 -#: .\recruitment\templates\candidate\candidate_list.html:145 +#: .\recruitment\templates\candidate\candidate_list.html:155 +#: .\recruitment\templates\skill_zone_cand\skill_zone_cand_card.html:73 msgid "Do you want to un-archive this candidate?" msgstr "" #: .\recruitment\templates\candidate\candidate_card.html:78 -#: .\recruitment\templates\candidate\candidate_list.html:154 +#: .\recruitment\templates\candidate\candidate_list.html:164 +#: .\recruitment\templates\skill_zone_cand\skill_zone_cand_card.html:79 msgid "Do you want to delete this candidate?" msgstr "" @@ -12732,6 +13184,7 @@ msgstr "" #: .\recruitment\templates\candidate\export_filter.html:28 #: .\recruitment\templates\candidate\filters.html:7 #: .\recruitment\templates\candidate\group_by.html:30 +#: .\recruitment\templates\skill_zone_cand\skill_zone_cand_nav.html:44 msgid "Candidates" msgstr "" @@ -12749,6 +13202,7 @@ msgstr "" #: .\recruitment\templates\candidate\candidate_list.html:23 #: .\recruitment\templates\candidate\candidate_nav.html:12 +#: .\recruitment\templates\skill_zone_cand\skill_zone_cand_nav.html:12 msgid "Export Candidates" msgstr "" @@ -12757,17 +13211,20 @@ msgid "Convert" msgstr "" #: .\recruitment\templates\candidate\candidate_list.html:113 -#: .\recruitment\templates\candidate\candidate_list.html:120 +#: .\recruitment\templates\candidate\candidate_list.html:122 +#, fuzzy +#| msgid "employee" +msgid "To employee " +msgstr "Employee" + +#: .\recruitment\templates\candidate\candidate_list.html:119 #: .\recruitment\templates\candidate\individual.html:40 msgid "Are you sure you want to convert this candidate into an employee?" msgstr "" -#: .\recruitment\templates\candidate\candidate_list.html:116 -#: .\recruitment\templates\candidate\candidate_list.html:123 -#, fuzzy -#| msgid "employee" -msgid "To Employee" -msgstr "Employee" +#: .\recruitment\templates\candidate\candidate_list.html:127 +msgid "To Skill zone" +msgstr "" #: .\recruitment\templates\candidate\candidate_update_form.html:29 msgid "Candidate Info" @@ -12832,10 +13289,12 @@ msgid "Scheduled Till" msgstr "" #: .\recruitment\templates\candidate\group_by.html:88 +#: .\recruitment\templates\skill_zone\skill_zone_list.html:148 msgid "Do you want to archive this candidate" msgstr "" #: .\recruitment\templates\candidate\group_by.html:95 +#: .\recruitment\templates\skill_zone\skill_zone_list.html:155 msgid "Do you want to un-archive this candidate" msgstr "" @@ -12939,7 +13398,7 @@ msgid "Ongoing Recruitments & Hiring Managers" msgstr "" #: .\recruitment\templates\offerletter\view_templates.html:28 -#: .\templates\sidebar.html:147 +#: .\templates\sidebar.html:145 msgid "Mail Templates" msgstr "" @@ -12980,11 +13439,12 @@ 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:276 +#: .\templates\sidebar.html:284 msgid "Profile" msgstr "" #: .\recruitment\templates\pipeline\form\candidate_drop_down_form.html:76 +#: .\recruitment\templates\skill_zone_cand\skill_zone_cand_form.html:7 msgid "Add Candidate" msgstr "" @@ -13019,27 +13479,27 @@ msgstr "" #: .\recruitment\templates\pipeline\nav.html:71 #: .\recruitment\templates\pipeline\pipeline_empty.html:10 -#: .\templates\sidebar.html:105 +#: .\templates\sidebar.html:104 msgid "Recruitments" msgstr "" -#: .\recruitment\templates\pipeline\pipeline.html:149 +#: .\recruitment\templates\pipeline\pipeline.html:148 #: .\recruitment\templates\pipeline\pipeline_card.html:47 msgid "candidates" msgstr "" -#: .\recruitment\templates\pipeline\pipeline.html:206 +#: .\recruitment\templates\pipeline\pipeline.html:205 #: .\recruitment\templates\pipeline\pipeline_card.html:78 #: .\recruitment\templates\pipeline\pipeline_card.html:289 #: .\recruitment\templates\stage\stage_component.html:95 msgid "Are you sure you want to delete this stage?" msgstr "" -#: .\recruitment\templates\pipeline\pipeline.html:301 +#: .\recruitment\templates\pipeline\pipeline.html:300 msgid "Move" msgstr "" -#: .\recruitment\templates\pipeline\pipeline.html:406 +#: .\recruitment\templates\pipeline\pipeline.html:405 #: .\recruitment\templates\pipeline\pipeline_card.html:268 #: .\recruitment\templates\pipeline\pipeline_components\kanban_tabs.html:152 msgid "View Note" @@ -13055,7 +13515,7 @@ msgid "At present, there is no ongoing recruitment." msgstr "" #: .\recruitment\templates\pipeline\pipeline_tabs.html:12 -#: .\templates\sidebar.html:175 +#: .\templates\sidebar.html:181 msgid "Stages" msgstr "" @@ -13103,6 +13563,68 @@ msgstr "" msgid "View Recruitments" msgstr "" +#: .\recruitment\templates\skill_zone\skill_zone_card.html:46 +msgid "Do you want to Archive this Skill zone?" +msgstr "" + +#: .\recruitment\templates\skill_zone\skill_zone_card.html:52 +msgid "Do you want to Un-Archive this Skill zone?" +msgstr "" + +#: .\recruitment\templates\skill_zone\skill_zone_card.html:59 +msgid "Do you want to delete this Skill zone?" +msgstr "" + +#: .\recruitment\templates\skill_zone\skill_zone_create.html:17 +#, fuzzy +#| msgid "create-allowance" +msgid "Create Skill Zone" +msgstr "Creation" + +#: .\recruitment\templates\skill_zone\skill_zone_list.html:33 +msgid "Do you want to archive this skill zone ?" +msgstr "" + +#: .\recruitment\templates\skill_zone\skill_zone_list.html:48 +msgid "Do you want to un archive this skill zone?" +msgstr "" + +#: .\recruitment\templates\skill_zone\skill_zone_list.html:62 +msgid "Are you sure want to delete this skill zone?" +msgstr "" + +#: .\recruitment\templates\skill_zone\skill_zone_list.html:96 +#: .\recruitment\templates\skill_zone_cand\skill_zone_cand_list.html:11 +msgid "Reasom" +msgstr "" + +#: .\recruitment\templates\skill_zone\skill_zone_list.html:97 +#: .\recruitment\templates\skill_zone_cand\skill_zone_cand_list.html:12 +msgid "Added on" +msgstr "" + +#: .\recruitment\templates\skill_zone\skill_zone_list.html:163 +msgid "Do you want to remove this candidate" +msgstr "" + +#: .\recruitment\templates\skill_zone\skill_zone_update.html:17 +#, fuzzy +#| msgid "update-allowance" +msgid "Update Skill Zone" +msgstr "Update" + +#: .\recruitment\templates\skill_zone\skill_zone_view.html:20 +msgid "You have no Skill Zone." +msgstr "" + +#: .\recruitment\templates\skill_zone_cand\skill_zone_cand_form.html:9 +msgid "Edit Candidate" +msgstr "" + +#: .\recruitment\templates\skill_zone_cand\skill_zone_cand_view.html:20 +msgid "You have no Candidate." +msgstr "" + #: .\recruitment\templates\stage\stage_create.html:8 msgid "View Stages" msgstr "" @@ -13257,58 +13779,103 @@ msgstr "" msgid "Application saved." msgstr "" -#: .\recruitment\views\views.py:134 +#: .\recruitment\views\views.py:145 msgid "Recruitment added." msgstr "" -#: .\recruitment\views\views.py:197 +#: .\recruitment\views\views.py:208 msgid "Recruitment Updated." msgstr "" -#: .\recruitment\views\views.py:288 .\recruitment\views\views.py:825 +#: .\recruitment\views\views.py:299 .\recruitment\views\views.py:836 msgid "Candidate added." msgstr "" -#: .\recruitment\views\views.py:298 .\recruitment\views\views.py:710 +#: .\recruitment\views\views.py:309 .\recruitment\views\views.py:721 msgid "Stage added." msgstr "" -#: .\recruitment\views\views.py:322 +#: .\recruitment\views\views.py:333 msgid "You dont have access" msgstr "" -#: .\recruitment\views\views.py:377 .\recruitment\views\views.py:776 +#: .\recruitment\views\views.py:388 .\recruitment\views\views.py:787 msgid "Stage updated." msgstr "" -#: .\recruitment\views\views.py:415 +#: .\recruitment\views\views.py:426 msgid "Recruitment updated." msgstr "" -#: .\recruitment\views\views.py:488 +#: .\recruitment\views\views.py:499 msgid "No change detected." msgstr "" -#: .\recruitment\views\views.py:528 +#: .\recruitment\views\views.py:539 msgid "Candidate stage updated" msgstr "" -#: .\recruitment\views\views.py:531 +#: .\recruitment\views\views.py:542 msgid "Something went wrong, Try agian." msgstr "" -#: .\recruitment\views\views.py:1002 +#: .\recruitment\views\views.py:1013 msgid "Candidate Updated Successfully." msgstr "" -#: .\recruitment\views\views.py:1023 +#: .\recruitment\views\views.py:1034 msgid "Employee instance already exist" msgstr "" -#: .\recruitment\views\views.py:1028 +#: .\recruitment\views\views.py:1039 msgid "Employee instance created successfully" msgstr "" +#: .\recruitment\views\views.py:1266 +msgid "Skill Zone created successfully." +msgstr "" + +#: .\recruitment\views\views.py:1286 +msgid "Skill Zone updated successfully." +msgstr "" + +#: .\recruitment\views\views.py:1310 .\recruitment\views\views.py:1466 +msgid "Skill zone deleted successfully.." +msgstr "" + +#: .\recruitment\views\views.py:1312 .\recruitment\views\views.py:1344 +#: .\recruitment\views\views.py:1468 +msgid "Skill zone not found." +msgstr "" + +#: .\recruitment\views\views.py:1336 +msgid "Skill zone archived successfully.." +msgstr "" + +#: .\recruitment\views\views.py:1340 +msgid "Skill zone unarchived successfully.." +msgstr "" + +#: .\recruitment\views\views.py:1419 +msgid "Candidate added successfully." +msgstr "" + +#: .\recruitment\views\views.py:1445 +msgid "Candidate edited successfully." +msgstr "" + +#: .\recruitment\views\views.py:1517 +msgid "Candidate archived successfully.." +msgstr "" + +#: .\recruitment\views\views.py:1521 +msgid "Candidate unarchived successfully.." +msgstr "" + +#: .\recruitment\views\views.py:1562 +msgid "Candidate added successfully.." +msgstr "" + #: .\templates\dashboard.html:66 msgid "New Joining Today" msgstr "" @@ -13472,89 +14039,107 @@ msgstr "" msgid "All\tSettings" msgstr "Settings" -#: .\templates\settings.html:124 +#: .\templates\settings.html:148 msgid "Attendance Break Point" msgstr "" -#: .\templates\settings.html:148 +#: .\templates\settings.html:181 +#, fuzzy +#| msgid "department-update" +msgid "Department Managers" +msgstr "Update" + +#: .\templates\settings.html:192 msgid "Employee Permission" msgstr "" -#: .\templates\settings.html:156 +#: .\templates\settings.html:203 msgid "User Group" msgstr "" -#: .\templates\settings.html:180 +#: .\templates\settings.html:236 msgid "Date & Time Format" msgstr "" -#: .\templates\sidebar.html:55 +#: .\templates\sidebar.html:54 msgid "My Company" msgstr "" -#: .\templates\sidebar.html:82 .\templates\sidebar.html:119 -#: .\templates\sidebar.html:218 .\templates\sidebar.html:353 -#: .\templates\sidebar.html:508 .\templates\sidebar.html:516 -#: .\templates\sidebar.html:610 +#: .\templates\sidebar.html:81 .\templates\sidebar.html:118 +#: .\templates\sidebar.html:225 .\templates\sidebar.html:362 +#: .\templates\sidebar.html:523 .\templates\sidebar.html:531 +#: .\templates\sidebar.html:623 .\templates\sidebar.html:694 msgid "Dashboard" msgstr "" -#: .\templates\sidebar.html:128 +#: .\templates\sidebar.html:127 msgid "Recruitment Pipeline" msgstr "" -#: .\templates\sidebar.html:137 +#: .\templates\sidebar.html:136 msgid "Recruitment Survey" msgstr "" -#: .\templates\sidebar.html:226 +#: .\templates\sidebar.html:234 msgid "Onboarding View" msgstr "" -#: .\templates\sidebar.html:234 +#: .\templates\sidebar.html:242 msgid "Candidate View" msgstr "" -#: .\templates\sidebar.html:369 +#: .\templates\sidebar.html:378 msgid "Allowance view" msgstr "" -#: .\templates\sidebar.html:377 +#: .\templates\sidebar.html:386 msgid "Deduction view" msgstr "" -#: .\templates\sidebar.html:440 +#: .\templates\sidebar.html:398 +msgid "Loan / Advance Salary" +msgstr "" + +#: .\templates\sidebar.html:455 msgid "Attendance Requests" msgstr "" -#: .\templates\sidebar.html:461 +#: .\templates\sidebar.html:476 msgid "Late Come Early Out" msgstr "" -#: .\templates\sidebar.html:468 +#: .\templates\sidebar.html:483 msgid "My Attendance" msgstr "" -#: .\templates\sidebar.html:544 +#: .\templates\sidebar.html:559 msgid "Assigned Leaves" msgstr "" -#: .\templates\sidebar.html:624 +#: .\templates\sidebar.html:637 msgid "360 Feedback" msgstr "" -#: .\templates\sidebar.html:681 +#: .\templates\sidebar.html:702 msgid "Asset view" msgstr "" -#: .\templates\sidebar.html:689 +#: .\templates\sidebar.html:710 msgid "Request and Allocation" msgstr "" -#: .\templates\sidebar.html:714 +#: .\templates\sidebar.html:735 msgid "Help Desk" msgstr "" +#: .\templates\sidebar.html:808 +msgid "Configuration" +msgstr "" + +#: .\templates\sidebar.html:823 +msgid "Multiple Approvals " +msgstr "" + #~ msgid "department-creation" #~ msgstr "Departments" diff --git a/horilla_crumbs/context_processors.py b/horilla_crumbs/context_processors.py index a97d3782c..658eded40 100644 --- a/horilla_crumbs/context_processors.py +++ b/horilla_crumbs/context_processors.py @@ -87,6 +87,7 @@ sidebar_urls = [ "tag-view", "ticket-type-view", "mail-server-conf", + "multiple-approval-condition", ] remove_urls = [ "objective-detailed-view", diff --git a/leave/admin.py b/leave/admin.py index 5f23fe69b..6923ce752 100644 --- a/leave/admin.py +++ b/leave/admin.py @@ -3,7 +3,15 @@ Module for registering LeaveType, LeaveRequest, AvailableLeave, Holiday, and Com models with the Django admin site. """ from django.contrib import admin -from .models import LeaveType, LeaveRequest, AvailableLeave, Holiday, CompanyLeave,LeaveAllocationRequest +from .models import ( + LeaveRequestConditionApproval, + LeaveType, + LeaveRequest, + AvailableLeave, + Holiday, + CompanyLeave, + LeaveAllocationRequest, +) # Register your models here. @@ -13,3 +21,4 @@ admin.site.register(AvailableLeave) admin.site.register(Holiday) admin.site.register(CompanyLeave) admin.site.register(LeaveAllocationRequest) +admin.site.register(LeaveRequestConditionApproval) diff --git a/leave/models.py b/leave/models.py index 5c87216af..f7de3c9e4 100644 --- a/leave/models.py +++ b/leave/models.py @@ -1,11 +1,13 @@ import calendar from collections.abc import Iterable from datetime import datetime, timedelta +import operator from django.db import models from django.utils import timezone from django.core.exceptions import ValidationError from dateutil.relativedelta import relativedelta from django.utils.translation import gettext_lazy as _ +from base import thread_local_middleware from base.models import Company, MultipleApprovalCondition from base.horilla_company_manager import HorillaCompanyManager from employee.models import Employee @@ -14,6 +16,15 @@ from django.core.files.storage import default_storage from django.conf import settings +operator_mapping = { + "equal": operator.eq, + "notequal": operator.ne, + "lt": operator.lt, + "gt": operator.gt, + "le": operator.le, + "ge": operator.ge, + "icontains": operator.contains, +} # Create your models here. BREAKDOWN = [ ("full_day", _("Full Day")), @@ -522,15 +533,23 @@ class LeaveRequest(models.Model): department_id = self.employee_id.employee_work_info.department_id requested_days = self.requested_days applicable_condition = False - conditions = MultipleApprovalCondition.objects.filter(department=department_id) - for condition in conditions: - operator = condition.condition_operator - if operator == "range": - start_value = float(condition.condition_start_value) - end_value = float(condition.condition_end_value) - if start_value <= requested_days <= end_value: - applicable_condition = condition - break + conditions = MultipleApprovalCondition.objects.filter(department=department_id).order_by('condition_value') + if conditions: + for condition in conditions: + operator = condition.condition_operator + if operator == "range": + start_value = float(condition.condition_start_value) + end_value = float(condition.condition_end_value) + if start_value <= requested_days <= end_value: + applicable_condition = condition + break + else: + operator_func = operator_mapping.get(condition.condition_operator) + condition_value = type(requested_days)(condition.condition_value) + if operator_func(requested_days, condition_value): + applicable_condition = condition + break + if applicable_condition and self.status=="requested": LeaveRequestConditionApproval.objects.filter(leave_request_id=self).delete() sequence = 0 @@ -593,7 +612,7 @@ class LeaveRequest(models.Model): self.status = "approved" available_leave.save() - def conditional_approvals(self, *args, **kwargs): + def multiple_approvals(self, *args, **kwargs): approvals = LeaveRequestConditionApproval.objects.filter(leave_request_id=self) requested_query = approvals.filter(is_approved=False).order_by("sequence") approved_query = approvals.filter(is_approved=True).order_by("sequence") @@ -605,10 +624,21 @@ class LeaveRequest(models.Model): "managers": managers, "approved": approved_query, "requested": requested_query, + "approvals":approvals, } else: result = False return result + + def is_approved(self): + request = getattr(thread_local_middleware._thread_locals,"request",None) + if request: + employee = Employee.objects.filter(employee_user_id = request.user).first() + condition_approval = LeaveRequestConditionApproval.objects.filter(leave_request_id=self,manager_id = employee.id).first() + if condition_approval: + return not condition_approval.is_approved + else: + return True class LeaveAllocationRequest(models.Model): diff --git a/leave/templates/leave/holiday/holiday_form.html b/leave/templates/leave/holiday/holiday_form.html index ba300667b..71ab29d81 100644 --- a/leave/templates/leave/holiday/holiday_form.html +++ b/leave/templates/leave/holiday/holiday_form.html @@ -1,4 +1,20 @@ {% load i18n %} +{% if messages %} +
+ {% for message in messages %} +
+
+ {{ message }} +
+
+ {% endfor %} +
+ +{% endif %} {% if form.errors %}
diff --git a/leave/templates/leave/holiday/holiday_update_form.html b/leave/templates/leave/holiday/holiday_update_form.html index d5f02974f..f4c477782 100644 --- a/leave/templates/leave/holiday/holiday_update_form.html +++ b/leave/templates/leave/holiday/holiday_update_form.html @@ -1,4 +1,20 @@ {% load i18n %} +{% if messages %} +
+ {% for message in messages %} +
+
+ {{ message }} +
+
+ {% endfor %} +
+ +{% endif %} {% if form.errors %}
diff --git a/leave/templates/leave/holiday/holiday_view.html b/leave/templates/leave/holiday/holiday_view.html index 272c5bc27..dc0a40e38 100644 --- a/leave/templates/leave/holiday/holiday_view.html +++ b/leave/templates/leave/holiday/holiday_view.html @@ -1,6 +1,6 @@ {% extends 'index.html' %} {% block content %} {% load static %} {% load i18n %} -{% if messages %} +{% comment %} {% if messages %}
{% for message in messages %}
@@ -10,7 +10,7 @@
{% endfor %}
-{% endif %} +{% endif %} {% endcomment %} @@ -194,7 +194,9 @@ {% trans "Create Holiday" %} -
@@ -217,7 +219,9 @@ {% trans "Update Holiday" %} -
diff --git a/leave/templates/leave/leave_request/leave_requests.html b/leave/templates/leave/leave_request/leave_requests.html index eda04de5c..c65af190f 100644 --- a/leave/templates/leave/leave_request/leave_requests.html +++ b/leave/templates/leave/leave_request/leave_requests.html @@ -77,7 +77,7 @@ {% if not dashboard %}
{% trans "Penalties" %}
{% trans "Options" %}
- {% if request.user|is_reportingmanager or perms.leave.chanage_leaverequest or perms.leave.delete_leaverequest %} + {% if request.user|is_reportingmanager or perms.leave.chanage_leaverequest or perms.leave.delete_leaverequest or request.user|is_leave_approval_manager %}
{% trans "Actions" %}
{% endif %} {% endif %} @@ -114,7 +114,15 @@
{{leave_request.start_date}}
{{leave_request.end_date}}
{{leave_request.requested_days}}
-
{{leave_request.get_status_display}}
+
+ {% if leave_request.multiple_approvals and leave_request.status == "requested" %} +
+ {{leave_request.multiple_approvals.approved|length}} / {{leave_request.multiple_approvals.managers|length}} {% trans "Approved" %} +
+ {% else %} + {{leave_request.get_status_display}} + {% endif %} +
{% if not dashboard %}
{% if leave_request.get_penalties_count %} @@ -123,7 +131,8 @@
- {% if leave_request.status == 'requested' %} + + {% if leave_request.is_approved and leave_request.status == 'requested' %} @@ -154,7 +163,7 @@
- {% if request.user|is_reportingmanager or perms.attendance.chanage_penaltyaccount %} + {% if request.user|is_reportingmanager or perms.attendance.chanage_penaltyaccount or request.user|is_leave_approval_manager %} {% endif %} - {% if request.user|is_reportingmanager or perms.leave.chanage_leaverequest or perms.leave.delete_leaverequest %} - {% if request.user|is_reportingmanager or perms.leave.chanage_leaverequest %} + {% if request.user|is_reportingmanager or perms.leave.chanage_leaverequest or perms.leave.delete_leaverequest or request.user|is_leave_approval_manager%} + {% if request.user|is_reportingmanager or perms.leave.chanage_leaverequest or request.user|is_leave_approval_manager %} {% endif %} - {% if request.user|is_reportingmanager or perms.leave.delete_leaverequest %} + {% if request.user|is_reportingmanager or perms.leave.delete_leaverequest or request.user|is_leave_approval_manager %} diff --git a/leave/templates/leave/leave_request/one_request_view.html b/leave/templates/leave/leave_request/one_request_view.html index 3851ba193..690623c8b 100644 --- a/leave/templates/leave/leave_request/one_request_view.html +++ b/leave/templates/leave/leave_request/one_request_view.html @@ -62,6 +62,25 @@ {{leave_request.created_by}}
+ {% if leave_request.multiple_approvals %} +
+
+ {% trans "Multiple Approvals" %} + {% for approval in leave_request.multiple_approvals.approvals %} +
{{forloop.counter}}.{{approval.manager_id}} : + {% if approval.is_approved %}{% trans "Approved" %} + {% else %} + {% if approval.is_rejected %} + {% trans "Rejected" %} + {% else %} + {% trans "Not Marked" %} + {% endif %} + {% endif %} +
+ {% endfor %} +
+
+ {% endif %}
@@ -96,7 +115,7 @@
- {% if leave_request.status == 'requested' %} + {% if leave_request.status == 'requested' %} diff --git a/leave/templates/leave/leave_request/penalty/condition.html b/leave/templates/leave/leave_request/penalty/condition.html new file mode 100644 index 000000000..d07d28ad4 --- /dev/null +++ b/leave/templates/leave/leave_request/penalty/condition.html @@ -0,0 +1,23 @@ +{% extends "index.html" %}{% block content %}{% load static %}{% load i18n %} +
+
+

+ {% trans "Multiple Approval Condition" %} +

+ + + +
+
+
+ {% include "leave/leave_request/penalty/create.html" %} +
+{% endblock content %} diff --git a/leave/templates/leave/leave_request/penalty/create.html b/leave/templates/leave/leave_request/penalty/create.html new file mode 100644 index 000000000..94e9ecfb2 --- /dev/null +++ b/leave/templates/leave/leave_request/penalty/create.html @@ -0,0 +1,122 @@ +{% load static %} {% load i18n %} {% load basefilters %} +
+
+
+
+
+
+
+
{% trans "Department" %}
+
{% trans "Condition Field" %}
+
{% trans "Condition Operator" %}
+
{% trans "Condition Value" %}
+
{% trans "Approval Managers" %}
+ {% if perms.leave.change_availableleave or perms.leave.delete_availableleave or request.user|is_reportingmanager %} +
{% trans "Actions" %}
+ {% endif %} +
+
+
+ {% for condition in conditions %} +
+
+ {{condition.department}} +
+
{{condition.get_condition_field_display}}
+
{{condition.get_condition_operator_display}}
+
+ {% if condition.condition_operator == "range" %} + {{condition.condition_start_value}} - {{condition.condition_end_value}} + {% else %} + {{condition.condition_value}} + {% endif %} +
+
+ {% for manager in condition.approval_managers %} + {{ forloop.counter }}. {{ manager }}
+ {% endfor %}
+ {% if perms.leave.change_availableleave or perms.leave.delete_availableleave or request.user|is_reportingmanager %} +
+
+ {% if request.user|is_reportingmanager or perms.leave.change_availableleave %} + + {% endif %} + {% if request.user|is_reportingmanager or perms.leave.delete_availableleave %} + + {% endif %} +
+
+ {% endif %} +
+ {% endfor %} +
+
+
+
+
+
+ {{form}} + {% trans "Add more managers.." %} +
+ +
+
+ +
+
+
+ diff --git a/leave/templates/leave/leave_request/request_view.html b/leave/templates/leave/leave_request/request_view.html index efa12d132..0a2ca0fbc 100644 --- a/leave/templates/leave/leave_request/request_view.html +++ b/leave/templates/leave/leave_request/request_view.html @@ -47,7 +47,7 @@
+ >