From ee1d04f411a14ae8979f251d7214723f2e579b5d Mon Sep 17 00:00:00 2001 From: Edsel Date: Mon, 1 Jun 2015 16:44:38 +0530 Subject: [PATCH] ICM-1 Modified organization summary report --- CRM/Report/Form/Contribute/OrganizationSummary.php | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/CRM/Report/Form/Contribute/OrganizationSummary.php b/CRM/Report/Form/Contribute/OrganizationSummary.php index 71ac55706f..59883097c0 100644 --- a/CRM/Report/Form/Contribute/OrganizationSummary.php +++ b/CRM/Report/Form/Contribute/OrganizationSummary.php @@ -260,10 +260,7 @@ class CRM_Report_Form_Contribute_OrganizationSummary extends CRM_Report_Form { ({$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_relationship']}.$this->otherContact ) {$this->_aclFrom} INNER JOIN civicrm_contribution {$this->_aliases['civicrm_contribution']} ON - ({$this->_aliases['civicrm_contribution']}.contact_id = {$this->_aliases['civicrm_relationship']}.$this->otherContact ) AND {$this->_aliases['civicrm_contribution']}.is_test = 0 - LEFT JOIN civicrm_line_item {$this->_aliases['civicrm_line_item']} - ON {$this->_aliases['civicrm_contribution']}.id = {$this->_aliases['civicrm_line_item']}.contribution_id - AND {$this->_aliases['civicrm_line_item']}.entity_table = 'civicrm_contribution' "; + ({$this->_aliases['civicrm_contribution']}.contact_id = {$this->_aliases['civicrm_relationship']}.$this->otherContact ) AND {$this->_aliases['civicrm_contribution']}.is_test = 0 "; if ($this->_addressField) { $this->_from .= " @@ -277,6 +274,7 @@ class CRM_Report_Form_Contribute_OrganizationSummary extends CRM_Report_Form { {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_email']}.contact_id AND {$this->_aliases['civicrm_email']}.is_primary = 1\n "; } + $this->getPermissionedFTQuery($this); } public function where() { @@ -326,9 +324,6 @@ class CRM_Report_Form_Contribute_OrganizationSummary extends CRM_Report_Form { if ($this->_aclWhere) { $this->_where .= " AND {$this->_aclWhere} "; } - CRM_Financial_BAO_FinancialType::getAvailableFinancialTypes($financialTypes); - $this->_where .= " AND {$this->_aliases['civicrm_contribution']}.financial_type_id IN (" . implode(',' , array_keys($financialTypes)) . ")"; - $this->_where .= " AND {$this->_aliases['civicrm_line_item']}.financial_type_id IN (" . implode(',' , array_keys($financialTypes)) . ")"; } public function groupBy() { -- 2.25.1