Merge pull request #3900 from aerele/non-negative-component

Author: asmitahase

hrms/payroll/doctype/salary_slip/salary_slip.py

@@ -1739,7 +1739,7 @@ def update_component_row(
 			):
 				component_row.set(attr, component_data.get(attr))
 
-		if additional_salary:
+		if additional_salary and amount:
 			if additional_salary.overwrite:
 				component_row.additional_amount = flt(
 					flt(amount) - flt(component_row.get("default_amount", 0)),

hrms/payroll/doctype/salary_slip/test_salary_slip.py

@@ -1828,6 +1828,128 @@ def test_status_on_discard(self):
 		salary_slip.reload()
 		self.assertEqual(salary_slip.status, "Cancelled")
 
+	def test_salary_component_for_payment_days_zero(self):
+		from hrms.payroll.doctype.salary_structure.test_salary_structure import (
+			create_salary_structure_assignment,
+			make_salary_structure,
+		)
+
+		emp = make_employee(
+			"test_payment_days_zero_component@salary.com",
+			company="_Test Company",
+			**{"date_of_joining": "2021-12-01"},
+		)
+
+		payroll_period = frappe.get_all("Payroll Period", filters={"company": "_Test Company"}, limit=1)
+		payroll_period = frappe.get_cached_doc("Payroll Period", payroll_period[0].name)
+
+		data = [
+			{
+				"salary_component": "Basic",
+				"abbr": "BS",
+				"type": "Earning",
+				"formula": "base",
+				"amount_based_on_formula": 1,
+				"depends_on_payment_days": 1,
+			},
+			{
+				"salary_component": "House Rent Allowance",
+				"abbr": "HRA",
+				"type": "Earning",
+				"formula": "BS * 0.5",
+				"amount_based_on_formula": 1,
+				"depends_on_payment_days": 0,
+			},
+		]
+		make_salary_component(data, False, company_list=["_Test Company"])
+
+		salary_structure_name = "Test Payment Days Zero Component"
+		salary_structure_doc = make_salary_structure(
+			salary_structure_name,
+			"Monthly",
+			company="_Test Company",
+			employee=emp,
+			from_date=payroll_period.start_date,
+			payroll_period=payroll_period,
+			base=65000,
+		)
+
+		create_salary_structure_assignment(
+			emp,
+			salary_structure_doc.name,
+			from_date=payroll_period.start_date,
+			company="_Test Company",
+			currency="INR",
+			payroll_period=payroll_period,
+			base=65000,
+		)
+
+		salary_slip = make_salary_slip(
+			salary_structure_doc.name, employee=emp, posting_date=payroll_period.start_date
+		)
+		salary_slip.payment_days = 0
+
+		earnings = {d.salary_component: d for d in salary_slip.earnings}
+
+		self.assertNotIn("Basic", earnings)
+
+		self.assertNotIn("House Rent Allowance", earnings)
+
+	def test_salary_component_for_additional_salary_zero(self):
+		from hrms.payroll.doctype.salary_structure.test_salary_structure import make_salary_structure
+
+		emp = make_employee(
+			"test_zero_value_component@salary.com",
+			company="_Test Company",
+			**{"date_of_joining": "2021-12-01"},
+		)
+
+		payroll_period = frappe.get_all("Payroll Period", filters={"company": "_Test Company"}, limit=1)
+		payroll_period = frappe.get_cached_doc("Payroll Period", payroll_period[0].name)
+
+		data = [
+			{
+				"salary_component": "Allowance",
+				"abbr": "ALL",
+				"type": "Earning",
+				"is_income_tax_component": 0,
+				"amount": 350,
+			},
+		]
+		make_salary_component(data, False, company_list=["_Test Company"])
+
+		salary_structure_name = "Test Additional Salary component"
+		salary_structure_doc = make_salary_structure(
+			salary_structure_name,
+			"Monthly",
+			company="_Test Company",
+			employee=emp,
+			from_date=payroll_period.start_date,
+			payroll_period=payroll_period,
+			base=65000,
+		)
+
+		frappe.get_doc(
+			{
+				"doctype": "Additional Salary",
+				"employee": emp,
+				"company": "_Test Company",
+				"salary_component": "Allowance",
+				"overwrite_salary_structure_amount": 1,
+				"amount": 0,
+				"payroll_date": payroll_period.start_date,
+				"currency": erpnext.get_default_currency(),
+			}
+		).submit()
+
+		salary_slip = make_salary_slip(
+			salary_structure_doc.name, employee=emp, posting_date=payroll_period.start_date
+		)
+		earnings = {d.salary_component: d.amount for d in salary_slip.earnings}
+
+		self.assertIn("Allowance", earnings)
+		self.assertEqual(earnings["Allowance"], 0.0)
+
 
 class TestSalarySlipSafeEval(IntegrationTestCase):
 	def test_safe_eval_for_salary_slip(self):