From ef8483d2eab2f8308895fdff6aaa8a3d1e15c9e3 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Tue, 7 Jun 2022 14:10:44 +0530 Subject: [PATCH] chore: Resolve conflicts --- erpnext/loan_management/doctype/loan/loan.py | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/erpnext/loan_management/doctype/loan/loan.py b/erpnext/loan_management/doctype/loan/loan.py index 7ae7f838c75..b66b8519238 100644 --- a/erpnext/loan_management/doctype/loan/loan.py +++ b/erpnext/loan_management/doctype/loan/loan.py @@ -59,16 +59,6 @@ class Loan(AccountsController): ) ) -<<<<<<< HEAD -======= - def validate_cost_center(self): - if not self.cost_center and self.rate_of_interest != 0.0: - self.cost_center = frappe.db.get_value("Company", self.company, "cost_center") - - if not self.cost_center: - frappe.throw(_("Cost center is mandatory for loans having rate of interest greater than 0")) - ->>>>>>> 815141bf57 (fix: Close unsecured terms loans) def on_submit(self): self.link_loan_security_pledge() # Interest accrual for backdated term loans