Merge pull request #27100 from altairisfr/shiprank

add rank to shipment lines display
This commit is contained in:
Laurent Destailleur 2024-01-05 02:13:10 +01:00 committed by GitHub
commit 97584d11e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -600,7 +600,7 @@ if ($id > 0 || !empty($ref)) {
$sql = "SELECT cd.rowid, cd.fk_product, cd.product_type as type, cd.label, cd.description,";
$sql .= " cd.price, cd.tva_tx, cd.subprice,";
$sql .= " cd.qty, cd.fk_unit,";
$sql .= " cd.qty, cd.fk_unit, cd.rang,";
$sql .= ' cd.date_start,';
$sql .= ' cd.date_end,';
$sql .= ' cd.special_code,';
@ -623,6 +623,9 @@ if ($id > 0 || !empty($ref)) {
$i = 0;
print '<thead>';
print '<tr class="liste_titre">';
if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER')) {
print '<th>'.$langs->trans("Rank").'</th>';
}
print '<th>'.$langs->trans("Description").'</th>';
print '<th class="center">'.$langs->trans("QtyOrdered").'</th>';
print '<th class="center">'.$langs->trans("QtyShipped").'</th>';
@ -661,6 +664,11 @@ if ($id > 0 || !empty($ref)) {
print '<tr class="oddeven">';
// Rank
if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER')) {
print '<td class="center">'.$objp->rang.'</td>';
}
// Product label
if ($objp->fk_product > 0) {
// Define output language