From 45a8051b52ed4aeb20b5291d7d2dcf09e324541c Mon Sep 17 00:00:00 2001
From: Alan Bell <alanbell@ubuntu.com>
Date: Mon, 29 Feb 2016 15:57:55 +0000
Subject: [PATCH] fix #123 custom date field formatter
---
modules/Reports/ReportRun.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/modules/Reports/ReportRun.php b/modules/Reports/ReportRun.php
index 7cf348876..2a3d73d5b 100644
--- a/modules/Reports/ReportRun.php
+++ b/modules/Reports/ReportRun.php
@@ -449,7 +449,8 @@ class ReportRun extends CRMEntity
} else if ($selectedfields[0] == "vtiger_crmentity" . $this->primarymodule) {
$columnSQL = "vtiger_crmentity." . $selectedfields[1] . " AS '" . decode_html($header_label) . "'";
} else {
- $columnSQL = $selectedfields[0] . "." . $selectedfields[1] . " AS '" . decode_html($header_label) . "'";
+ $userformat=str_replace(array("dd-mm-yyyy","mm-dd-yyyy","yyyy-mm-dd"),array("%d-%m-%Y","$m-%d-%Y","$Y-%m-%d"),$current_user->date_format);
+ $columnSQL = "date_format (" . $selectedfields[0] . "." . $selectedfields[1] . ",'$userformat') AS '" . decode_html($header_label) . "'";
}
$this->queryPlanner->addTable($selectedfields[0]);
}
--
GitLab