From 9f5cfdd65bba076ed3f1e82d19eb6a9432c52242 Mon Sep 17 00:00:00 2001 From: l0gesh29 Date: Mon, 2 Jun 2025 13:35:23 +0530 Subject: [PATCH] fix: Accounts receivable shouldn't fetch DN for employees * fix: reorder function call * fix: Add condition to fetch return entries for specific party types (cherry picked from commit c8e052f3c6bcf0126b53ad9ae011f95df431c6b4) --- .../report/accounts_receivable/accounts_receivable.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py index 263158b9ba7..268d246ea8e 100644 --- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py @@ -98,9 +98,6 @@ class ReceivablePayableReport: def get_data(self): self.get_sales_invoices_or_customers_based_on_sales_person() - # Build delivery note map against all sales invoices - self.build_delivery_note_map() - # Get invoice details like bill_no, due_date etc for all invoices self.get_invoice_details() @@ -108,7 +105,8 @@ class ReceivablePayableReport: self.get_future_payments() # Get return entries - self.get_return_entries() + if not self.filters.party_type or self.filters.party_type in ["Customer", "Supplier"]: + self.get_return_entries() # Get Exchange Rate Revaluations self.get_exchange_rate_revaluations() @@ -122,6 +120,9 @@ class ReceivablePayableReport: elif self.ple_fetch_method == "UnBuffered Cursor": self.fetch_ple_in_unbuffered_cursor() + # Build delivery note map against all sales invoices + self.build_delivery_note_map() + self.build_data() def fetch_ple_in_buffered_cursor(self):