From 518f4e6bc578f67fc5bc7b43c7f7b5119919249c Mon Sep 17 00:00:00 2001
From: Edsel <edsel.lopez@jmaconsulting.biz>
Date: Mon, 1 Jun 2015 16:42:37 +0530
Subject: [PATCH] ICM-8 Removed contributions with unpermissioned FTs

---
 CRM/Report/Form.php                   | 9 ++++++---
 CRM/Report/Form/Contribute/Detail.php | 3 +--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/CRM/Report/Form.php b/CRM/Report/Form.php
index 87d18b55e8..ba40a83b65 100644
--- a/CRM/Report/Form.php
+++ b/CRM/Report/Form.php
@@ -4500,17 +4500,20 @@ LEFT JOIN civicrm_contact {$field['alias']} ON {$field['alias']}.id = {$this->_a
       $temp = $query->_aliases['civicrm_line_item'];
       $query->_aliases['civicrm_line_item'] = $alias;
     }
+    if (empty($query->_where)) {
+      $query->_where = "WHERE ";
+    }
     CRM_Core_DAO::executeQuery("DROP TEMPORARY TABLE IF EXISTS civicrm_contribution_temp");
     
     $sql = "CREATE TEMPORARY TABLE civicrm_contribution_temp AS SELECT {$query->_aliases['civicrm_contribution']}.id {$query->_from} 
-              INNER JOIN civicrm_line_item   {$query->_aliases['civicrm_line_item']}
+              LEFT JOIN civicrm_line_item   {$query->_aliases['civicrm_line_item']}
                       ON {$query->_aliases['civicrm_contribution']}.id = {$query->_aliases['civicrm_line_item']}.contribution_id AND
                          {$query->_aliases['civicrm_line_item']}.entity_table = 'civicrm_contribution' 
+                      AND {$query->_aliases['civicrm_line_item']}.financial_type_id NOT IN (" . implode(',' , array_keys($financialTypes)) . ") 
               {$query->_where} 
                       AND {$query->_aliases['civicrm_contribution']}.financial_type_id IN (" . implode(',' , array_keys($financialTypes)) . ")
-                      AND {$query->_aliases['civicrm_line_item']}.financial_type_id IN (" . implode(',' , array_keys($financialTypes)) . ")  
+                      AND {$query->_aliases['civicrm_line_item']}.id IS NULL
               GROUP BY {$query->_aliases['civicrm_contribution']}.id";
-    CRM_Core_DAO::executeQuery($sql);
     $query->_from .= " 
               INNER JOIN civicrm_contribution_temp temp ON {$query->_aliases['civicrm_contribution']}.id = temp.id ";
     if (isset($temp)) {
diff --git a/CRM/Report/Form/Contribute/Detail.php b/CRM/Report/Form/Contribute/Detail.php
index fd33671571..4999faeb7e 100644
--- a/CRM/Report/Form/Contribute/Detail.php
+++ b/CRM/Report/Form/Contribute/Detail.php
@@ -418,9 +418,8 @@ class CRM_Report_Form_Contribute_Detail extends CRM_Report_Form {
         FROM  civicrm_contact      {$this->_aliases['civicrm_contact']} {$this->_aclFrom}
               INNER JOIN civicrm_contribution {$this->_aliases['civicrm_contribution']}
                       ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_contribution']}.contact_id AND {$this->_aliases['civicrm_contribution']}.is_test = 0";
-    
-    CRM_Core_DAO::executeQuery("DROP TEMPORARY TABLE IF EXISTS civicrm_contribution_temp");
     $this->getPermissionedFTQuery($this);
+    
     if (CRM_Utils_Array::value('contribution_or_soft_value', $this->_params) ==
       'both'
     ) {
-- 
2.25.1