chore: remove unused import

(cherry picked from commit da17577) # Conflicts: # .git-blame-ignore-revs # .github/helper/install.sh # .github/workflows/ci.yml # .github/workflows/initiate_release.yml # .github/workflows/on_release.yml # .mergify.yml # .releaserc # 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/test_appraisal.py # hrms/hr/doctype/appraisal_cycle/appraisal_cycle.json # 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/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.json # hrms/hr/doctype/employee_advance/test_employee_advance.py # 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.json # 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/test_exit_interview.py # hrms/hr/doctype/expected_skill_set/expected_skill_set.json # hrms/hr/doctype/expense_claim/expense_claim.json # 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.json # hrms/hr/doctype/full_and_final_statement/test_full_and_final_statement.py # hrms/hr/doctype/goal/goal.json # 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.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_feedback/interview_feedback.json # hrms/hr/doctype/interview_feedback/test_interview_feedback.py # hrms/hr/doctype/interview_round/interview_round.json # 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_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/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.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.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.json # hrms/hr/doctype/leave_control_panel/test_leave_control_panel.py # hrms/hr/doctype/leave_encashment/leave_encashment.json # 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/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/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/pwa_notification/pwa_notification.json # hrms/hr/doctype/pwa_notification/test_pwa_notification.py # hrms/hr/doctype/shift_assignment/shift_assignment.json # hrms/hr/doctype/shift_assignment/test_shift_assignment.py # hrms/hr/doctype/shift_assignment_schedule/test_shift_assignment_schedule.py # hrms/hr/doctype/shift_assignment_tool/test_shift_assignment_tool.py # hrms/hr/doctype/shift_location/test_shift_location.py # hrms/hr/doctype/shift_request/shift_request.json # hrms/hr/doctype/shift_request/test_shift_request.py # hrms/hr/doctype/shift_type/shift_type.json # 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/upload_attendance/test_upload_attendance.py # 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/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/test_employee_util.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/leave_ledger/test_leave_ledger.py # hrms/hr/report/monthly_attendance_sheet/test_monthly_attendance_sheet.py # hrms/hr/report/project_profitability/test_project_profitability.py # hrms/hr/report/shift_attendance/test_shift_attendance.py # hrms/hr/report/vehicle_expenses/test_vehicle_expenses.py # hrms/hr/workspace/shift_&_attendance/shift_&_attendance.json # hrms/payroll/doctype/additional_salary/additional_salary.json # hrms/payroll/doctype/additional_salary/test_additional_salary.py # hrms/payroll/doctype/bulk_salary_structure_assignment/bulk_salary_structure_assignment.json # hrms/payroll/doctype/bulk_salary_structure_assignment/test_bulk_salary_structure_assignment.py # hrms/payroll/doctype/employee_benefit_application/employee_benefit_application.json # 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/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.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.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.json # hrms/payroll/doctype/payroll_period/payroll_period.json # 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.json # 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/test_salary_slip.py # hrms/payroll/doctype/salary_slip_leave/salary_slip_leave.json # hrms/payroll/doctype/salary_slip_timesheet/salary_slip_timesheet.json # hrms/payroll/doctype/salary_structure/salary_structure.json # hrms/payroll/doctype/salary_structure/test_salary_structure.py # hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.json # hrms/payroll/doctype/salary_structure_assignment/test_salary_structure_assignment.py # hrms/payroll/doctype/salary_withholding/test_salary_withholding.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/report/salary_register/salary_register.py # pyproject.toml # yarn.lock
frappe · Dec 12, 2024 · 61bf163 · 61bf163
1 parent 8f9eed2
commit 61bf163
Show file tree

Hide file tree

Showing 294 changed files with 359,342 additions and 5 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -23,8 +23,16 @@ f37f15b2b5329e3b0b35891e1c4fd82f48562c6d
 # bulk formatting PWA frontend code
 920daa1a3ddccaefaf7b9348f850831d6e0a0e6b
 
+<<<<<<< HEAD
 # js, scss prettier formatting
 29a18f44ed7e1f1c183a6d180bb76cdb3ba484f1
 
 # python ruff formatting
