[pull] develop from frappe:develop#356

Merged

pull[bot] merged 10 commits into

thispl:developfrom

Jun 11, 2026

Commits on Jun 9, 2026

Commits on Jun 10, 2026

refactor: use salary structure assignment's calculations for preview of salary slip
asmitahase
committed
fix: filter employers contribution components in the child table
asmitahase
committed
fix: exclude do not include in total from annual_gross_earning and include it in ctc
asmitahase
committed
fix: rename ts_config which sounds like a typescript config file to timesheet_config
asmitahase
committed
test: ctc and annual gross earning for salary structure based on timesheet
asmitahase
committed
fix: move timesheet wage component calculation to salary slip
asmitahase
committed
fix: notes, variable names and redundant function passsing
asmitahase
committed
Merge pull request #4682 from asmitahase/employers-contribution
asmitahase
authored