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

fix: fieldname

Browse Source
This commit is contained in:
Deepesh Garg 2020-12-05 22:44:45 +05:30
parent 452cbcd6ea
commit 2d1cfae596
1 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
erpnext/patches/v13_0/update_old_loans.py
View File

@ -101,32 +101,34 @@ def execute():
process_loan_interest_accrual_for_term_loans(posting_date=nowdate(), loan_type=loan_type, process_loan_interest_accrual_for_term_loans(posting_date=nowdate(), loan_type=loan_type,
loan=loan.name) loan=loan.name)
accrued_entries = get_accrued_interest_entries(loan.name)
total_principal, total_interest = frappe.db.get_value('Repayment Schedule', fields=['sum(principal_amount) as total_principal',
'sum(interest_amount) as total_interest'], filters={'is_paid': 1, 'parent': loan.name})
for entry in accrued_entries: if frappe.db.has_column('Repayment Schedule', 'paid'):
interest_paid = 0 total_principal, total_interest = frappe.db.get_value('Repayment Schedule', {'paid': 1, 'parent': loan.name},
principal_paid = 0 ['sum(principal_amount) as total_principal', 'sum(interest_amount) as total_interest'])
if total_interest > entry.interest_amount: accrued_entries = get_accrued_interest_entries(loan.name)
interest_paid = entry.interest_amount for entry in accrued_entries:
else: interest_paid = 0
interest_paid = total_interest principal_paid = 0
if total_principal > entry.payable_principal_amount: if total_interest > entry.interest_amount:
principal_paid = entry.payable_principal_amount interest_paid = entry.interest_amount
else: else:
principal_paid = total_principal interest_paid = total_interest
frappe.db.sql(""" UPDATE `tabLoan Interest Accrual` if total_principal > entry.payable_principal_amount:
SET paid_principal_amount = `paid_principal_amount` + %s, principal_paid = entry.payable_principal_amount
paid_interest_amount = `paid_interest_amount` + %s else:
WHERE name = %s""", principal_paid = total_principal
(principal_paid, interest_paid, entry.name))
total_principal -= principal_paid frappe.db.sql(""" UPDATE `tabLoan Interest Accrual`
total_interest -= interest_paid SET paid_principal_amount = `paid_principal_amount` + %s,
paid_interest_amount = `paid_interest_amount` + %s
WHERE name = %s""",
(principal_paid, interest_paid, entry.name))
total_principal -= principal_paid
total_interest -= interest_paid
def create_loan_type(loan, loan_type_name, penalty_account): def create_loan_type(loan, loan_type_name, penalty_account):
loan_type_doc = frappe.new_doc('Loan Type') loan_type_doc = frappe.new_doc('Loan Type')