perf: Timeout while doing payment reconciliation (v13) (#33818)

perf: Timeout while doing payment reconciliation

erpnext/accounts/doctype/payment_entry/payment_entry.py

@@ -1255,6 +1255,7 @@ def get_outstanding_reference_documents(args):
 		args.get("party_type"),
 		args.get("party"),
 		args.get("party_account"),
+		args.get("company"),
 		filters=args,
 		condition=condition,
 	)

erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py

@@ -211,7 +211,7 @@ class PaymentReconciliation(Document):
 			condition += " and cost_center = '{0}' ".format(self.cost_center)
 
 		non_reconciled_invoices = get_outstanding_invoices(
-			self.party_type, self.party, self.receivable_payable_account, condition=condition
+			self.party_type, self.party, self.receivable_payable_account, self.company, condition=condition
 		)
 
 		if self.invoice_limit:

erpnext/accounts/utils.py

@@ -840,7 +840,7 @@ def remove_return_pos_invoices(party_type, party, invoice_list):
 	return invoice_list
 
 
-def get_outstanding_invoices(party_type, party, account, condition=None, filters=None):
+def get_outstanding_invoices(party_type, party, account, company, condition=None, filters=None):
 	outstanding_invoices = []
 	precision = frappe.get_precision("Sales Invoice", "outstanding_amount") or 2
 
@@ -892,21 +892,32 @@ def get_outstanding_invoices(party_type, party, account, condition=None, filters
 
 	invoice_list = remove_return_pos_invoices(party_type, party, invoice_list)
 
+	if invoice_list:
+		invoices = [d.voucher_no for d in invoice_list]
 		payment_entries = frappe.db.sql(
 			"""
 			select against_voucher_type, against_voucher,
 				ifnull(sum({payment_dr_or_cr}), 0) as payment_amount
 			from `tabGL Entry`
-		where party_type = %(party_type)s and party = %(party)s
+			where
+				company = %(company)s
+				and party_type = %(party_type)s and party = %(party)s
 				and account = %(account)s
 				and {payment_dr_or_cr} > 0
-			and against_voucher is not null and against_voucher != ''
+				and ifnull(against_voucher, '') != ''
 				and is_cancelled=0
+				and against_voucher in %(invoices)s
 			group by against_voucher_type, against_voucher
 		""".format(
-			payment_dr_or_cr=payment_dr_or_cr
+				payment_dr_or_cr=payment_dr_or_cr,
 			),
-		{"party_type": party_type, "party": party, "account": account},
+			{
+				"company": company,
+				"party_type": party_type,
+				"party": party,
+				"account": account,
+				"invoices": invoices,
+			},
 			as_dict=True,
 		)
 
@@ -947,6 +958,7 @@ def get_outstanding_invoices(party_type, party, account, condition=None, filters
 		outstanding_invoices = sorted(
 			outstanding_invoices, key=lambda k: k["due_date"] or getdate(nowdate())
 		)
+
 	return outstanding_invoices