From d5cd6bf972ea757e7a21ec086c27ebdd3980f620 Mon Sep 17 00:00:00 2001 From: Edsel Date: Mon, 13 Jul 2015 17:39:37 +0530 Subject: [PATCH] ICM-17 Added conditional checks for reports --- 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, 26 insertions(+), 9 deletions(-) diff --git a/CRM/Report/Form/Contribute/Bookkeeping.php b/CRM/Report/Form/Contribute/Bookkeeping.php index f8ab911691..6004b150e6 100644 --- a/CRM/Report/Form/Contribute/Bookkeeping.php +++ b/CRM/Report/Form/Contribute/Bookkeeping.php @@ -410,7 +410,9 @@ 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' "; - $this->getPermissionedFTQuery($this, "civicrm_line_item_1"); + if (CRM_Financial_BAO_FinancialType::isACLFinancialTypeStatus()) { + $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 4999faeb7e..a2bf45c0e3 100644 --- a/CRM/Report/Form/Contribute/Detail.php +++ b/CRM/Report/Form/Contribute/Detail.php @@ -418,7 +418,9 @@ 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"; - $this->getPermissionedFTQuery($this); + if (CRM_Financial_BAO_FinancialType::isACLFinancialTypeStatus()) { + $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 563ced26aa..846387c98e 100644 --- a/CRM/Report/Form/Contribute/HouseholdSummary.php +++ b/CRM/Report/Form/Contribute/HouseholdSummary.php @@ -265,7 +265,9 @@ 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 "; } - $this->getPermissionedFTQuery($this); + if (CRM_Financial_BAO_FinancialType::isACLFinancialTypeStatus()) { + $this->getPermissionedFTQuery($this); + } } public function where() { diff --git a/CRM/Report/Form/Contribute/Lybunt.php b/CRM/Report/Form/Contribute/Lybunt.php index 62227a7c13..ce9373dbd5 100644 --- a/CRM/Report/Form/Contribute/Lybunt.php +++ b/CRM/Report/Form/Contribute/Lybunt.php @@ -430,7 +430,9 @@ class CRM_Report_Form_Contribute_Lybunt extends CRM_Report_Form { $this->where(); $this->groupBy(); - $this->getPermissionedFTQuery($this); + if (CRM_Financial_BAO_FinancialType::isACLFinancialTypeStatus()) { + $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 59883097c0..01f3c25291 100644 --- a/CRM/Report/Form/Contribute/OrganizationSummary.php +++ b/CRM/Report/Form/Contribute/OrganizationSummary.php @@ -274,7 +274,9 @@ 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); + if (CRM_Financial_BAO_FinancialType::isACLFinancialTypeStatus()) { + $this->getPermissionedFTQuery($this); + } } public function where() { diff --git a/CRM/Report/Form/Contribute/Summary.php b/CRM/Report/Form/Contribute/Summary.php index 50f3d283b1..6aa7bf99bd 100644 --- a/CRM/Report/Form/Contribute/Summary.php +++ b/CRM/Report/Form/Contribute/Summary.php @@ -465,7 +465,9 @@ 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"; } - $this->getPermissionedFTQuery($this); + if (CRM_Financial_BAO_FinancialType::isACLFinancialTypeStatus()) { + $this->getPermissionedFTQuery($this); + } } /** diff --git a/CRM/Report/Form/Contribute/Sybunt.php b/CRM/Report/Form/Contribute/Sybunt.php index 8048ce68e4..75c0d4ef93 100644 --- a/CRM/Report/Form/Contribute/Sybunt.php +++ b/CRM/Report/Form/Contribute/Sybunt.php @@ -433,8 +433,10 @@ class CRM_Report_Form_Contribute_Sybunt extends CRM_Report_Form { $this->from(); $this->where(); $this->groupBy(); - - $this->getPermissionedFTQuery($this); + + if (CRM_Financial_BAO_FinancialType::isACLFinancialTypeStatus()) { + $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 1a515f4606..dd52fcf294 100644 --- a/CRM/Report/Form/Contribute/TopDonor.php +++ b/CRM/Report/Form/Contribute/TopDonor.php @@ -382,7 +382,10 @@ class CRM_Report_Form_Contribute_TopDonor extends CRM_Report_Form { $this->select(); $this->from(); - $this->getPermissionedFTQuery($this); + + if (CRM_Financial_BAO_FinancialType::isACLFinancialTypeStatus()) { + $this->getPermissionedFTQuery($this); + } $this->where(); -- 2.25.1