From 30d46f2f4de13d7bb3007dda4dc374315716bc9b Mon Sep 17 00:00:00 2001 From: monishdeb Date: Sun, 30 Aug 2015 23:26:04 +0530 Subject: [PATCH] CRM-17090 fix - Accounting batch filters broken https://issues.civicrm.org/jira/browse/CRM-17090 --- CRM/Batch/BAO/Batch.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CRM/Batch/BAO/Batch.php b/CRM/Batch/BAO/Batch.php index 5f70b23b58..e70f6bbcea 100755 --- a/CRM/Batch/BAO/Batch.php +++ b/CRM/Batch/BAO/Batch.php @@ -676,8 +676,8 @@ LEFT JOIN civicrm_contribution_soft ON civicrm_contribution_soft.contribution_id 'sort_name', 'financial_type_id', 'contribution_page_id', - 'contribution_payment_instrument_id', - 'contribution_transaction_id', + 'payment_instrument_id', + 'contribution_trxn_id', 'contribution_source', 'contribution_currency_type', 'contribution_pay_later', @@ -737,6 +737,7 @@ LEFT JOIN civicrm_contribution_soft ON civicrm_contribution_soft.contribution_id $where = implode(' AND ', $query->_where[0]) . " AND civicrm_entity_batch.batch_id IS NULL AND civicrm_entity_financial_trxn.entity_table = 'civicrm_contribution'"; + $where = str_replace('civicrm_contribution.payment_instrument_id', 'civicrm_financial_trxn.payment_instrument_id', $where); $searchValue = TRUE; } else { -- 2.25.1