From c56f1805153888a7a43d13ed230c9634a43c362a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 23 Nov 2021 21:52:40 +0100
Subject: [PATCH] can merge products but experimental

---
 htdocs/bom/class/bom.class.php | 17 +++++++++++++++++
 htdocs/product/card.php        |  4 ++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index fd8d4a19a75..ae352623d42 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -1078,6 +1078,23 @@ class BOM extends CommonObject
 			}
 		}
 	}
+
+	/**
+	 * Function used to replace a product id with another one.
+	 *
+	 * @param DoliDB $db Database handler
+	 * @param int $origin_id Old product id
+	 * @param int $dest_id New product id
+	 * @return bool
+	 */
+	public static function replaceProduct(DoliDB $db, $origin_id, $dest_id)
+	{
+		$tables = array(
+			'bom_bomline'
+		);
+
+		return CommonObject::commonReplaceProduct($db, $origin_id, $dest_id, $tables);
+	}
 }
 
 
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 06a5a4102ff..41ecd4ff56c 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -318,7 +318,7 @@ if (empty($reshook)) {
 						'Commande' => '/commande/class/commande.class.php',
 						'Facture' => '/compta/facture/class/facture.class.php',
 						'FactureRec' => '/compta/facture/class/facture-rec.class.php',
-						// 'Mo' => '/mrp/class/mo.class.php',
+						'Bom' => '/bom/class/bom.class.php',
 						'Contrat' => '/contrat/class/contrat.class.php',
 						'Expedition' => '/expedition/class/expedition.class.php',
 						'Fichinter' => '/fichinter/class/fichinter.class.php',
@@ -2679,7 +2679,7 @@ if ($action == 'merge') {
 			'name' => 'product_origin',
 			'label' => $langs->trans('MergeOriginProduct'),
 			'type' => 'other',
-			'value' => $form->select_produits('', 'product_origin', '', 0, 0, 1, 2, '', 1, array(), 0, 1, 0, '', 0, '', null, 1),
+			'value' => $form->select_produits('', 'product_origin', '', 0, 0, 1, 2, '', 1, array(), 0, 1, 0, 'minwidth200', 0, '', null, 1),
 		)
 	);
 	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("MergeProducts"), $langs->trans("ConfirmMergeProducts"), "confirm_merge", $formquestion, 'no', 1, 250);