diff --git a/include/ListView/ListViewController.php b/include/ListView/ListViewController.php index 233f3eb156ef9662fa4bb17a8a74cc0e59a1ca8f..832ad9db6f8e3f9c994a9a085ab321dca61210d1 100644 --- a/include/ListView/ListViewController.php +++ b/include/ListView/ListViewController.php @@ -405,7 +405,8 @@ class ListViewController { } } } elseif ($fieldDataType == 'double') { - $value = decimalFormat($value); + //Converting the decimal value to user preferred format, considering number of decimals and decimal separator + $value = CurrencyField::convertToUserFormat(decimalFormat($value)); } elseif($fieldDataType == 'url') { $matchPattern = "^[\w]+:\/\/^"; preg_match($matchPattern, $rawValue, $matches); diff --git a/layouts/v7/modules/Vtiger/DetailViewBlockView.tpl b/layouts/v7/modules/Vtiger/DetailViewBlockView.tpl index f2a99adfeeebedfe2cf40b996156fe25bbcd9862..a9e65902fb88d787a9ef778b79fbbbf740696ecc 100644 --- a/layouts/v7/modules/Vtiger/DetailViewBlockView.tpl +++ b/layouts/v7/modules/Vtiger/DetailViewBlockView.tpl @@ -105,6 +105,9 @@ {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} diff --git a/layouts/v7/modules/Vtiger/uitypes/Number.tpl b/layouts/v7/modules/Vtiger/uitypes/Number.tpl index d7d792b43845b54ca4c515216055a48b2e1211f8..3a2370e601b4df67a4376624849c664411b43e29 100644 --- a/layouts/v7/modules/Vtiger/uitypes/Number.tpl +++ b/layouts/v7/modules/Vtiger/uitypes/Number.tpl @@ -15,7 +15,8 @@ {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'} - {assign var="FIELD_VALUE" value=$FIELD_MODEL->getDisplayValue($FIELD_MODEL->get('fieldvalue'))} + <!-- 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')))} {else} {assign var="FIELD_VALUE" value=$FIELD_MODEL->get('fieldvalue')} {/if} diff --git a/layouts/v7/modules/Vtiger/uitypes/StringDetailView.tpl b/layouts/v7/modules/Vtiger/uitypes/StringDetailView.tpl index 6ece8c7be5b01a602de767c258a1bf861f90b40f..c057adaca3567ec725081b47cb33dd314ac8136d 100644 --- a/layouts/v7/modules/Vtiger/uitypes/StringDetailView.tpl +++ b/layouts/v7/modules/Vtiger/uitypes/StringDetailView.tpl @@ -41,6 +41,9 @@ {/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}