Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use new adjustment amount fields

Browse Source
This commit is contained in:
Labeeb Mattra 2022-06-30 11:42:01 +05:30
parent d6f632a770
commit 7d468a8778
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
erpnext/loan_management/doctype/loan_balance_adjustment/loan_balance_adjustment.py
View File

@ -61,27 +61,28 @@ class LoanBalanceAdjustment(AccountsController):
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":
adj_field = "credit_adjustment_amount"
elif self.adjustment_type == "Debit Adjustment":
adj_field = "debit_adjustment_amount"
frappe.db.set_value( frappe.db.set_value(
"Loan", "Loan", self.loan, {adj_field: adjustment_amount}
self.loan,
{
"adjustment_amount": 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.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.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.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.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")
@ -98,8 +99,10 @@ class LoanBalanceAdjustment(AccountsController):
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_entry = { loan_entry = {
"account": self.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,
@ -111,7 +114,7 @@ class LoanBalanceAdjustment(AccountsController):
} }
company_entry = { company_entry = {
"account": self.adjustment_account, "account": self.adjustment_account,
"against": self.loan_account, "against": loan_account,
"against_voucher_type": "Loan", "against_voucher_type": "Loan",
"against_voucher": self.loan, "against_voucher": self.loan,
"remarks": _("{} against loan:".format(self.adjustment_type)) + self.loan, "remarks": _("{} against loan:".format(self.adjustment_type)) + self.loan,