Fixed: Time_UIType static function call and conflict with base type

layouts/v7/modules/Calendar/QuickCreateFollowup.tpl

@@ -18,7 +18,7 @@
 			{assign var="timeformat" value=$USER_MODEL->get('hour_format')}
 			{assign var="currentDate" value=Vtiger_Date_UIType::getDisplayDateValue('')}
 			{assign var="time" value=Vtiger_Time_UIType::getDisplayTimeValue(null)}
-			{assign var="currentTimeInVtigerFormat" value=Vtiger_Time_UIType::getDisplayValue($time)}
+			{assign var="currentTimeInVtigerFormat" value=Vtiger_Time_UIType::getDisplayValueUserFormat($time)}
 			{assign var=FOLLOW_UP_LABEL value={vtranslate('LBL_HOLD_FOLLOWUP_ON',"Events")}}
 			<input type="hidden" name="module" value="{$MODULE}">
 			<input type="hidden" name="action" value="SaveFollowupAjax" />

layouts/vlayout/modules/Calendar/QuickCreateFollowup.tpl

@@ -20,7 +20,7 @@
     {assign var="timeformat" value=$USER_MODEL->get('hour_format')}
     {assign var="currentDate" value=Vtiger_Date_UIType::getDisplayDateValue('')}
     {assign var="time" value=Vtiger_Time_UIType::getDisplayTimeValue(null)}
-    {assign var="currentTimeInVtigerFormat" value=Vtiger_Time_UIType::getDisplayValue($time)}
+    {assign var="currentTimeInVtigerFormat" value=Vtiger_Time_UIType::getDisplayValueUserFormat($time)}
     {assign var=FOLLOW_UP_LABEL value={vtranslate('LBL_HOLD_FOLLOWUP_ON',"Events")}}
     
     <form class="form-horizontal followupCreateView" id="followupQuickCreate" name="followupQuickCreate" method="post" action="index.php">

modules/Leads/models/DetailView.php

@@ -22,7 +22,11 @@ class Leads_DetailView_Model extends Accounts_DetailView_Model {
 		$recordModel = $this->getRecord();
 		$emailModuleModel = Vtiger_Module_Model::getInstance('Emails');
 
-		$linkModelList = Vtiger_DetailView_Model::getDetailViewLinks($linkParams);
+		$baseDetailViewModel = new Vtiger_DetailView_Model();
+		$baseDetailViewModel->setModule($moduleModel);
+		$baseDetailViewModel->setRecord($recordModel);
+
+		$linkModelList = $baseDetailViewModel::getDetailViewLinks($linkParams);
 
 		if($currentUserModel->hasModulePermission($emailModuleModel->getId())) {
 			$basicActionLink = array(

modules/Reports/models/ScheduleReports.php

@@ -414,7 +414,7 @@ class Reports_ScheduleReports_Model extends Vtiger_Base_Model {
 		$dateTime = new DateTimeField($this->get('next_trigger_time'));
 		$nextTriggerTime = $dateTime->getDisplayDateTimeValue();
 		$valueParts = explode(' ', $nextTriggerTime);
-		$value = $valueParts[0].' '.Vtiger_Time_UIType::getDisplayValue($valueParts[1]);
+		$value = $valueParts[0].' '.Vtiger_Time_UIType::getDisplayValueUserFormat($valueParts[1]);
 		return $value;
 	}
 

modules/Vtiger/models/DetailView.php

@@ -55,7 +55,7 @@ class Vtiger_DetailView_Model extends Vtiger_Base_Model {
 	 * @return <array> - array of link models in the format as below
 	 *                   array('linktype'=>list of link models);
 	 */
-	public static function getDetailViewLinks($linkParams) {
+	public function getDetailViewLinks($linkParams) {
 		$linkTypes = array('DETAILVIEWBASIC','DETAILVIEW');
 		$moduleModel = $this->getModule();
 		$recordModel = $this->getRecord();

modules/Vtiger/models/Record.php

@@ -212,7 +212,7 @@ class Vtiger_Record_Model extends Vtiger_Base_Model {
 		if($fieldName == "time_start" && $this->getModule()->getName() == "Emails"){
 			$date = new DateTime();
 			$dateTime = new DateTimeField($date->format('Y-m-d').' '.$this->get($fieldName));
-			$value = Vtiger_Time_UIType::getDisplayValue($dateTime->getDisplayTime());
+			$value = Vtiger_Time_UIType::getDisplayValueUserFormat($dateTime->getDisplayTime());
 			$this->set($fieldName, $value);
 			return $value;
 		}else if($fieldName == "date_start" && $this->getModule()->getName() == "Emails"){

modules/Vtiger/uitypes/Time.php

@@ -90,7 +90,7 @@ class Vtiger_Time_UIType extends Vtiger_Base_UIType {
 	 * @param <Object> $value
 	 * @return $value
 	 */
-	public static function getDisplayValue($value, $record = false, $recordInstance=false) {
+	public function getDisplayValue($value, $record = false, $recordInstance=false) {
 		$userModel = Users_Privileges_Model::getCurrentUserModel();
 		if($userModel->get('hour_format') == '12'){
 			return self::getTimeValueInAMorPM($value);
@@ -98,6 +98,14 @@ class Vtiger_Time_UIType extends Vtiger_Base_UIType {
 		return $value;
 	}
 
+	/**
+	 * Helper static function.
+	 */
+	public static function getDisplayValueUserFormat($value, $record = false, $recordInstance = false) {
+		$instance = new static();
+		return $instance->getDisplayValue($value, $record, $recordInstance);
+	}
+
 	/**
 	 * Function to get the display value in edit view
 	 * @param $value

modules/com_vtiger_workflow/VTSimpleTemplate.inc

@@ -383,7 +383,7 @@ class VTSimpleTemplate{
 				$dateTime = new DateTimeField($adb->query_result($result, $i, 'createdtime'));
 				$dateTimeValue = $dateTime->getDisplayDateTimeValue();
 				$dateTimeParts = explode(' ', $dateTimeValue);
-				$createdTime = $dateTimeParts[0].' '.Vtiger_Time_UIType::getDisplayValue($dateTimeParts[1]);
+				$createdTime = $dateTimeParts[0].' '.Vtiger_Time_UIType::getDisplayValueUserFormat($dateTimeParts[1]);
 				$timeZone = vtranslate($current_user->time_zone, 'Users');
 				$userId = $adb->query_result($result, $i, 'userid');
 				$commenter = getOwnerName($userId);