From: Deepak Srivastava Date: Wed, 24 Apr 2013 07:02:25 +0000 (+0530) Subject: Fix for CRM-12409 X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=d27f85b6fc139bb0ba45d1c0d161fd3ff708774b;p=civicrm-core.git Fix for CRM-12409 --- diff --git a/CRM/Report/Form/Contribute/Summary.php b/CRM/Report/Form/Contribute/Summary.php index e18bfcfe36..4c0fbaf771 100644 --- a/CRM/Report/Form/Contribute/Summary.php +++ b/CRM/Report/Form/Contribute/Summary.php @@ -352,24 +352,6 @@ class CRM_Report_Form_Contribute_Summary extends CRM_Report_Form { $ignoreFields = array('total_amount', 'sort_name'); $errors = $self->customDataFormRule($fields, $ignoreFields); - if (CRM_Utils_Array::value('receive_date', $fields['group_bys'])) { - foreach ($self->_columns as $tableName => $table) { - if (array_key_exists('fields', $table)) { - foreach ($table['fields'] as $fieldName => $field) { - if (CRM_Utils_Array::value($field['name'], $fields['fields']) && - $fields['fields'][$field['name']] && - in_array( $field['name'], array('sort_name', 'postal_greeting_display', 'contribution_source', 'financial_type'))) { - $grouping[] = $field['title']; - } - } - } - } - if (!empty($grouping)) { - $temp = 'and ' . implode(', ', $grouping); - $errors['fields'] = ts("Please do not use combination of Receive Date %1", array(1 => $temp)); - } - } - if (!CRM_Utils_Array::value('receive_date', $fields['group_bys'])) { if (CRM_Utils_Array::value('receive_date_relative', $fields) || CRM_Utils_Date::isDate($fields['receive_date_from']) ||