Merge branch 'develop' into l10n_develop

Author: asmitahase

hrms/payroll/doctype/additional_salary/additional_salary.py

@@ -37,13 +37,42 @@ def validate(self):
 			frappe.throw(_("Amount should not be less than zero"))
 
 	def validate_salary_structure(self):
-		if not frappe.db.exists("Salary Structure Assignment", {"employee": self.employee}):
+		salary_structure = frappe.db.get_value(
+			"Salary Structure Assignment",
+			{
+				"employee": self.employee,
+				"docstatus": 1,
+				"from_date": ["<=", self.payroll_date or self.from_date],
+			},
+			"salary_structure",
+			order_by="from_date desc",
+		)
+
+		if not salary_structure:
 			frappe.throw(
 				_("There is no Salary Structure assigned to {0}. First assign a Salary Structure.").format(
 					self.employee
 				)
 			)
 
+		if self.overwrite_salary_structure_amount:
+			is_structure_component = frappe.db.get_value(
+				"Salary Detail",
+				{
+					"parenttype": "Salary Structure",
+					"parent": salary_structure,
+					"salary_component": self.salary_component,
+				},
+			)
+
+			if not is_structure_component:
+				self.overwrite_salary_structure_amount = 0
+				frappe.msgprint(
+					_(
+						"Overwrite Salary Structure Amount is disabled as the Salary Component: {0} not part of the Salary Structure: {1}"
+					).format(self.salary_component, salary_structure)
+				)
+
 	def validate_recurring_additional_salary_overlap(self):
 		if self.is_recurring:
 			AdditionalSalary = frappe.qb.DocType("Additional Salary")

hrms/payroll/doctype/additional_salary/test_additional_salary.py

@@ -26,7 +26,10 @@ def test_recurring_additional_salary(self):
 		emp_id = make_employee("test_additional@salary.com")
 		frappe.db.set_value("Employee", emp_id, "relieving_date", add_days(nowdate(), 1800))
 		salary_structure = make_salary_structure(
-			"Test Salary Structure Additional Salary", "Monthly", employee=emp_id
+			"Test Salary Structure Additional Salary",
+			"Monthly",
+			employee=emp_id,
+			from_date=add_days(nowdate(), -50),
 		)
 		add_sal = get_additional_salary(emp_id)
 
@@ -44,7 +47,10 @@ def test_disabled_recurring_additional_salary(self):
 		emp_id = make_employee("test_additional@salary.com")
 
 		salary_structure = make_salary_structure(
-			"Test Salary Structure Additional Salary", "Monthly", employee=emp_id
+			"Test Salary Structure Additional Salary",
+			"Monthly",
+			employee=emp_id,
+			from_date=add_days(nowdate(), -50),
 		)
 		add_sal = get_additional_salary(emp_id)
 		ss = make_employee_salary_slip(emp_id, "Monthly", salary_structure=salary_structure.name)
@@ -149,8 +155,13 @@ def _get_tds_component(doc) -> dict:
 
 	def test_validate_duplicate_or_overlapping_additional_salary(self):
 		emp_id = make_employee("test_additional@salary.com")
-		make_salary_structure("Test Salary Structure Additional Salary", "Monthly", employee=emp_id)
 		date = nowdate()
+		make_salary_structure(
+			"Test Salary Structure Additional Salary",
+			"Monthly",
+			employee=emp_id,
+			from_date=add_days(date, -50),
+		)
 		get_additional_salary(emp_id, overwrite_salary_structure=1)
 		additional_salary_doc = frappe.get_doc(
 			{

hrms/payroll/doctype/salary_slip/salary_slip.py

@@ -1963,9 +1963,9 @@ def get_taxable_earnings(self, allow_tax_exemption=False, based_on_payment_days=
 				amount, additional_amount = self.get_amount_based_on_payment_days(earning)
 			else:
 				if earning.additional_amount:
-					amount, additional_amount = earning.amount, earning.additional_amount
+					amount, additional_amount = earning.amount or 0, earning.additional_amount or 0
 				else:
-					amount, additional_amount = earning.default_amount, earning.additional_amount
+					amount, additional_amount = earning.default_amount or 0, earning.additional_amount or 0
 
 			if earning.is_tax_applicable:
 				taxable_earnings += amount - additional_amount

hrms/payroll/doctype/salary_slip/test_salary_slip.py

@@ -2051,6 +2051,14 @@ def make_earning_salary_component(
 			"amount": 0,
 			"remove_if_zero_valued": 1,
 		},
+		{
+			"salary_component": "Recurring Salary Component",
+			"abbr": "RSC",
+			"type": "Earning",
+			"depends_on_payment_days": 0,
+			"amount": 0,
+			"remove_if_zero_valued": 1,
+		},
 	]
 
 	if test_accrual_component: