Skip to content

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

Closed
mergify[bot] wants to merge 13 commits into
developfrom
mergify/bp/develop/pr-4545
Closed

feat: Employee CTC Breakup report (backport #4485) (backport #4545)#4596
mergify[bot] wants to merge 13 commits into
developfrom
mergify/bp/develop/pr-4545

Conversation

@mergify

@mergify mergify Bot commented May 27, 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).
This is an automatic backport of pull request #4545 done by [Mergify](https://mergify.com).

asmitahase added 13 commits May 27, 2026 07:09
(cherry picked from commit 52d3dbd)
(cherry picked from commit 211d83a)

# Conflicts:
#	hrms/payroll/report/employee_ctc_break_up/employee_ctc_break_up.js
#	hrms/payroll/report/employee_ctc_break_up/employee_ctc_break_up.json
#	hrms/payroll/report/employee_ctc_break_up/employee_ctc_break_up.py
(cherry picked from commit a5e23ef)
(cherry picked from commit 9307612)

# Conflicts:
#	hrms/payroll/report/employee_ctc_break_up/employee_ctc_break_up.py
(cherry picked from commit 245bdc7)
(cherry picked from commit 687b261)

# Conflicts:
#	hrms/payroll/report/employee_ctc_break_up/employee_ctc_break_up.py
(cherry picked from commit 8219b1b)
(cherry picked from commit f992583)

# Conflicts:
#	hrms/payroll/report/employee_ctc_break_up/employee_ctc_break_up.js
#	hrms/payroll/report/employee_ctc_break_up/employee_ctc_break_up.py
#	hrms/payroll/report/employee_ctc_break_up/employee_profile_card.html
…r this

(cherry picked from commit 351c2a2)
(cherry picked from commit e6ebb85)

# Conflicts:
#	hrms/payroll/report/employee_ctc_break_up/employee_ctc_break_up.py
…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)
(cherry picked from commit 6f253fa)

# Conflicts:
#	hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.js
#	hrms/payroll/report/employee_ctc_break_up/employee_ctc_break_up.json
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
(cherry picked from commit f8761f2)

# Conflicts:
#	hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.js
#	hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py
#	hrms/payroll/report/employee_ctc_break_up/employee_ctc_break_up.py
(cherry picked from commit d8c8f59)
(cherry picked from commit d0a93fb)

# Conflicts:
#	hrms/payroll/report/employee_ctc_break_up/employee_ctc_break_up.js
…ed tests

(cherry picked from commit 1b914d6)
(cherry picked from commit cfad249)

# Conflicts:
#	hrms/payroll/report/employee_ctc_break_up/employee_ctc_break_up.py
(cherry picked from commit cd411ec)
(cherry picked from commit 0fbf1bf)

# Conflicts:
#	hrms/payroll/report/employee_ctc_break_up/employee_profile_card.html
(cherry picked from commit e066f64)

# Conflicts:
#	hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py
(cherry picked from commit 3f96b30)
(cherry picked from commit 10eba63)
@mergify mergify Bot added the conflicts label May 27, 2026
@mergify

mergify Bot commented May 27, 2026

Copy link
Copy Markdown
Contributor Author

Cherry-pick of 211d83a has failed:

On branch mergify/bp/develop/pr-4545
Your branch is up to date with 'origin/develop'.

You are currently cherry-picking commit 211d83aa.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both added:      hrms/payroll/report/employee_ctc_break_up/employee_ctc_break_up.js
	both added:      hrms/payroll/report/employee_ctc_break_up/employee_ctc_break_up.json
	both added:      hrms/payroll/report/employee_ctc_break_up/employee_ctc_break_up.py

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 9307612 has failed:

On branch mergify/bp/develop/pr-4545
Your branch is ahead of 'origin/develop' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 93076125.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 687b261 has failed:

On branch mergify/bp/develop/pr-4545
Your branch is ahead of 'origin/develop' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 687b2617.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of f992583 has failed:

On branch mergify/bp/develop/pr-4545
Your branch is ahead of 'origin/develop' by 3 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit f992583c.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hrms/payroll/report/employee_ctc_break_up/employee_ctc_break_up.js
	both modified:   hrms/payroll/report/employee_ctc_break_up/employee_ctc_break_up.py
	both added:      hrms/payroll/report/employee_ctc_break_up/employee_profile_card.html

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of e6ebb85 has failed:

On branch mergify/bp/develop/pr-4545
Your branch is ahead of 'origin/develop' by 4 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit e6ebb85b.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 6f253fa has failed:

On branch mergify/bp/develop/pr-4545
Your branch is ahead of 'origin/develop' by 5 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 6f253fad.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of f8761f2 has failed:

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

You are currently cherry-picking commit f8761f2a.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of d0a93fb has failed:

On branch mergify/bp/develop/pr-4545
Your branch is ahead of 'origin/develop' by 7 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit d0a93fbb.
  (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/report/employee_ctc_break_up/employee_ctc_break_up.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hrms/payroll/report/employee_ctc_break_up/employee_ctc_break_up.js

Cherry-pick of cfad249 has failed:

On branch mergify/bp/develop/pr-4545
Your branch is ahead of 'origin/develop' by 8 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit cfad2496.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 0fbf1bf has failed:

On branch mergify/bp/develop/pr-4545
Your branch is ahead of 'origin/develop' by 9 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 0fbf1bf9.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hrms/payroll/report/employee_ctc_break_up/employee_profile_card.html

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of e066f64 has failed:

On branch mergify/bp/develop/pr-4545
Your branch is ahead of 'origin/develop' by 10 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit e066f64f.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

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

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.

CTC Breakup Preview

1 participant