From 3fd8e21a4e5ae86a9e7b40b31f7316c1687526ce Mon Sep 17 00:00:00 2001
From: francescbassas <francesc@babu.cat>
Date: Mon, 24 Dec 2018 11:16:15 +0100
Subject: [PATCH] #620 - Unable to show custom fields on Repeat Contributions
 Report

https://lab.civicrm.org/dev/core/issues/620
---
 CRM/Report/Form/Contribute/Repeat.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CRM/Report/Form/Contribute/Repeat.php b/CRM/Report/Form/Contribute/Repeat.php
index 3b0f835d227e..0beac39635cf 100644
--- 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();