Skip to content

Commit

Permalink
Merge pull request #160 from frappe/mergify/bp/version-15/pr-152
Browse files Browse the repository at this point in the history
fix: Remove charges receivable GL Entries (#152)
  • Loading branch information
deepeshgarg007 authored Jan 17, 2024
2 parents 78f7fd5 + 4dfb857 commit c1d19d7
Showing 1 changed file with 1 addition and 41 deletions.
42 changes: 1 addition & 41 deletions lending/loan_management/doctype/loan_repayment/loan_repayment.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def make_credit_note(self):
item_details = frappe.db.get_value(
"Loan Product",
self.loan_product,
["charges_waiver_item", "charges_receivable_account"],
["charges_waiver_item"],
as_dict=1,
)

Expand All @@ -105,7 +105,6 @@ def make_credit_note(self):
si.set_missing_values()
si.is_return = 1
si.loan = self.against_loan
si.debit_to = item_details.charges_receivable_account
si.save()
for tax in si.get("taxes"):
tax.included_in_print_rate = 1
Expand Down Expand Up @@ -639,7 +638,6 @@ def make_gl_entries(self, cancel=0, adv_adj=0):
"suspense_interest_receivable",
"suspense_interest_income",
"interest_income_account",
"charges_receivable_account",
],
as_dict=1,
)
Expand Down Expand Up @@ -684,44 +682,6 @@ def make_gl_entries(self, cancel=0, adv_adj=0):
)
)

if self.total_paid_charges and self.repayment_type != "Charges Waiver":
for charges in self.get("pending_charges"):
gle_map.append(
self.get_gl_dict(
{
"account": account_details.charges_receivable_account,
"party_type": self.applicant_type,
"party": self.applicant,
"against": payment_account,
"credit": charges.allocated_amount,
"credit_in_account_currency": charges.allocated_amount,
"against_voucher_type": "Sales Invoice",
"against_voucher": charges.sales_invoice,
"remarks": _(remarks),
"cost_center": self.cost_center,
"posting_date": getdate(self.posting_date),
}
)
)

gle_map.append(
self.get_gl_dict(
{
"account": payment_account,
"against": account_details.charges_receivable_account,
"debit": charges.allocated_amount,
"debit_in_account_currency": charges.allocated_amount,
"against_voucher_type": "Loan",
"against_voucher": self.against_loan,
"remarks": _(remarks),
"cost_center": self.cost_center,
"posting_date": getdate(self.posting_date),
"party_type": payment_party_type,
"party": payment_party,
}
)
)

for repayment in self.get("repayment_details"):
if repayment.paid_interest_amount:
gle_map.append(
Expand Down

0 comments on commit c1d19d7

Please sign in to comment.