Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions htdocs/fourn/commande/dispatch.php
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,7 @@
}

//$sql = "SELECT l.rowid, l.fk_product, l.subprice, l.remise_percent, l.ref AS sref, SUM(l.qty) as qty,";
$sql = "SELECT l.rowid, l.fk_product, l.subprice, l.remise_percent, l.ref AS sref, l.qty as qty,";
$sql = "SELECT l.rowid, l.fk_product, l.subprice, l.remise_percent, l.ref AS sref, l.qty as qty, l.description,";
$sql .= " p.ref, p.label, p.tobatch, p.fk_default_warehouse";

// Enable hooks to alter the SQL query (SELECT)
Expand Down Expand Up @@ -816,9 +816,6 @@
if ($remaintodispatch || !getDolGlobalString('SUPPLIER_ORDER_DISABLE_STOCK_DISPATCH_WHEN_TOTAL_REACHED')) {
$nbproduct++;

// To show detail cref and description value, we must make calculation by cref
// print ($objp->cref?' ('.$objp->cref.')':'');
// if ($objp->description) print '<br>'.nl2br($objp->description);
$suffix = '_0_'.$i;

print "\n";
Expand All @@ -838,6 +835,9 @@

$linktoprod = $tmpproduct->getNomUrl(1);
$linktoprod .= ' - '.$objp->label."\n";
if (!empty($objp->description) && $objp->description != $objp->label) {
$linktoprod = $form->textwithtooltip($linktoprod, dol_htmlentitiesbr($objp->description));
}

if (isModEnabled('productbatch')) {
if ($objp->tobatch) {
Expand Down
8 changes: 4 additions & 4 deletions htdocs/reception/dispatch.php
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@


//$sql = "SELECT l.rowid, l.fk_product, l.subprice, l.remise_percent, l.ref AS sref, SUM(l.qty) as qty,";
$sql = "SELECT l.rowid, l.fk_product, l.subprice, l.remise_percent, l.ref AS sref, l.qty as qty,";
$sql = "SELECT l.rowid, l.fk_product, l.subprice, l.remise_percent, l.ref AS sref, l.qty as qty, l.description,";
$sql .= " p.ref, p.label, p.tobatch, p.fk_default_warehouse";
// Enable hooks to alter the SQL query (SELECT)
$parameters = array();
Expand Down Expand Up @@ -609,9 +609,6 @@
if ($remaintodispatch || !getDolGlobalString('SUPPLIER_ORDER_DISABLE_STOCK_DISPATCH_WHEN_TOTAL_REACHED')) {
$nbproduct++;

// To show detail cref and description value, we must make calculation by cref
// print ($objp->cref?' ('.$objp->cref.')':'');
// if ($objp->description) print '<br>'.nl2br($objp->description);
$suffix = '_0_'.$i;

print "\n";
Expand All @@ -631,6 +628,9 @@

$linktoprod = $tmpproduct->getNomUrl(1);
$linktoprod .= ' - '.$objp->label."\n";
if (!empty($objp->description) && $objp->description != $objp->label) {
$linktoprod = $form->textwithtooltip($linktoprod, dol_htmlentitiesbr($objp->description));
}

if (isModEnabled('productbatch')) {
if ($objp->tobatch) {
Expand Down
Loading