From 480a0ca7a8d97bbaa4de103a722e823ff5aed47f Mon Sep 17 00:00:00 2001
From: Anand Baburajan <anandbaburajan@gmail.com>
Date: Tue, 19 Sep 2023 15:18:35 +0530
Subject: [PATCH] fix: fetch logic for repay_from_salary in loan_repayment
 [v14] (#37135)

* fix: fetch logic for repay_from_salary in loan_repayment

* chore: only fetch repay_from_salary if field exists
---
 .../doctype/loan_repayment/loan_repayment.js             | 9 ++++++++-
 .../doctype/loan_repayment/loan_repayment.py             | 6 ++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/erpnext/loan_management/doctype/loan_repayment/loan_repayment.js b/erpnext/loan_management/doctype/loan_repayment/loan_repayment.js
index 82a2d802b80d..53581339faef 100644
--- a/erpnext/loan_management/doctype/loan_repayment/loan_repayment.js
+++ b/erpnext/loan_management/doctype/loan_repayment/loan_repayment.js
@@ -6,7 +6,14 @@
 frappe.ui.form.on('Loan Repayment', {
 	// refresh: function(frm) {
 
-	// }
+	// },
+
+	setup: function(frm) {
+		if (frappe.meta.has_field("Loan Repayment", "repay_from_salary")) {
+			frm.add_fetch("against_loan", "repay_from_salary", "repay_from_salary");
+		}
+	},
+
 	onload: function(frm) {
 		frm.set_query('against_loan', function() {
 			return {
diff --git a/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py b/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py
index f0e113b0e7b6..0d16c7f0c50c 100644
--- a/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py
+++ b/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py
@@ -80,6 +80,12 @@ def set_missing_values(self, amounts):
 		if amounts.get("due_date"):
 			self.due_date = amounts.get("due_date")
 
+		if hasattr(self, "repay_from_salary") and hasattr(self, "payroll_payable_account"):
+			if self.repay_from_salary and not self.payroll_payable_account:
+				frappe.throw(_("Please set Payroll Payable Account in Loan Repayment"))
+			elif not self.repay_from_salary and self.payroll_payable_account:
+				self.repay_from_salary = 1
+
 	def check_future_entries(self):
 		future_repayment_date = frappe.db.get_value(
 			"Loan Repayment",