Merge pull request #15913 from atm-john/fix/12.0_bom_unit

FIX bom line unit display #13831
This commit is contained in:
Laurent Destailleur 2021-01-06 19:31:59 +01:00 committed by GitHub
commit 35d74035be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 3 deletions

View File

@ -116,7 +116,6 @@ if ($conf->global->PRODUCT_USE_UNITS)
{
$coldisplay++;
print '<td class="nobottom linecoluseunit left">';
print $form->selectUnits($line->fk_unit, "units");
print '</td>';
}

View File

@ -112,7 +112,6 @@ if ($conf->global->PRODUCT_USE_UNITS)
{
$coldisplay++;
print '<td class="nobottom linecoluseunit left">';
print $form->selectUnits($line->fk_unit, "units");
print '</td>';
}

View File

@ -82,7 +82,7 @@ print '</td>';
if ($conf->global->PRODUCT_USE_UNITS)
{
print '<td class="linecoluseunit nowrap left">';
$label = $line->getLabelOfUnit('short');
$label = $tmpproduct->getLabelOfUnit('short');
if ($label !== '') {
print $langs->trans($label);
}