Fix: on n'affiche pas la description du produit dans le récap des expéditions car fait doublon
This commit is contained in:
parent
c1c5369f28
commit
1e24541133
@ -510,7 +510,7 @@ if ($_GET["id"] > 0)
|
|||||||
{
|
{
|
||||||
print '<br>';
|
print '<br>';
|
||||||
|
|
||||||
$sql = "SELECT cd.fk_product, cd.description, cd.rowid, cd.qty as qty_asked";
|
$sql = "SELECT cd.fk_product, cd.rowid, cd.qty as qty_asked";
|
||||||
$sql .= ", ed.qty as qty_shipped, e.ref, ed.fk_expedition as expedition_id";
|
$sql .= ", ed.qty as qty_shipped, e.ref, ed.fk_expedition as expedition_id";
|
||||||
$sql .= ", ".$db->pdate("e.date_expedition")." as date_expedition";
|
$sql .= ", ".$db->pdate("e.date_expedition")." as date_expedition";
|
||||||
if ($conf->livraison->enabled) $sql .= ", l.rowid as livraison_id, l.ref as livraison_ref";
|
if ($conf->livraison->enabled) $sql .= ", l.rowid as livraison_id, l.ref as livraison_ref";
|
||||||
@ -562,7 +562,6 @@ if ($_GET["id"] > 0)
|
|||||||
|
|
||||||
print '<td>';
|
print '<td>';
|
||||||
print '<a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$objp->fk_product.'">'.img_object($langs->trans("ShowProduct"),"product").' '.$product->ref.'</a> - '.$product->libelle;
|
print '<a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$objp->fk_product.'">'.img_object($langs->trans("ShowProduct"),"product").' '.$product->ref.'</a> - '.$product->libelle;
|
||||||
if ($objp->description) print '<br>'.nl2br($objp->description);
|
|
||||||
print '</td>';
|
print '</td>';
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user