From a260e7391fb71c6f1396a97980dbbcf7d9e44512 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 1 Aug 2019 14:22:45 +0200
Subject: [PATCH] FIX for #11232

---
 htdocs/core/class/html.formmargin.class.php | 32 ++++++++++-----------
 1 file changed, 15 insertions(+), 17 deletions(-)

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 '<tr class="oddeven">';
 			print '<td>'.$langs->trans('MarginOnProducts').'</td>';
-			print '<td class="right">'.price($marginInfo['pv_products'], null, null, null, null, $rounding).'</td>';
-			print '<td class="right">'.price($marginInfo['pa_products'], null, null, null, null, $rounding).'</td>';
-			print '<td class="right">'.price($marginInfo['margin_on_products'], null, null, null, null, $rounding).'</td>';
+			print '<td class="right">'.price($marginInfo['pv_products']).'</td>';
+			print '<td class="right">'.price($marginInfo['pa_products']).'</td>';
+			print '<td class="right">'.price($marginInfo['margin_on_products']).'</td>';
 			if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-				print '<td class="right">'.(($marginInfo['margin_rate_products'] == '')?'':price($marginInfo['margin_rate_products'], null, null, null, null, $rounding).'%').'</td>';
+				print '<td class="right">'.(($marginInfo['margin_rate_products'] == '')?'':price($marginInfo['margin_rate_products'], null, null, null, null, 2).'%').'</td>';
 			if (! empty($conf->global->DISPLAY_MARK_RATES))
-				print '<td class="right">'.(($marginInfo['mark_rate_products'] == '')?'':price($marginInfo['mark_rate_products'], null, null, null, null, $rounding).'%').'</td>';
+				print '<td class="right">'.(($marginInfo['mark_rate_products'] == '')?'':price($marginInfo['mark_rate_products'], null, null, null, null, 2).'%').'</td>';
 			print '</tr>';
 		}
 
@@ -254,13 +252,13 @@ class FormMargin
 		{
 			print '<tr class="oddeven">';
 			print '<td>'.$langs->trans('MarginOnServices').'</td>';
-			print '<td class="right">'.price($marginInfo['pv_services'], null, null, null, null, $rounding).'</td>';
-			print '<td class="right">'.price($marginInfo['pa_services'], null, null, null, null, $rounding).'</td>';
-			print '<td class="right">'.price($marginInfo['margin_on_services'], null, null, null, null, $rounding).'</td>';
+			print '<td class="right">'.price($marginInfo['pv_services']).'</td>';
+			print '<td class="right">'.price($marginInfo['pa_services']).'</td>';
+			print '<td class="right">'.price($marginInfo['margin_on_services']).'</td>';
 			if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-				print '<td class="right">'.(($marginInfo['margin_rate_services'] == '')?'':price($marginInfo['margin_rate_services'], null, null, null, null, $rounding).'%').'</td>';
+				print '<td class="right">'.(($marginInfo['margin_rate_services'] == '')?'':price($marginInfo['margin_rate_services'], null, null, null, null, 2).'%').'</td>';
 			if (! empty($conf->global->DISPLAY_MARK_RATES))
-				print '<td class="right">'.(($marginInfo['mark_rate_services'] == '')?'':price($marginInfo['mark_rate_services'], null, null, null, null, $rounding).'%').'</td>';
+				print '<td class="right">'.(($marginInfo['mark_rate_services'] == '')?'':price($marginInfo['mark_rate_services'], null, null, null, null, 2).'%').'</td>';
 			print '</tr>';
 		}
 
@@ -268,13 +266,13 @@ class FormMargin
 		{
 			print '<tr class="liste_total">';
 			print '<td>'.$langs->trans('TotalMargin').'</td>';
-			print '<td class="right">'.price($marginInfo['pv_total'], null, null, null, null, $rounding).'</td>';
-			print '<td class="right">'.price($marginInfo['pa_total'], null, null, null, null, $rounding).'</td>';
-			print '<td class="right">'.price($marginInfo['total_margin'], null, null, null, null, $rounding).'</td>';
+			print '<td class="right">'.price($marginInfo['pv_total']).'</td>';
+			print '<td class="right">'.price($marginInfo['pa_total']).'</td>';
+			print '<td class="right">'.price($marginInfo['total_margin']).'</td>';
 			if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-				print '<td class="right">'.(($marginInfo['total_margin_rate'] == '')?'':price($marginInfo['total_margin_rate'], null, null, null, null, $rounding).'%').'</td>';
+				print '<td class="right">'.(($marginInfo['total_margin_rate'] == '')?'':price($marginInfo['total_margin_rate'], null, null, null, null, 2).'%').'</td>';
 			if (! empty($conf->global->DISPLAY_MARK_RATES))
-				print '<td class="right">'.(($marginInfo['total_mark_rate'] == '')?'':price($marginInfo['total_mark_rate'], null, null, null, null, $rounding).'%').'</td>';
+				print '<td class="right">'.(($marginInfo['total_mark_rate'] == '')?'':price($marginInfo['total_mark_rate'], null, null, null, null, 2).'%').'</td>';
 			print '</tr>';
 		}
 		print '</table>';