nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-24 15:39:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'version-14-hotfix' into SaiFi0102-asset-capitalization-v14

Browse Source
This commit is contained in:
Sagar Sharma
2022-09-15 08:17:37 +05:30
committed by GitHub
parent f126e88e5e 64aad88684
commit 85cf30cfa8
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/loan_management/doctype/loan_repayment/loan_repayment.py
View File

@@ -516,6 +516,8 @@ def get_accrued_interest_entries(against_loan, posting_date=None):
if not posting_date: if not posting_date:
posting_date = getdate() posting_date = getdate()
precision = cint(frappe.db.get_default("currency_precision")) or 2
unpaid_accrued_entries = frappe.db.sql( unpaid_accrued_entries = frappe.db.sql(
""" """
SELECT name, posting_date, interest_amount - paid_interest_amount as interest_amount, SELECT name, posting_date, interest_amount - paid_interest_amount as interest_amount,
@@ -536,6 +538,13 @@ def get_accrued_interest_entries(against_loan, posting_date=None):
as_dict=1, as_dict=1,
) )
# Skip entries with zero interest amount & payable principal amount
unpaid_accrued_entries = [
d
for d in unpaid_accrued_entries
if flt(d.interest_amount, precision) > 0 or flt(d.payable_principal_amount, precision) > 0
]
return unpaid_accrued_entries return unpaid_accrued_entries

2
erpnext/patches/v14_0/migrate_existing_lead_notes_as_per_the_new_format.py
View File

@@ -12,7 +12,7 @@ def execute():
frappe.qb.from_(dt) frappe.qb.from_(dt)
.select(dt.name, dt.notes, dt.modified_by, dt.modified) .select(dt.name, dt.notes, dt.modified_by, dt.modified)
.where(dt.notes.isnotnull() & dt.notes != "") .where(dt.notes.isnotnull() & dt.notes != "")
).run() ).run(as_dict=True)
for d in records: for d in records:
if strip_html(cstr(d.notes)).strip(): if strip_html(cstr(d.notes)).strip():