From 5baba69970d9ff3ee1981706867fe0208603a185 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 28 Oct 2021 15:05:50 +0200
Subject: [PATCH] Fix regressions

---
 htdocs/bom/ajax/interface.php            | 28 ---------------
 htdocs/bom/bom_card.php                  | 44 +++++-------------------
 htdocs/bom/tpl/objectline_create.tpl.php | 24 ++++++-------
 htdocs/bom/tpl/objectline_edit.tpl.php   |  9 ++---
 htdocs/bom/tpl/objectline_title.tpl.php  | 16 +++++----
 htdocs/bom/tpl/objectline_view.tpl.php   | 15 +++-----
 6 files changed, 37 insertions(+), 99 deletions(-)
 delete mode 100644 htdocs/bom/ajax/interface.php

diff --git a/htdocs/bom/ajax/interface.php b/htdocs/bom/ajax/interface.php
deleted file mode 100644
index 23b208e25ba..00000000000
--- a/htdocs/bom/ajax/interface.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-require '../../main.inc.php';
-
-$action = GETPOST('action', 'alphanohtml');
-$select_product_val = GETPOST('select_product_val', 'int');
-$current_bom_id = GETPOST('current_bom_id', 'int');
-
-global $db;
-
-switch ($action) {
-	case 'select_BOM':
-		//Selection of nomenclatures corresponding to the selected product
-		$sql = 'SELECT b.rowid, b.ref, b.label, b.fk_product, p.label AS product_label FROM '.MAIN_DB_PREFIX.'bom_bom AS b ';
-		$sql.= ' INNER JOIN '.MAIN_DB_PREFIX.'product AS p ON b.fk_product=p.rowid';
-		$sql.= ' WHERE fk_product='.(int) $select_product_val.' AND b.rowid<>'. (int) $current_bom_id;
-		$resql = $db->query($sql);
-		if ($resql && $db->num_rows($resql) > 0) {
-			$options = array();
-			$cpt=0;
-			while ($obj = $db->fetch_object($resql)) {
-				$options[$obj->rowid] = $obj->ref.' - '.$obj->label;
-				$cpt++;
-			}
-			print json_encode($options);
-		}
-
-	break;
-}
diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index 5e86611507b..bd873f0052d 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -242,6 +242,7 @@ if (empty($reshook)) {
 	}
 }
 
