feat: employer contribution type in salary component [frappe] PR#4682

Bot Dokosrequested to merge
ft-pr-4682 into develop

From: https://github.com/frappe/hrms/pull/4682
Date: 2026-06-11 03:26:52+05:30

  • fix: notes, variable names and redundant function passsing
  • fix: move timesheet wage component calculation to salary slip
  • test: ctc and annual gross earning for salary structure based on timesheet
  • fix: rename ts_config which sounds like a typescript config file to timesheet_config
  • fix: exclude do not include in total from annual_gross_earning and include it in ctc
  • fix: filter employers contribution components in the child table
  • refactor: use salary structure assignment's calculations for preview of salary slip test: employer's contribution components
  • test: modify test_ctc_validation because ctc not auto calculates
  • feat: employer contribution type in salary component refactor(Salary Slip): move component evaluation scope to salary structure assignment


Checkout instructions 
# Checkout locally
git fetch upstream
git switch ft-pr-4682

# Alternatively, re-take the changes
git switch develop
ft take ft-pr-4682

# Make changes then rebase
git rebase -i develop

# Fix or ignore conflicts
git checkout --theirs .
git rebase --continue

# Force-push changes
git push --force-with-lease

Merge request reports