-16c75305e5fd25cb4a25d6232a7ad6a8814be11d
+16c75305e5fd25cb4a25d6232a7ad6a8814be11d
+=======
+# python ruff formatting
+b68457552bb3540565267f23fbfcee35c9f86e1c
+
+# js, scss prettier formatting
+1ab1d6238171a5cee3263812402a8b82e7131cb1
+>>>>>>> da17577dc (chore: remove unused import)
diff --git a/.github/helper/install.sh b/.github/helper/install.sh
@@ -10,7 +10,18 @@ sudo apt install libcups2-dev redis-server mariadb-client-10.6
 
 pip install frappe-bench
 
+<<<<<<< HEAD
 git clone https://github.com/frappe/frappe --branch "$BRANCH_TO_CLONE" --depth 1
+=======
+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
@@ -40,9 +51,15 @@ 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/frappe/lending --branch ${BRANCH_TO_CLONE%"-hotfix"}
+=======
+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
 
@@ -51,4 +68,8 @@ CI=Yes bench build --app frappe &
 bench --site test_site reinstall --yes
 
 bench --verbose --site test_site install-app lending
-bench --verbose --site test_site install-app hrms
+<<<<<<< HEAD
+bench --verbose --site test_site install-app hrms
+=======
+bench --verbose --site test_site install-app hrms
+>>>>>>> da17577dc (chore: remove unused import)
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/workflows/ci.yml b/.github/workflows/ci.yml
@@ -106,10 +106,18 @@ jobs:
         run: |
           bash ${GITHUB_WORKSPACE}/.github/helper/install.sh
         env:
+<<<<<<< HEAD
           BRANCH_TO_CLONE: ${{ env.HR_BRANCH }}
 
       - name: Run Tests
         run: cd ~/frappe-bench/ && bench --site test_site run-parallel-tests --app hrms --total-builds 2 --build-number ${{ matrix.container }}
+=======
+          FRAPPE_USER: ${{ github.event.inputs.user }}
+          FRAPPE_BRANCH: ${{ github.event.inputs.branch }}
+
+      - name: Run Tests
+        run: cd ~/frappe-bench/ && bench --site test_site run-parallel-tests --app hrms --total-builds ${{ strategy.job-total }} --build-number ${{ matrix.container }}
+>>>>>>> da17577dc (chore: remove unused import)
         env:
           TYPE: server
           CAPTURE_COVERAGE: ${{ github.event_name != 'pull_request' }}
@@ -128,13 +136,25 @@ jobs:
     if: ${{ github.event_name != 'pull_request' }}
     steps:
       - name: Clone
+<<<<<<< HEAD
         uses: actions/checkout@v2
+=======
+        uses: actions/checkout@v4
+>>>>>>> da17577dc (chore: remove unused import)
 
       - name: Download artifacts
         uses: actions/download-artifact@v3
 
       - name: Upload coverage data
+<<<<<<< HEAD
         uses: codecov/codecov-action@v2
         with:
           fail_ci_if_error: true
-          verbose: true
+          verbose: true
+=======
+        uses: codecov/codecov-action@v4
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          fail_ci_if_error: true
+          verbose: true
+>>>>>>> da17577dc (chore: remove unused import)
diff --git a/.github/workflows/generate-pot-file.yml b/.github/workflows/generate-pot-file.yml
@@ -0,0 +1,35 @@
+name: Regenerate POT file (translatable strings)
+on:
+  schedule:
+    # 9:30 UTC => 3 PM IST Sunday
+    - cron: "30 9 * * 0"
+  workflow_dispatch:
+
+jobs:
+  regenerate-pot-file:
+    name: Regenerate POT file
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        branch: ["develop"]
+    permissions:
+      contents: write
+
+    steps:
+        - name: Checkout
+          uses: actions/checkout@v4
+          with:
+            ref: ${{ matrix.branch }}
+
+        - name: Setup Python
+          uses: actions/setup-python@v5
+          with:
+            python-version: "3.12"
+
+        - name: Run script to update POT file
+          run: |
+            bash ${GITHUB_WORKSPACE}/.github/helper/update_pot_file.sh
+          env:
+            GH_TOKEN: ${{ secrets.RELEASE_TOKEN }}
+            BASE_BRANCH: ${{ matrix.branch }}
diff --git a/.github/workflows/initiate_release.yml b/.github/workflows/initiate_release.yml
@@ -15,7 +15,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+<<<<<<< HEAD
         version: ["14"]
