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

fix: empty payment term column in accounts receivable report (#25556)

Browse Source
This commit is contained in:
Saqib 2021-05-04 12:26:49 +05:30 committed by GitHub
parent 308905b1be
commit 076020643d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/report/accounts_receivable/accounts_receivable.py
View File

@ -364,7 +364,7 @@ class ReceivablePayableReport(object):
payment_terms_details = frappe.db.sql(""" payment_terms_details = frappe.db.sql("""
select select
si.name, si.party_account_currency, si.currency, si.conversion_rate, si.name, si.party_account_currency, si.currency, si.conversion_rate,
ps.due_date, ps.payment_amount, ps.description, ps.paid_amount, ps.discounted_amount ps.due_date, ps.payment_term, ps.payment_amount, ps.description, ps.paid_amount, ps.discounted_amount
from `tab{0}` si, `tabPayment Schedule` ps from `tab{0}` si, `tabPayment Schedule` ps
where where
si.name = ps.parent and si.name = ps.parent and
@ -394,7 +394,7 @@ class ReceivablePayableReport(object):
"due_date": d.due_date, "due_date": d.due_date,
"invoiced": invoiced, "invoiced": invoiced,
"invoice_grand_total": row.invoiced, "invoice_grand_total": row.invoiced,
"payment_term": d.description, "payment_term": d.description or d.payment_term,
"paid": d.paid_amount + d.discounted_amount, "paid": d.paid_amount + d.discounted_amount,
"credit_note": 0.0, "credit_note": 0.0,
"outstanding": invoiced - d.paid_amount - d.discounted_amount "outstanding": invoiced - d.paid_amount - d.discounted_amount