From d5f0fe6c105d8ecd2a8d91c6e547bdef06c57eaa Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Fri, 21 Jan 2022 10:55:06 +0100
Subject: [PATCH 01/28] OF consumption batch select : wip

---
 htdocs/mrp/mo_production.php                  |  5 ++-
 .../product/class/html.formproduct.class.php  | 38 ++++++++++++++-----
 2 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index bc1a0457325..efe922a304a 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -1023,8 +1023,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 							print '<td>';
 							if ($tmpproduct->status_batch) {
 								$preselected = (GETPOSTISSET('batch-'.$line->id.'-'.$i) ? GETPOST('batch-'.$line->id.'-'.$i) : '');
-								print '<input type="text" class="width50" name="batch-'.$line->id.'-'.$i.'" value="'.$preselected.'" list="batch-'.$line->id.'-'.$i.'">';
-								print $formproduct->selectLotDataList('batch-'.$line->id.'-'.$i, 0, $line->fk_product, '', '');
+//								print '<input type="text" class="width50" name="batch-'.$line->id.'-'.$i.'" value="'.$preselected.'" list="batch-'.$line->id.'-'.$i.'">';
+								print $formproduct->selectLotDataList('batch-'.$line->id.'-'.$i, 0, $line->fk_product, 1, '');
+//								print $formproduct->selectLotStock('', 'batch-'.$line->id.'-'.$i, '', 0, '', $line->fk_product);
 							}
 							print '</td>';
 						}
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index da10faa4f34..c6365935fb8 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -626,13 +626,13 @@ class FormProduct
 	{
 		global $conf, $langs;
 
-		dol_syslog(get_class($this)."::selectLotDataList $htmlname, $empty, $fk_product, $fk_entrepot,$objectLines", LOG_DEBUG);
+		dol_syslog(get_class($this) . "::selectLotDataList $htmlname, $empty, $fk_product, $fk_entrepot,$objectLines", LOG_DEBUG);
 
 		$out = '';
 		$productIdArray = array();
 		if (!is_array($objectLines) || !count($objectLines)) {
 			if (!empty($fk_product) && $fk_product > 0) {
-				$productIdArray[] = (int) $fk_product;
+				$productIdArray[] = (int)$fk_product;
 			}
 		} else {
 			foreach ($objectLines as $line) {
@@ -644,26 +644,44 @@ class FormProduct
 
 		$nboflot = $this->loadLotStock($productIdArray);
 
-		$out .= '<datalist id="'.$htmlname.'" >';
+		$out .= '<select class="flat' . ($morecss ? ' ' . $morecss : '') . '"' . ($disabled ? ' disabled' : '') . ' id="' . $htmlname . '" name="' . ($htmlname . ($disabled ? '_disabled' : '')) . '">';
 
 		if (!empty($fk_product) && $fk_product > 0) {
-			$productIdArray = array((int) $fk_product); // only show lot stock for product
+			$productIdArray = array((int)$fk_product); // only show lot stock for product
 		} else {
 			foreach ($this->cache_lot as $key => $value) {
 				$productIdArray[] = $key;
 			}
 		}
 
+		$TBatchQuantity = array();
 		foreach ($productIdArray as $productId) {
 			foreach ($this->cache_lot[$productId] as $id => $arraytypes) {
-				if (empty($fk_entrepot) || $fk_entrepot == $arraytypes['entrepot_id']) {
-					$label = $arraytypes['entrepot_label'].' - ';
-					$label .= $arraytypes['batch'];
-					$out .= '<option>'.$arraytypes['batch'].'</option>';
-				}
+				$TBatchQuantity[$arraytypes['batch']][$arraytypes['entrepot_id']] = $arraytypes['qty'];
 			}
 		}
-		$out .= '</datalist>';
+
+
+		foreach ($TBatchQuantity as $batch => $TQtyByWarehouse) {
+
+			$label = '';
+
+			//si pas d'entrepôt, on affiche le stock total du lot, tout entrepôt compris
+			if (empty($fk_entrepot)) $label .= " (" . $langs->trans('Stock total') . " : " . array_sum($TQtyByWarehouse) . ")";
+			//sinon on affiche seulement le stock de l'entrepôt en question
+			else $label .= " (" . $langs->trans('Stock') . " : " . $TQtyByWarehouse[$fk_entrepot] . ")";
+
+			$out .= '<option value="' . $batch . '"';
+			$out .= ' data-html="' . dol_escape_htmltag($label) . '"';
+			$out .= '>';
+			$out .= $label;
+			$out .= '</option>';
+
+//			$out .= '<option>'.$arraytypes['batch'].'</option>';
+		}
+
+
+		$out .= '</select>';
 
 		return $out;
 	}

From 378473ca1f96429c6422b68d363cf2f96b983fa5 Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Fri, 21 Jan 2022 12:21:47 +0100
Subject: [PATCH 02/28] OF Consumption batch select : WIP

---
 htdocs/mrp/mo_production.php                  |  3 +-
 .../product/class/html.formproduct.class.php  | 42 ++++++++++++-------
 2 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index efe922a304a..ce35b526025 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -184,6 +184,7 @@ if (empty($reshook)) {
 		$pos = 0;
 		// Process line to consume
 		foreach ($object->lines as $line) {
+
 			if ($line->role == 'toconsume') {
 				$tmpproduct = new Product($db);
 				$tmpproduct->fetch($line->fk_product);
@@ -1024,7 +1025,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 							if ($tmpproduct->status_batch) {
 								$preselected = (GETPOSTISSET('batch-'.$line->id.'-'.$i) ? GETPOST('batch-'.$line->id.'-'.$i) : '');
 //								print '<input type="text" class="width50" name="batch-'.$line->id.'-'.$i.'" value="'.$preselected.'" list="batch-'.$line->id.'-'.$i.'">';
-								print $formproduct->selectLotDataList('batch-'.$line->id.'-'.$i, 0, $line->fk_product, 1, '');
+								print $formproduct->selectLotDataList('batch-'.$line->id.'-'.$i, 1, $line->fk_product, '');
 //								print $formproduct->selectLotStock('', 'batch-'.$line->id.'-'.$i, '', 0, '', $line->fk_product);
 							}
 							print '</td>';
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index c6365935fb8..d357383df23 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -622,7 +622,7 @@ class FormProduct
 	 *  @param	array	$objectLines	Only cache lot numbers for products in lines of object. If no lines only for fk_product. If no fk_product, all.
 	 *  @return	string					HTML datalist
 	 */
-	public function selectLotDataList($htmlname = 'batch_id', $empty = 0, $fk_product = 0, $fk_entrepot = 0, $objectLines = array())
+	public function selectLotDataList($htmlname = 'batch_id', $empty = 0, $fk_product = 0, $fk_entrepot = 0, $objectLines = array(),  $forcecombo = 0, $events = array(), $morecss = 'minwidth200', $disabled = 0, $selected = '', $empty_label = '')
 	{
 		global $conf, $langs;
 
@@ -644,7 +644,16 @@ class FormProduct
 
 		$nboflot = $this->loadLotStock($productIdArray);
 
+		if ($conf->use_javascript_ajax && !$forcecombo) {
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+			$comboenhancement = ajax_combobox($htmlname, $events);
+			$out .= $comboenhancement;
+		}
+
 		$out .= '<select class="flat' . ($morecss ? ' ' . $morecss : '') . '"' . ($disabled ? ' disabled' : '') . ' id="' . $htmlname . '" name="' . ($htmlname . ($disabled ? '_disabled' : '')) . '">';
+		if ($empty) {
+			$out .= '<option value="-1">'.($empty_label ? $empty_label : '&nbsp;').'</option>';
+		}
 
 		if (!empty($fk_product) && $fk_product > 0) {
 			$productIdArray = array((int)$fk_product); // only show lot stock for product
@@ -654,30 +663,35 @@ class FormProduct
 			}
 		}
 
+
 		$TBatchQuantity = array();
 		foreach ($productIdArray as $productId) {
 			foreach ($this->cache_lot[$productId] as $id => $arraytypes) {
-				$TBatchQuantity[$arraytypes['batch']][$arraytypes['entrepot_id']] = $arraytypes['qty'];
+				$TBatchQuantity[$productId][$arraytypes['batch']][$arraytypes['entrepot_id']] = $arraytypes['qty'];
 			}
 		}
 
+		foreach($TBatchQuantity as $id_product => $TBatchs){
 
-		foreach ($TBatchQuantity as $batch => $TQtyByWarehouse) {
+			foreach ($TBatchs as $batch => $TQtyByWarehouse) {
+				$label = $batch;
 
-			$label = '';
+				//si pas d'entrepôt, on affiche le stock total du lot, tout entrepôt compris
+				if (empty($fk_entrepot)) $label .= " (" . $langs->trans('Stock total') . " : " . array_sum($TQtyByWarehouse) . ")";
+				//sinon on affiche seulement le stock de l'entrepôt en question
+				else $label .= " (" . $langs->trans('Stock') . " : " . $TQtyByWarehouse[$fk_entrepot] . ")";
 
-			//si pas d'entrepôt, on affiche le stock total du lot, tout entrepôt compris
-			if (empty($fk_entrepot)) $label .= " (" . $langs->trans('Stock total') . " : " . array_sum($TQtyByWarehouse) . ")";
-			//sinon on affiche seulement le stock de l'entrepôt en question
-			else $label .= " (" . $langs->trans('Stock') . " : " . $TQtyByWarehouse[$fk_entrepot] . ")";
+				$out .= '<option value="' . $batch . '"';
 
-			$out .= '<option value="' . $batch . '"';
-			$out .= ' data-html="' . dol_escape_htmltag($label) . '"';
-			$out .= '>';
-			$out .= $label;
-			$out .= '</option>';
+				if ($selected == $batch) {
+					$out .= ' selected';
+				}
 
-//			$out .= '<option>'.$arraytypes['batch'].'</option>';
+				$out .= ' data-html="' . dol_escape_htmltag($label) . '"';
+				$out .= '>';
+				$out .= $label;
+				$out .= '</option>';
+			}
 		}
 
 

From 1f591c20b1f9b18f36152ff8969d7834a7acb740 Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Mon, 24 Jan 2022 15:19:47 +0100
Subject: [PATCH 03/28] MO Cosumption selectors auto : WIP

---
 htdocs/mrp/mo_production.php | 96 ++++++++++++++++++++++++++++++++++++
 1 file changed, 96 insertions(+)

diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index ce35b526025..774e691cce1 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -1014,6 +1014,54 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 						}
 						print '</td>';
 
+						?>
+
+						<script  type="text/javascript" language="javascript">
+
+							var element = $("select[name*='idwarehouse']");
+
+							element.change(function(){
+
+
+								console.log($(this).val());
+
+								$.ajax({
+									type: "POST",
+									url: "<?php echo DOL_URL_ROOT.'/mrp/ajax/interface.php'; ?>",
+									data: {
+										action: "updateselectbatchbywarehouse",
+										warehouse_id: $(this).val(),
+										fk_product : <?php echo $line->fk_product ?>
+									}
+								}).done(function( data ) {
+
+									var element2 = $("#<?php echo 'batch-'.$line->id.'-'.$i ?>");
+
+									element2.empty();
+
+									var data = JSON.parse(data);
+
+									element2.append($('<option>', {
+										value: -1,
+										text : ''
+									}));
+
+									$.each(data, function (key, value) {
+
+										element2.append($('<option>', {
+											value: key,
+											text : value
+										}));
+									});
+
+								});
+
+							});
+
+						</script>
+
+						<?php
+
 						// Stock
 						if ($conf->stock->enabled) {
 							print '<td></td>';
@@ -1029,6 +1077,54 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 //								print $formproduct->selectLotStock('', 'batch-'.$line->id.'-'.$i, '', 0, '', $line->fk_product);
 							}
 							print '</td>';
+
+							?>
+
+							<script  type="text/javascript" language="javascript">
+
+								var element = $("select[name*='batch']");
+
+								element.change(function(){
+
+									$.ajax({
+										type: "POST",
+										url: "<?php echo DOL_URL_ROOT.'/mrp/ajax/interface.php'; ?>",
+										data: {
+											action: "updateselectwarehousebybatch",
+											batch_id: $(this).val(),
+											fk_product : <?php echo $line->fk_product ?>
+										}
+									}).done(function( data ) {
+
+										console.log(data);
+
+										if(data != 0) {
+
+											var element2 = $("#<?php echo 'idwarehouse-' . $line->id . '-' . $i ?>");
+
+											element2.empty();
+
+											var data = JSON.parse(data);
+
+											$.each(data, function (key, value) {
+
+												element2.append($('<option>', {
+													value: key,
+													text: value
+												}));
+											});
+										}
+
+									});
+
+								});
+
+							</script>
+
+							<?php
+
+
+
 						}
 
 						// Action delete line

From 1f2f12717f7f989cf3714e493868dbc6816e2198 Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Mon, 24 Jan 2022 17:36:39 +0100
Subject: [PATCH 04/28] WIP

---
 htdocs/mrp/mo_production.php | 47 ++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index 774e691cce1..30a0b443129 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -989,6 +989,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 							$disable = 'disabled';
 						}
 
+						print '<input type="hidden" name="product-'.$line->id.'-'.$i.'" value="'.$line->fk_product.'">';
+
 						// Qty
 						print '<td class="right"><input type="text" class="width50 right" name="qty-'.$line->id.'-'.$i.'" value="'.$preselected.'" '.$disable.' ></td>';
 
@@ -1022,8 +1024,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 							element.change(function(){
 
+								var element = $(this);
 
-								console.log($(this).val());
+								var product_element_name = element.attr('name').replace('idwarehouse', 'product');
 
 								$.ajax({
 									type: "POST",
@@ -1031,11 +1034,12 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 									data: {
 										action: "updateselectbatchbywarehouse",
 										warehouse_id: $(this).val(),
-										fk_product : <?php echo $line->fk_product ?>
+										product_id: $("input[name='"+product_element_name+"']").val()
 									}
 								}).done(function( data ) {
 
-									var element2 = $("#<?php echo 'batch-'.$line->id.'-'.$i ?>");
+									var element2_name = element.attr('name').replace('idwarehouse', 'batch');
+									var element2 = $("select[name*='"+element2_name+"']");
 
 									element2.empty();
 
@@ -1082,10 +1086,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 							<script  type="text/javascript" language="javascript">
 
-								var element = $("select[name*='batch']");
 
 								element.change(function(){
 
+									var element = $(this);
+
 									$.ajax({
 										type: "POST",
 										url: "<?php echo DOL_URL_ROOT.'/mrp/ajax/interface.php'; ?>",
@@ -1094,27 +1099,21 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 											batch_id: $(this).val(),
 											fk_product : <?php echo $line->fk_product ?>
 										}
-									}).done(function( data ) {
-
-										console.log(data);
-
-										if(data != 0) {
-
-											var element2 = $("#<?php echo 'idwarehouse-' . $line->id . '-' . $i ?>");
-
-											element2.empty();
-
-											var data = JSON.parse(data);
-
-											$.each(data, function (key, value) {
-
-												element2.append($('<option>', {
-													value: key,
-													text: value
-												}));
-											});
-										}
+									}).done(function(data) {
 
+										// var element2_name = element.attr('id').replace('batch', 'idwarehouse');
+										// var element2 = $("select[name*='"+element2_name+"']");
+										//
+										// element2.empty();
+										//
+										// var data = JSON.parse(data);
+										//
+										// $.each(data, function (key, value) {
+										// 	element2.append($('<option>', {
+										// 		value: key,
+										// 		text: value,
+										// 	}).attr('data-html', value));
+										// });
 									});
 
 								});

From d436d7af836baab0a614970dcad0030aa594a699 Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Mon, 24 Jan 2022 18:23:26 +0100
Subject: [PATCH 05/28] WIP

---
 htdocs/mrp/mo_production.php | 198 +++++++++++++++++++----------------
 1 file changed, 105 insertions(+), 93 deletions(-)

diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index 30a0b443129..5a7de44e7bd 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -1016,56 +1016,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 						}
 						print '</td>';
 
-						?>
-
-						<script  type="text/javascript" language="javascript">
-
-							var element = $("select[name*='idwarehouse']");
-
-							element.change(function(){
-
-								var element = $(this);
-
-								var product_element_name = element.attr('name').replace('idwarehouse', 'product');
-
-								$.ajax({
-									type: "POST",
-									url: "<?php echo DOL_URL_ROOT.'/mrp/ajax/interface.php'; ?>",
-									data: {
-										action: "updateselectbatchbywarehouse",
-										warehouse_id: $(this).val(),
-										product_id: $("input[name='"+product_element_name+"']").val()
-									}
-								}).done(function( data ) {
-
-									var element2_name = element.attr('name').replace('idwarehouse', 'batch');
-									var element2 = $("select[name*='"+element2_name+"']");
-
-									element2.empty();
-
-									var data = JSON.parse(data);
-
-									element2.append($('<option>', {
-										value: -1,
-										text : ''
-									}));
-
-									$.each(data, function (key, value) {
-
-										element2.append($('<option>', {
-											value: key,
-											text : value
-										}));
-									});
-
-								});
-
-							});
-
-						</script>
-
-						<?php
-
 						// Stock
 						if ($conf->stock->enabled) {
 							print '<td></td>';
@@ -1081,49 +1031,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 //								print $formproduct->selectLotStock('', 'batch-'.$line->id.'-'.$i, '', 0, '', $line->fk_product);
 							}
 							print '</td>';
-
-							?>
-
-							<script  type="text/javascript" language="javascript">
-
-
-								element.change(function(){
-
-									var element = $(this);
-
-									$.ajax({
-										type: "POST",
-										url: "<?php echo DOL_URL_ROOT.'/mrp/ajax/interface.php'; ?>",
-										data: {
-											action: "updateselectwarehousebybatch",
-											batch_id: $(this).val(),
-											fk_product : <?php echo $line->fk_product ?>
-										}
-									}).done(function(data) {
-
-										// var element2_name = element.attr('id').replace('batch', 'idwarehouse');
-										// var element2 = $("select[name*='"+element2_name+"']");
-										//
-										// element2.empty();
-										//
-										// var data = JSON.parse(data);
-										//
-										// $.each(data, function (key, value) {
-										// 	element2.append($('<option>', {
-										// 		value: key,
-										// 		text: value,
-										// 	}).attr('data-html', value));
-										// });
-									});
-
-								});
-
-							</script>
-
-							<?php
-
-
-
 						}
 
 						// Action delete line
@@ -1412,6 +1319,111 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 		print '</div>';
 		print '</div>';
+
+		?>
+
+		<script  type="text/javascript" language="javascript">
+
+			$(document).ready(function() {
+				updateselectbatchbywarehouse();
+				updateselectwarehousebybatch();
+			});
+
+			//Lorsqu'un entrepôt est sélectionné, on propose seulement les numéro de séries qui sont disponibles dans celui-ci
+			//TODO : revoir requête sql de l'interface pour les cas suivants : si entrepôt sélectionné, alors quantité des nums individuel, sinon quantité globale
+			function updateselectbatchbywarehouse() {
+
+				var element = $("select[name*='idwarehouse']");
+
+				element.change(function () {
+
+					var element = $(this);
+
+					var product_element_name = element.attr('name').replace('idwarehouse', 'product');
+
+					$.ajax({
+						type: "POST",
+						url: "<?php echo DOL_URL_ROOT . '/mrp/ajax/interface.php'; ?>",
+						data: {
+							action: "updateselectbatchbywarehouse",
+							warehouse_id: $(this).val(),
+							product_id: $("input[name='" + product_element_name + "']").val()
+						}
+					}).done(function (data) {
+
+						console.log(data);
+						var element2_name = element.attr('name').replace('idwarehouse', 'batch');
+						var element2 = $("select[name*='" + element2_name + "']");
+
+						element2.empty();
+
+						var data = JSON.parse(data);
+
+						element2.append($('<option>', {
+							value: -1,
+							text: ''
+						}));
+
+						$.each(data, function (key, value) {
+
+							element2.append($('<option>', {
+								value: key,
+								text: value
+							}));
+						});
+
+					});
+
+				});
+			}
+
+			//Lorsqu'un numéro de lot/série est sélectionné, on propose seulement le ou les entrepôts où celui-ci est disponible
+			//TODO : revoir requête sql de l'interface pour les cas suivants : si num sélectionné, alors quantité des entrepôts individuel, sinon quantité globale
+			function updateselectwarehousebybatch() {
+				var element = $("select[name*='batch']");
+
+				element.change(function () {
+
+					var element = $(this);
+
+					var product_element_name = element.attr('name').replace('batch', 'product');
+
+					$.ajax({
+						type: "POST",
+						url: "<?php echo DOL_URL_ROOT . '/mrp/ajax/interface.php'; ?>",
+						data: {
+							action: "updateselectwarehousebybatch",
+							batch_id: $(this).val(),
+							product_id: $("input[name='" + product_element_name + "']").val()
+						}
+					}).done(function (data) {
+
+						var element2_name = element.attr('name').replace('batch', 'idwarehouse');
+						var element2 = $("select[name*='" + element2_name + "']");
+
+						element2.empty();
+
+						var data = JSON.parse(data);
+
+						element2.append($('<option>', {
+							value: -1,
+							text: ''
+						}));
+
+						$.each(data, function (key, value) {
+							element2.append($('<option>', {
+								value: key,
+								text: value,
+							}).attr('data-html', value));
+						});
+					});
+
+				});
+			}
+
+		</script>
+
+		<?php
 	}
 
 	if (in_array($action, array('consumeorproduce', 'consumeandproduceall', 'addconsumeline'))) {

From f0942a5ac6415290ee23683ea681fe45fb875786 Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Tue, 25 Jan 2022 12:33:28 +0100
Subject: [PATCH 06/28] WIP

---
 htdocs/mrp/mo_production.php | 56 ++++++++++++++++++++----------------
 1 file changed, 31 insertions(+), 25 deletions(-)

diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index 5a7de44e7bd..c74f286323d 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -1332,13 +1332,14 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			//Lorsqu'un entrepôt est sélectionné, on propose seulement les numéro de séries qui sont disponibles dans celui-ci
 			//TODO : revoir requête sql de l'interface pour les cas suivants : si entrepôt sélectionné, alors quantité des nums individuel, sinon quantité globale
 			function updateselectbatchbywarehouse() {
-
 				var element = $("select[name*='idwarehouse']");
 
 				element.change(function () {
-
 					var element = $(this);
 
+					var element2_name = element.attr('name').replace('idwarehouse', 'batch');
+					var element2 = $("select[name*='" + element2_name + "']");
+
 					var product_element_name = element.attr('name').replace('idwarehouse', 'product');
 
 					$.ajax({
@@ -1351,9 +1352,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 						}
 					}).done(function (data) {
 
-						console.log(data);
-						var element2_name = element.attr('name').replace('idwarehouse', 'batch');
-						var element2 = $("select[name*='" + element2_name + "']");
+						console.log(data)
+						var selected = element2.val();
 
 						element2.empty();
 
@@ -1366,10 +1366,20 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 						$.each(data, function (key, value) {
 
-							element2.append($('<option>', {
-								value: key,
-								text: value
-							}));
+							if(element.val() == -1) {
+								var label = key + " (<?php echo $langs->trans('Stock total') ?> : " + value + ")";
+							} else {
+								var label = key + " (<?php echo $langs->trans('Stock') ?> : " + value + ")";
+							}
+
+							if(key === selected) {
+								var option ='<option value="'+key+'" selected>'+ label +'</option>';
+							} else {
+								var option ='<option value="'+key+'">'+ label +'</option>';
+							}
+
+							element2.append(option);
+
 						});
 
 					});
@@ -1386,6 +1396,15 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 					var element = $(this);
 
+					var element2_name = element.attr('name').replace('batch', 'idwarehouse');
+					var element2 = $("select[name*='" + element2_name + "']");
+
+					var selected = element2.val();
+
+					if(selected != -1){
+						return;
+					}
+
 					var product_element_name = element.attr('name').replace('batch', 'product');
 
 					$.ajax({
@@ -1398,24 +1417,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 						}
 					}).done(function (data) {
 
-						var element2_name = element.attr('name').replace('batch', 'idwarehouse');
-						var element2 = $("select[name*='" + element2_name + "']");
-
-						element2.empty();
-
 						var data = JSON.parse(data);
 
-						element2.append($('<option>', {
-							value: -1,
-							text: ''
-						}));
-
-						$.each(data, function (key, value) {
-							element2.append($('<option>', {
-								value: key,
-								text: value,
-							}).attr('data-html', value));
-						});
+						if(data != 0){
+							element2.val(data).change();
+						}
 					});
 
 				});

From a5ab9e059a3bd678f3b7dfbd7a3ebbe1038ac431 Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Tue, 25 Jan 2022 16:25:53 +0100
Subject: [PATCH 07/28] WIP : clean code

---
 htdocs/mrp/mo_production.php | 49 ++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index c74f286323d..06445d39502 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -1330,17 +1330,21 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			});
 
 			//Lorsqu'un entrepôt est sélectionné, on propose seulement les numéro de séries qui sont disponibles dans celui-ci
-			//TODO : revoir requête sql de l'interface pour les cas suivants : si entrepôt sélectionné, alors quantité des nums individuel, sinon quantité globale
 			function updateselectbatchbywarehouse() {
 				var element = $("select[name*='idwarehouse']");
 
 				element.change(function () {
-					var element = $(this);
 
-					var element2_name = element.attr('name').replace('idwarehouse', 'batch');
-					var element2 = $("select[name*='" + element2_name + "']");
+					//select entrepôts
+					var selectwarehouse = $(this);
 
-					var product_element_name = element.attr('name').replace('idwarehouse', 'product');
+					//select lots/series
+					var selectbatch_name = selectwarehouse.attr('name').replace('idwarehouse', 'batch');
+					var selectbatch = $("select[name*='" + selectbatch_name + "']");
+					var selectedbatch = selectbatch.val();
+
+					//produit de la ligne
+					var product_element_name = selectwarehouse.attr('name').replace('idwarehouse', 'product');
 
 					$.ajax({
 						type: "POST",
@@ -1352,33 +1356,31 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 						}
 					}).done(function (data) {
 
-						console.log(data)
-						var selected = element2.val();
-
-						element2.empty();
+						selectbatch.empty();
 
 						var data = JSON.parse(data);
 
-						element2.append($('<option>', {
+						selectbatch.append($('<option>', {
 							value: -1,
 							text: ''
 						}));
 
 						$.each(data, function (key, value) {
 
-							if(element.val() == -1) {
+							//si aucun entrepôt sélectionné, alors c'est le stock total du num lot/serie qui s'affiche
+							if(selectwarehouse.val() == -1) {
 								var label = key + " (<?php echo $langs->trans('Stock total') ?> : " + value + ")";
 							} else {
 								var label = key + " (<?php echo $langs->trans('Stock') ?> : " + value + ")";
 							}
 
-							if(key === selected) {
+							if(key === selectedbatch) {
 								var option ='<option value="'+key+'" selected>'+ label +'</option>';
 							} else {
 								var option ='<option value="'+key+'">'+ label +'</option>';
 							}
 
-							element2.append(option);
+							selectbatch.append(option);
 
 						});
 
@@ -1387,24 +1389,26 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 				});
 			}
 
-			//Lorsqu'un numéro de lot/série est sélectionné, on propose seulement le ou les entrepôts où celui-ci est disponible
-			//TODO : revoir requête sql de l'interface pour les cas suivants : si num sélectionné, alors quantité des entrepôts individuel, sinon quantité globale
+			//Lorsqu'un numéro de lot/série est sélectionné et qu'il n'est disponible seulement dans un entrepôt, l'entrepôt est automatiquement sélectionné
 			function updateselectwarehousebybatch() {
 				var element = $("select[name*='batch']");
 
 				element.change(function () {
 
-					var element = $(this);
+					//select lot/série
+					var selectbatch = $(this);
 
-					var element2_name = element.attr('name').replace('batch', 'idwarehouse');
-					var element2 = $("select[name*='" + element2_name + "']");
+					//select entrepôts
+					var selectwarehouse_name = selectbatch.attr('name').replace('batch', 'idwarehouse');
+					var selectwarehouse = $("select[name*='" + selectwarehouse_name + "']");
+					var selectedwarehouse = selectwarehouse.val();
 
-					var selected = element2.val();
-
-					if(selected != -1){
+					//si un entrepôt est déjà sélectionné, alors on ne change rien
+					if(selectedwarehouse != -1){
 						return;
 					}
 
+					//produit de la ligne
 					var product_element_name = element.attr('name').replace('batch', 'product');
 
 					$.ajax({
@@ -1417,10 +1421,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 						}
 					}).done(function (data) {
 
+						console.log(data);
 						var data = JSON.parse(data);
 
 						if(data != 0){
-							element2.val(data).change();
+							selectwarehouse.val(data).change();
 						}
 					});
 

From 2ea5da3e13751f2d5cd266b050d8243df0af81ca Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Tue, 25 Jan 2022 17:16:21 +0100
Subject: [PATCH 08/28] WIP

---
 htdocs/mrp/mo_production.php                  | 17 +++----
 .../product/class/html.formproduct.class.php  | 50 ++++---------------
 2 files changed, 17 insertions(+), 50 deletions(-)

diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index 06445d39502..a9d56c1a850 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -1026,7 +1026,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 							print '<td>';
 							if ($tmpproduct->status_batch) {
 								$preselected = (GETPOSTISSET('batch-'.$line->id.'-'.$i) ? GETPOST('batch-'.$line->id.'-'.$i) : '');
-//								print '<input type="text" class="width50" name="batch-'.$line->id.'-'.$i.'" value="'.$preselected.'" list="batch-'.$line->id.'-'.$i.'">';
+								print '<input type="text" class="width50" name="batch-'.$line->id.'-'.$i.'" value="'.$preselected.'" list="batch-'.$line->id.'-'.$i.'">';
 								print $formproduct->selectLotDataList('batch-'.$line->id.'-'.$i, 1, $line->fk_product, '');
 //								print $formproduct->selectLotStock('', 'batch-'.$line->id.'-'.$i, '', 0, '', $line->fk_product);
 							}
@@ -1340,7 +1340,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 					//select lots/series
 					var selectbatch_name = selectwarehouse.attr('name').replace('idwarehouse', 'batch');
-					var selectbatch = $("select[name*='" + selectbatch_name + "']");
+					var selectbatch = $("datalist[id*='" + selectbatch_name + "']");
 					var selectedbatch = selectbatch.val();
 
 					//produit de la ligne
@@ -1357,21 +1357,21 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 					}).done(function (data) {
 
 						selectbatch.empty();
+						$('input[name*='+selectbatch_name+']').val('');
 
 						var data = JSON.parse(data);
 
 						selectbatch.append($('<option>', {
-							value: -1,
-							text: ''
+							value: '',
 						}));
 
 						$.each(data, function (key, value) {
 
 							//si aucun entrepôt sélectionné, alors c'est le stock total du num lot/serie qui s'affiche
 							if(selectwarehouse.val() == -1) {
-								var label = key + " (<?php echo $langs->trans('Stock total') ?> : " + value + ")";
+								var label = " (<?php echo $langs->trans('Stock total') ?> : " + value + ")";
 							} else {
-								var label = key + " (<?php echo $langs->trans('Stock') ?> : " + value + ")";
+								var label =  " (<?php echo $langs->trans('Stock') ?> : " + value + ")";
 							}
 
 							if(key === selectedbatch) {
@@ -1391,9 +1391,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 			//Lorsqu'un numéro de lot/série est sélectionné et qu'il n'est disponible seulement dans un entrepôt, l'entrepôt est automatiquement sélectionné
 			function updateselectwarehousebybatch() {
-				var element = $("select[name*='batch']");
 
-				element.change(function () {
+				$(document).on('change', 'input', function(){
 
 					//select lot/série
 					var selectbatch = $(this);
@@ -1409,7 +1408,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 					}
 
 					//produit de la ligne
-					var product_element_name = element.attr('name').replace('batch', 'product');
+					var product_element_name = selectbatch.attr('name').replace('batch', 'product');
 
 					$.ajax({
 						type: "POST",
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index d357383df23..ce4681db7ba 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -626,13 +626,13 @@ class FormProduct
 	{
 		global $conf, $langs;
 
-		dol_syslog(get_class($this) . "::selectLotDataList $htmlname, $empty, $fk_product, $fk_entrepot,$objectLines", LOG_DEBUG);
+		dol_syslog(get_class($this)."::selectLotDataList $htmlname, $empty, $fk_product, $fk_entrepot,$objectLines", LOG_DEBUG);
 
 		$out = '';
 		$productIdArray = array();
 		if (!is_array($objectLines) || !count($objectLines)) {
 			if (!empty($fk_product) && $fk_product > 0) {
-				$productIdArray[] = (int)$fk_product;
+				$productIdArray[] = (int) $fk_product;
 			}
 		} else {
 			foreach ($objectLines as $line) {
@@ -644,58 +644,26 @@ class FormProduct
 
 		$nboflot = $this->loadLotStock($productIdArray);
 
-		if ($conf->use_javascript_ajax && !$forcecombo) {
-			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
-			$comboenhancement = ajax_combobox($htmlname, $events);
-			$out .= $comboenhancement;
-		}
-
-		$out .= '<select class="flat' . ($morecss ? ' ' . $morecss : '') . '"' . ($disabled ? ' disabled' : '') . ' id="' . $htmlname . '" name="' . ($htmlname . ($disabled ? '_disabled' : '')) . '">';
-		if ($empty) {
-			$out .= '<option value="-1">'.($empty_label ? $empty_label : '&nbsp;').'</option>';
-		}
+		$out .= '<datalist id="'.$htmlname.'" >';
 
 		if (!empty($fk_product) && $fk_product > 0) {
-			$productIdArray = array((int)$fk_product); // only show lot stock for product
+			$productIdArray = array((int) $fk_product); // only show lot stock for product
 		} else {
 			foreach ($this->cache_lot as $key => $value) {
 				$productIdArray[] = $key;
 			}
 		}
 
-
-		$TBatchQuantity = array();
 		foreach ($productIdArray as $productId) {
 			foreach ($this->cache_lot[$productId] as $id => $arraytypes) {
-				$TBatchQuantity[$productId][$arraytypes['batch']][$arraytypes['entrepot_id']] = $arraytypes['qty'];
-			}
-		}
-
-		foreach($TBatchQuantity as $id_product => $TBatchs){
-
-			foreach ($TBatchs as $batch => $TQtyByWarehouse) {
-				$label = $batch;
-
-				//si pas d'entrepôt, on affiche le stock total du lot, tout entrepôt compris
-				if (empty($fk_entrepot)) $label .= " (" . $langs->trans('Stock total') . " : " . array_sum($TQtyByWarehouse) . ")";
-				//sinon on affiche seulement le stock de l'entrepôt en question
-				else $label .= " (" . $langs->trans('Stock') . " : " . $TQtyByWarehouse[$fk_entrepot] . ")";
-
-				$out .= '<option value="' . $batch . '"';
-
-				if ($selected == $batch) {
-					$out .= ' selected';
+				if (empty($fk_entrepot) || $fk_entrepot == $arraytypes['entrepot_id']) {
+					$label = $arraytypes['entrepot_label'].' - ';
+					$label .= $arraytypes['batch'];
+					$out .= '<option>'.$arraytypes['batch'].'</option>';
 				}
-
-				$out .= ' data-html="' . dol_escape_htmltag($label) . '"';
-				$out .= '>';
-				$out .= $label;
-				$out .= '</option>';
 			}
 		}
-
-
-		$out .= '</select>';
+		$out .= '</datalist>';
 
 		return $out;
 	}

From f5446e0801ce5d0307acc19c35df8d7c0f3a58ee Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Tue, 25 Jan 2022 17:23:48 +0100
Subject: [PATCH 09/28] Clean

---
 htdocs/product/class/html.formproduct.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index ce4681db7ba..da10faa4f34 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -622,7 +622,7 @@ class FormProduct
 	 *  @param	array	$objectLines	Only cache lot numbers for products in lines of object. If no lines only for fk_product. If no fk_product, all.
 	 *  @return	string					HTML datalist
 	 */
-	public function selectLotDataList($htmlname = 'batch_id', $empty = 0, $fk_product = 0, $fk_entrepot = 0, $objectLines = array(),  $forcecombo = 0, $events = array(), $morecss = 'minwidth200', $disabled = 0, $selected = '', $empty_label = '')
+	public function selectLotDataList($htmlname = 'batch_id', $empty = 0, $fk_product = 0, $fk_entrepot = 0, $objectLines = array())
 	{
 		global $conf, $langs;
 

From 25e8a2c75833f29a3003127aeac3a0ddb306a74b Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Wed, 26 Jan 2022 09:40:15 +0100
Subject: [PATCH 10/28] Ajout interface.php

---
 htdocs/mrp/ajax/interface.php                 | 86 +++++++++++++++++++
 htdocs/mrp/mo_production.php                  |  9 +-
 .../product/class/html.formproduct.class.php  |  2 +-
 3 files changed, 88 insertions(+), 9 deletions(-)
 create mode 100644 htdocs/mrp/ajax/interface.php

diff --git a/htdocs/mrp/ajax/interface.php b/htdocs/mrp/ajax/interface.php
new file mode 100644
index 00000000000..b91cfc34c13
--- /dev/null
+++ b/htdocs/mrp/ajax/interface.php
@@ -0,0 +1,86 @@
+<?php
+
+/**
+ *	\file       htdocs/mrp/ajax/ajax_bom.php
+ *	\brief      Ajax search component for Mrp. It get BOM content.
+ */
+
+//if (! defined('NOREQUIREUSER'))	define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
+//if (! defined('NOREQUIREDB'))		define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
+//if (! defined('NOREQUIRETRAN'))		define('NOREQUIRETRAN','1');
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', '1');
+}
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1');
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+
+global $db, $langs;
+
+require '../../main.inc.php'; // Load $user and permissions
+
+$warehouse_id = GETPOST('warehouse_id', 'int');
+$batch_id = GETPOST('batch_id', 'int');
+$fk_product = GETPOST('product_id', 'int');
+$action = GETPOST('action', 'alphanohtml');
+
+if($action == 'updateselectbatchbywarehouse') {
+
+	$TRes = array();
+
+	$sql = "SELECT pb.batch, pb.rowid, ps.fk_entrepot, pb.qty, e.ref as label, ps.fk_product";
+	$sql .= " FROM " . MAIN_DB_PREFIX . "product_batch as pb";
+	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_stock as ps on ps.rowid = pb.fk_product_stock";
+	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "entrepot as e on e.rowid = ps.fk_entrepot AND e.entity IN (" . getEntity('stock') . ")";
+	$sql .= " WHERE ps.fk_product = '" . $fk_product . "'";
+	if ($warehouse_id > 0) $sql .= " AND fk_entrepot = '" . $warehouse_id . "'";
+	$sql .= " ORDER BY e.ref, pb.batch";
+
+	$resql = $db->query($sql);
+
+	if ($resql) {
+		while ($obj = $db->fetch_object($resql)) {
+			$TRes[$obj->batch] += $obj->qty;
+		}
+	}
+
+	print json_encode($TRes);
+} elseif($action == 'updateselectwarehousebybatch'){
+
+	$res = 0;
+
+	$sql = "SELECT pb.batch, pb.rowid, ps.fk_entrepot, e.ref, pb.qty";
+	$sql .= " FROM " . MAIN_DB_PREFIX . "product_batch as pb";
+	$sql .= " JOIN " . MAIN_DB_PREFIX . "product_stock as ps on ps.rowid = pb.fk_product_stock";
+	$sql .= " JOIN " . MAIN_DB_PREFIX . "entrepot as e on e.rowid = ps.fk_entrepot AND e.entity IN (" . getEntity('stock') . ")";
+	$sql .= " WHERE ps.fk_product = '" . $fk_product . "'";
+	if ($batch_id > 0) $sql.= " AND pb.batch = '" . $batch_id . "'";
+	$sql .= " ORDER BY e.ref, pb.batch";
+
+	$resql = $db->query($sql);
+
+	if($resql){
+			if($db->num_rows($resql) == 1){
+				$obj = $db->fetch_object($resql);
+				$res = $obj->fk_entrepot;
+			}
+	}
+
+	print json_encode($res);
+
+}
+
+
+
diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index a9d56c1a850..cfb1616e751 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -1027,8 +1027,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 							if ($tmpproduct->status_batch) {
 								$preselected = (GETPOSTISSET('batch-'.$line->id.'-'.$i) ? GETPOST('batch-'.$line->id.'-'.$i) : '');
 								print '<input type="text" class="width50" name="batch-'.$line->id.'-'.$i.'" value="'.$preselected.'" list="batch-'.$line->id.'-'.$i.'">';
-								print $formproduct->selectLotDataList('batch-'.$line->id.'-'.$i, 1, $line->fk_product, '');
-//								print $formproduct->selectLotStock('', 'batch-'.$line->id.'-'.$i, '', 0, '', $line->fk_product);
+								print $formproduct->selectLotDataList('batch-'.$line->id.'-'.$i, 0, $line->fk_product, '', '');//								print $formproduct->selectLotStock('', 'batch-'.$line->id.'-'.$i, '', 0, '', $line->fk_product);
 							}
 							print '</td>';
 						}
@@ -1357,7 +1356,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 					}).done(function (data) {
 
 						selectbatch.empty();
-						$('input[name*='+selectbatch_name+']').val('');
 
 						var data = JSON.parse(data);
 
@@ -1381,11 +1379,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 							}
 
 							selectbatch.append(option);
-
 						});
-
 					});
-
 				});
 			}
 
@@ -1420,14 +1415,12 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 						}
 					}).done(function (data) {
 
-						console.log(data);
 						var data = JSON.parse(data);
 
 						if(data != 0){
 							selectwarehouse.val(data).change();
 						}
 					});
-
 				});
 			}
 
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index da10faa4f34..b9a01af1666 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -659,7 +659,7 @@ class FormProduct
 				if (empty($fk_entrepot) || $fk_entrepot == $arraytypes['entrepot_id']) {
 					$label = $arraytypes['entrepot_label'].' - ';
 					$label .= $arraytypes['batch'];
-					$out .= '<option>'.$arraytypes['batch'].'</option>';
+					$out .= '<option value="'.$arraytypes['batch'].'">('.$langs->trans('Stock Total').': '.$arraytypes['qty'].')</option>';
 				}
 			}
 		}

From ccacf2e89aee64b9f16a070d7546027266cd2311 Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Wed, 26 Jan 2022 09:49:06 +0100
Subject: [PATCH 11/28] Clean code

---
 htdocs/mrp/ajax/interface.php |  6 +-----
 htdocs/mrp/mo_production.php  | 16 ++++------------
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/htdocs/mrp/ajax/interface.php b/htdocs/mrp/ajax/interface.php
index b91cfc34c13..45709b81ac0 100644
--- a/htdocs/mrp/ajax/interface.php
+++ b/htdocs/mrp/ajax/interface.php
@@ -1,16 +1,12 @@
 <?php
 
 /**
- *	\file       htdocs/mrp/ajax/ajax_bom.php
- *	\brief      Ajax search component for Mrp. It get BOM content.
+ *	\file       htdocs/mrp/ajax/interface.php
  */
 
-//if (! defined('NOREQUIREUSER'))	define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
-//if (! defined('NOREQUIREDB'))		define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
 if (!defined('NOREQUIRESOC')) {
 	define('NOREQUIRESOC', '1');
 }
-//if (! defined('NOREQUIRETRAN'))		define('NOREQUIRETRAN','1');
 if (!defined('NOCSRFCHECK')) {
 	define('NOCSRFCHECK', '1');
 }
diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index cfb1616e751..3860e542db2 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -1027,7 +1027,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 							if ($tmpproduct->status_batch) {
 								$preselected = (GETPOSTISSET('batch-'.$line->id.'-'.$i) ? GETPOST('batch-'.$line->id.'-'.$i) : '');
 								print '<input type="text" class="width50" name="batch-'.$line->id.'-'.$i.'" value="'.$preselected.'" list="batch-'.$line->id.'-'.$i.'">';
-								print $formproduct->selectLotDataList('batch-'.$line->id.'-'.$i, 0, $line->fk_product, '', '');//								print $formproduct->selectLotStock('', 'batch-'.$line->id.'-'.$i, '', 0, '', $line->fk_product);
+								print $formproduct->selectLotDataList('batch-'.$line->id.'-'.$i, 0, $line->fk_product, '', '');
 							}
 							print '</td>';
 						}
@@ -1324,25 +1324,23 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		<script  type="text/javascript" language="javascript">
 
 			$(document).ready(function() {
+				//Consumption : When a warehouse is selected, only the lot/serial numbers that are available in it are offered
 				updateselectbatchbywarehouse();
+				//Consumption : When a lot/serial number is selected and it is only available in one warehouse, the warehouse is automatically selected
 				updateselectwarehousebybatch();
 			});
 
-			//Lorsqu'un entrepôt est sélectionné, on propose seulement les numéro de séries qui sont disponibles dans celui-ci
 			function updateselectbatchbywarehouse() {
 				var element = $("select[name*='idwarehouse']");
 
 				element.change(function () {
 
-					//select entrepôts
 					var selectwarehouse = $(this);
 
-					//select lots/series
 					var selectbatch_name = selectwarehouse.attr('name').replace('idwarehouse', 'batch');
 					var selectbatch = $("datalist[id*='" + selectbatch_name + "']");
 					var selectedbatch = selectbatch.val();
 
-					//produit de la ligne
 					var product_element_name = selectwarehouse.attr('name').replace('idwarehouse', 'product');
 
 					$.ajax({
@@ -1365,7 +1363,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 						$.each(data, function (key, value) {
 
-							//si aucun entrepôt sélectionné, alors c'est le stock total du num lot/serie qui s'affiche
 							if(selectwarehouse.val() == -1) {
 								var label = " (<?php echo $langs->trans('Stock total') ?> : " + value + ")";
 							} else {
@@ -1384,25 +1381,20 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 				});
 			}
 
-			//Lorsqu'un numéro de lot/série est sélectionné et qu'il n'est disponible seulement dans un entrepôt, l'entrepôt est automatiquement sélectionné
 			function updateselectwarehousebybatch() {
 
-				$(document).on('change', 'input', function(){
+				$(document).on('change', 'input[name*=batch]', function(){
 
-					//select lot/série
 					var selectbatch = $(this);
 
-					//select entrepôts
 					var selectwarehouse_name = selectbatch.attr('name').replace('batch', 'idwarehouse');
 					var selectwarehouse = $("select[name*='" + selectwarehouse_name + "']");
 					var selectedwarehouse = selectwarehouse.val();
 
-					//si un entrepôt est déjà sélectionné, alors on ne change rien
 					if(selectedwarehouse != -1){
 						return;
 					}
 
-					//produit de la ligne
 					var product_element_name = selectbatch.attr('name').replace('batch', 'product');
 
 					$.ajax({

From fd1fd82e5db59a8626b0f21f07e837e58f396a31 Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Wed, 26 Jan 2022 09:53:34 +0100
Subject: [PATCH 12/28] Clean

---
 htdocs/mrp/mo_production.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index 3860e542db2..7521e096dbb 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -1319,6 +1319,10 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print '</div>';
 		print '</div>';
 
+		if (in_array($action, array('consumeorproduce', 'consumeandproduceall', 'addconsumeline'))) {
+			print "</form>\n";
+		}
+
 		?>
 
 		<script  type="text/javascript" language="javascript">
@@ -1420,10 +1424,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 		<?php
 	}
-
-	if (in_array($action, array('consumeorproduce', 'consumeandproduceall', 'addconsumeline'))) {
-		print "</form>\n";
-	}
 }
 
 // End of page

From 390d8694dafb86364dbd9f17cd65316a456b6281 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 2 Feb 2022 14:38:33 +0000
Subject: [PATCH 13/28] Fixing style errors.

---
 htdocs/mrp/ajax/interface.php | 20 +++++++-------------
 htdocs/mrp/mo_production.php  |  1 -
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/htdocs/mrp/ajax/interface.php b/htdocs/mrp/ajax/interface.php
index 45709b81ac0..018f92b5dfb 100644
--- a/htdocs/mrp/ajax/interface.php
+++ b/htdocs/mrp/ajax/interface.php
@@ -32,8 +32,7 @@ $batch_id = GETPOST('batch_id', 'int');
 $fk_product = GETPOST('product_id', 'int');
 $action = GETPOST('action', 'alphanohtml');
 
-if($action == 'updateselectbatchbywarehouse') {
-
+if ($action == 'updateselectbatchbywarehouse') {
 	$TRes = array();
 
 	$sql = "SELECT pb.batch, pb.rowid, ps.fk_entrepot, pb.qty, e.ref as label, ps.fk_product";
@@ -53,8 +52,7 @@ if($action == 'updateselectbatchbywarehouse') {
 	}
 
 	print json_encode($TRes);
-} elseif($action == 'updateselectwarehousebybatch'){
-
+} elseif ($action == 'updateselectwarehousebybatch') {
 	$res = 0;
 
 	$sql = "SELECT pb.batch, pb.rowid, ps.fk_entrepot, e.ref, pb.qty";
@@ -67,16 +65,12 @@ if($action == 'updateselectbatchbywarehouse') {
 
 	$resql = $db->query($sql);
 
-	if($resql){
-			if($db->num_rows($resql) == 1){
-				$obj = $db->fetch_object($resql);
-				$res = $obj->fk_entrepot;
-			}
+	if ($resql) {
+		if ($db->num_rows($resql) == 1) {
+			$obj = $db->fetch_object($resql);
+			$res = $obj->fk_entrepot;
+		}
 	}
 
 	print json_encode($res);
-
 }
-
-
-
diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index c13d1ffed9b..976801c5e3d 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -184,7 +184,6 @@ if (empty($reshook)) {
 		$pos = 0;
 		// Process line to consume
 		foreach ($object->lines as $line) {
-
 			if ($line->role == 'toconsume') {
 				$tmpproduct = new Product($db);
 				$tmpproduct->fetch($line->fk_product);

From 19dd1374625c67a2e3e580847d51e93ab20834ba Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Mon, 7 Feb 2022 10:55:33 +0100
Subject: [PATCH 14/28] Permission and correct merge conflict error

---
 htdocs/mrp/ajax/interface.php                   |  5 +++--
 htdocs/mrp/mo_production.php                    |  2 ++
 htdocs/product/class/html.formproduct.class.php | 12 +++++-------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/htdocs/mrp/ajax/interface.php b/htdocs/mrp/ajax/interface.php
index 45709b81ac0..639e0d21642 100644
--- a/htdocs/mrp/ajax/interface.php
+++ b/htdocs/mrp/ajax/interface.php
@@ -31,8 +31,9 @@ $warehouse_id = GETPOST('warehouse_id', 'int');
 $batch_id = GETPOST('batch_id', 'int');
 $fk_product = GETPOST('product_id', 'int');
 $action = GETPOST('action', 'alphanohtml');
+$permissiontoproduce = GETPOST('permissiontoproduce', 'int');
 
-if($action == 'updateselectbatchbywarehouse') {
+if($action == 'updateselectbatchbywarehouse' && $permissiontoproduce) {
 
 	$TRes = array();
 
@@ -53,7 +54,7 @@ if($action == 'updateselectbatchbywarehouse') {
 	}
 
 	print json_encode($TRes);
-} elseif($action == 'updateselectwarehousebybatch'){
+} elseif($action == 'updateselectwarehousebybatch' && $permissiontoproduce){
 
 	$res = 0;
 
diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index c13d1ffed9b..444823c849b 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -1364,6 +1364,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 						url: "<?php echo DOL_URL_ROOT . '/mrp/ajax/interface.php'; ?>",
 						data: {
 							action: "updateselectbatchbywarehouse",
+							permissiontoproduce: <?php echo $permissiontoproduce ?>,
 							warehouse_id: $(this).val(),
 							product_id: $("input[name='" + product_element_name + "']").val()
 						}
@@ -1418,6 +1419,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 						url: "<?php echo DOL_URL_ROOT . '/mrp/ajax/interface.php'; ?>",
 						data: {
 							action: "updateselectwarehousebybatch",
+							permissiontoproduce: <?php echo $permissiontoproduce ?>,
 							batch_id: $(this).val(),
 							product_id: $("input[name='" + product_element_name + "']").val()
 						}
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index bac6c958d24..99d19a8e5f2 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -655,13 +655,11 @@ class FormProduct
 		}
 
 		foreach ($productIdArray as $productId) {
-			if (array_key_exists($productId, $this->cache_lot)) {
-				foreach ($this->cache_lot[$productId] as $id => $arraytypes) {
-					if (empty($fk_entrepot) || $fk_entrepot == $arraytypes['entrepot_id']) {
-						$label = $arraytypes['entrepot_label'] . ' - ';
-						$label .= $arraytypes['batch'];
-						$out .= '<option>' . $arraytypes['batch'] . '</option>';
-					}
+			foreach ($this->cache_lot[$productId] as $id => $arraytypes) {
+				if (empty($fk_entrepot) || $fk_entrepot == $arraytypes['entrepot_id']) {
+					$label = $arraytypes['entrepot_label'] . ' - ';
+					$label .= $arraytypes['batch'];
+					$out .= '<option value="' . $arraytypes['batch'] . '">(' . $langs->trans('Stock Total') . ': ' . $arraytypes['qty'] . ')</option>';
 				}
 			}
 		}

From 09efa97a3170f1da71236617b8b3d192b9175690 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 7 Feb 2022 10:00:17 +0000
Subject: [PATCH 15/28] Fixing style errors.

---
 htdocs/mrp/ajax/interface.php | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/htdocs/mrp/ajax/interface.php b/htdocs/mrp/ajax/interface.php
index 639e0d21642..36b17ed9354 100644
--- a/htdocs/mrp/ajax/interface.php
+++ b/htdocs/mrp/ajax/interface.php
@@ -33,8 +33,7 @@ $fk_product = GETPOST('product_id', 'int');
 $action = GETPOST('action', 'alphanohtml');
 $permissiontoproduce = GETPOST('permissiontoproduce', 'int');
 
-if($action == 'updateselectbatchbywarehouse' && $permissiontoproduce) {
-
+if ($action == 'updateselectbatchbywarehouse' && $permissiontoproduce) {
 	$TRes = array();
 
 	$sql = "SELECT pb.batch, pb.rowid, ps.fk_entrepot, pb.qty, e.ref as label, ps.fk_product";
@@ -54,8 +53,7 @@ if($action == 'updateselectbatchbywarehouse' && $permissiontoproduce) {
 	}
 
 	print json_encode($TRes);
-} elseif($action == 'updateselectwarehousebybatch' && $permissiontoproduce){
-
+} elseif ($action == 'updateselectwarehousebybatch' && $permissiontoproduce) {
 	$res = 0;
 
 	$sql = "SELECT pb.batch, pb.rowid, ps.fk_entrepot, e.ref, pb.qty";
@@ -68,16 +66,12 @@ if($action == 'updateselectbatchbywarehouse' && $permissiontoproduce) {
 
 	$resql = $db->query($sql);
 
-	if($resql){
-			if($db->num_rows($resql) == 1){
-				$obj = $db->fetch_object($resql);
-				$res = $obj->fk_entrepot;
-			}
+	if ($resql) {
+		if ($db->num_rows($resql) == 1) {
+			$obj = $db->fetch_object($resql);
+			$res = $obj->fk_entrepot;
+		}
 	}
 
 	print json_encode($res);
-
 }
-
-
-

From 1307afcddf30995f4653bf96b5890f8238c9541e Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Fri, 11 Feb 2022 11:37:13 +0100
Subject: [PATCH 16/28] FIX (int) sql request

---
 htdocs/mrp/ajax/interface.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/mrp/ajax/interface.php b/htdocs/mrp/ajax/interface.php
index 639e0d21642..1c0ebb4f73d 100644
--- a/htdocs/mrp/ajax/interface.php
+++ b/htdocs/mrp/ajax/interface.php
@@ -62,7 +62,7 @@ if($action == 'updateselectbatchbywarehouse' && $permissiontoproduce) {
 	$sql .= " FROM " . MAIN_DB_PREFIX . "product_batch as pb";
 	$sql .= " JOIN " . MAIN_DB_PREFIX . "product_stock as ps on ps.rowid = pb.fk_product_stock";
 	$sql .= " JOIN " . MAIN_DB_PREFIX . "entrepot as e on e.rowid = ps.fk_entrepot AND e.entity IN (" . getEntity('stock') . ")";
-	$sql .= " WHERE ps.fk_product = '" . $fk_product . "'";
+	$sql .= " WHERE ps.fk_product = " .((int) $fk_product);
 	if ($batch_id > 0) $sql.= " AND pb.batch = '" . $batch_id . "'";
 	$sql .= " ORDER BY e.ref, pb.batch";
 

From 5b8d80ab17e786996d6564e752a6d280f028dccd Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Mon, 14 Feb 2022 10:19:36 +0100
Subject: [PATCH 17/28] FIX SQL request

---
 htdocs/mrp/ajax/interface.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/mrp/ajax/interface.php b/htdocs/mrp/ajax/interface.php
index 17b20c9e576..c9df6ea01a2 100644
--- a/htdocs/mrp/ajax/interface.php
+++ b/htdocs/mrp/ajax/interface.php
@@ -40,7 +40,7 @@ if ($action == 'updateselectbatchbywarehouse' && $permissiontoproduce) {
 	$sql .= " FROM " . MAIN_DB_PREFIX . "product_batch as pb";
 	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_stock as ps on ps.rowid = pb.fk_product_stock";
 	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "entrepot as e on e.rowid = ps.fk_entrepot AND e.entity IN (" . getEntity('stock') . ")";
-	$sql .= " WHERE ps.fk_product = '" . $fk_product . "'";
+	$sql .= " WHERE ps.fk_product = " .((int) $fk_product);
 	if ($warehouse_id > 0) $sql .= " AND fk_entrepot = '" . $warehouse_id . "'";
 	$sql .= " ORDER BY e.ref, pb.batch";
 

From 5cf723e7a596440bf982f9d627bdfab6755de4da Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Tue, 22 Feb 2022 11:50:47 +0100
Subject: [PATCH 18/28] Ret Travis

---
 htdocs/mrp/ajax/interface.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/mrp/ajax/interface.php b/htdocs/mrp/ajax/interface.php
index c9df6ea01a2..dd35a61dcbb 100644
--- a/htdocs/mrp/ajax/interface.php
+++ b/htdocs/mrp/ajax/interface.php
@@ -41,7 +41,7 @@ if ($action == 'updateselectbatchbywarehouse' && $permissiontoproduce) {
 	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_stock as ps on ps.rowid = pb.fk_product_stock";
 	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "entrepot as e on e.rowid = ps.fk_entrepot AND e.entity IN (" . getEntity('stock') . ")";
 	$sql .= " WHERE ps.fk_product = " .((int) $fk_product);
-	if ($warehouse_id > 0) $sql .= " AND fk_entrepot = '" . $warehouse_id . "'";
+	if ($warehouse_id > 0) $sql .= " AND fk_entrepot = '" . ((int) $warehouse_id) . "'";
 	$sql .= " ORDER BY e.ref, pb.batch";
 
 	$resql = $db->query($sql);

From 49545228c850000f1865063d7e5a532e0f770fbe Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Tue, 22 Feb 2022 11:59:00 +0100
Subject: [PATCH 19/28] Travis

---
 htdocs/mrp/ajax/interface.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/mrp/ajax/interface.php b/htdocs/mrp/ajax/interface.php
index dd35a61dcbb..62ee9785a8f 100644
--- a/htdocs/mrp/ajax/interface.php
+++ b/htdocs/mrp/ajax/interface.php
@@ -61,7 +61,7 @@ if ($action == 'updateselectbatchbywarehouse' && $permissiontoproduce) {
 	$sql .= " JOIN " . MAIN_DB_PREFIX . "product_stock as ps on ps.rowid = pb.fk_product_stock";
 	$sql .= " JOIN " . MAIN_DB_PREFIX . "entrepot as e on e.rowid = ps.fk_entrepot AND e.entity IN (" . getEntity('stock') . ")";
 	$sql .= " WHERE ps.fk_product = " .((int) $fk_product);
-	if ($batch_id > 0) $sql.= " AND pb.batch = '" . $batch_id . "'";
+	if ($batch_id > 0) $sql.= " AND pb.batch = '" . ((int) $batch_id) . "'";
 	$sql .= " ORDER BY e.ref, pb.batch";
 
 	$resql = $db->query($sql);

From 5c576d0ae59156c3952c507332c7359dc1c9183c Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Tue, 8 Mar 2022 11:21:04 +0100
Subject: [PATCH 20/28] FIX updateselectwarehousebybatch : request sql must
 take batch, no id + fix delete condition

---
 htdocs/mrp/ajax/interface.php | 4 ++--
 htdocs/mrp/mo_production.php  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/mrp/ajax/interface.php b/htdocs/mrp/ajax/interface.php
index 62ee9785a8f..32c8a142a45 100644
--- a/htdocs/mrp/ajax/interface.php
+++ b/htdocs/mrp/ajax/interface.php
@@ -28,7 +28,7 @@ global $db, $langs;
 require '../../main.inc.php'; // Load $user and permissions
 
 $warehouse_id = GETPOST('warehouse_id', 'int');
-$batch_id = GETPOST('batch_id', 'int');
+$batch = GETPOST('batch', 'alphanohtml');
 $fk_product = GETPOST('product_id', 'int');
 $action = GETPOST('action', 'alphanohtml');
 $permissiontoproduce = GETPOST('permissiontoproduce', 'int');
@@ -61,7 +61,7 @@ if ($action == 'updateselectbatchbywarehouse' && $permissiontoproduce) {
 	$sql .= " JOIN " . MAIN_DB_PREFIX . "product_stock as ps on ps.rowid = pb.fk_product_stock";
 	$sql .= " JOIN " . MAIN_DB_PREFIX . "entrepot as e on e.rowid = ps.fk_entrepot AND e.entity IN (" . getEntity('stock') . ")";
 	$sql .= " WHERE ps.fk_product = " .((int) $fk_product);
-	if ($batch_id > 0) $sql.= " AND pb.batch = '" . ((int) $batch_id) . "'";
+	if ($batch) $sql.= " AND pb.batch = '" . $batch . "'";
 	$sql .= " ORDER BY e.ref, pb.batch";
 
 	$resql = $db->query($sql);
diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index 777c869b4aa..e018085bcac 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -1419,7 +1419,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 						data: {
 							action: "updateselectwarehousebybatch",
 							permissiontoproduce: <?php echo $permissiontoproduce ?>,
-							batch_id: $(this).val(),
+							batch: $(this).val(),
 							product_id: $("input[name='" + product_element_name + "']").val()
 						}
 					}).done(function (data) {

From e8e44d4ca440218ebc5861e643bf8264b265865e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 7 Apr 2022 15:17:50 +0200
Subject: [PATCH 21/28] Update interface.php

---
 htdocs/mrp/ajax/interface.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/mrp/ajax/interface.php b/htdocs/mrp/ajax/interface.php
index 32c8a142a45..271b34e5b13 100644
--- a/htdocs/mrp/ajax/interface.php
+++ b/htdocs/mrp/ajax/interface.php
@@ -61,7 +61,7 @@ if ($action == 'updateselectbatchbywarehouse' && $permissiontoproduce) {
 	$sql .= " JOIN " . MAIN_DB_PREFIX . "product_stock as ps on ps.rowid = pb.fk_product_stock";
 	$sql .= " JOIN " . MAIN_DB_PREFIX . "entrepot as e on e.rowid = ps.fk_entrepot AND e.entity IN (" . getEntity('stock') . ")";
 	$sql .= " WHERE ps.fk_product = " .((int) $fk_product);
-	if ($batch) $sql.= " AND pb.batch = '" . $batch . "'";
+	if ($batch) $sql.= " AND pb.batch = '" . $db->escape($batch) . "'";
 	$sql .= " ORDER BY e.ref, pb.batch";
 
 	$resql = $db->query($sql);

From 2f03a15956f8676675d3dbe4a073be0b2f727a6b Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Fri, 22 Apr 2022 08:47:57 +0200
Subject: [PATCH 22/28] FIX missing escape()

---
 htdocs/mrp/ajax/interface.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/mrp/ajax/interface.php b/htdocs/mrp/ajax/interface.php
index 32c8a142a45..271b34e5b13 100644
--- a/htdocs/mrp/ajax/interface.php
+++ b/htdocs/mrp/ajax/interface.php
@@ -61,7 +61,7 @@ if ($action == 'updateselectbatchbywarehouse' && $permissiontoproduce) {
 	$sql .= " JOIN " . MAIN_DB_PREFIX . "product_stock as ps on ps.rowid = pb.fk_product_stock";
 	$sql .= " JOIN " . MAIN_DB_PREFIX . "entrepot as e on e.rowid = ps.fk_entrepot AND e.entity IN (" . getEntity('stock') . ")";
 	$sql .= " WHERE ps.fk_product = " .((int) $fk_product);
-	if ($batch) $sql.= " AND pb.batch = '" . $batch . "'";
+	if ($batch) $sql.= " AND pb.batch = '" . $db->escape($batch) . "'";
 	$sql .= " ORDER BY e.ref, pb.batch";
 
 	$resql = $db->query($sql);

From 5146fee40850551b1550cb24cc56de129704eb01 Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Tue, 12 Jul 2022 13:57:22 +0200
Subject: [PATCH 23/28] FIX line deleted

---
 htdocs/product/class/html.formproduct.class.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index 8d18d5e21d3..600c645eb9f 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -655,11 +655,13 @@ class FormProduct
 		}
 
 		foreach ($productIdArray as $productId) {
-			foreach ($this->cache_lot[$productId] as $id => $arraytypes) {
-				if (empty($fk_entrepot) || $fk_entrepot == $arraytypes['entrepot_id']) {
-					$label = $arraytypes['entrepot_label'] . ' - ';
-					$label .= $arraytypes['batch'];
-					$out .= '<option value="' . $arraytypes['batch'] . '">(' . $langs->trans('Stock Total') . ': ' . $arraytypes['qty'] . ')</option>';
+			if (array_key_exists($productId, $this->cache_lot)) {
+				foreach ($this->cache_lot[$productId] as $id => $arraytypes) {
+					if (empty($fk_entrepot) || $fk_entrepot == $arraytypes['entrepot_id']) {
+						$label = $arraytypes['entrepot_label'] . ' - ';
+						$label .= $arraytypes['batch'];
+						$out .= '<option value="' . $arraytypes['batch'] . '">(' . $langs->trans('Stock Total') . ': ' . $arraytypes['qty'] . ')</option>';
+					}
 				}
 			}
 		}

From 9537fb3808b7f63e71e892fafabca141b775ea5a Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Wed, 24 Aug 2022 09:12:39 +0200
Subject: [PATCH 24/28] FIX php 8 error

---
 htdocs/mrp/ajax/interface.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/htdocs/mrp/ajax/interface.php b/htdocs/mrp/ajax/interface.php
index 271b34e5b13..ec626598808 100644
--- a/htdocs/mrp/ajax/interface.php
+++ b/htdocs/mrp/ajax/interface.php
@@ -48,11 +48,17 @@ if ($action == 'updateselectbatchbywarehouse' && $permissiontoproduce) {
 
 	if ($resql) {
 		while ($obj = $db->fetch_object($resql)) {
-			$TRes[$obj->batch] += $obj->qty;
+			if(empty($TRes[$obj->batch])){
+				$TRes[$obj->batch]  = $obj->qty;
+			} else {
+				$TRes[$obj->batch] += $obj->qty;
+			}
 		}
 	}
 
-	print json_encode($TRes);
+	echo json_encode($TRes);
+	exit();
+
 } elseif ($action == 'updateselectwarehousebybatch' && $permissiontoproduce) {
 	$res = 0;
 
@@ -73,5 +79,7 @@ if ($action == 'updateselectbatchbywarehouse' && $permissiontoproduce) {
 		}
 	}
 
-	print json_encode($res);
+	echo json_encode($res);
+	exit();
+
 }

From 797f30a2dbc734d6ecc08099732413e9d062096e Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 24 Aug 2022 07:17:51 +0000
Subject: [PATCH 25/28] Fixing style errors.

---
 htdocs/mrp/ajax/interface.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/htdocs/mrp/ajax/interface.php b/htdocs/mrp/ajax/interface.php
index ec626598808..4822294a95c 100644
--- a/htdocs/mrp/ajax/interface.php
+++ b/htdocs/mrp/ajax/interface.php
@@ -48,7 +48,7 @@ if ($action == 'updateselectbatchbywarehouse' && $permissiontoproduce) {
 
 	if ($resql) {
 		while ($obj = $db->fetch_object($resql)) {
-			if(empty($TRes[$obj->batch])){
+			if (empty($TRes[$obj->batch])) {
 				$TRes[$obj->batch]  = $obj->qty;
 			} else {
 				$TRes[$obj->batch] += $obj->qty;
@@ -58,7 +58,6 @@ if ($action == 'updateselectbatchbywarehouse' && $permissiontoproduce) {
 
 	echo json_encode($TRes);
 	exit();
-
 } elseif ($action == 'updateselectwarehousebybatch' && $permissiontoproduce) {
 	$res = 0;
 
@@ -81,5 +80,4 @@ if ($action == 'updateselectbatchbywarehouse' && $permissiontoproduce) {
 
 	echo json_encode($res);
 	exit();
-
 }

From 4e46be4e7d0de2c2f6b416d9c0be827ee2e60a6c Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Tue, 4 Apr 2023 21:29:03 +0000
Subject: [PATCH 26/28] Fixing style errors.

---
 htdocs/mrp/mo_production.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index 97aaad8ec90..4f2ef643712 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -1492,11 +1492,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print '</div>';
 	}
 
-		if (in_array($action, array('consumeorproduce', 'consumeandproduceall', 'addconsumeline'))) {
-			print "</form>\n";
-		}
+	if (in_array($action, array('consumeorproduce', 'consumeandproduceall', 'addconsumeline'))) {
+		print "</form>\n";
+	}
 
-		?>
+	?>
 
 		<script  type="text/javascript" language="javascript">
 

From 2d728b4cbba7bb8df2cdca3989985a3760cf753b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 4 Apr 2023 23:31:30 +0200
Subject: [PATCH 27/28] Update mo_production.php

---
 htdocs/mrp/mo_production.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index 4f2ef643712..a8408120b3b 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -1597,8 +1597,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 		</script>
 
-		<?php
-	}
+	<?php
 }
 
 // End of page

From 94a2b4bdfc3385285fff58365c7a7324e03a841b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 4 Apr 2023 23:35:42 +0200
Subject: [PATCH 28/28] Update interface.php

---
 htdocs/mrp/ajax/interface.php | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/htdocs/mrp/ajax/interface.php b/htdocs/mrp/ajax/interface.php
index 4822294a95c..195c9a570bd 100644
--- a/htdocs/mrp/ajax/interface.php
+++ b/htdocs/mrp/ajax/interface.php
@@ -23,15 +23,24 @@ if (!defined('NOREQUIREAJAX')) {
 	define('NOREQUIREAJAX', '1');
 }
 
-global $db, $langs;
-
 require '../../main.inc.php'; // Load $user and permissions
 
 $warehouse_id = GETPOST('warehouse_id', 'int');
 $batch = GETPOST('batch', 'alphanohtml');
 $fk_product = GETPOST('product_id', 'int');
 $action = GETPOST('action', 'alphanohtml');
-$permissiontoproduce = GETPOST('permissiontoproduce', 'int');
+
+$result = restrictedArea($user, 'mrp');
+
+$permissiontoproduce = $user->rights->mrp->write;
+
+
+
+/*
+ * View
+ */
+
+top_httphead("application/json");
 
 if ($action == 'updateselectbatchbywarehouse' && $permissiontoproduce) {
 	$TRes = array();
@@ -57,7 +66,6 @@ if ($action == 'updateselectbatchbywarehouse' && $permissiontoproduce) {
 	}
 
 	echo json_encode($TRes);
-	exit();
 } elseif ($action == 'updateselectwarehousebybatch' && $permissiontoproduce) {
 	$res = 0;
 
@@ -79,5 +87,4 @@ if ($action == 'updateselectbatchbywarehouse' && $permissiontoproduce) {
 	}
 
 	echo json_encode($res);
-	exit();
 }