Merge pull request #13350 from francescbassas/patch-16

#620 - Unable to show custom fields on Repeat Contributions Report
civicrm · Dec 27, 2018 · f01f6ac · f01f6ac
2 parents 29e86a0 + 5210bcc
commit f01f6ac
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/CRM/Report/Form/Contribute/Repeat.php b/CRM/Report/Form/Contribute/Repeat.php
@@ -574,7 +574,7 @@ public static function formRule($fields, $files, $self) {
     }
     else {
       foreach ($fields['fields'] as $fld_id => $value) {
-        if (!($fld_id == 'total_amount1') && !($fld_id == 'total_amount2')) {
+        if (!($fld_id == 'total_amount1') && !($fld_id == 'total_amount2') && !(substr($fld_id, 0, 7) === "custom_")) {
           $found = FALSE;
           $invlidGroups = array();
           foreach ($fields['group_bys'] as $grp_id => $val) {
@@ -833,6 +833,7 @@ public function postProcess() {
     $this->buildGroupTempTable();
     $this->select();
     $this->from();
+    $this->customDataFrom();
     $this->where();
     $this->groupBy();
     $this->orderBy();