[pull] develop from frappe:develop

hrms/hr/doctype/expense_claim/expense_claim.py

@@ -116,6 +116,9 @@ def validate(self):
 		if self.task and not self.project:
 			self.project = frappe.db.get_value("Task", self.task, "project")
 
+		if flt(self.grand_total) > 0 and self.total_advance_amount:
+			self.is_paid = 0
+
 	def set_status(self, update=False):
 		status = {"0": "Draft", "1": "Submitted", "2": "Cancelled"}[cstr(self.docstatus or 0)]
 

hrms/hr/doctype/expense_claim/test_expense_claim.py

@@ -255,26 +255,47 @@ def test_advance_amount_allocation_against_claim_with_taxes(self):
 
 	def test_expense_claim_partially_paid_via_advance(self):
 		from hrms.hr.doctype.employee_advance.test_employee_advance import (
-			get_advances_for_claim,
 			make_employee_advance,
 			make_payment_entry,
 		)
+		from hrms.hr.doctype.expense_claim.expense_claim import get_expense_claim
 
 		frappe.db.delete("Employee Advance")
 
-		payable_account = get_payable_account("_Test Company")
-		claim = make_expense_claim(
-			payable_account, 1000, 1000, "_Test Company", "Travel Expenses - _TC", do_not_submit=True
-		)
-
-		# link advance for partial amount
-		advance = make_employee_advance(claim.employee, {"advance_amount": 500})
+		employee = make_employee("test_partial_advance_claim@expenseclaim.com", "_Test Company")
+		advance = make_employee_advance(employee, {"advance_amount": 500})
 		make_payment_entry(advance)
 
-		claim = get_advances_for_claim(claim, advance.name)
+		currency, cost_center = frappe.db.get_value(
+			"Company", "_Test Company", ["default_currency", "cost_center"]
+		)
+		claim = get_expense_claim(advance.name)  # function call to create claim from employee advance form
+		claim.update(
+			{
+				"payable_account": get_payable_account("_Test Company"),
+				"currency": currency,
+				"exchange_rate": 1,
+				"approval_status": "Approved",
+			}
+		)
+		claim.append(
+			"expenses",
+			{
+				"expense_type": "Travel",
+				"default_account": "Travel Expenses - _TC",
+				"amount": 1000,
+				"sanctioned_amount": 1000,
+				"cost_center": cost_center,
+			},
+		)
+
+		# assert is_paid to be checked true as claim is done via advance actions button
+		self.assertTrue(claim.is_paid)
 		claim.save()
 		claim.submit()
 
+		# assert is_paid to be checked false as claim amount is greater than advance
+		self.assertFalse(claim.is_paid)
 		self.assertEqual(claim.grand_total, 500)
 		self.assertEqual(claim.status, "Unpaid")
 

hrms/hr/report/employee_hours_utilization_based_on_timesheet/employee_hours_utilization_based_on_timesheet.py

@@ -34,7 +34,7 @@ def validate_standard_working_hours(self):
 		if not self.standard_working_hours:
 			msg = _("The metrics for this report are calculated based on {0}. Please set {0} in {1}.").format(
 				frappe.bold(_("Standard Working Hours")),
-				frappe.utils.get_link_to_form("HR Settings", "HR Settings"),
+				frappe.utils.get_link_to_form("HR Settings", "HR Settings", _("HR Settings")),
 			)
 
 			frappe.throw(msg)

hrms/hr/report/project_profitability/project_profitability.py

@@ -100,7 +100,7 @@ def get_standard_working_hours() -> float | None:
 		frappe.throw(
 			_("The metrics for this report are calculated based on the {0}. Please set {0} in {1}.").format(
 				frappe.bold(_("Standard Working Hours")),
-				frappe.utils.get_link_to_form("HR Settings", "HR Settings"),
+				frappe.utils.get_link_to_form("HR Settings", "HR Settings", _("HR Settings")),
 			)
 		)