From d5f60bb83a31f1e3fa6c452bc0332b45780967bb Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 8 Jun 2018 13:35:57 +1200
Subject: [PATCH] core/#170 minimal fix for fatal on soft_credit field
Signed-off-by: Kevin Cristiano <kcristiano@tadpole.cc>
---
civicrm/CRM/Report/Form/Contribute/Detail.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/civicrm/CRM/Report/Form/Contribute/Detail.php b/civicrm/CRM/Report/Form/Contribute/Detail.php
index 8ce9d48a69..19b4865962 100644
--- a/civicrm/CRM/Report/Form/Contribute/Detail.php
+++ b/civicrm/CRM/Report/Form/Contribute/Detail.php
@@ -704,7 +704,7 @@ UNION ALL
array_key_exists('civicrm_contribution_contribution_id', $row)
) {
$query = "
-SELECT civicrm_contact_id, civicrm_contact_sort_name, civicrm_contribution_total_amount, civicrm_contribution_currency
+SELECT civicrm_contact_id, civicrm_contact_sort_name, civicrm_contribution_total_amount_sum, civicrm_contribution_currency
FROM civireport_contribution_detail_temp2
WHERE civicrm_contribution_contribution_id={$row['civicrm_contribution_contribution_id']}";
$this->addToDeveloperTab($query);
@@ -716,7 +716,7 @@ WHERE civicrm_contribution_contribution_id={$row['civicrm_contribution_contribu
$dao->civicrm_contact_id);
$string = $string . ($string ? $separator : '') .
"<a href='{$url}'>{$dao->civicrm_contact_sort_name}</a> " .
- CRM_Utils_Money::format($dao->civicrm_contribution_total_amount, $dao->civicrm_contribution_currency);
+ CRM_Utils_Money::format($dao->civicrm_contribution_total_amount_sum, $dao->civicrm_contribution_currency);
}
$rows[$rowNum]['civicrm_contribution_soft_credits'] = $string;
}
--
GitLab