From 5ae1ea3e998682401dc554cd813686a7e4b157e5 Mon Sep 17 00:00:00 2001
From: DemeritCowboy <demeritcowboy@hotmail.com>
Date: Thu, 14 Nov 2019 23:05:57 -0500
Subject: [PATCH] wip

---
 CRM/Case/XMLProcessor/Report.php     | 9 +--------
 templates/CRM/Case/Form/CaseView.tpl | 2 +-
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/CRM/Case/XMLProcessor/Report.php b/CRM/Case/XMLProcessor/Report.php
index 0f05a56b92..b240b3c77c 100644
--- a/CRM/Case/XMLProcessor/Report.php
+++ b/CRM/Case/XMLProcessor/Report.php
@@ -177,13 +177,6 @@ class CRM_Case_XMLProcessor_Report extends CRM_Case_XMLProcessor {
       $map[$aType['id']] = $aType;
     }
 
-    // get all core activities
-    $coreActivityTypes = CRM_Case_PseudoConstant::caseActivityType(FALSE, TRUE);
-
-    foreach ($coreActivityTypes as $aType) {
-      $map[$aType['id']] = $aType;
-    }
-
     $activityTypeIDs = implode(',', array_keys($map));
     $query = "
 SELECT a.*, c.id as caseID
@@ -776,7 +769,7 @@ LIMIT  1
       $activityTypes = $form->getActivityTypes($xml, $activitySetName);
     }
     else {
-      $activityTypes = CRM_Case_XMLProcessor::allActivityTypes();
+      $activityTypes = CRM_Case_XMLProcessor::allActivityTypes(FALSE, TRUE);
     }
 
     if (!$activityTypes) {
diff --git a/templates/CRM/Case/Form/CaseView.tpl b/templates/CRM/Case/Form/CaseView.tpl
index aa64be25e9..ae8fc33fca 100644
--- a/templates/CRM/Case/Form/CaseView.tpl
+++ b/templates/CRM/Case/Form/CaseView.tpl
@@ -103,7 +103,7 @@
     <div>
       <p>
         {if $hasAccessToAllCases}
-          <a class="crm-hover-button action-item no-popup" href="{crmURL p='civicrm/case/report/print' q="all=1&redact=0&cid=$contactID&caseID=$caseId&asn=standard_timeline"}"><i class="crm-i fa-print"></i> {ts}Print Report{/ts}</a>
+          <a class="crm-hover-button action-item no-popup" href="{crmURL p='civicrm/case/report/print' q="all=1&redact=0&cid=$contactID&caseID=$caseId&asn="}"><i class="crm-i fa-print"></i> {ts}Print Report{/ts}</a>
         {/if}
 
         {if !empty($exportDoc)}
-- 
2.25.1