+=======
+        version: ["14", "15"]
+>>>>>>> da17577dc (chore: remove unused import)
 
     steps:
       - uses: octokit/[email protected]

diff --git a/.github/workflows/on_release.yml b/.github/workflows/on_release.yml
@@ -3,7 +3,11 @@ on:
   workflow_dispatch:
   push:
     branches:
+<<<<<<< HEAD
       - version-15
+=======
+      - version-14
+>>>>>>> da17577dc (chore: remove unused import)
 jobs:
   release:
     name: Release

diff --git a/.mergify.yml b/.mergify.yml
@@ -8,6 +8,10 @@ pull_request_rules:
           - author!=frappe-pr-bot
           - author!=mergify[bot]
         - or:
+<<<<<<< HEAD
+=======
+          - base=version-16
+>>>>>>> da17577dc (chore: remove unused import)
           - base=version-15
           - base=version-14
     actions:
@@ -57,3 +61,16 @@ pull_request_rules:
           - version-14-hotfix
         assignees:
           - "{{ author }}"
+<<<<<<< HEAD
+=======
+
+  - name: backport to version-15-hotfix
+    conditions:
+      - label="backport version-15-hotfix"
+    actions:
+      backport:
+        branches:
+          - version-15-hotfix
+        assignees:
+          - "{{ author }}"
+>>>>>>> da17577dc (chore: remove unused import)
diff --git a/.releaserc b/.releaserc
@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
 	"branches": ["version-15"],
