From e4f73929c4997818935a6ff585538a083746e1ee Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 19 Feb 2019 17:11:50 +0530 Subject: [PATCH] fix: AR/AP report based on account type --- .../report/accounts_receivable/accounts_receivable.py | 9 ++++++++- 1 file 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 95cb351d2e..b8c98542dc 100755 --- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py @@ -495,6 +495,7 @@ class ReceivablePayableReport(object): values.append(self.filters.get(party_type_field)) if party_type_field=="customer": + account_type = "Receivable" if self.filters.get("customer_group"): lft, rgt = frappe.db.get_value("Customer Group", self.filters.get("customer_group"), ["lft", "rgt"]) @@ -529,12 +530,18 @@ class ReceivablePayableReport(object): or (steam.parent = against_voucher and steam.parenttype = against_voucher_type) or (steam.parent = party and steam.parenttype = 'Customer')))""".format(lft, rgt)) - if party_type_field=="supplier": + elif party_type_field=="supplier": + account_type = "Payable" if self.filters.get("supplier_group"): conditions.append("""party in (select name from tabSupplier where supplier_group=%s)""") values.append(self.filters.get("supplier_group")) + accounts = [d.name for d in frappe.get_all("Account", + filters={"account_type": account_type, "company": self.filters.company})] + conditions.append("account in (%s)" % ','.join(['%s'] *len(accounts))) + values += accounts + return " and ".join(conditions), values def get_gl_entries_for(self, party, party_type, against_voucher_type, against_voucher):