Merge pull request #1562 from frappe/version-15-hotfix

chore: release v15

hrms/hr/doctype/employee_advance/employee_advance.py

@@ -27,6 +27,7 @@ def onload(self):
 
 	def validate(self):
 		validate_active_employee(self.employee)
+		self.validate_exchange_rate()
 		self.set_status()
 
 	def on_cancel(self):
@@ -43,6 +44,10 @@ def publish_update(self):
 		employee_user = frappe.db.get_value("Employee", self.employee, "user_id", cache=True)
 		hrms.refetch_resource("hrms:employee_advance_balance", employee_user)
 
+	def validate_exchange_rate(self):
+		if not self.exchange_rate:
+			frappe.throw(_("Exchange Rate cannot be zero."))
+
 	def set_status(self, update=False):
 		precision = self.precision("paid_amount")
 		total_amount = flt(flt(self.claimed_amount) + flt(self.return_amount), precision)

hrms/overrides/employee_payment_entry.py

@@ -44,7 +44,8 @@ def set_missing_ref_details(
 					d.reference_doctype, d.reference_name, self.party_account_currency
 				)
 
-				if ref_exchange_rate:
+				# Only update exchange rate when the reference is Journal Entry
+				if ref_exchange_rate and d.reference_doctype == "Journal Entry":
 					ref_details.update({"exchange_rate": ref_exchange_rate})
 
 				for field, value in ref_details.items():