+$conf->global->BOM_SUB_BOM=1;
 
 /*
  * View
@@ -573,38 +574,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline')) {
 			print '</table>';
 		}
-		?>
-		<script>
-			let select_product_val;
-			let current_bom_id = <?php echo $object->id?>;
-			//On change on the bom select
-			$('#idprod').on('change', function () {
-				select_product_val = $('#idprod').select2().val();
-
-				//Ajax to set all options without reloading the page
-				$.ajax({
-					url: 'script/interface.php'
-					, method: 'POST'
-					, dataType: 'text'
-					, data: {
-						action: 'select_BOM'
-						, select_product_val: select_product_val
-						, current_bom_id: current_bom_id
-					}
-				}).done(function (data) {
-					//To remove all options of the bom select on change
-					$('#bom_select').get(0).length = 0;
-
-					//To set options for the bom select on change
-					let options = JSON.parse(data)
-					for (let key in options) {
-						let opt = new Option(options[key], key);
-						$('#bom_select').append(opt)
-					}
-				})
-			})
-		</script>
-		<?php
 		print '</div>';
 
 		print "</form>\n";
@@ -612,9 +581,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 		<script type="text/javascript" language="javascript">
 			$(document).ready(function() {
-
+				// When clicking on collapse
 				$(".collapse_bom").click(function() {
-
+					console.log("We click on collapse");
 					var id_bom_line = $(this).attr('id').replace('collapse-', '');
 					if($(this).text().indexOf('+') > 0) {
 						$('[parentid="'+ id_bom_line +'"]').show();
@@ -628,14 +597,17 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 					return false;
 				});
 
-				//To Show all the sub bom lines
+				// To Show all the sub bom lines
 				$("#show_all").click(function() {
+					console.log("We click on show all");
 					$("[class^=sub_bom_lines]").show();
 					$("[class^=collapse_bom]").html('(-)&nbsp;');
 					return false;
 				});
-				//To Hide all the sub bom lines
+
+				// To Hide all the sub bom lines
 				$("#hide_all").click(function() {
+					console.log("We click on hide all");
 					$("[class^=sub_bom_lines]").hide();
 					$("[class^=collapse_bom]").html('(+)&nbsp;');
 					return false;
diff --git a/htdocs/bom/tpl/objectline_create.tpl.php b/htdocs/bom/tpl/objectline_create.tpl.php
index d96f8da2791..fc8c811379c 100644
--- a/htdocs/bom/tpl/objectline_create.tpl.php
+++ b/htdocs/bom/tpl/objectline_create.tpl.php
@@ -61,8 +61,6 @@ if ($nolinesbefore) {
 	print '<td class="linecoldescription minwidth500imp">';
 	print '<div id="add"></div><span class="hideonsmartphone">'.$langs->trans('AddNewLine').'</span>';
 	print '</td>';
-	// Linked BOM
-	print '<td class="linecolBOM">'.$langs->trans('BOM').'</td>';
 	print '<td class="linecolqty right">'.$langs->trans('Qty').'</td>';
 	if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 		print '<td class="linecoluseunit left">';
@@ -90,15 +88,14 @@ print '<td class="bordertop nobottom linecoldescription minwidth500imp">';
 
 // Predefined product/service
 if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
-	if ($forceall >= 0 && $freelines) {
-		echo '<br>';
+	if (!empty($conf->global->BOM_SUB_BOM)) {
+		print $langs->trans("Product");
 	}
 	echo '<span class="prod_entry_mode_predef">';
-	$filtertype = '';
-	if (!empty($object->element) && $object->element == 'contrat' && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) {
-		$filtertype = '1';
+	$filtertype = 0;
+	if (!empty($object->element) && $object->element == 'contrat' && empty($conf->global->STOCK_SUPPORT_SERVICES)) {
+		$filtertype = -1;
 	}
-
 	$statustoshow = -1;
 	if (!empty($conf->global->ENTREPOT_EXTRA_STATUS)) {
 		// hide products in closed warehouse, but show products for internal transfer
@@ -109,11 +106,14 @@ if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
 
 	echo '</span>';
 }
-$coldisplay++;
-print '<td class="bordertop nobottom linecolbom">';
-print '<select id="bom_select" name="bom_select"><options value="-1"></options></select>';
+if (!empty($conf->global->BOM_SUB_BOM)) {
+	print '<br>'.$langs->trans("or").' '.$langs->trans("BOM");
+	// TODO Add component to select a BOM
+	print '<select id="bom_select" name="bom_select"><options value="-1"></options></select>';
+}
 print '</td>';
 
+
 $coldisplay++;
 print '<td class="bordertop nobottom linecolqty right"><input type="text" size="2" name="qty" id="qty" class="flat right" value="'.(GETPOSTISSET("qty") ? GETPOST("qty", 'alpha', 2) : 1).'">';
 print '</td>';
@@ -134,7 +134,7 @@ print '</td>';
 
 $coldisplay++;
 print '<td class="bordertop nobottom nowrap linecollost right">';
-print '<input type="text" size="1" name="efficiency" id="efficiency" class="flat right" value="'.(GETPOSTISSET("efficiency") ?GETPOST("efficiency", 'alpha') : 1).'">';
+print '<input type="text" size="2" name="efficiency" id="efficiency" class="flat right" value="'.((GETPOSTISSET("efficiency") && $action == 'addline') ?GETPOST("efficiency", 'alpha') : 1).'">';
 print '</td>';
 
 $coldisplay++;
diff --git a/htdocs/bom/tpl/objectline_edit.tpl.php b/htdocs/bom/tpl/objectline_edit.tpl.php
index 54e145ad2ee..e5f24fa994f 100644
--- a/htdocs/bom/tpl/objectline_edit.tpl.php
+++ b/htdocs/bom/tpl/objectline_edit.tpl.php
@@ -97,8 +97,6 @@ print '</td>';
 */
 
 $coldisplay++;
