chore: remove unused import

(cherry picked from commit da17577) # Conflicts: # .editorconfig # .git-blame-ignore-revs # .github/helper/install.sh # .github/helper/site_config.json # .github/labeler.yml # .github/workflows/ci.yml # .github/workflows/linters.yml # .gitignore # .mergify.yml # .pre-commit-config.yaml # MANIFEST.in # README.md # hrms/__init__.py # hrms/controllers/tests/test_employee_reminders.py # hrms/hooks.py # hrms/hr/doctype/appointment_letter/appointment_letter.json # hrms/hr/doctype/appointment_letter/test_appointment_letter.py # hrms/hr/doctype/appointment_letter_content/appointment_letter_content.json # hrms/hr/doctype/appointment_letter_template/appointment_letter_template.json # hrms/hr/doctype/appointment_letter_template/test_appointment_letter_template.py # hrms/hr/doctype/appraisal/appraisal.json # hrms/hr/doctype/appraisal/appraisal.py # hrms/hr/doctype/appraisal/test_appraisal.py # hrms/hr/doctype/appraisal_cycle/appraisal_cycle.js # hrms/hr/doctype/appraisal_cycle/appraisal_cycle.json # hrms/hr/doctype/appraisal_cycle/appraisal_cycle.py # hrms/hr/doctype/appraisal_cycle/test_appraisal_cycle.py # hrms/hr/doctype/appraisal_goal/appraisal_goal.json # hrms/hr/doctype/appraisal_kra/appraisal_kra.json # hrms/hr/doctype/appraisal_template/appraisal_template.json # hrms/hr/doctype/appraisal_template/test_appraisal_template.py # hrms/hr/doctype/appraisal_template_goal/appraisal_template_goal.json # hrms/hr/doctype/appraisee/appraisee.json # hrms/hr/doctype/attendance/attendance.json # hrms/hr/doctype/attendance/test_attendance.py # hrms/hr/doctype/attendance_request/attendance_request.json # hrms/hr/doctype/attendance_request/attendance_request.py # hrms/hr/doctype/attendance_request/test_attendance_request.py # hrms/hr/doctype/compensatory_leave_request/compensatory_leave_request.json # hrms/hr/doctype/compensatory_leave_request/test_compensatory_leave_request.py # hrms/hr/doctype/daily_work_summary/daily_work_summary.json # hrms/hr/doctype/daily_work_summary/test_daily_work_summary.py # hrms/hr/doctype/daily_work_summary_group/daily_work_summary_group.json # hrms/hr/doctype/daily_work_summary_group_user/daily_work_summary_group_user.json # hrms/hr/doctype/department_approver/department_approver.json # hrms/hr/doctype/designation_skill/designation_skill.json # hrms/hr/doctype/employee_advance/employee_advance.js # hrms/hr/doctype/employee_advance/employee_advance.json # hrms/hr/doctype/employee_advance/employee_advance.py # hrms/hr/doctype/employee_advance/test_employee_advance.py # hrms/hr/doctype/employee_attendance_tool/employee_attendance_tool.js # hrms/hr/doctype/employee_attendance_tool/employee_attendance_tool.json # hrms/hr/doctype/employee_attendance_tool/test_employee_attendance_tool.py # hrms/hr/doctype/employee_boarding_activity/employee_boarding_activity.json # hrms/hr/doctype/employee_checkin/employee_checkin.js # hrms/hr/doctype/employee_checkin/employee_checkin.json # hrms/hr/doctype/employee_checkin/employee_checkin.py # hrms/hr/doctype/employee_checkin/test_employee_checkin.py # hrms/hr/doctype/employee_feedback_criteria/employee_feedback_criteria.json # hrms/hr/doctype/employee_feedback_criteria/test_employee_feedback_criteria.py # hrms/hr/doctype/employee_feedback_rating/employee_feedback_rating.json # hrms/hr/doctype/employee_grade/employee_grade.json # hrms/hr/doctype/employee_grade/test_employee_grade.py # hrms/hr/doctype/employee_grievance/employee_grievance.json # hrms/hr/doctype/employee_grievance/test_employee_grievance.py # hrms/hr/doctype/employee_health_insurance/employee_health_insurance.json # hrms/hr/doctype/employee_health_insurance/test_employee_health_insurance.py # hrms/hr/doctype/employee_onboarding/employee_onboarding.json # hrms/hr/doctype/employee_onboarding/test_employee_onboarding.py # hrms/hr/doctype/employee_onboarding_template/employee_onboarding_template.json # hrms/hr/doctype/employee_onboarding_template/test_employee_onboarding_template.py # hrms/hr/doctype/employee_performance_feedback/employee_performance_feedback.json # hrms/hr/doctype/employee_performance_feedback/test_employee_performance_feedback.py # hrms/hr/doctype/employee_promotion/employee_promotion.json # hrms/hr/doctype/employee_promotion/test_employee_promotion.py # hrms/hr/doctype/employee_property_history/employee_property_history.json # hrms/hr/doctype/employee_referral/employee_referral.json # hrms/hr/doctype/employee_referral/test_employee_referral.py # hrms/hr/doctype/employee_separation/employee_separation.json # hrms/hr/doctype/employee_separation/test_employee_separation.py # hrms/hr/doctype/employee_separation_template/employee_separation_template.json # hrms/hr/doctype/employee_separation_template/test_employee_separation_template.py # hrms/hr/doctype/employee_skill/employee_skill.json # hrms/hr/doctype/employee_skill_map/employee_skill_map.json # hrms/hr/doctype/employee_training/employee_training.json # hrms/hr/doctype/employee_transfer/employee_transfer.json # hrms/hr/doctype/employee_transfer/test_employee_transfer.py # hrms/hr/doctype/employment_type/employment_type.json # hrms/hr/doctype/exit_interview/exit_interview.json # hrms/hr/doctype/exit_interview/exit_interview.py # hrms/hr/doctype/exit_interview/test_exit_interview.py # hrms/hr/doctype/expected_skill_set/expected_skill_set.json # hrms/hr/doctype/expense_claim/expense_claim.js # hrms/hr/doctype/expense_claim/expense_claim.json # hrms/hr/doctype/expense_claim/expense_claim.py # hrms/hr/doctype/expense_claim/expense_claim_list.js # hrms/hr/doctype/expense_claim/test_expense_claim.py # hrms/hr/doctype/expense_claim_account/expense_claim_account.json # hrms/hr/doctype/expense_claim_advance/expense_claim_advance.json # hrms/hr/doctype/expense_claim_detail/expense_claim_detail.json # hrms/hr/doctype/expense_claim_type/expense_claim_type.json # hrms/hr/doctype/expense_claim_type/test_expense_claim_type.py # hrms/hr/doctype/expense_taxes_and_charges/expense_taxes_and_charges.json # hrms/hr/doctype/full_and_final_asset/full_and_final_asset.json # hrms/hr/doctype/full_and_final_asset/test_full_and_final_asset.py # hrms/hr/doctype/full_and_final_outstanding_statement/full_and_final_outstanding_statement.json # hrms/hr/doctype/full_and_final_statement/full_and_final_statement.js # hrms/hr/doctype/full_and_final_statement/full_and_final_statement.json # hrms/hr/doctype/full_and_final_statement/full_and_final_statement.py # hrms/hr/doctype/full_and_final_statement/test_full_and_final_statement.py # hrms/hr/doctype/goal/goal.json # hrms/hr/doctype/goal/goal.py # hrms/hr/doctype/goal/goal_list.js # hrms/hr/doctype/goal/goal_tree.js # hrms/hr/doctype/goal/test_goal.py # hrms/hr/doctype/grievance_type/grievance_type.json # hrms/hr/doctype/grievance_type/test_grievance_type.py # hrms/hr/doctype/hr_settings/hr_settings.json # hrms/hr/doctype/hr_settings/test_hr_settings.py # hrms/hr/doctype/identification_document_type/identification_document_type.json # hrms/hr/doctype/identification_document_type/test_identification_document_type.py # hrms/hr/doctype/interest/interest.json # hrms/hr/doctype/interest/test_interest.py # hrms/hr/doctype/interview/interview.js # hrms/hr/doctype/interview/interview.json # hrms/hr/doctype/interview/interview.py # hrms/hr/doctype/interview/test_interview.py # hrms/hr/doctype/interview_detail/interview_detail.json # hrms/hr/doctype/interview_detail/interview_detail.py # hrms/hr/doctype/interview_feedback/interview_feedback.json # hrms/hr/doctype/interview_feedback/interview_feedback.py # hrms/hr/doctype/interview_feedback/test_interview_feedback.py # hrms/hr/doctype/interview_round/interview_round.json # hrms/hr/doctype/interview_round/interview_round.py # hrms/hr/doctype/interview_round/test_interview_round.py # hrms/hr/doctype/interview_type/interview_type.json # hrms/hr/doctype/interview_type/test_interview_type.py # hrms/hr/doctype/interviewer/interviewer.json # hrms/hr/doctype/job_applicant/job_applicant.json # hrms/hr/doctype/job_applicant/job_applicant.py # hrms/hr/doctype/job_applicant/job_applicant_dashboard.html # hrms/hr/doctype/job_applicant/test_job_applicant.py # hrms/hr/doctype/job_applicant_source/job_applicant_source.json # hrms/hr/doctype/job_applicant_source/test_job_applicant_source.py # hrms/hr/doctype/job_offer/job_offer.json # hrms/hr/doctype/job_offer/test_job_offer.py # hrms/hr/doctype/job_offer_term/job_offer_term.json # hrms/hr/doctype/job_offer_term_template/job_offer_term_template.json # hrms/hr/doctype/job_offer_term_template/test_job_offer_term_template.py # hrms/hr/doctype/job_opening/job_opening.json # hrms/hr/doctype/job_opening/job_opening.py # hrms/hr/doctype/job_opening/test_job_opening.py # hrms/hr/doctype/job_requisition/job_requisition.json # hrms/hr/doctype/job_requisition/test_job_requisition.py # hrms/hr/doctype/kra/kra.json # hrms/hr/doctype/kra/test_kra.py # hrms/hr/doctype/leave_allocation/leave_allocation.js # hrms/hr/doctype/leave_allocation/leave_allocation.json # hrms/hr/doctype/leave_allocation/test_earned_leaves.py # hrms/hr/doctype/leave_allocation/test_leave_allocation.py # hrms/hr/doctype/leave_application/leave_application.js # hrms/hr/doctype/leave_application/leave_application.json # hrms/hr/doctype/leave_application/leave_application.py # hrms/hr/doctype/leave_application/test_leave_application.py # hrms/hr/doctype/leave_block_list/leave_block_list.json # hrms/hr/doctype/leave_block_list/test_leave_block_list.py # hrms/hr/doctype/leave_block_list_allow/leave_block_list_allow.json # hrms/hr/doctype/leave_block_list_date/leave_block_list_date.json # hrms/hr/doctype/leave_control_panel/leave_control_panel.js # hrms/hr/doctype/leave_control_panel/leave_control_panel.json # hrms/hr/doctype/leave_control_panel/leave_control_panel.py # hrms/hr/doctype/leave_control_panel/test_leave_control_panel.py # hrms/hr/doctype/leave_encashment/leave_encashment.js # hrms/hr/doctype/leave_encashment/leave_encashment.json # hrms/hr/doctype/leave_encashment/leave_encashment.py # hrms/hr/doctype/leave_encashment/test_leave_encashment.py # hrms/hr/doctype/leave_ledger_entry/leave_ledger_entry.json # hrms/hr/doctype/leave_ledger_entry/test_leave_ledger_entry.py # hrms/hr/doctype/leave_period/leave_period.json # hrms/hr/doctype/leave_period/test_leave_period.py # hrms/hr/doctype/leave_policy/leave_policy.json # hrms/hr/doctype/leave_policy/test_leave_policy.py # hrms/hr/doctype/leave_policy_assignment/leave_policy_assignment.json # hrms/hr/doctype/leave_policy_assignment/leave_policy_assignment.py # hrms/hr/doctype/leave_policy_assignment/leave_policy_assignment_list.js # hrms/hr/doctype/leave_policy_assignment/test_leave_policy_assignment.py # hrms/hr/doctype/leave_policy_detail/leave_policy_detail.json # hrms/hr/doctype/leave_policy_detail/test_leave_policy_detail.py # hrms/hr/doctype/leave_type/leave_type.json # hrms/hr/doctype/leave_type/leave_type.py # hrms/hr/doctype/leave_type/test_leave_type.py # hrms/hr/doctype/leave_type/test_records.json # hrms/hr/doctype/offer_term/offer_term.json # hrms/hr/doctype/offer_term/test_offer_term.py # hrms/hr/doctype/purpose_of_travel/purpose_of_travel.json # hrms/hr/doctype/purpose_of_travel/test_purpose_of_travel.py # hrms/hr/doctype/shift_assignment/shift_assignment.json # hrms/hr/doctype/shift_assignment/shift_assignment.py # hrms/hr/doctype/shift_assignment/test_shift_assignment.py # hrms/hr/doctype/shift_request/shift_request.json # hrms/hr/doctype/shift_request/shift_request.py # hrms/hr/doctype/shift_request/test_shift_request.py # hrms/hr/doctype/shift_type/shift_type.js # hrms/hr/doctype/shift_type/shift_type.json # hrms/hr/doctype/shift_type/shift_type.py # hrms/hr/doctype/shift_type/test_shift_type.py # hrms/hr/doctype/skill/skill.json # hrms/hr/doctype/skill_assessment/skill_assessment.json # hrms/hr/doctype/staffing_plan/staffing_plan.json # hrms/hr/doctype/staffing_plan/test_staffing_plan.py # hrms/hr/doctype/staffing_plan_detail/staffing_plan_detail.json # hrms/hr/doctype/training_event/test_training_event.py # hrms/hr/doctype/training_event/training_event.json # hrms/hr/doctype/training_event_employee/training_event_employee.json # hrms/hr/doctype/training_feedback/test_training_feedback.py # hrms/hr/doctype/training_feedback/training_feedback.json # hrms/hr/doctype/training_program/test_training_program.py # hrms/hr/doctype/training_program/training_program.json # hrms/hr/doctype/training_result/test_training_result.py # hrms/hr/doctype/training_result/training_result.json # hrms/hr/doctype/training_result_employee/training_result_employee.json # hrms/hr/doctype/travel_itinerary/travel_itinerary.json # hrms/hr/doctype/travel_request/test_travel_request.py # hrms/hr/doctype/travel_request/travel_request.json # hrms/hr/doctype/upload_attendance/test_upload_attendance.py # hrms/hr/doctype/upload_attendance/upload_attendance.js # hrms/hr/doctype/upload_attendance/upload_attendance.json # hrms/hr/doctype/vehicle_log/test_vehicle_log.py # hrms/hr/doctype/vehicle_log/vehicle_log.json # hrms/hr/doctype/vehicle_service/vehicle_service.json # hrms/hr/doctype/vehicle_service_item/test_vehicle_service_item.py # hrms/hr/doctype/vehicle_service_item/vehicle_service_item.json # hrms/hr/page/organizational_chart/organizational_chart.js # hrms/hr/page/organizational_chart/test_organizational_chart.py # hrms/hr/report/appraisal_overview/test_appraisal_overview.py # hrms/hr/report/employee_exits/test_employee_exits.py # hrms/hr/report/employee_hours_utilization_based_on_timesheet/employee_hours_utilization_based_on_timesheet.py # hrms/hr/report/employee_hours_utilization_based_on_timesheet/test_employee_util.py # hrms/hr/report/employee_leave_balance/employee_leave_balance.py # hrms/hr/report/employee_leave_balance/test_employee_leave_balance.py # hrms/hr/report/employee_leave_balance_summary/test_employee_leave_balance_summary.py # hrms/hr/report/employees_working_on_a_holiday/test_employees_working_on_a_holiday.py # hrms/hr/report/monthly_attendance_sheet/test_monthly_attendance_sheet.py # hrms/hr/report/project_profitability/project_profitability.py # hrms/hr/report/project_profitability/test_project_profitability.py # hrms/hr/report/vehicle_expenses/test_vehicle_expenses.py # hrms/hr/utils.py # hrms/hr/workspace/leaves/leaves.json # hrms/hr/workspace/shift_&_attendance/shift_&_attendance.json # hrms/overrides/company.py # hrms/overrides/dashboard_overrides.py # hrms/overrides/employee_master.py # hrms/overrides/employee_payment_entry.py # hrms/patches.txt # hrms/patches/post_install/rename_stop_to_send_birthday_reminders.py # hrms/patches/v14_0/create_custom_field_in_loan.py # hrms/payroll/doctype/additional_salary/additional_salary.js # hrms/payroll/doctype/additional_salary/additional_salary.json # hrms/payroll/doctype/additional_salary/additional_salary.py # hrms/payroll/doctype/additional_salary/test_additional_salary.py # hrms/payroll/doctype/employee_benefit_application/employee_benefit_application.json # hrms/payroll/doctype/employee_benefit_application/employee_benefit_application.py # hrms/payroll/doctype/employee_benefit_application/test_employee_benefit_application.py # hrms/payroll/doctype/employee_benefit_application_detail/employee_benefit_application_detail.json # hrms/payroll/doctype/employee_benefit_claim/employee_benefit_claim.json # hrms/payroll/doctype/employee_benefit_claim/employee_benefit_claim.py # hrms/payroll/doctype/employee_benefit_claim/test_employee_benefit_claim.py # hrms/payroll/doctype/employee_cost_center/employee_cost_center.json # hrms/payroll/doctype/employee_incentive/employee_incentive.json # hrms/payroll/doctype/employee_incentive/test_employee_incentive.py # hrms/payroll/doctype/employee_other_income/employee_other_income.json # hrms/payroll/doctype/employee_other_income/test_employee_other_income.py # hrms/payroll/doctype/employee_tax_exemption_category/employee_tax_exemption_category.json # hrms/payroll/doctype/employee_tax_exemption_category/test_employee_tax_exemption_category.py # hrms/payroll/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.json # hrms/payroll/doctype/employee_tax_exemption_declaration/test_employee_tax_exemption_declaration.py # hrms/payroll/doctype/employee_tax_exemption_declaration_category/employee_tax_exemption_declaration_category.json # hrms/payroll/doctype/employee_tax_exemption_proof_submission/employee_tax_exemption_proof_submission.js # hrms/payroll/doctype/employee_tax_exemption_proof_submission/employee_tax_exemption_proof_submission.json # hrms/payroll/doctype/employee_tax_exemption_proof_submission/test_employee_tax_exemption_proof_submission.py # hrms/payroll/doctype/employee_tax_exemption_proof_submission_detail/employee_tax_exemption_proof_submission_detail.json # hrms/payroll/doctype/employee_tax_exemption_sub_category/employee_tax_exemption_sub_category.json # hrms/payroll/doctype/employee_tax_exemption_sub_category/test_employee_tax_exemption_sub_category.py # hrms/payroll/doctype/gratuity/gratuity.json # hrms/payroll/doctype/gratuity/gratuity.py # hrms/payroll/doctype/gratuity/test_gratuity.py # hrms/payroll/doctype/gratuity_applicable_component/gratuity_applicable_component.json # hrms/payroll/doctype/gratuity_rule/gratuity_rule.json # hrms/payroll/doctype/gratuity_rule/test_gratuity_rule.py # hrms/payroll/doctype/gratuity_rule_slab/gratuity_rule_slab.json # hrms/payroll/doctype/income_tax_slab/income_tax_slab.js # hrms/payroll/doctype/income_tax_slab/income_tax_slab.json # hrms/payroll/doctype/income_tax_slab/test_income_tax_slab.py # hrms/payroll/doctype/income_tax_slab_other_charges/income_tax_slab_other_charges.json # hrms/payroll/doctype/payroll_employee_detail/payroll_employee_detail.json # hrms/payroll/doctype/payroll_entry/payroll_entry.js # hrms/payroll/doctype/payroll_entry/payroll_entry.json # hrms/payroll/doctype/payroll_entry/payroll_entry.py # hrms/payroll/doctype/payroll_entry/test_payroll_entry.py # hrms/payroll/doctype/payroll_period/payroll_period.json # hrms/payroll/doctype/payroll_period/payroll_period.py # hrms/payroll/doctype/payroll_period/test_payroll_period.py # hrms/payroll/doctype/payroll_period_date/payroll_period_date.json # hrms/payroll/doctype/payroll_settings/payroll_settings.json # hrms/payroll/doctype/payroll_settings/test_payroll_settings.py # hrms/payroll/doctype/retention_bonus/retention_bonus.json # hrms/payroll/doctype/retention_bonus/test_retention_bonus.py # hrms/payroll/doctype/salary_component/salary_component.js # hrms/payroll/doctype/salary_component/salary_component.json # hrms/payroll/doctype/salary_component/salary_component.py # hrms/payroll/doctype/salary_component/test_salary_component.py # hrms/payroll/doctype/salary_component_account/salary_component_account.json # hrms/payroll/doctype/salary_detail/salary_detail.json # hrms/payroll/doctype/salary_slip/salary_slip.json # hrms/payroll/doctype/salary_slip/salary_slip.py # hrms/payroll/doctype/salary_slip/test_salary_slip.py # hrms/payroll/doctype/salary_slip_leave/salary_slip_leave.json # hrms/payroll/doctype/salary_slip_loan/salary_slip_loan.json # hrms/payroll/doctype/salary_slip_timesheet/salary_slip_timesheet.json # hrms/payroll/doctype/salary_structure/salary_structure.js # hrms/payroll/doctype/salary_structure/salary_structure.json # hrms/payroll/doctype/salary_structure/salary_structure.py # hrms/payroll/doctype/salary_structure/test_salary_structure.py # hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.js # hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.json # hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py # hrms/payroll/doctype/salary_structure_assignment/test_salary_structure_assignment.py # hrms/payroll/doctype/taxable_salary_slab/taxable_salary_slab.json # hrms/payroll/report/income_tax_computation/test_income_tax_computation.py # hrms/payroll/report/income_tax_deductions/test_income_tax_deductions.py # hrms/payroll/workspace/salary_payout/salary_payout.json # hrms/public/build.json # hrms/public/js/erpnext/journal_entry.js # hrms/public/js/hrms.bundle.js # hrms/public/js/performance.bundle.js # hrms/public/js/performance/performance_feedback.js # hrms/public/js/templates/rating.html # hrms/public/scss/hrms.bundle.scss # hrms/setup.py # hrms/subscription_utils.py # hrms/templates/generators/job_opening.html # hrms/tests/test_utils.py # hrms/utils/__init__.py # hrms/utils/holiday_list.py # pyproject.toml
frappe · Dec 12, 2024 · dd9c6e8 · dd9c6e8
1 parent cf7495f
commit dd9c6e8
Show file tree

