[pull] develop from frappe:develop

hrms/payroll/doctype/payroll_entry/payroll_entry.py

@@ -218,9 +218,13 @@ def cancel_linked_journal_entries(self):
 			)
 			# cancel linked payment ledger entry
 			for pl in journal_entry_payment_ledgers:
-				frappe.get_doc("Payment Ledger Entry", pl).cancel()
+				payment_ledger_entry = frappe.get_doc("Payment Ledger Entry", pl)
+				payment_ledger_entry.flags.ignore_permissions = True
+				payment_ledger_entry.cancel()
 
-			frappe.get_doc("Journal Entry", je).cancel()
+			journal_entry = frappe.get_doc("Journal Entry", je)
+			journal_entry.flags.ignore_permissions = True
+			journal_entry.cancel()
 
 	def cancel_linked_payment_ledger_entries(self):
 		payment_ledgers = frappe.get_all(
@@ -231,7 +235,9 @@ def cancel_linked_payment_ledger_entries(self):
 
 		# cancel payment ledger entry
 		for pl in payment_ledgers:
-			frappe.get_doc("Payment Ledger Entry", pl).cancel()
+			payment_ledger_entry = frappe.get_doc("Payment Ledger Entry", pl)
+			payment_ledger_entry.flags.ignore_permissions = True
+			payment_ledger_entry.cancel()
 
 	def get_linked_salary_slips(self):
 		return frappe.get_all("Salary Slip", {"payroll_entry": self.name}, ["name", "docstatus"])

hrms/payroll/doctype/payroll_entry/test_payroll_entry.py

@@ -444,6 +444,41 @@ def test_payroll_entry_cancellation(self):
 		journal_entries = get_linked_journal_entries(payroll_entry.name, docstatus=2)
 		self.assertEqual(len(journal_entries), 2)
 
+	def test_payroll_entry_cancellation_with_hr_manager(self):
+		company_doc = frappe.get_doc("Company", "_Test Company")
+		employee = make_employee("test_hr_manager_employee@payroll.com", company=company_doc.name)
+
+		setup_salary_structure(employee, company_doc)
+		dates = get_start_end_dates("Monthly", nowdate())
+		payroll_entry = make_payroll_entry(
+			start_date=dates.start_date,
+			end_date=dates.end_date,
+			payable_account=company_doc.default_payroll_payable_account,
+			currency=company_doc.default_currency,
+			company=company_doc.name,
+			cost_center="Main - _TC",
+			payment_account="Cash - _TC",
+		)
+
+		hr_user = frappe.get_doc(
+			{
+				"doctype": "User",
+				"email": "test_hr_manager@payroll.com",
+				"first_name": "Test HR Manager",
+				"enabled": 1,
+			}
+		).insert(ignore_if_duplicate=True)
+		hr_user.add_roles("HR Manager")
+		frappe.set_user(hr_user.name)
+
+		payroll_entry.submit()
+		self.assertEqual(payroll_entry.status, "Submitted")
+
+		payroll_entry.cancel()
+		self.assertEqual(payroll_entry.status, "Cancelled")
+
+		frappe.set_user("Administrator")
+
 	def test_payroll_entry_status(self):
 		company_doc = frappe.get_doc("Company", "_Test Company")
 		employee = make_employee("test_employee@payroll.com", company=company_doc.name)

hrms/payroll/doctype/salary_slip/test_salary_slip.py

@@ -2230,16 +2230,6 @@ def make_earning_salary_component(
 	if setup or test_tax:
 		make_salary_component(data, test_tax, company_list)
 
-	data.append(
-		{
-			"salary_component": "Basic Salary",
-			"abbr": "BS",
-			"condition": "base < 10000",
-			"formula": "base*.2",
-			"type": "Earning",
-			"amount_based_on_formula": 1,
-		}
-	)
 	return data
 
 

hrms/payroll/doctype/salary_structure/test_salary_structure.py

@@ -231,7 +231,7 @@ def create_salary_structure_assignment(
 	leave_encashment_amount_per_day=None,
 ):
 	if not currency:
-		currency = "INR" or "INR"
+		currency = "INR"
 
 	if not allow_duplicate and frappe.db.exists("Salary Structure Assignment", {"employee": employee}):
 		frappe.db.sql("""delete from `tabSalary Structure Assignment` where employee=%s""", (employee))

hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.js

@@ -69,6 +69,22 @@ frappe.ui.form.on("Salary Structure Assignment", {
 		);
 		frm.page.set_inner_btn_group_as_primary(__("Create"));
 
+		frm.add_custom_button(
+			__("See CTC Break-up"),
+			function () {
+				if (!frm.doc.ctc) {
+					frm.scroll_to_field("ctc");
+					frappe.throw(
+						__("Please set employee's total cost to company to see CTC breakup."),
+					);
+				}
+				frappe.set_route("query-report", "Employee CTC Break-up", {
+					employee: frm.doc.employee,
+					salary_structure_assignment: frm.doc.name,
+				});
+			},
+			__("Actions"),
+		);
 		frm.add_custom_button(
 			__("Preview Salary Slip"),
 			function () {

hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.json

@@ -22,6 +22,7 @@
   "currency",
   "section_break_7",
   "base",
+  "ctc",
   "column_break_9",
   "variable",
   "amended_from",
@@ -242,11 +243,17 @@
    "fieldtype": "Currency",
    "label": "Leave Encashment Amount Per Day",
    "options": "currency"
+  },
+  {
+   "allow_on_submit": 1,
+   "fieldname": "ctc",
+   "fieldtype": "Currency",
+   "label": "Total Cost To Company (CTC)"
   }
  ],
  "is_submittable": 1,
  "links": [],
- "modified": "2026-02-26 14:37:43.779340",
+ "modified": "2026-05-14 13:33:55.869281",
  "modified_by": "Administrator",
  "module": "Payroll",
  "name": "Salary Structure Assignment",

hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py

@@ -30,6 +30,7 @@ class SalaryStructureAssignment(Document):
 		amended_from: DF.Link | None
 		base: DF.Currency
 		company: DF.Link
+		ctc: DF.Currency
 		currency: DF.Link
 		department: DF.Link | None
 		designation: DF.Link | None

hrms/payroll/report/employee_ctc_break_up/employee_ctc_break_up.js

@@ -0,0 +1,59 @@
+// Copyright (c) 2026, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.query_reports["Employee CTC Break-up"] = {
+	filters: [
+		{
+			fieldname: "company",
+			label: __("Company"),
+			fieldtype: "Link",
+			options: "Company",
+			reqd: 1,
+			default: frappe.defaults.get_user_default("Company"),
+		},
+		{
+			fieldname: "employee",
+			label: __("Employee"),
+			fieldtype: "Link",
+			options: "Employee",
+			reqd: 1,
+			get_query: function () {
+				let company = frappe.query_report.get_filter_value("company");
+				return {
+					filters: {
+						company: company,
+					},
+				};
+			},
+			on_change: function () {
+				frappe.query_report.set_filter_value("salary_structure_assignment", "");
+			},
+		},
+		{
+			fieldname: "salary_structure_assignment",
+			label: __("Salary Structure Assignment"),
+			fieldtype: "Link",
+			options: "Salary Structure Assignment",
+			reqd: 1,
+			get_query: function () {
+				let employee = frappe.query_report.get_filter_value("employee");
+				if (!employee) return;
+				return {
+					filters: {
+						employee: employee,
+						docstatus: 1,
+					},
+				};
+			},
+		},
+	],
+	formatter: function (value, row, column, data, default_formatter) {
+		value = default_formatter(value, row, column, data);
+		if (data?.bold && value) value = `<strong>${value}</strong>`;
+		if (column.fieldname == "type" && value) {
+			let indicator_color = value === "Fixed" ? "blue" : "orange";
+			value = `<span class="indicator-pill no-indicator-dot ${indicator_color}">${value}</span>`;
+		}
+		return value;
+	},
+};

hrms/payroll/report/employee_ctc_break_up/employee_ctc_break_up.json

@@ -0,0 +1,33 @@
+{
+ "add_total_row": 0,
+ "add_translate_data": 0,
+ "columns": [],
+ "creation": "2026-04-15 23:59:12.988472",
+ "disabled": 0,
+ "docstatus": 0,
+ "doctype": "Report",
+ "filters": [],
+ "idx": 0,
+ "is_standard": "Yes",
+ "modified": "2026-05-14 12:08:50.414476",
+ "modified_by": "Administrator",
+ "module": "Payroll",
+ "name": "Employee CTC Break-up",
+ "owner": "Administrator",
+ "prepared_report": 0,
+ "ref_doctype": "Salary Structure Assignment",
+ "report_name": "Employee CTC Break-up",
+ "report_type": "Script Report",
+ "roles": [
+  {
+   "role": "HR Manager"
+  },
+  {
+   "role": "System Manager"
+  },
+  {
+   "role": "HR User"
+  }
+ ],
+ "timeout": 0
+}