From cf324f75d734f8dc7a83e0d54e16902331656f1a Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Wed, 6 Jan 2021 16:01:19 +0100
Subject: [PATCH] Fix bom line unit display #13831

---
 htdocs/bom/tpl/objectline_create.tpl.php | 1 -
 htdocs/bom/tpl/objectline_edit.tpl.php   | 1 -
 htdocs/bom/tpl/objectline_view.tpl.php   | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/htdocs/bom/tpl/objectline_create.tpl.php b/htdocs/bom/tpl/objectline_create.tpl.php
index eeffb625381..20d523ff512 100644
--- a/htdocs/bom/tpl/objectline_create.tpl.php
+++ b/htdocs/bom/tpl/objectline_create.tpl.php
@@ -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>';
 }
 
diff --git a/htdocs/bom/tpl/objectline_edit.tpl.php b/htdocs/bom/tpl/objectline_edit.tpl.php
index 3840f495dea..31a4b1ee008 100644
--- a/htdocs/bom/tpl/objectline_edit.tpl.php
+++ b/htdocs/bom/tpl/objectline_edit.tpl.php
@@ -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>';
 }
 
diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index e1e94dc2076..c9770465458 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -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);
 	}