-// For BOM
-print '<td></td>';
 
 print '<td class="nobottom linecolqty right">';
 if (($line->info_bits & 2) != 2) {
@@ -126,7 +124,7 @@ print '</td>';
 
 $coldisplay++;
 print '<td class="nobottom nowrap linecollost right">';
-print '<input type="text" size="1" name="efficiency" id="efficiency" class="flat right" value="'.$line->efficiency.'"></td>';
+print '<input type="text" size="2" name="efficiency" id="efficiency" class="flat right" value="'.$line->efficiency.'"></td>';
 
 $coldisplay++;
 print '<td class="nobottom nowrap linecolcostprice right">';
@@ -135,9 +133,8 @@ print '</td>';
 $coldisplay += $colspan;
 print '<td class="nobottom linecoledit center valignmiddle" colspan="'.$colspan.'">';
 $coldisplay += $colspan;
-print '<input type="submit" class="button buttongen marginbottomonly button-save" id="savelinebutton marginbottomonly" name="save" value="'.$langs->trans("Save").'">';
-print '<br>';
-print '<input type="submit" class="button buttongen marginbottomonly button-cancel" id="cancellinebutton" name="cancel" value="'.$langs->trans("Cancel").'">';
+print '<input type="submit" class="button buttongen margintoponly marginbottomonly button-save" id="savelinebutton" name="save" value="'.$langs->trans("Save").'">';
+print '<input type="submit" class="button buttongen margintoponly marginbottomonly button-cancel" id="cancellinebutton" name="cancel" value="'.$langs->trans("Cancel").'">';
 print '</td>';
 print '</tr>';
 
diff --git a/htdocs/bom/tpl/objectline_title.tpl.php b/htdocs/bom/tpl/objectline_title.tpl.php
index 0656f23aed9..dff3a38ccd2 100644
--- a/htdocs/bom/tpl/objectline_title.tpl.php
+++ b/htdocs/bom/tpl/objectline_title.tpl.php
@@ -39,23 +39,25 @@ if (empty($object) || !is_object($object)) {
 	exit;
 }
 print "<!-- BEGIN PHP TEMPLATE objectline_title.tpl.php -->\n";
+
+
 // Title line
 print "<thead>\n";
 
 print '<tr class="liste_titre nodrag nodrop">';
-print '<a id="show_all" href="#">'.img_picto('', 'folder-open', 'class="paddingright"').$langs->trans("ExpandAll").'</a>&nbsp;&nbsp;';
-print '<a id="hide_all" href="#">'.img_picto('', 'folder', 'class="paddingright"').$langs->trans("UndoExpandAll").'</a>&nbsp;';
 
 // Adds a line numbering column
 if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
 	print '<td class="linecolnum center">&nbsp;</td>';
 }
 
-// Description
-print '<td class="linecoldescription">'.$langs->trans('Description').'</td>';
-
-// Linked BOM
-print '<td class="linecolBOM">'.$langs->trans('BOM').'</td>';
+// Product or sub-bom
+print '<td class="linecoldescription">'.$langs->trans('Description');
+if (!empty($conf->global->BOM_SUB_BOM)) {
+	print ' &nbsp; <a id="show_all" href="#">'.img_picto('', 'folder-open', 'class="paddingright"').$langs->trans("ExpandAll").'</a>&nbsp;&nbsp;';
+	print '<a id="hide_all" href="#">'.img_picto('', 'folder', 'class="paddingright"').$langs->trans("UndoExpandAll").'</a>&nbsp;';
+}
+print '</td>';
 
 // Qty
 print '<td class="linecolqty right">'.$form->textwithpicto($langs->trans('Qty'), $langs->trans("QtyRequiredIfNoLoss")).'</td>';
diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index 8256019bd98..82626c12fec 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -82,19 +82,14 @@ $tmpproduct = new Product($object->db);
 $tmpproduct->fetch($line->fk_product);
 $tmpbom = new BOM($object->db);
 $res = $tmpbom->fetch($line->fk_bom_child);
-if (!empty($tmpbom->id)) {
+if ($tmpbom->id > 0) {
+	print $tmpbom->getNomUrl(1);
 	print '<a class="collapse_bom" id="collapse-'.$line->id.'" href="#">' . (empty($conf->global->BOM_SHOW_ALL_BOM_BY_DEFAULT) ? '(+)' : '(-)') . '&nbsp;</a>';
-}
-print $tmpproduct->getNomUrl(1);
-print ' - '.$tmpproduct->label;
-print '</td>';
-
-// To show BOM links in the list
-if ($res > 0) {
-	print '<td id="bom_id">'.$tmpbom->getNomUrl(1).'</td>';
 } else {
-		print '<td id="bom_id">&nbsp;</td>';
+	print $tmpproduct->getNomUrl(1);
+	print ' - '.$tmpproduct->label;
 }
+print '</td>';
 
 print '<td class="linecolqty nowrap right">';
 $coldisplay++;