| commit | 86bac2cf52e6094755e8f21df871a7f56a4d53a5 | [log] [tgz] |
|---|---|---|
| author | ruthra kumar <ruthra@erpnext.com> | Tue Jul 04 09:02:05 2023 +0530 |
| committer | ruthra kumar <ruthra@erpnext.com> | Mon Aug 21 20:50:34 2023 +0530 |
| tree | cb22be6095d729769a6a4371d8047c04de6784fd | |
| parent | 52f609e67a30988e498cf03bc0da7fa946ab3f5d [diff] |
refactor: filter on advance payments
diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py index a724dbf..5f69c67 100644 --- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
@@ -75,6 +75,9 @@ } ) + if self.payment_name: + condition.update({"name": self.payment_name}) + payment_entries = get_advance_payment_entries( self.party_type, self.party,
diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py index fbf97aa..7e43dbc 100644 --- a/erpnext/controllers/accounts_controller.py +++ b/erpnext/controllers/accounts_controller.py
@@ -2396,6 +2396,9 @@ q = q.select((payment_entry.target_exchange_rate).as_("exchange_rate")) 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.posting_date >= condition["from_payment_date"])