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

refactor: filter on cr/dr notes

Browse Source
This commit is contained in:
ruthra kumar 2023-07-04 08:49:30 +05:30
parent e48f8139eb
commit 52f609e67a
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,7 @@
import frappe import frappe
from frappe import _, msgprint, qb from frappe import _, msgprint, qb
from frappe.model.document import Document from frappe.model.document import Document
from frappe.query_builder import Criterion
from frappe.query_builder.custom import ConstantColumn from frappe.query_builder.custom import ConstantColumn
from frappe.utils import flt, fmt_money, get_link_to_form, getdate, nowdate, today from frappe.utils import flt, fmt_money, get_link_to_form, getdate, nowdate, today
@ -146,6 +147,15 @@ class PaymentReconciliation(Document):
def get_return_invoices(self): def get_return_invoices(self):
voucher_type = "Sales Invoice" if self.party_type == "Customer" else "Purchase Invoice" voucher_type = "Sales Invoice" if self.party_type == "Customer" else "Purchase Invoice"
doc = qb.DocType(voucher_type) doc = qb.DocType(voucher_type)
conditions = []
conditions.append(doc.docstatus == 1)
conditions.append(doc[frappe.scrub(self.party_type)] == self.party)
conditions.append(doc.is_return == 1)
if self.payment_name:
conditions.append(doc.name.like(f"%{self.payment_name}%"))
self.return_invoices = ( self.return_invoices = (
qb.from_(doc) qb.from_(doc)
.select( .select(
@ -153,11 +163,7 @@ class PaymentReconciliation(Document):
doc.name.as_("voucher_no"), doc.name.as_("voucher_no"),
doc.return_against, doc.return_against,
) )
.where( .where(Criterion.all(conditions))
(doc.docstatus == 1)
& (doc[frappe.scrub(self.party_type)] == self.party)
& (doc.is_return == 1)
)
.run(as_dict=True) .run(as_dict=True)
) )