diff --git a/htdocs/core/class/html.formmargin.class.php b/htdocs/core/class/html.formmargin.class.php
index f9b0a59280f..ea038fa8131 100644
--- a/htdocs/core/class/html.formmargin.class.php
+++ b/htdocs/core/class/html.formmargin.class.php
@@ -199,8 +199,6 @@ class FormMargin
if (! $user->rights->margins->liretous) return;
- $rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT, $conf->global->MAIN_MAX_DECIMALS_TOT);
-
$marginInfo = $this->getMarginInfosArray($object, $force_price);
if (! empty($conf->global->MARGIN_ADD_SHOWHIDE_BUTTON)) // TODO Warning this feature rely on an external js file that may be removed. Using native js function document.cookie should be better
@@ -240,13 +238,13 @@ class FormMargin
//if ($marginInfo['margin_on_products'] != 0 && $marginInfo['margin_on_services'] != 0) {
print '
';
print '| '.$langs->trans('MarginOnProducts').' | ';
- print ''.price($marginInfo['pv_products'], null, null, null, null, $rounding).' | ';
- print ''.price($marginInfo['pa_products'], null, null, null, null, $rounding).' | ';
- print ''.price($marginInfo['margin_on_products'], null, null, null, null, $rounding).' | ';
+ print ''.price($marginInfo['pv_products']).' | ';
+ print ''.price($marginInfo['pa_products']).' | ';
+ print ''.price($marginInfo['margin_on_products']).' | ';
if (! empty($conf->global->DISPLAY_MARGIN_RATES))
- print ''.(($marginInfo['margin_rate_products'] == '')?'':price($marginInfo['margin_rate_products'], null, null, null, null, $rounding).'%').' | ';
+ print ''.(($marginInfo['margin_rate_products'] == '')?'':price($marginInfo['margin_rate_products'], null, null, null, null, 2).'%').' | ';
if (! empty($conf->global->DISPLAY_MARK_RATES))
- print ''.(($marginInfo['mark_rate_products'] == '')?'':price($marginInfo['mark_rate_products'], null, null, null, null, $rounding).'%').' | ';
+ print ''.(($marginInfo['mark_rate_products'] == '')?'':price($marginInfo['mark_rate_products'], null, null, null, null, 2).'%').' | ';
print '
';
}
@@ -254,13 +252,13 @@ class FormMargin
{
print '';
print '| '.$langs->trans('MarginOnServices').' | ';
- print ''.price($marginInfo['pv_services'], null, null, null, null, $rounding).' | ';
- print ''.price($marginInfo['pa_services'], null, null, null, null, $rounding).' | ';
- print ''.price($marginInfo['margin_on_services'], null, null, null, null, $rounding).' | ';
+ print ''.price($marginInfo['pv_services']).' | ';
+ print ''.price($marginInfo['pa_services']).' | ';
+ print ''.price($marginInfo['margin_on_services']).' | ';
if (! empty($conf->global->DISPLAY_MARGIN_RATES))
- print ''.(($marginInfo['margin_rate_services'] == '')?'':price($marginInfo['margin_rate_services'], null, null, null, null, $rounding).'%').' | ';
+ print ''.(($marginInfo['margin_rate_services'] == '')?'':price($marginInfo['margin_rate_services'], null, null, null, null, 2).'%').' | ';
if (! empty($conf->global->DISPLAY_MARK_RATES))
- print ''.(($marginInfo['mark_rate_services'] == '')?'':price($marginInfo['mark_rate_services'], null, null, null, null, $rounding).'%').' | ';
+ print ''.(($marginInfo['mark_rate_services'] == '')?'':price($marginInfo['mark_rate_services'], null, null, null, null, 2).'%').' | ';
print '
';
}
@@ -268,13 +266,13 @@ class FormMargin
{
print '';
print '| '.$langs->trans('TotalMargin').' | ';
- print ''.price($marginInfo['pv_total'], null, null, null, null, $rounding).' | ';
- print ''.price($marginInfo['pa_total'], null, null, null, null, $rounding).' | ';
- print ''.price($marginInfo['total_margin'], null, null, null, null, $rounding).' | ';
+ print ''.price($marginInfo['pv_total']).' | ';
+ print ''.price($marginInfo['pa_total']).' | ';
+ print ''.price($marginInfo['total_margin']).' | ';
if (! empty($conf->global->DISPLAY_MARGIN_RATES))
- print ''.(($marginInfo['total_margin_rate'] == '')?'':price($marginInfo['total_margin_rate'], null, null, null, null, $rounding).'%').' | ';
+ print ''.(($marginInfo['total_margin_rate'] == '')?'':price($marginInfo['total_margin_rate'], null, null, null, null, 2).'%').' | ';
if (! empty($conf->global->DISPLAY_MARK_RATES))
- print ''.(($marginInfo['total_mark_rate'] == '')?'':price($marginInfo['total_mark_rate'], null, null, null, null, $rounding).'%').' | ';
+ print ''.(($marginInfo['total_mark_rate'] == '')?'':price($marginInfo['total_mark_rate'], null, null, null, null, 2).'%').' | ';
print '
';
}
print '';