Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #37844 from frappe/mergify/bp/version-15-hotfix/pr-37838

Browse Source 
refactor: pass limits to JE and PE queries in reconciliation tool (backport #37838)
This commit is contained in:
ruthra kumar 2023-11-02 11:08:36 +05:30 committed by GitHub
commit 39a178d27a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
View File

@ -109,6 +109,8 @@ class PaymentReconciliation(Document):
"t2.against_account like %(bank_cash_account)s" if self.bank_cash_account else "1=1" "t2.against_account like %(bank_cash_account)s" if self.bank_cash_account else "1=1"
) )
limit = f"limit {self.payment_limit}" if self.payment_limit else " "
# nosemgrep # nosemgrep
journal_entries = frappe.db.sql( journal_entries = frappe.db.sql(
""" """
@ -132,11 +134,13 @@ class PaymentReconciliation(Document):
ELSE {bank_account_condition} ELSE {bank_account_condition}
END) END)
order by t1.posting_date order by t1.posting_date
{limit}
""".format( """.format(
**{ **{
"dr_or_cr": dr_or_cr, "dr_or_cr": dr_or_cr,
"bank_account_condition": bank_account_condition, "bank_account_condition": bank_account_condition,
"condition": condition, "condition": condition,
"limit": limit,
} }
), ),
{ {
@ -162,7 +166,7 @@ class PaymentReconciliation(Document):
if self.payment_name: if self.payment_name:
conditions.append(doc.name.like(f"%{self.payment_name}%")) conditions.append(doc.name.like(f"%{self.payment_name}%"))
self.return_invoices = ( self.return_invoices_query = (
qb.from_(doc) qb.from_(doc)
.select( .select(
ConstantColumn(voucher_type).as_("voucher_type"), ConstantColumn(voucher_type).as_("voucher_type"),
@ -170,8 +174,11 @@ class PaymentReconciliation(Document):
doc.return_against, doc.return_against,
) )
.where(Criterion.all(conditions)) .where(Criterion.all(conditions))
.run(as_dict=True)
) )
if self.payment_limit:
self.return_invoices_query = self.return_invoices_query.limit(self.payment_limit)
self.return_invoices = self.return_invoices_query.run(as_dict=True)
def get_dr_or_cr_notes(self): def get_dr_or_cr_notes(self):