Skip to content

[pull] develop from frappe:develop #350

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Jun 4, 2026
Merged

[pull] develop from frappe:develop #350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc81059
fix: Add component abbreviation to component name in CTC break-up report
asmitahase Jun 4, 2026
d82e65a
Merge pull request #4643 from asmitahase/fix-component-name
asmitahase Jun 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions hrms/payroll/report/employee_ctc_break_up/employee_ctc_break_up.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def get_data(self):
self.calculate_yearly_amounts_and_percent_of_ctc()
self.indent_salary_components()
self.separate_salary_components_by_type()
self.set_type_and_formula()
self.set_abbr_type_and_formula()
self.set_totals_row_for_component_types()
self.set_net_and_gross_earning_rows()

Expand Down Expand Up @@ -130,8 +130,9 @@ def separate_salary_components_by_type(self):
component for component in self.salary_components if component.get("is_tax_component")
]

def set_type_and_formula(self):
def set_abbr_type_and_formula(self):
for component in self.earning_components + self.deduction_components:
component["salary_component"] = f"{component.get("salary_component")} ({component.get("abbr")})"
component["type"] = "Formula" if component.get("amount_based_on_formula") else "Fixed"
component["formula"] = (
component.get("formula") or "-"
Expand Down
12 changes: 8 additions & 4 deletions hrms/payroll/report/employee_ctc_break_up/test_employee_ctc_breakup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,23 +160,25 @@ def test_report(self):
self.assertEqual(earning_components_totals.get("percent_of_ctc"), 100)

basic_earning_component = earning_components[1]
self.assertEqual(basic_earning_component.get("salary_component"), "Basic Salary")
self.assertEqual(basic_earning_component.get("salary_component"), "Basic Salary (BS)")
self.assertEqual(basic_earning_component.get("type"), "Formula")
self.assertEqual(basic_earning_component.get("formula"), "base")
self.assertEqual(basic_earning_component.get("per_cycle"), 60000)
self.assertEqual(basic_earning_component.get("annual"), 720000)
self.assertEqual(basic_earning_component.get("percent_of_ctc"), 64.52)

hra_earning_component = earning_components[2]
self.assertEqual(hra_earning_component.get("salary_component"), "HRA")
self.assertEqual(hra_earning_component.get("salary_component"), "HRA (H)")
self.assertEqual(hra_earning_component.get("type"), "Fixed")
self.assertEqual(hra_earning_component.get("formula"), 3000)
self.assertEqual(hra_earning_component.get("per_cycle"), 3000)
self.assertEqual(hra_earning_component.get("annual"), 36000)
self.assertEqual(hra_earning_component.get("percent_of_ctc"), 3.23)

special_allowance_earning_component = earning_components[3]
self.assertEqual(special_allowance_earning_component.get("salary_component"), "Special Allowance")
self.assertEqual(
special_allowance_earning_component.get("salary_component"), "Special Allowance (SA)"
)
self.assertEqual(special_allowance_earning_component.get("type"), "Formula")
self.assertEqual(special_allowance_earning_component.get("formula"), "BS\n*.5")
self.assertEqual(special_allowance_earning_component.get("per_cycle"), 30000)
Expand All @@ -192,7 +194,9 @@ def test_report(self):
self.assertEqual(deduction_components_totals.get("percent_of_ctc"), 0.22)

professional_tax_deduction_component = deduction_components[1]
self.assertEqual(professional_tax_deduction_component.get("salary_component"), "Professional Tax")
self.assertEqual(
professional_tax_deduction_component.get("salary_component"), "Professional Tax (PT)"
)
self.assertEqual(professional_tax_deduction_component.get("type"), "Fixed")
self.assertEqual(professional_tax_deduction_component.get("formula"), 200)
self.assertEqual(professional_tax_deduction_component.get("per_cycle"), 200)
Expand Down
Loading