CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-18 17:55:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #36297 from GursheenK/cost-center-check-for-payment-reconciliation

Browse Source 
fix: cost center filter for fetching payments
This commit is contained in:
Deepesh Garg
2023-07-27 18:36:12 +05:30
committed by GitHub
parent 8bf957b9a1 479cab0336
commit dc603c3df0
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
erpnext/controllers/accounts_controller.py
View File

@@ -2217,21 +2217,29 @@ def get_advance_payment_entries(
reference_condition = ""
order_list = []
if not condition:
condition = ""
payment_entries_against_order = frappe.db.sql(
"""
select
'Payment Entry' as reference_type, t1.name as reference_name,
t1.remarks, t2.allocated_amount as amount, t2.name as reference_row,
t2.reference_name as against_order, t1.posting_date,
t1.{0} as currency, t1.{4} as exchange_rate
t1.{0} as currency, t1.{5} as exchange_rate
from `tabPayment Entry` t1, `tabPayment Entry Reference` t2
where
t1.name = t2.parent and t1.{1} = %s and t1.payment_type = %s
and t1.party_type = %s and t1.party = %s and t1.docstatus = 1
and t2.reference_doctype = %s {2}
order by t1.posting_date {3}
and t2.reference_doctype = %s {2} {3}
order by t1.posting_date {4}
""".format(
currency_field, party_account_field, reference_condition, limit_cond, exchange_rate_field
currency_field,
party_account_field,
reference_condition,
condition,
limit_cond,
exchange_rate_field,
),
[party_account, payment_type, party_type, party, order_doctype] + order_list,
as_dict=1,