From fe32835e8c09edee48faf967a6ac6341ddb5cd6e Mon Sep 17 00:00:00 2001 From: Pradeep Nayak Date: Tue, 14 Jul 2015 12:40:21 +0530 Subject: [PATCH] Revert "ICM-17 Added conditional checks for reports" This reverts commit 323b0c9882bed3bfd508e473cfb731028a98062e. --- CRM/Report/Form/Contribute/Bookkeeping.php | 4 +--- CRM/Report/Form/Contribute/Detail.php | 4 +--- CRM/Report/Form/Contribute/HouseholdSummary.php | 4 +--- CRM/Report/Form/Contribute/Lybunt.php | 4 +--- CRM/Report/Form/Contribute/OrganizationSummary.php | 4 +--- CRM/Report/Form/Contribute/Summary.php | 4 +--- CRM/Report/Form/Contribute/Sybunt.php | 6 ++---- CRM/Report/Form/Contribute/TopDonor.php | 5 +---- 8 files changed, 9 insertions(+), 26 deletions(-) diff --git a/CRM/Report/Form/Contribute/Bookkeeping.php b/CRM/Report/Form/Contribute/Bookkeeping.php index 6004b150e6..f8ab911691 100644 --- a/CRM/Report/Form/Contribute/Bookkeeping.php +++ b/CRM/Report/Form/Contribute/Bookkeeping.php @@ -410,9 +410,7 @@ class CRM_Report_Form_Contribute_Bookkeeping extends CRM_Report_Form { ON fitem.financial_account_id = {$this->_aliases['civicrm_financial_account']}_credit_2.id LEFT JOIN civicrm_line_item {$this->_aliases['civicrm_line_item']} ON fitem.entity_id = {$this->_aliases['civicrm_line_item']}.id AND fitem.entity_table = 'civicrm_line_item' "; - if (CRM_Financial_BAO_FinancialType::isACLFinancialTypeStatus()) { - $this->getPermissionedFTQuery($this, "civicrm_line_item_1"); - } + $this->getPermissionedFTQuery($this, "civicrm_line_item_1"); } public function orderBy() { diff --git a/CRM/Report/Form/Contribute/Detail.php b/CRM/Report/Form/Contribute/Detail.php index a2bf45c0e3..4999faeb7e 100644 --- a/CRM/Report/Form/Contribute/Detail.php +++ b/CRM/Report/Form/Contribute/Detail.php @@ -418,9 +418,7 @@ 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"; - if (CRM_Financial_BAO_FinancialType::isACLFinancialTypeStatus()) { - $this->getPermissionedFTQuery($this); - } + $this->getPermissionedFTQuery($this); if (CRM_Utils_Array::value('contribution_or_soft_value', $this->_params) == 'both' diff --git a/CRM/Report/Form/Contribute/HouseholdSummary.php b/CRM/Report/Form/Contribute/HouseholdSummary.php index 846387c98e..563ced26aa 100644 --- a/CRM/Report/Form/Contribute/HouseholdSummary.php +++ b/CRM/Report/Form/Contribute/HouseholdSummary.php @@ -265,9 +265,7 @@ class CRM_Report_Form_Contribute_HouseholdSummary extends CRM_Report_Form { {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_email']}.contact_id AND {$this->_aliases['civicrm_email']}.is_primary = 1\n "; } - if (CRM_Financial_BAO_FinancialType::isACLFinancialTypeStatus()) { - $this->getPermissionedFTQuery($this); - } + $this->getPermissionedFTQuery($this); } public function where() { diff --git a/CRM/Report/Form/Contribute/Lybunt.php b/CRM/Report/Form/Contribute/Lybunt.php index ce9373dbd5..62227a7c13 100644 --- a/CRM/Report/Form/Contribute/Lybunt.php +++ b/CRM/Report/Form/Contribute/Lybunt.php @@ -430,9 +430,7 @@ class CRM_Report_Form_Contribute_Lybunt extends CRM_Report_Form { $this->where(); $this->groupBy(); - if (CRM_Financial_BAO_FinancialType::isACLFinancialTypeStatus()) { - $this->getPermissionedFTQuery($this); - } + $this->getPermissionedFTQuery($this); $rows = $this->_contactIds = array(); $this->limit(); diff --git a/CRM/Report/Form/Contribute/OrganizationSummary.php b/CRM/Report/Form/Contribute/OrganizationSummary.php index 01f3c25291..59883097c0 100644 --- a/CRM/Report/Form/Contribute/OrganizationSummary.php +++ b/CRM/Report/Form/Contribute/OrganizationSummary.php @@ -274,9 +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 "; } - if (CRM_Financial_BAO_FinancialType::isACLFinancialTypeStatus()) { - $this->getPermissionedFTQuery($this); - } + $this->getPermissionedFTQuery($this); } public function where() { diff --git a/CRM/Report/Form/Contribute/Summary.php b/CRM/Report/Form/Contribute/Summary.php index 6aa7bf99bd..50f3d283b1 100644 --- a/CRM/Report/Form/Contribute/Summary.php +++ b/CRM/Report/Form/Contribute/Summary.php @@ -465,9 +465,7 @@ class CRM_Report_Form_Contribute_Summary extends CRM_Report_Form { {$this->_aliases['civicrm_address']}.contact_id AND {$this->_aliases['civicrm_address']}.is_primary = 1\n"; } - if (CRM_Financial_BAO_FinancialType::isACLFinancialTypeStatus()) { - $this->getPermissionedFTQuery($this); - } + $this->getPermissionedFTQuery($this); } /** diff --git a/CRM/Report/Form/Contribute/Sybunt.php b/CRM/Report/Form/Contribute/Sybunt.php index 75c0d4ef93..8048ce68e4 100644 --- a/CRM/Report/Form/Contribute/Sybunt.php +++ b/CRM/Report/Form/Contribute/Sybunt.php @@ -433,10 +433,8 @@ class CRM_Report_Form_Contribute_Sybunt extends CRM_Report_Form { $this->from(); $this->where(); $this->groupBy(); - - if (CRM_Financial_BAO_FinancialType::isACLFinancialTypeStatus()) { - $this->getPermissionedFTQuery($this); - } + + $this->getPermissionedFTQuery($this); $rows = $contactIds = array(); if (empty($this->_params['charts'])) { diff --git a/CRM/Report/Form/Contribute/TopDonor.php b/CRM/Report/Form/Contribute/TopDonor.php index dd52fcf294..1a515f4606 100644 --- a/CRM/Report/Form/Contribute/TopDonor.php +++ b/CRM/Report/Form/Contribute/TopDonor.php @@ -382,10 +382,7 @@ class CRM_Report_Form_Contribute_TopDonor extends CRM_Report_Form { $this->select(); $this->from(); - - if (CRM_Financial_BAO_FinancialType::isACLFinancialTypeStatus()) { - $this->getPermissionedFTQuery($this); - } + $this->getPermissionedFTQuery($this); $this->where(); -- 2.25.1