Merge pull request #853 from frappe/version-14-hotfix

hrms/hr/doctype/expense_claim/test_expense_claim.py

@@ -300,6 +300,41 @@ def test_expense_claim_gl_entry(self):
 			self.assertEqual(expected_values[gle.account][1], gle.debit)
 			self.assertEqual(expected_values[gle.account][2], gle.credit)
 
+	def test_invalid_gain_loss_for_expense_claim(self):
+		payable_account = get_payable_account(company_name)
+		taxes = generate_taxes()
+		expense_claim = make_expense_claim(
+			payable_account,
+			300,
+			200,
+			company_name,
+			"Travel Expenses - _TC3",
+			do_not_submit=True,
+			taxes=taxes,
+		)
+		expense_claim.submit()
+
+		from hrms.overrides.employee_payment_entry import get_payment_entry_for_employee
+
+		pe = get_payment_entry_for_employee(expense_claim.doctype, expense_claim.name)
+		pe.save()
+		pe.submit()
+		self.assertEqual(len(pe.references), 1)
+		self.assertEqual(pe.references[0].exchange_gain_loss, 0.0)
+		self.assertEqual(pe.references[0].exchange_rate, 1.0)
+		# Invalid gain/loss JE shouldn't be created for base currency Expense Claims
+		self.assertEqual(
+			frappe.db.get_all(
+				"Journal Entry Account",
+				filters={
+					"reference_type": expense_claim.doctype,
+					"reference_name": expense_claim.name,
+					"docstatus": 1,
+				},
+			),
+			[],
+		)
+
 	def test_rejected_expense_claim(self):
 		payable_account = get_payable_account(company_name)
 		expense_claim = frappe.get_doc(

hrms/overrides/employee_payment_entry.py

@@ -106,6 +106,7 @@ def get_payment_entry_for_employee(dt, dn, party_amount=None, bank_account=None,
 
 	pe.setup_party_account_field()
 	pe.set_missing_values()
+	pe.set_missing_ref_details()
 
 	if party_account and bank:
 		reference_doc = None

hrms/patches.txt

@@ -8,4 +8,5 @@ hrms.patches.v14_0.create_custom_field_for_appraisal_template
 hrms.patches.post_install.update_performance_module_changes #2023-04-17
 hrms.patches.v14_0.update_ess_user_access #2023-08-14
 execute:frappe.db.set_default("date_format", frappe.db.get_single_value("System Settings", "date_format"))
-hrms.patches.v14_0.create_vehicle_service_item
+hrms.patches.v14_0.create_vehicle_service_item
+hrms.patches.v14_0.update_repay_from_salary_and_payroll_payable_account_fields

hrms/patches/v14_0/update_repay_from_salary_and_payroll_payable_account_fields.py

@@ -0,0 +1,16 @@
+import frappe
+
+
+def execute():
+	if frappe.db.exists("Custom Field", {"name": "Loan Repayment-repay_from_salary"}):
+		frappe.db.set_value(
+			"Custom Field", {"name": "Loan Repayment-repay_from_salary"}, "fetch_if_empty", 1
+		)
+
+	if frappe.db.exists("Custom Field", {"name": "Loan Repayment-payroll_payable_account"}):
+		frappe.db.set_value(
+			"Custom Field",
+			{"name": "Loan Repayment-payroll_payable_account"},
+			"insert_after",
+			"payment_account",
+		)

hrms/setup.py

@@ -305,6 +305,7 @@ def get_custom_fields():
 			{
 				"default": "0",
 				"fetch_from": "against_loan.repay_from_salary",
+				"fetch_if_empty": 1,
 				"fieldname": "repay_from_salary",
 				"fieldtype": "Check",
 				"label": "Repay From Salary",
@@ -317,7 +318,7 @@ def get_custom_fields():
 				"label": "Payroll Payable Account",
 				"mandatory_depends_on": "eval:doc.repay_from_salary",
 				"options": "Account",
-				"insert_after": "rate_of_interest",
+				"insert_after": "payment_account",
 			},
 		],
 	}