From 4ff2b0114fd181f312c5d36e0a8c8c7784cd7ff0 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 21 Feb 2019 17:48:21 +0530 Subject: [PATCH] fix: Removed limit conditionas it does not make sense in get_outstanding function --- .../payment_reconciliation/payment_reconciliation.py | 5 ++++- erpnext/accounts/utils.py | 8 +++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py index 79e019aaeb2..5e4a121e2c5 100644 --- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py @@ -83,7 +83,10 @@ class PaymentReconciliation(Document): condition = self.check_condition() non_reconciled_invoices = get_outstanding_invoices(self.party_type, self.party, - self.receivable_payable_account, condition=condition, limit=self.limit) + self.receivable_payable_account, condition=condition) + + if self.limit: + non_reconciled_invoices = non_reconciled_invoices[:self.limit] self.add_invoice_entries(non_reconciled_invoices) diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py index d4e1840eb9c..226776e9858 100644 --- a/erpnext/accounts/utils.py +++ b/erpnext/accounts/utils.py @@ -615,7 +615,7 @@ def get_held_invoices(party_type, party): return held_invoices -def get_outstanding_invoices(party_type, party, account, condition=None, limit=None): +def get_outstanding_invoices(party_type, party, account, condition=None): outstanding_invoices = [] precision = frappe.get_precision("Sales Invoice", "outstanding_amount") or 2 @@ -628,7 +628,6 @@ def get_outstanding_invoices(party_type, party, account, condition=None, limit=N invoice = 'Sales Invoice' if erpnext.get_party_account_type(party_type) == 'Receivable' else 'Purchase Invoice' held_invoices = get_held_invoices(party_type, party) - limit_cond = "limit %s" % limit if limit else "" invoice_list = frappe.db.sql(""" select @@ -643,11 +642,10 @@ def get_outstanding_invoices(party_type, party, account, condition=None, limit=N and (against_voucher = '' or against_voucher is null)) or (voucher_type not in ('Journal Entry', 'Payment Entry'))) group by voucher_type, voucher_no - order by posting_date, name {limit_cond}""".format( + order by posting_date, name""".format( dr_or_cr=dr_or_cr, invoice = invoice, - condition=condition or "", - limit_cond = limit_cond + condition=condition or "" ), { "party_type": party_type, "party": party,