notice fixes

diff --git a/CRM/Report/Form.php b/CRM/Report/Form.php
index 4088c942430f96d75ce2dc80ecdf422b06eead3b..0a17416244f039dbbad4eb6748ef82007e079f18 100644 (file)
--- a/CRM/Report/Form.php
+++ b/CRM/Report/Form.php
@@ -195,6 +195,7 @@ class CRM_Report_Form extends CRM_Core_Form {
   protected $_sections = NULL;
   protected $_autoIncludeIndexedFieldsAsOrderBys = 0;
   protected $_absoluteUrl = FALSE;
+  protected $_grandFlag   = FALSE;
 
   /**
    * Flag to indicate if result-set is to be stored in a class variable which could be retrieved using getResultSet() method.
@@ -1614,7 +1615,6 @@ WHERE cg.extends IN ('" . implode("','", $this->_customGroupExtends) . "') AND
     }
     $lastRow = array_pop($rows);
 
-    $this->_grandFlag = FALSE;
     foreach ($this->_columnHeaders as $fld => $val) {
       if (!in_array($fld, $this->_statFields)) {
         if (!$this->_grandFlag) {

diff --git a/CRM/Report/Form/Contribute/Summary.php b/CRM/Report/Form/Contribute/Summary.php
index 273c4bcf7529cf089f0e12fd0413ace1d8b4d249..6d5874eb8524d8d3c051485c8ba4a4b598c527d3 100644 (file)
--- a/CRM/Report/Form/Contribute/Summary.php
+++ b/CRM/Report/Form/Contribute/Summary.php
@@ -123,7 +123,7 @@ class CRM_Report_Form_Contribute_Summary extends CRM_Report_Form {
         'fields' =>
         array(
           'contribution_source' => array('title' => ts('Source'),
-      ),
+          ),
           'currency' =>
           array('required' => TRUE,
             'no_display' => TRUE,
@@ -227,7 +227,6 @@ class CRM_Report_Form_Contribute_Summary extends CRM_Report_Form {
         'operatorType' => CRM_Report_Form::OP_MULTISELECT,
         'options' => $this->activeCampaigns,
       );
-      $this->_columns['civicrm_contribution']['grouping']['campaign_id'] = 'contri-fields';
       $this->_columns['civicrm_contribution']['group_bys']['campaign_id'] = array('title' => ts('Campaign'));
     }