diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php
index a47acb63eec..f65acb2eeda 100644
--- a/htdocs/margin/agentMargins.php
+++ b/htdocs/margin/agentMargins.php
@@ -223,8 +223,6 @@ if ($result)
print_liste_field_titre("MarkRate", $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
print "\n";
- $rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT, $conf->global->MAIN_MAX_DECIMALS_TOT);
-
if ($num > 0)
{
$group_list = array();
@@ -291,13 +289,13 @@ if ($result)
print '
';
print "| ".$group_array['htmlname']." | \n";
- print "".price($pv, null, null, null, null, $rounding)." | \n";
- print "".price($pa, null, null, null, null, $rounding)." | \n";
- print "".price($marge, null, null, null, null, $rounding)." | \n";
+ print "".price(price2num($pv, 'MT'))." | \n";
+ print "".price(price2num($pa, 'MT'))." | \n";
+ print "".price(price2num($marge, 'MT'))." | \n";
if (! empty($conf->global->DISPLAY_MARGIN_RATES))
- print "".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")." | \n";
+ print "".(($marginRate === '')?'n/a':price(price2num($marginRate, 'MT'))."%")." | \n";
if (! empty($conf->global->DISPLAY_MARK_RATES))
- print "".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")." | \n";
+ print "".(($markRate === '')?'n/a':price(price2num($markRate, 'MT'))."%")." | \n";
print "
\n";
}
}
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index 149464ceb2f..d54eee43056 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -277,8 +277,6 @@ if ($result)
$cumul_achat = 0;
$cumul_vente = 0;
- $rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT, $conf->global->MAIN_MAX_DECIMALS_TOT);
-
if ($num > 0)
{
while ($i < $num /*&& $i < $conf->liste_limit*/)
@@ -317,13 +315,13 @@ if ($result)
print "".$companystatic->getNomUrl(1, 'margin')." | \n";
}
- print "".price($pv, null, null, null, null, $rounding)." | \n";
- print "".price($pa, null, null, null, null, $rounding)." | \n";
- print "".price($marge, null, null, null, null, $rounding)." | \n";
+ print "".price(price2num($pv, 'MT'))." | \n";
+ print "".price(price2num($pa, 'MT'))." | \n";
+ print "".price(price2num($marge, 'MT'))." | \n";
if (!empty($conf->global->DISPLAY_MARGIN_RATES))
- print "".(($marginRate === '') ? 'n/a' : price($marginRate, null, null, null, null, $rounding)."%")." | \n";
+ print "".(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%")." | \n";
if (!empty($conf->global->DISPLAY_MARK_RATES))
- print "".(($markRate === '') ? 'n/a' : price($markRate, null, null, null, null, $rounding)."%")." | \n";
+ print "".(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%")." | \n";
print "\n";
$i++;
diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index 66f42475548..cc6f7fe0ed9 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -252,7 +252,6 @@ if ($result)
$cumul_achat = 0;
$cumul_vente = 0;
- $rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT, $conf->global->MAIN_MAX_DECIMALS_TOT);
if ($num > 0)
{
@@ -303,13 +302,13 @@ if ($result)
print "\n";
//print "".$product_static->getNomUrl(1)." | \n";
}
- print "".price($pv, null, null, null, null, $rounding)." | \n";
- print "".price($pa, null, null, null, null, $rounding)." | \n";
- print "".price($marge, null, null, null, null, $rounding)." | \n";
+ print "".price(price2num($pv, 'MT'))." | \n";
+ print "".price(price2num($pa, 'MT'))." | \n";
+ print "".price(price2num($marge, 'MT'))." | \n";
if (!empty($conf->global->DISPLAY_MARGIN_RATES))
- print "".(($marginRate === '') ? 'n/a' : price($marginRate, null, null, null, null, $rounding)."%")." | \n";
+ print "".(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%")." | \n";
if (!empty($conf->global->DISPLAY_MARK_RATES))
- print "".(($markRate === '') ? 'n/a' : price($markRate, null, null, null, null, $rounding)."%")." | \n";
+ print "".(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%")." | \n";
print "\n";
$i++;
@@ -331,13 +330,13 @@ if ($result)
else
print '';
print $langs->trans('TotalMargin')." | ";
- print "".price($cumul_vente, null, null, null, null, $rounding)." | \n";
- print "".price($cumul_achat, null, null, null, null, $rounding)." | \n";
- print "".price($totalMargin, null, null, null, null, $rounding)." | \n";
+ print "".price(price2num($cumul_vente, 'MT'))." | \n";
+ print "".price(price2num($cumul_achat, 'MT'))." | \n";
+ print "".price(price2num($totalMargin, 'MT'))." | \n";
if (!empty($conf->global->DISPLAY_MARGIN_RATES))
- print "".(($marginRate === '') ? 'n/a' : price($marginRate, null, null, null, null, $rounding)."%")." | \n";
+ print "".(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%")." | \n";
if (!empty($conf->global->DISPLAY_MARK_RATES))
- print "".(($markRate === '') ? 'n/a' : price($markRate, null, null, null, null, $rounding)."%")." | \n";
+ print "".(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%")." | \n";
print "\n";
print "";
@@ -358,9 +357,9 @@ $(document).ready(function() {
$("div.fiche form").submit();
});
- $("#totalMargin").html("'.price($totalMargin, null, null, null, null, $rounding).'");
- $("#marginRate").html("'.(($marginRate === '') ? 'n/a' : price($marginRate, null, null, null, null, $rounding)."%").'");
- $("#markRate").html("'.(($markRate === '') ? 'n/a' : price($markRate, null, null, null, null, $rounding)."%").'");
+ $("#totalMargin").html("'.price(price2num($totalMargin, 'MT')).'");
+ $("#marginRate").html("'.(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%").'");
+ $("#markRate").html("'.(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%").'");
});
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index c02f2149de0..c102e89898c 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -1350,7 +1350,8 @@ if ($action == 'edit_price' && $object->getRights()->creer)
{
print '';
print '| ';
- print $form->textwithpicto($langs->trans('SellingPrice').' '.$i, $langs->trans("PrecisionUnitIsLimitedToXDecimals", $conf->global->MAIN_MAX_DECIMALS_UNIT), 1, 1);
+ $text = $langs->trans('SellingPrice').' '.$i;
+ print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", $conf->global->MAIN_MAX_DECIMALS_UNIT), 1, 1);
print ' | ';
// VAT