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

Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0

Browse Source
This commit is contained in:
Laurent Destailleur 2023-01-06 16:26:14 +01:00
commit a219c620e4
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,7 +68,7 @@ $hookmanager->initHooks(array('ordersupplierdispatch'));
// Recuperation de l'id de projet // Recuperation de l'id de projet
$projectid = 0; $projectid = 0;
if ($_GET["projectid"]) { if (GETPOSTISSET("projectid")) {
$projectid = GETPOST("projectid", 'int'); $projectid = GETPOST("projectid", 'int');
} }
@ -782,7 +782,8 @@ if ($id > 0 || !empty($ref)) {
if (!$objp->fk_product > 0) { if (!$objp->fk_product > 0) {
$nbfreeproduct++; $nbfreeproduct++;
} else { } else {
$remaintodispatch = price2num($objp->qty - ((float) $products_dispatched[$objp->rowid]), 5); // Calculation of dispatched $alreadydispatched = isset($products_dispatched[$objp->rowid])?$products_dispatched[$objp->rowid]:0;
$remaintodispatch = price2num($objp->qty - ((float) $alreadydispatched), 5); // Calculation of dispatched
if ($remaintodispatch < 0 && empty($conf->global->SUPPLIER_ORDER_ALLOW_NEGATIVE_QTY_FOR_SUPPLIER_ORDER_RETURN)) { if ($remaintodispatch < 0 && empty($conf->global->SUPPLIER_ORDER_ALLOW_NEGATIVE_QTY_FOR_SUPPLIER_ORDER_RETURN)) {
$remaintodispatch = 0; $remaintodispatch = 0;
} }
@ -799,7 +800,7 @@ if ($id > 0 || !empty($ref)) {
print '<!-- Line to dispatch '.$suffix.' -->'."\n"; print '<!-- Line to dispatch '.$suffix.' -->'."\n";
// hidden fields for js function // hidden fields for js function
print '<input id="qty_ordered'.$suffix.'" type="hidden" value="'.$objp->qty.'">'; print '<input id="qty_ordered'.$suffix.'" type="hidden" value="'.$objp->qty.'">';
print '<input id="qty_dispatched'.$suffix.'" type="hidden" value="'.(float) $products_dispatched[$objp->rowid].'">'; print '<input id="qty_dispatched'.$suffix.'" type="hidden" value="'.(float) $alreadydispatched.'">';
print '<tr class="oddeven">'; print '<tr class="oddeven">';
if (empty($conf->cache['product'][$objp->fk_product])) { if (empty($conf->cache['product'][$objp->fk_product])) {
@ -860,7 +861,7 @@ if ($id > 0 || !empty($ref)) {
print '<td class="right">'.$objp->qty.'</td>'; print '<td class="right">'.$objp->qty.'</td>';
// Already dispatched // Already dispatched
print '<td class="right">'.$products_dispatched[$objp->rowid].'</td>'; print '<td class="right">'.$alreadydispatched.'</td>';
if (isModEnabled('productbatch') && $objp->tobatch > 0) { if (isModEnabled('productbatch') && $objp->tobatch > 0) {
$type = 'batch'; $type = 'batch';