fix lint
This commit is contained in:
parent
1b5b2138ee
commit
8434ec09c3
@ -7,142 +7,141 @@ from frappe import _
|
|||||||
from frappe.utils import nowdate, add_days
|
from frappe.utils import nowdate, add_days
|
||||||
from erpnext.controllers.accounts_controller import AccountsController
|
from erpnext.controllers.accounts_controller import AccountsController
|
||||||
from erpnext.loan_management.doctype.process_loan_interest_accrual.process_loan_interest_accrual import (
|
from erpnext.loan_management.doctype.process_loan_interest_accrual.process_loan_interest_accrual import (
|
||||||
process_loan_interest_accrual_for_demand_loans,
|
process_loan_interest_accrual_for_demand_loans,
|
||||||
)
|
)
|
||||||
from erpnext.accounts.general_ledger import make_gl_entries
|
from erpnext.accounts.general_ledger import make_gl_entries
|
||||||
|
|
||||||
|
|
||||||
class LoanBalanceAdjustment(AccountsController):
|
class LoanBalanceAdjustment(AccountsController):
|
||||||
"""
|
"""
|
||||||
Add credit/debit adjustments to loan ledger.
|
Add credit/debit adjustments to loan ledger.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def validate(self):
|
def validate(self):
|
||||||
if self.amount == 0:
|
if self.amount == 0:
|
||||||
frappe.throw(_("Amount cannot be zero"))
|
frappe.throw(_("Amount cannot be zero"))
|
||||||
if self.amount < 0:
|
if self.amount < 0:
|
||||||
frappe.throw(_("Amount cannot be negative"))
|
frappe.throw(_("Amount cannot be negative"))
|
||||||
self.set_missing_values()
|
self.set_missing_values()
|
||||||
|
|
||||||
def on_submit(self):
|
def on_submit(self):
|
||||||
self.set_status_and_amounts()
|
self.set_status_and_amounts()
|
||||||
self.make_gl_entries()
|
self.make_gl_entries()
|
||||||
|
|
||||||
def on_cancel(self):
|
def on_cancel(self):
|
||||||
self.set_status_and_amounts(cancel=1)
|
self.set_status_and_amounts(cancel=1)
|
||||||
self.make_gl_entries(cancel=1)
|
self.make_gl_entries(cancel=1)
|
||||||
self.ignore_linked_doctypes = ["GL Entry", "Payment Ledger Entry"]
|
self.ignore_linked_doctypes = ["GL Entry", "Payment Ledger Entry"]
|
||||||
|
|
||||||
def set_missing_values(self):
|
def set_missing_values(self):
|
||||||
if not self.posting_date:
|
if not self.posting_date:
|
||||||
self.posting_date = nowdate()
|
self.posting_date = nowdate()
|
||||||
|
|
||||||
if not self.cost_center:
|
if not self.cost_center:
|
||||||
self.cost_center = erpnext.get_default_cost_center(self.company)
|
self.cost_center = erpnext.get_default_cost_center(self.company)
|
||||||
|
|
||||||
def set_status_and_amounts(self, cancel=0):
|
def set_status_and_amounts(self, cancel=0):
|
||||||
loan_details = frappe.get_all(
|
loan_details = frappe.get_all(
|
||||||
"Loan",
|
"Loan",
|
||||||
fields=[
|
fields=[
|
||||||
"loan_amount",
|
"loan_amount",
|
||||||
"adjustment_amount",
|
"adjustment_amount",
|
||||||
"total_payment",
|
"total_payment",
|
||||||
"total_principal_paid",
|
"total_principal_paid",
|
||||||
"total_interest_payable",
|
"total_interest_payable",
|
||||||
"status",
|
"status",
|
||||||
"is_term_loan",
|
"is_term_loan",
|
||||||
"is_secured_loan",
|
"is_secured_loan",
|
||||||
],
|
],
|
||||||
filters={"name": self.loan},
|
filters={"name": self.loan},
|
||||||
)[0]
|
)[0]
|
||||||
|
|
||||||
if cancel:
|
if cancel:
|
||||||
adjustment_amount = self.get_values_on_cancel(loan_details)
|
adjustment_amount = self.get_values_on_cancel(loan_details)
|
||||||
else:
|
else:
|
||||||
adjustment_amount = self.get_values_on_submit(loan_details)
|
adjustment_amount = self.get_values_on_submit(loan_details)
|
||||||
|
|
||||||
if self.adjustment_type == "Credit Adjustment":
|
if self.adjustment_type == "Credit Adjustment":
|
||||||
adj_field = "credit_adjustment_amount"
|
adj_field = "credit_adjustment_amount"
|
||||||
elif self.adjustment_type == "Debit Adjustment":
|
elif self.adjustment_type == "Debit Adjustment":
|
||||||
adj_field = "debit_adjustment_amount"
|
adj_field = "debit_adjustment_amount"
|
||||||
|
|
||||||
frappe.db.set_value(
|
frappe.db.set_value(
|
||||||
"Loan", self.loan, {adj_field: adjustment_amount}
|
"Loan", self.loan, {adj_field: adjustment_amount}
|
||||||
)
|
)
|
||||||
|
|
||||||
def get_values_on_cancel(self, loan_details):
|
def get_values_on_cancel(self, loan_details):
|
||||||
if self.adjustment_type == "Credit Adjustment":
|
if self.adjustment_type == "Credit Adjustment":
|
||||||
adjustment_amount = loan_details.credit_adjustment_amount - self.amount
|
adjustment_amount = loan_details.credit_adjustment_amount - self.amount
|
||||||
elif self.adjustment_type == "Debit Adjustment":
|
elif self.adjustment_type == "Debit Adjustment":
|
||||||
adjustment_amount = loan_details.debit_adjustment_amount - self.amount
|
adjustment_amount = loan_details.debit_adjustment_amount - self.amount
|
||||||
|
|
||||||
return adjustment_amount
|
return adjustment_amount
|
||||||
|
|
||||||
def get_values_on_submit(self, loan_details):
|
def get_values_on_submit(self, loan_details):
|
||||||
if self.adjustment_type == "Credit Adjustment":
|
if self.adjustment_type == "Credit Adjustment":
|
||||||
adjustment_amount = loan_details.credit_adjustment_amount + self.amount
|
adjustment_amount = loan_details.credit_adjustment_amount + self.amount
|
||||||
elif self.adjustment_type == "Debit Adjustment":
|
elif self.adjustment_type == "Debit Adjustment":
|
||||||
adjustment_amount = loan_details.debit_adjustment_amount + self.amount
|
adjustment_amount = loan_details.debit_adjustment_amount + self.amount
|
||||||
|
|
||||||
if (
|
if (
|
||||||
loan_details.status in ("Disbursed", "Partially Disbursed")
|
loan_details.status in ("Disbursed", "Partially Disbursed")
|
||||||
and not loan_details.is_term_loan
|
and not loan_details.is_term_loan
|
||||||
):
|
):
|
||||||
process_loan_interest_accrual_for_demand_loans(
|
process_loan_interest_accrual_for_demand_loans(
|
||||||
posting_date=add_days(self.posting_date, -1),
|
posting_date=add_days(self.posting_date, -1),
|
||||||
loan=self.loan,
|
loan=self.loan,
|
||||||
accrual_type=self.adjustment_type,
|
accrual_type=self.adjustment_type,
|
||||||
)
|
)
|
||||||
|
|
||||||
return adjustment_amount
|
return adjustment_amount
|
||||||
|
|
||||||
def make_gl_entries(self, cancel=0, adv_adj=0):
|
def make_gl_entries(self, cancel=0, adv_adj=0):
|
||||||
gle_map = []
|
gle_map = []
|
||||||
|
loan_account = frappe.db.get_value("Loan", self.loan, "loan_account")
|
||||||
loan_account = frappe.db.get_value("Loan", self.loan, "loan_account")
|
remarks = "{} against loan {}".format(
|
||||||
remarks = "{} against loan {}".format(
|
self.adjustment_type.capitalize(), self.loan
|
||||||
self.adjustment_type.capitalize(), self.loan
|
)
|
||||||
)
|
|
||||||
if self.reference_number:
|
if self.reference_number:
|
||||||
remarks += "with reference no. {}".format(self.reference_number)
|
remarks += "with reference no. {}".format(self.reference_number)
|
||||||
|
|
||||||
loan_entry = {
|
loan_entry = {
|
||||||
"account": loan_account,
|
"account": loan_account,
|
||||||
"against": self.adjustment_account,
|
"against": self.adjustment_account,
|
||||||
"against_voucher_type": "Loan",
|
"against_voucher_type": "Loan",
|
||||||
"against_voucher": self.loan,
|
"against_voucher": self.loan,
|
||||||
"remarks": _(remarks),
|
"remarks": _(remarks),
|
||||||
"cost_center": self.cost_center,
|
"cost_center": self.cost_center,
|
||||||
"party_type": self.applicant_type,
|
"party_type": self.applicant_type,
|
||||||
"party": self.applicant,
|
"party": self.applicant,
|
||||||
"posting_date": self.posting_date,
|
"posting_date": self.posting_date,
|
||||||
}
|
}
|
||||||
company_entry = {
|
company_entry = {
|
||||||
"account": self.adjustment_account,
|
"account": self.adjustment_account,
|
||||||
"against": loan_account,
|
"against": loan_account,
|
||||||
"against_voucher_type": "Loan",
|
"against_voucher_type": "Loan",
|
||||||
"against_voucher": self.loan,
|
"against_voucher": self.loan,
|
||||||
"remarks": _(remarks),
|
"remarks": _(remarks),
|
||||||
"cost_center": self.cost_center,
|
"cost_center": self.cost_center,
|
||||||
"posting_date": self.posting_date,
|
"posting_date": self.posting_date,
|
||||||
}
|
}
|
||||||
if self.adjustment_type == "Credit Adjustment":
|
if self.adjustment_type == "Credit Adjustment":
|
||||||
loan_entry["credit"] = self.amount
|
loan_entry["credit"] = self.amount
|
||||||
loan_entry["credit_in_account_currency"] = self.amount
|
loan_entry["credit_in_account_currency"] = self.amount
|
||||||
|
|
||||||
company_entry["debit"] = self.amount
|
company_entry["debit"] = self.amount
|
||||||
company_entry["debit_in_account_currency"] = self.amount
|
company_entry["debit_in_account_currency"] = self.amount
|
||||||
|
|
||||||
elif self.adjustment_type == "Debit Adjustment":
|
elif self.adjustment_type == "Debit Adjustment":
|
||||||
loan_entry["debit"] = self.amount
|
loan_entry["debit"] = self.amount
|
||||||
loan_entry["debit_in_account_currency"] = self.amount
|
loan_entry["debit_in_account_currency"] = self.amount
|
||||||
|
|
||||||
company_entry["credit"] = self.amount
|
company_entry["credit"] = self.amount
|
||||||
company_entry["credit_in_account_currency"] = self.amount
|
company_entry["credit_in_account_currency"] = self.amount
|
||||||
|
|
||||||
gle_map.append(self.get_gl_dict(loan_entry))
|
gle_map.append(self.get_gl_dict(loan_entry))
|
||||||
|
|
||||||
gle_map.append(self.get_gl_dict(company_entry))
|
gle_map.append(self.get_gl_dict(company_entry))
|
||||||
|
|
||||||
if gle_map:
|
if gle_map:
|
||||||
make_gl_entries(gle_map, cancel=cancel, adv_adj=adv_adj, merge_entries=False)
|
make_gl_entries(gle_map, cancel=cancel, adv_adj=adv_adj, merge_entries=False)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user