+=======
+	"branches": ["version-14"],
+>>>>>>> da17577dc (chore: remove unused import)
 	"plugins": [
 		"@semantic-release/commit-analyzer", {
 			"preset": "angular",
@@ -10,7 +14,11 @@
 		"@semantic-release/release-notes-generator",
 		[
 			"@semantic-release/exec", {
+<<<<<<< HEAD
 				"prepareCmd": 'sed -ir -E "s/\"[0-9]+\.[0-9]+\.[0-9]+\"/\"${nextRelease.version}\"/" hrms/__init__.py'
+=======
+				"prepareCmd": 'sed -ir "s/[0-9]*\.[0-9]*\.[0-9]*/${nextRelease.version}/" hrms/__init__.py'
+>>>>>>> da17577dc (chore: remove unused import)
 			}
 		],
 		[

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,5 +1,8 @@
 include MANIFEST.in
+<<<<<<< HEAD
 include requirements.txt
+=======
+>>>>>>> da17577dc (chore: remove unused import)
 include *.json
 include *.md
 include *.py
@@ -15,4 +18,8 @@ recursive-include hrms *.png
 recursive-include hrms *.py
 recursive-include hrms *.svg
 recursive-include hrms *.txt
-recursive-exclude hrms *.pyc
+<<<<<<< HEAD
+recursive-exclude hrms *.pyc
+=======
+recursive-exclude hrms *.pyc
+>>>>>>> da17577dc (chore: remove unused import)
diff --git a/README.md b/README.md
@@ -1,5 +1,9 @@
 <div align="center">
+<<<<<<< HEAD
 	<a href="https://frappehr.com">
+=======
+	<a href="https://frappe.io/hr">
+>>>>>>> da17577dc (chore: remove unused import)
 		<img src="https://raw.githubusercontent.com/frappe/hrms/develop/hrms/public/images/frappe-hr-logo.png" height="128" alt="Frappe HR Logo">
 	</a>
 	<h2>Frappe HR</h2>
@@ -10,6 +14,7 @@
 [![CI](https://github.com/frappe/hrms/actions/workflows/ci.yml/badge.svg?branch=develop)](https://github.com/frappe/hrms/actions/workflows/ci.yml)
 [![codecov](https://codecov.io/gh/frappe/hrms/branch/develop/graph/badge.svg?token=0TwvyUg3I5)](https://codecov.io/gh/frappe/hrms)
 
+<<<<<<< HEAD
 [https://frappehr.com](https://frappehr.com)
 
 <div align="center" style="max-height: 40px;">
@@ -18,6 +23,24 @@
 	</a>
 </div>
 
+=======
+[https://frappe.io/hr](https://frappe.io/hr)
+
+<p align="center">
+	<a href="https://www.producthunt.com/posts/frappe-hr?utm_source=badge-featured&utm_medium=badge&utm_souce=badge-frappe&#0045;hr" target="_blank">
+		<img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=421276&theme=dark" alt="Frappe&#0032;HR - The&#0032;missing&#0032;open&#0032;source&#0032;HR&#0032;and&#0032;payroll&#0032;software | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" />
+	</a>
+</p>
+
+<div align="center" style="max-height: 40px;">
+	<a href="https://frappecloud.com/hrms/signup">
+		<img src=".github/try-on-f-cloud-button.svg" height="50">
+	</a>
+</div>
+
+
+
+>>>>>>> da17577dc (chore: remove unused import)
 </div>
 
 ## Introduction

diff --git a/crowdin.yml b/crowdin.yml
@@ -0,0 +1,8 @@
+files:
+  - source: /hrms/locale/main.pot
+    translation: /hrms/locale/%two_letters_code%.po
+pull_request_title: "fix: sync translations from crowdin"
+pull_request_labels:
+  - translation
+commit_message: "fix: %language% translations"
+append_commit_message: false
diff --git a/hrms/__init__.py b/hrms/__init__.py
@@ -1,6 +1,10 @@
 import frappe
 
+<<<<<<< HEAD
 __version__ = "15.33.2"
+=======
+__version__ = "16.0.0-dev"
+>>>>>>> da17577dc (chore: remove unused import)
 
 
 def refetch_resource(cache_key: str | list, user=None):

diff --git a/hrms/controllers/tests/test_employee_reminders.py b/hrms/controllers/tests/test_employee_reminders.py
@@ -4,7 +4,11 @@
 from datetime import timedelta
 
 import frappe
+<<<<<<< HEAD
 from frappe.tests.utils import FrappeTestCase
+=======
+from frappe.tests import IntegrationTestCase
+>>>>>>> da17577dc (chore: remove unused import)
 from frappe.utils import add_months, getdate
 
 from erpnext.setup.doctype.employee.test_employee import make_employee
@@ -14,7 +18,11 @@
 from hrms.hr.utils import get_holidays_for_employee
 
 
+<<<<<<< HEAD
 class TestEmployeeReminders(FrappeTestCase):
+=======
+class TestEmployeeReminders(IntegrationTestCase):
+>>>>>>> da17577dc (chore: remove unused import)
 	@classmethod
 	def setUpClass(cls):
 		super().setUpClass()

diff --git a/hrms/hooks.py b/hrms/hooks.py
@@ -6,6 +6,11 @@
 app_license = "GNU General Public License (v3)"
 required_apps = ["frappe/erpnext"]
 source_link = "http://github.com/frappe/hrms"
+<<<<<<< HEAD
+=======
+app_logo_url = "/assets/hrms/images/frappe-hr-logo.svg"
+app_home = "/app/hr"
+>>>>>>> da17577dc (chore: remove unused import)
 
 add_to_apps_screen = [
 	{
@@ -239,7 +244,11 @@
 	"monthly": ["hrms.controllers.employee_reminders.send_reminders_in_advance_monthly"],
 }
 
+<<<<<<< HEAD
 advance_payment_doctypes = ["Gratuity", "Employee Advance"]
+=======
+advance_payment_payable_doctypes = ["Gratuity", "Employee Advance"]
+>>>>>>> da17577dc (chore: remove unused import)
 
 invoice_doctypes = ["Expense Claim"]