fix: fix test

Author: AyshaHakeem

hrms/hr/doctype/employee_advance/test_employee_advance.py

@@ -14,7 +14,7 @@
 	make_bank_entry,
 	make_return_entry,
 )
-from hrms.hr.doctype.expense_claim.expense_claim import get_advances
+from hrms.hr.doctype.expense_claim.expense_claim import get_advances, get_allocation_amount
 from hrms.hr.doctype.expense_claim.test_expense_claim import (
 	get_payable_account,
 	make_expense_claim,
@@ -353,7 +353,11 @@ def get_advances_for_claim(claim, advance_name, amount=None):
 		if amount:
 			allocated_amount = amount
 		else:
-			allocated_amount = flt(entry.paid_amount) - flt(entry.claimed_amount)
+			allocated_amount = get_allocation_amount(
+				paid_amount=entry.paid_amount,
+				claimed_amount=entry.claimed_amount,
+				return_amount=entry.return_amount,
+			)
 
 		claim.append(
 			"advances",
@@ -362,7 +366,8 @@ def get_advances_for_claim(claim, advance_name, amount=None):
 				"posting_date": entry.posting_date,
 				"advance_account": entry.advance_account,
 				"advance_paid": entry.paid_amount,
-				"unclaimed_amount": allocated_amount,
+				"return_amount": entry.return_amount,
+				"unclaimed_amount": entry.paid_amount - entry.claimed_amount,
 				"allocated_amount": allocated_amount,
 			},
 		)

hrms/hr/doctype/expense_claim/expense_claim.py

@@ -333,7 +333,9 @@ def validate_advances(self):
 			d.advance_paid = ref_doc.paid_amount
 			d.unclaimed_amount = flt(ref_doc.paid_amount) - flt(ref_doc.claimed_amount)
 
-			if d.allocated_amount and flt(d.allocated_amount) > flt(d.unclaimed_amount):
+			if d.allocated_amount and flt(d.allocated_amount) > (
+				flt(d.unclaimed_amount) - flt(d.return_amount)
+			):
 				frappe.throw(
 					_("Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2}").format(
 						d.idx, d.allocated_amount, d.unclaimed_amount
@@ -537,7 +539,7 @@ def get_expense_claim(
 			"advance_paid": flt(paid_amount),
 			"unclaimed_amount": flt(paid_amount) - flt(claimed_amount),
 			"allocated_amount": get_allocation_amount(
-				flt(paid_amount), flt(claimed_amount), flt(return_amount)
+				paid_amount=(paid_amount), claimed_amount=(claimed_amount), return_amount=(return_amount)
 			),
 			"return_amount": flt(return_amount),
 		},
@@ -598,6 +600,17 @@ def make_expense_claim_for_delivery_trip(source_name, target_doc=None):
 	return doc
 
 
+# // amke below fucntion reusable basef on wht is passed, if only unclaimed and return_amt is pased, return unclaimed - returne_amt else paid_amount - (claimed_amount + return_amount)
+# @frappe.whitelist()
+# def get_allocation_amount(paid_amount, claimed_amount, return_amount):
+# 	return paid_amount - (claimed_amount + return_amount)
+
+
 @frappe.whitelist()
-def get_allocation_amount(paid_amount, claimed_amount, return_amount):
-	return paid_amount - (claimed_amount + return_amount)
+def get_allocation_amount(paid_amount=None, claimed_amount=None, return_amount=None, unclaimed_amount=None):
+	if unclaimed_amount is not None and return_amount is not None:
+		return flt(unclaimed_amount) - flt(return_amount)
+	elif paid_amount is not None and claimed_amount is not None and return_amount is not None:
+		return flt(paid_amount) - (flt(claimed_amount) + flt(return_amount))
+	else:
+		frappe.throw(_("Invalid parameters provided. Please pass the required arguments."))

hrms/hr/doctype/expense_claim/test_expense_claim.py

@@ -256,50 +256,60 @@ def test_expense_claim_partially_paid_via_advance(self):
 	def test_expense_claim_with_deducted_returned_advance(self):
 		from hrms.hr.doctype.employee_advance.test_employee_advance import (
 			create_return_through_additional_salary,
+			get_advances_for_claim,
 			make_employee_advance,
 			make_journal_entry_for_advance,
 		)
-		from hrms.hr.doctype.expense_claim.expense_claim import get_advances
+		from hrms.hr.doctype.expense_claim.expense_claim import get_allocation_amount
 		from hrms.payroll.doctype.salary_component.test_salary_component import create_salary_component
 		from hrms.payroll.doctype.salary_structure.test_salary_structure import make_salary_structure
 
+		# create employee and employee advance
 		employee_name = make_employee("[email protected]", "_Test Company")
 		advance = make_employee_advance(employee_name, {"repay_unclaimed_amount_from_salary": 1})
 		journal_entry = make_journal_entry_for_advance(advance)
 		journal_entry.submit()
+		advance.reload()
 
-		args = {"type": "Deduction"}
-		create_salary_component("Advance Salary - Deduction", **args)
+		# set up salary components and structure
+		create_salary_component("Advance Salary - Deduction", type="Deduction")
 		make_salary_structure(
 			"Test Additional Salary for Advance Return",
 			"Monthly",
 			employee=employee_name,
 			company="_Test Company",
 		)
 
-		advance.reload()
+		# create additional salary for advance return
 		additional_salary = create_return_through_additional_salary(advance)
 		additional_salary.salary_component = "Advance Salary - Deduction"
 		additional_salary.payroll_date = nowdate()
 		additional_salary.amount = 400
 		additional_salary.insert()
 		additional_salary.submit()
-
 		advance.reload()
+
 		self.assertEqual(advance.return_amount, 400)
 
+		# create an expense claim
 		payable_account = get_payable_account("_Test Company")
 		claim = make_expense_claim(
 			payable_account, 200, 200, "_Test Company", "Travel Expenses - _TC", do_not_submit=True
 		)
-		advances = get_advances(claim.employee)
-		for entry in advances:
-			if entry.name == advance.name:
-				self.assertTrue(entry.return_amount, 400)
-				self.assertTrue(
-					entry.allocated_amount,
-					advance.paid_amount - (advance.claimed_amount + advance.return_amount),
-				)
+
+		# link advance to the claim
+		claim = get_advances_for_claim(claim, advance.name, amount=200)
+		claim.save()
+		claim.submit()
+
+		# verify the allocation amount
+		advance = claim.advances[0]
+		self.assertEqual(
+			get_allocation_amount(
+				unclaimed_amount=advance.unclaimed_amount, return_amount=advance.return_amount
+			),
+			600,
+		)
 
 	def test_expense_claim_gl_entry(self):
 		payable_account = get_payable_account(company_name)