[pull] develop from frappe:develop#330

Merged

pull[bot] merged 17 commits into

thispl:developfrom

May 18, 2026

Commits on May 17, 2026

chore: update POT file
frappe-pr-bot
committed

Commits on May 18, 2026

Merge pull request #4544 from frappe/pot_develop_2026-05-17
asmitahase
authored
feat: Employee CTC Breakup report
asmitahase
committed
feat: support for all available payroll frequencies
asmitahase
committed
feat: validate filters and ctc
asmitahase
committed
feat: CTC summary card
asmitahase
committed
chore: render template use is safe, asking the rules to be ignored for this
asmitahase
committed
feat: custom button on salary structure assigment to see CTC breakup report
asmitahase
committed
feat: new field ctc in salary structure assignment
asmitahase
committed
fix: clear salary structure assignment on employee change
asmitahase
committed
test: added posting date flag for tests in salary breakup report, added tests
asmitahase
committed
chore: wrapping strings in translation function
asmitahase
committed
test(Salary Slip): remove duplicate salary component
asmitahase
committed
Merge pull request #4485 from asmitahase/ctc-breakup
asmitahase
authored
fix(payroll_entry): ignore permissions when canceling payment ledger and journal entries

krishna-254
authored and
asmitahase
committed
test(payroll_entry): add test for payroll entry cancellation by HR Manager

krishna-254
authored and
asmitahase
committed
Merge pull request #4539 from krishna-254/fix/payroll-entry-canceling-for-hr-manager
asmitahase
authored