Fixes: The decimal field values are formatted according to user's preffered format

include/ListView/ListViewController.php

@@ -405,8 +405,7 @@ class ListViewController {
 						}
 					}
 				} elseif ($fieldDataType == 'double') {
-					//Converting the decimal value to user preferred format, considering number of decimals and decimal separator
-					$value = CurrencyField::convertToUserFormat(decimalFormat($value));
+					$value = decimalFormat($value);
 				} elseif($fieldDataType == 'url') {
 					$matchPattern = "^[\w]+:\/\/^";
 					preg_match($matchPattern, $rawValue, $matches);

layouts/v7/modules/Vtiger/DetailViewBlockView.tpl

@@ -105,9 +105,6 @@
 										{assign var=FIELD_VALUE value=$FIELD_MODEL->get('fieldvalue')}
 										{if $fieldDataType eq 'multipicklist'}
 											{assign var=FIELD_DISPLAY_VALUE value=$FIELD_MODEL->getDisplayValue($FIELD_MODEL->get('fieldvalue'))}
-										{else if $fieldDataType eq 'double'}
-											 <!-- Converting the decimal value to user format, considering the number of decimals and decimal separator and assigning the value-->
-											{assign var=FIELD_DISPLAY_VALUE value=Vtiger_Util_Helper::toSafeHTML(CurrencyField::convertToUserFormat($FIELD_MODEL->getDisplayValue($FIELD_MODEL->get('fieldvalue'))))}
 										{else}
 											{assign var=FIELD_DISPLAY_VALUE value=Vtiger_Util_Helper::toSafeHTML($FIELD_MODEL->getDisplayValue($FIELD_MODEL->get('fieldvalue')))}
 										{/if}

layouts/v7/modules/Vtiger/uitypes/Number.tpl

@@ -15,8 +15,7 @@
 {if $MODULE eq 'HelpDesk' && ($FIELD_MODEL->get('name') eq 'days' || $FIELD_MODEL->get('name') eq 'hours')}
 	{assign var="FIELD_VALUE" value=$FIELD_MODEL->getDisplayValue($FIELD_MODEL->get('fieldvalue'))}
 {else if $FIELD_MODEL->getFieldDataType() eq 'double'}
-   <!-- Converting the decimal value to user format, considering the number of decimals and decimal separator -->
-	{assign var="FIELD_VALUE" value=CurrencyField::convertToUserFormat($FIELD_MODEL->getDisplayValue($FIELD_MODEL->get('fieldvalue')))}
+	{assign var="FIELD_VALUE" value=$FIELD_MODEL->getDisplayValue($FIELD_MODEL->get('fieldvalue'))}
 {else}
 	{assign var="FIELD_VALUE" value=$FIELD_MODEL->get('fieldvalue')}
 {/if}

layouts/v7/modules/Vtiger/uitypes/StringDetailView.tpl

@@ -41,9 +41,6 @@
     {/if}
 {else if  $FIELD_MODEL->get('name') eq 'signature'}
 	{decode_html($FIELD_MODEL->getDisplayValue($FIELD_MODEL->get('fieldvalue'), $RECORD->getId(), $RECORD))}
-{else if $FIELD_MODEL->getFieldDataType() eq 'double'}
-    <!-- Converting the decimal value to user format, considering the number of decimals and decimal separator -->
-    {CurrencyField::convertToUserFormat($FIELD_MODEL->getDisplayValue($FIELD_MODEL->get('fieldvalue'), $RECORD->getId(), $RECORD))}
 {else}
     {$FIELD_MODEL->getDisplayValue($FIELD_MODEL->get('fieldvalue'), $RECORD->getId(), $RECORD)}
 {/if}

modules/Vtiger/uitypes/Double.php

@@ -24,7 +24,11 @@ class Vtiger_Double_UIType extends Vtiger_Base_UIType {
 	 * @return <Object>
 	 */
 	public function getDisplayValue($value, $record=false, $recordInstance=false) {
-		return decimalFormat($value);
+		//The value is formatting to the user preffered format
+		//The third parameter for the converTouserFormat() function is skipConversion. 
+		//We set skipConversion to true because there's no need to convert the values for different currency formats.
+		$value = CurrencyField::convertToUserFormat(decimalFormat($value), null, true);
+		return $value;
 	}
 
 	/**