diff --git a/modules/Reports/ReportUtils.php b/modules/Reports/ReportUtils.php index 57f1b15f4e0e41879af63d2d13c1e455bcfb6698..31f6b3a55788f2e82d1dee9dc790e9582e77b00c 100644 --- a/modules/Reports/ReportUtils.php +++ b/modules/Reports/ReportUtils.php @@ -219,14 +219,21 @@ function getReportFieldValue ($report, $picklistArray, $dbField, $valueArray, $f } elseif ($fieldType == 'double' && $operation != 'ExcelExport') { if($current_user->truncate_trailing_zeros == true) $fieldvalue = decimalFormat($fieldvalue); - } + } else { + // special fields + if ( ($report->primarymodule == "Emails" && $dbField->name == "Date_Sent") || $dbField->name == "Emails_Date_Sent") { + $fieldvalue = DateTimeField::convertToUserFormat($fieldvalue); + } + } + if($fieldType == 'currency' && $value == "" && $operation != 'ExcelExport'){ $currencyField = new CurrencyField($value); $fieldvalue = $currencyField->getDisplayValue(); return $fieldvalue; } else if($fieldvalue == "" && $operation != 'ExcelExport') { return ""; - } + } + $fieldvalue = str_replace("<", "<", $fieldvalue); $fieldvalue = str_replace(">", ">", $fieldvalue); $fieldvalue = decode_html($fieldvalue); @@ -356,4 +363,4 @@ function getReportSearchCondition($searchParams, $filterId) { return false; } -?> \ No newline at end of file +?>