From 3b38a9e418e46869c870d11f47effd45bb4cc3c6 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 13 Nov 2019 18:49:45 +0530 Subject: [PATCH] Accounts Receivable report fixes (#19575) * fix: Set due date in accounts receivable based on payment terms * fix: Show AR summary based on outstanding --- .../report/accounts_receivable/accounts_receivable.py | 6 +++++- .../accounts_receivable_summary.py | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py index 95444428b8a..0e606e1fbeb 100755 --- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py @@ -187,7 +187,11 @@ class ReceivablePayableReport(object): self.data.append(row) def set_invoice_details(self, row): - row.update(self.invoice_details.get(row.voucher_no, {})) + invoice_details = self.invoice_details.get(row.voucher_no, {}) + if row.due_date: + invoice_details.pop("due_date", None) + row.update(invoice_details) + if row.voucher_type == 'Sales Invoice': if self.filters.show_delivery_notes: self.set_delivery_notes(row) diff --git a/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py b/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py index 86f001cba4e..47da0ae9d43 100644 --- a/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +++ b/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py @@ -36,6 +36,9 @@ class AccountsReceivableSummary(ReceivablePayableReport): self.filters.report_date) or {} for party, party_dict in iteritems(self.party_total): + if party_dict.outstanding <= 0: + continue + row = frappe._dict() row.party = party