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

refactor: filter on advance payments

Browse Source
This commit is contained in:
ruthra kumar 2023-07-04 09:02:05 +05:30
parent 52f609e67a
commit 86bac2cf52
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,6 +75,9 @@ class PaymentReconciliation(Document):
} }
) )
if self.payment_name:
condition.update({"name": self.payment_name})
payment_entries = get_advance_payment_entries( payment_entries = get_advance_payment_entries(
self.party_type, self.party_type,
self.party, self.party,

3
erpnext/controllers/accounts_controller.py
View File

@ -2396,6 +2396,9 @@ def get_common_query(
q = q.select((payment_entry.target_exchange_rate).as_("exchange_rate")) q = q.select((payment_entry.target_exchange_rate).as_("exchange_rate"))
if condition: if condition:
if condition.get("name", None):
q = q.where(payment_entry.name.like(f"%{condition.get('name')}%"))
q = q.where(payment_entry.company == condition["company"]) q = q.where(payment_entry.company == condition["company"])
q = ( q = (
q.where(payment_entry.posting_date >= condition["from_payment_date"]) q.where(payment_entry.posting_date >= condition["from_payment_date"])