lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix rounding

Browse Source
This commit is contained in:
Laurent Destailleur 2020-12-31 16:06:54 +01:00
parent 3743790160
commit d834f6023d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/core/class/html.form.class.php
View File

@ -2652,14 +2652,14 @@ class Form
if (!empty($conf->stock->enabled) && isset($objp->stock) && ($objp->fk_product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES))) if (!empty($conf->stock->enabled) && isset($objp->stock) && ($objp->fk_product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)))
{ {
if (!empty($user->rights->stock->lire)) { if (!empty($user->rights->stock->lire)) {
$opt .= ' - '.$langs->trans("Stock").':'.$objp->stock; $opt .= ' - '.$langs->trans("Stock").': '.price(price2num($objp->stock, 'MS'));
if ($objp->stock > 0) { if ($objp->stock > 0) {
$outval .= ' - <span class="product_line_stock_ok">'; $outval .= ' - <span class="product_line_stock_ok">';
} elseif ($objp->stock <= 0) { } elseif ($objp->stock <= 0) {
$outval .= ' - <span class="product_line_stock_too_low">'; $outval .= ' - <span class="product_line_stock_too_low">';
} }
$outval .= $langs->transnoentities("Stock").':'.$objp->stock; $outval .= $langs->transnoentities("Stock").': '.price(price2num($objp->stock, 'MS'));
$outval .= '</span>'; $outval .= '</span>';
if (empty($novirtualstock) && !empty($conf->global->STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO)) // Warning, this option may slow down combo list generation if (empty($novirtualstock) && !empty($conf->global->STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO)) // Warning, this option may slow down combo list generation
{ {
@ -2989,14 +2989,14 @@ class Form
$novirtualstock = ($showstockinlist == 2); $novirtualstock = ($showstockinlist == 2);
if (!empty($user->rights->stock->lire)) { if (!empty($user->rights->stock->lire)) {
$outvallabel .= ' - '.$langs->trans("Stock").':'.$objp->stock; $outvallabel .= ' - '.$langs->trans("Stock").': '.price(price2num($objp->stock, 'MS'));
if ($objp->stock > 0) { if ($objp->stock > 0) {
$optlabel .= ' - <span class="product_line_stock_ok">'; $optlabel .= ' - <span class="product_line_stock_ok">';
} elseif ($objp->stock <= 0) { } elseif ($objp->stock <= 0) {
$optlabel .= ' - <span class="product_line_stock_too_low">'; $optlabel .= ' - <span class="product_line_stock_too_low">';
} }
$optlabel .= $langs->transnoentities("Stock").':'.$objp->stock; $optlabel .= $langs->transnoentities("Stock").':'.price(price2num($objp->stock, 'MS'));
$optlabel .= '</span>'; $optlabel .= '</span>';
if (empty($novirtualstock) && !empty($conf->global->STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO)) // Warning, this option may slow down combo list generation if (empty($novirtualstock) && !empty($conf->global->STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO)) // Warning, this option may slow down combo list generation
{ {