feat: Employee CTC Breakup report (backport #4485) (backport #4545)#4596
Closed
mergify[bot] wants to merge 13 commits into
Closed
feat: Employee CTC Breakup report (backport #4485) (backport #4545)#4596mergify[bot] wants to merge 13 commits into
mergify[bot] wants to merge 13 commits into
Conversation
…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 e066f64) # Conflicts: # hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py
(cherry picked from commit 3f96b30)
(cherry picked from commit 10eba63)
Contributor
Author
|
Cherry-pick of 211d83a has failed: Cherry-pick of 9307612 has failed: Cherry-pick of 687b261 has failed: Cherry-pick of f992583 has failed: Cherry-pick of e6ebb85 has failed: Cherry-pick of 6f253fa has failed: Cherry-pick of f8761f2 has failed: Cherry-pick of d0a93fb has failed: Cherry-pick of cfad249 has failed: Cherry-pick of 0fbf1bf has failed: Cherry-pick of e066f64 has failed: 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 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #4376

Depends partly on frappe/frappe#39121
Screencast.From.2026-05-14.14-05-04.mp4
More Screenshots
no-docsSummary by CodeRabbit
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).