From dd5c61d9f2adeced4cf761583f589ca220b657d2 Mon Sep 17 00:00:00 2001
From: x <x@x.x>
Date: Thu, 20 Apr 2023 09:57:49 +0200
Subject: [PATCH] Bom : Display workstation of line

---
 htdocs/bom/bom_card.php                | 2 +-
 htdocs/bom/tpl/objectline_view.tpl.php | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index 14a165315f4..001d5fa3c05 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -171,7 +171,7 @@ if (empty($reshook)) {
 		$efficiency = price2num(GETPOST('efficiency', 'alpha'));
 		$fk_unit = GETPOST('fk_unit', 'alphanohtml');
 
-		if(!empty($idprod)){
+		if(!empty($idprod) && $conf->workstation->enabled){
 			$product = new Product($db);
 			$res = $product->fetch($idprod);
 			if($res > 0 && $product->type == Product::TYPE_SERVICE) $fk_default_workstation = $product->fk_default_workstation;
diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index d000118e1b9..cfe63286339 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -158,9 +158,10 @@ if ($filtertype != 1) {
 	// Work station
 	if (isModEnabled('workstation')) {
 		$workstation = new Workstation($object->db);
-		$res = $workstation->fetch($tmpproduct->fk_default_workstation);
+		$fk_default_workstation = (!empty($line->fk_default_workstation)) ? $line->fk_default_workstation : $tmpproduct->fk_default_workstation;
+		$res = $workstation->fetch($fk_default_workstation);
 
-		print '<td class="linecolunit nowrap right">';
+		print '<td class="linecolworkstation nowrap right">';
 		$coldisplay++;
 		if ($res > 0) echo $workstation->getNomUrl();
 		print '</td>';