Skip to content

feat: Employee CTC Breakup report (backport #4485)#4545

Merged
asmitahase merged 14 commits into
version-16-hotfixfrom
mergify/bp/version-16-hotfix/pr-4485
May 27, 2026
Merged

feat: Employee CTC Breakup report (backport #4485)#4545
asmitahase merged 14 commits into
version-16-hotfixfrom
mergify/bp/version-16-hotfix/pr-4485

Conversation

@mergify

@mergify mergify Bot commented May 18, 2026

Copy link
Copy Markdown
Contributor

Closes #4376
Depends partly on frappe/frappe#39121
image

  • Added new field to set total CTC in the Salary Structure assignment. Full explanation as to why is here
Screencast.From.2026-05-14.14-05-04.mp4
More Screenshots Screen Shot 2026-05-14 at 11 19 55 Screen Shot 2026-05-14 at 11 19 23 image

no-docs

Summary by CodeRabbit

  • New Features
    • Added "Employee CTC Break-up" script report with detailed salary component breakdown (earnings, deductions, tax), annualized amounts, percent-of-CTC, and bolded subtotal/total rows.
    • Report UI includes Company, Employee, and Salary Structure Assignment filters with dependent queries and required-filter validation.
    • Includes responsive employee profile card, summary metrics (Annual CTC, per-cycle CTC, Gross, Net), and colored type indicators with bold formatting where applicable.

Review Change Stack


This is an automatic backport of pull request #4485 done by [Mergify](https://mergify.com).

@mergify

mergify Bot commented May 18, 2026

Copy link
Copy Markdown
Contributor Author

Cherry-pick of 1594127 has failed:

On branch mergify/bp/version-16-hotfix/pr-4485
Your branch is ahead of 'origin/version-16-hotfix' by 6 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 15941275.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   hrms/payroll/doctype/salary_structure/test_salary_structure.py
	modified:   hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.js
	modified:   hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.json
	modified:   hrms/payroll/report/employee_ctc_break_up/employee_ctc_break_up.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

asmitahase added 13 commits May 27, 2026 11:39
(cherry picked from commit 52d3dbd)
(cherry picked from commit 245bdc7)
(cherry picked from commit 8219b1b)
…report

feat: added the report to the payroll workspace sidebar
fix: changed reference report from salary structure to salary structure assignment

(cherry picked from commit 0717efa)
feat: fetch ctc from salary structure assignment instead of employee master in the breakup report

(cherry picked from commit 1594127)

# Conflicts:
#	hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py
@asmitahase asmitahase force-pushed the mergify/bp/version-16-hotfix/pr-4485 branch from ae65627 to 3f96b30 Compare May 27, 2026 06:09
@asmitahase asmitahase enabled auto-merge May 27, 2026 07:04
@asmitahase asmitahase merged commit 04e4683 into version-16-hotfix May 27, 2026
14 checks passed
@asmitahase asmitahase deleted the mergify/bp/version-16-hotfix/pr-4485 branch May 27, 2026 07:09
@frappe-pr-bot

Copy link
Copy Markdown
Collaborator

🎉 This PR is included in version 16.8.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants