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

Merge pull request #3504 from fappels/3.5-patch-Dispatch-rounding

Browse Source 
Fix #3471 3.5 Rounding issue when dispatching non-integer
This commit is contained in:
Laurent Destailleur 2015-09-12 11:07:55 +02:00
commit a3032d5674
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/fourn/commande/dispatch.php
View File

@ -229,9 +229,17 @@ if ($id > 0 || ! empty($ref))
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) if ($resql)
{ {
while ( $row = $db->fetch_row($resql) ) $num = $db->num_rows($resql);
$i = 0;
if ($num)
{ {
$products_dispatched[$row[0]] = $row[1]; while ($i < $num)
{
$objd = $db->fetch_object($resql);
$products_dispatched[$objd->fk_product] = price2num($objd->qty, 5);
$i++;
}
} }
$db->free($resql); $db->free($resql);
} }
@ -277,7 +285,7 @@ if ($id > 0 || ! empty($ref))
} }
else else
{ {
$remaintodispatch=($objp->qty - $products_dispatched[$objp->fk_product]); // Calculation of dispatched $remaintodispatch=(price2num($objp->qty, 5) - $products_dispatched[$objp->fk_product]); // Calculation of dispatched
if ($remaintodispatch < 0) $remaintodispatch=0; if ($remaintodispatch < 0) $remaintodispatch=0;
if ($remaintodispatch) if ($remaintodispatch)
{ {