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

Merge pull request #14991 from FHenry/dev_fixBOM_withunit_feature

Browse Source 
Dev fix bom with PRODUCT USE UNIT feature
This commit is contained in:
Laurent Destailleur 2020-10-12 12:55:00 +02:00 committed by GitHub
commit a1c01b6408
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/bom/tpl/objectline_create.tpl.php
View File

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

2
htdocs/bom/tpl/objectline_edit.tpl.php
View File

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

2
htdocs/bom/tpl/objectline_view.tpl.php
View File

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