Hide file tree

Showing 646 changed files with 404,527 additions and 6 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -9,7 +9,14 @@ trim_trailing_whitespace = true
 charset = utf-8
 
 # js indentation settings
+<<<<<<< HEAD
 [{*.js,*.vue,*.css,*.scss,*.html}]
 indent_style = tab
 indent_size = 4
-max_line_length = 99
+max_line_length = 99
+=======
+[{*.js,*.ts,*.vue,*.css,*.scss,*.html}]
+indent_style = tab
+indent_size = 4
+max_line_length = 99
+>>>>>>> da17577dc (chore: remove unused import)
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -17,8 +17,22 @@
 # bulk formatting
 b55d6e27af6bd274dfa47e66a3012ddec68ce798
 
+<<<<<<< HEAD
 # js, scss prettier formatting
 4a224b988a254a053e9c49cd101cd67d433aed90
 
 # python ruff formatting
-7b0d00220047545d3d18650235dac9cebe0d2bca
+7b0d00220047545d3d18650235dac9cebe0d2bca
+=======
+# bulk formatting PWA frontend code
+f37f15b2b5329e3b0b35891e1c4fd82f48562c6d
+
+# bulk formatting PWA frontend code
+920daa1a3ddccaefaf7b9348f850831d6e0a0e6b
+
+# python ruff formatting
+b68457552bb3540565267f23fbfcee35c9f86e1c
+
+# js, scss prettier formatting
+1ab1d6238171a5cee3263812402a8b82e7131cb1
+>>>>>>> da17577dc (chore: remove unused import)
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -0,0 +1,81 @@
+---
+name: Bug Report
+description: Report a bug encountered while using Frappe HR
+labels: ["bug"]
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Welcome to Frappe HR issue tracker! Before creating an issue, please consider the following:
+
+        1. This tracker should only be used to report bugs and request features / enhancements to Frappe HR
+            - For questions and general support, checkout the [documentation](https://frappehr.com/docs) or use the [forum](https://discuss.frappe.io) to get inputs from the open source community.
+            - For documentation issues, propose edit on the [documentation site](https://frappehr.com/docs) directly.
+        2. When making a bug report, make sure you provide all required information. The easier it is for
+           maintainers to reproduce, the faster it'll be fixed.
+        3. If you think you know what the reason for the bug is, share it with us. Maybe put in a PR 😉
+
+  - type: textarea
+    id: bug-info
+    attributes:
+      label: Information about bug
+      description: Also tell us, what did you expect to happen? If applicable, add screenshots to help explain your problem.
+      placeholder: Please provide as much information as possible.
+    validations:
+      required: true
+
+  - type: dropdown
+    id: module
+    attributes:
+      label: Module
+      description: Select the affected module of Frappe HR.
+      multiple: true
+      options:
+        - HR
+        - Payroll
+        - other
+    validations:
+      required: true
+
+  - type: textarea
+    id: exact-version
+    attributes:
+      label: Version
+      description: Share exact version number of Frappe, ERPNext and Frappe HR you are using.
+      placeholder: |
+        Frappe version -
+        ERPNext version -
+        Frappe HR version -
+    validations:
+      required: true
+
+  - type: dropdown
+    id: install-method
+    attributes:
+      label: Installation method
+      options:
+        - docker
+        - easy-install
+        - manual install
+        - FrappeCloud
+    validations:
+      required: false
+
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant log output / Stack trace / Full Error Message.
+      description: Please copy and paste any relevant log output. This will be automatically formatted.
+      render: shell
+
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Code of Conduct
+      description: |
+        By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/frappe/hrms/blob/develop/CODE_OF_CONDUCT.md)
+      options:
+        - label: I agree to follow this project's Code of Conduct
+          required: true
+...
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Community Forum
+    url: https://discuss.frappe.io/
+    about: For general QnA, discussions and community help.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,33 @@
+<!--
+
+Some key notes before you open a PR:
+
+ 1. Select which branch should this PR be merged in?
+ 2. PR name follows [convention](http://karma-runner.github.io/4.0/dev/git-commit-msg.html)
+ 3. All tests pass locally, UI and Unit tests
+ 4. All business logic and validations must be on the server-side
+ 5. Update necessary Documentation
+ 6. Put `closes #XXXX` in your comment to auto-close the issue that your PR fixes
+
+
+Also, if you're new here
+
+- Documentation Guidelines => https://github.com/frappe/erpnext/wiki/Page-format-for-ERPNext-docs
+
+- Contribution Guide => https://github.com/frappe/erpnext/wiki/Contribution-Guidelines
+
+- Pull Request Checklist => https://github.com/frappe/erpnext/wiki/Pull-Request-Checklist
+
+-->
+
+> Please provide enough information so that others can review your pull request:
+
+<!-- You can skip this if you're fixing a typo or updating existing documentation -->
+
+> Explain the **details** for making this change. What existing problem does the pull request solve?
+
+<!-- Example: When "Adding a function to do X", explain why it is necessary to have a way to do X. -->
+
+> Screenshots/GIFs
+
+<!-- Add images/recordings to better visualize the change: expected/current behviour -->
diff --git a/.github/helper/install.sh b/.github/helper/install.sh
@@ -4,16 +4,34 @@ set -e
 
 cd ~ || exit
 
+<<<<<<< HEAD
 sudo apt update && sudo apt install redis-server libcups2-dev
 
 pip install frappe-bench
 
 git clone https://github.com/frappe/frappe --branch "$BRANCH_TO_CLONE" --depth 1
+=======
+sudo apt update
+sudo apt remove mysql-server mysql-client
+sudo apt install libcups2-dev redis-server mariadb-client-10.6
+
+pip install frappe-bench
+
+githubbranch=${GITHUB_BASE_REF:-${GITHUB_REF##*/}}
+frappeuser=${FRAPPE_USER:-"frappe"}
+frappebranch=${FRAPPE_BRANCH:-$githubbranch}
+erpnextbranch=${ERPNEXT_BRANCH:-$githubbranch}
+paymentsbranch=${PAYMENTS_BRANCH:-${githubbranch%"-hotfix"}}
+lendingbranch=${LENDING_BRANCH:-${githubbranch%"-hotfix"}}
+
+git clone "https://github.com/${frappeuser}/frappe" --branch "${frappebranch}" --depth 1
+>>>>>>> da17577dc (chore: remove unused import)
 bench init --skip-assets --frappe-path ~/frappe --python "$(which python)" frappe-bench
 
 mkdir ~/frappe-bench/sites/test_site
 cp -r "${GITHUB_WORKSPACE}/.github/helper/site_config.json" ~/frappe-bench/sites/test_site/
 
+<<<<<<< HEAD
 mysql --host 127.0.0.1 --port 3306 -u root -e "SET GLOBAL character_set_server = 'utf8mb4'"
 mysql --host 127.0.0.1 --port 3306 -u root -e "SET GLOBAL collation_server = 'utf8mb4_unicode_ci'"
 
@@ -23,6 +41,16 @@ mysql --host 127.0.0.1 --port 3306 -u root -e "GRANT ALL PRIVILEGES ON \`test_fr
 
 mysql --host 127.0.0.1 --port 3306 -u root -e "UPDATE mysql.user SET Password=PASSWORD('travis') WHERE User='root'"
 mysql --host 127.0.0.1 --port 3306 -u root -e "FLUSH PRIVILEGES"
+=======
+mariadb --host 127.0.0.1 --port 3306 -u root -proot -e "SET GLOBAL character_set_server = 'utf8mb4'"
+mariadb --host 127.0.0.1 --port 3306 -u root -proot -e "SET GLOBAL collation_server = 'utf8mb4_unicode_ci'"
+
+mariadb --host 127.0.0.1 --port 3306 -u root -proot -e "CREATE USER 'test_frappe'@'localhost' IDENTIFIED BY 'test_frappe'"
+mariadb --host 127.0.0.1 --port 3306 -u root -proot -e "CREATE DATABASE test_frappe"
+mariadb --host 127.0.0.1 --port 3306 -u root -proot -e "GRANT ALL PRIVILEGES ON \`test_frappe\`.* TO 'test_frappe'@'localhost'"
+
+mariadb --host 127.0.0.1 --port 3306 -u root -proot -e "FLUSH PRIVILEGES"
+>>>>>>> da17577dc (chore: remove unused import)
 
 install_whktml() {
     wget -O /tmp/wkhtmltox.tar.xz https://github.com/frappe/wkhtmltopdf/raw/master/wkhtmltox-0.12.3_linux-generic-amd64.tar.xz
@@ -39,13 +67,23 @@ sed -i 's/schedule:/# schedule:/g' Procfile
 sed -i 's/socketio:/# socketio:/g' Procfile
 sed -i 's/redis_socketio:/# redis_socketio:/g' Procfile
 
+<<<<<<< HEAD
 bench get-app payments --branch ${BRANCH_TO_CLONE%"-hotfix"}
 bench get-app https://github.com/frappe/erpnext --branch "$BRANCH_TO_CLONE" --resolve-deps
+=======
+bench get-app "https://github.com/${frappeuser}/payments" --branch "$paymentsbranch"
+bench get-app "https://github.com/${frappeuser}/erpnext" --branch "$erpnextbranch" --resolve-deps
+bench get-app "https://github.com/${frappeuser}/lending" --branch "$lendingbranch"
+>>>>>>> da17577dc (chore: remove unused import)
 bench get-app hrms "${GITHUB_WORKSPACE}"
 bench setup requirements --dev
 
 bench start &>> ~/frappe-bench/bench_start.log &
 CI=Yes bench build --app frappe &
 bench --site test_site reinstall --yes
 
+<<<<<<< HEAD
+=======
+bench --verbose --site test_site install-app lending
+>>>>>>> da17577dc (chore: remove unused import)
 bench --verbose --site test_site install-app hrms
diff --git a/.github/helper/site_config.json b/.github/helper/site_config.json
@@ -9,7 +9,11 @@
     "mail_password": "test",
     "admin_password": "admin",
     "root_login": "root",
+<<<<<<< HEAD
     "root_password": "travis",
+=======
+    "root_password": "root",
+>>>>>>> da17577dc (chore: remove unused import)
     "host_name": "http://test_site:8000",
     "install_apps": ["payments", "erpnext"],
     "throttle_user_limit": 100

diff --git a/.github/helper/update_pot_file.sh b/.github/helper/update_pot_file.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+set -e
+cd ~ || exit
+
+echo "Setting Up Bench..."
+
+pip install frappe-bench
+bench -v init frappe-bench --skip-assets --skip-redis-config-generation --python "$(which python)" --frappe-branch "${BASE_BRANCH}"
+cd ./frappe-bench || exit
+
+echo "Get HRMS..."
+bench get-app --skip-assets hrms "${GITHUB_WORKSPACE}"
+
+echo "Generating POT file..."
+bench generate-pot-file --app hrms
+
+cd ./apps/hrms || exit
+
+echo "Configuring git user..."
+git config user.email "[email protected]"
+git config user.name "frappe-pr-bot"
+
+echo "Setting the correct git remote..."
+# Here, the git remote is a local file path by default. Let's change it to the upstream repo.
+git remote set-url upstream https://github.com/frappe/hrms.git
+
+echo "Creating a new branch..."
+isodate=$(date -u +"%Y-%m-%d")
+branch_name="pot_${BASE_BRANCH}_${isodate}"
+git checkout -b "${branch_name}"
+
+echo "Commiting changes..."
+git add hrms/locale/main.pot
+git commit -m "chore: update POT file"
+
+gh auth setup-git
+git push -u upstream "${branch_name}"
+
+echo "Creating a PR..."
+gh pr create --fill --base "${BASE_BRANCH}" --head "${branch_name}" -R frappe/hrms
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -1,4 +1,8 @@
 # Any python files modifed but no test files modified
+<<<<<<< HEAD
 add-test-cases:
+=======
+needs-tests:
+>>>>>>> da17577dc (chore: remove unused import)
 - any: ['hrms/**/*.py']
   all: ['!hrms/**/test*.py']
diff --git a/.github/try-on-f-cloud-button.svg b/.github/try-on-f-cloud-button.svg