schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: Resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2022-06-07 14:10:44 +05:30
parent d6d1d79ba0
commit ef8483d2ea
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/loan_management/doctype/loan/loan.py
View File

@@ -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): def on_submit(self):
self.link_loan_security_pledge() self.link_loan_security_pledge()
# Interest accrual for backdated term loans # Interest accrual for backdated term loans