From c7ff60866a871af82322722b8d163a94be0f218d Mon Sep 17 00:00:00 2001
From: Stephan Steininger <stephan.steininger@gw-it.eu>
Date: Mon, 27 Sep 2021 10:04:59 +0200
Subject: [PATCH 1/7] load existing batch numbers for item  within mrp
 consumtion

---
 htdocs/mrp/mo_production.php                    | 10 ++++++++--
 htdocs/product/class/html.formproduct.class.php |  9 +++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index 84dab109b91..9bde31e2a53 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -945,7 +945,12 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 						if ($action == 'consumeorproduce' && !GETPOSTISSET('qty-'.$line->id.'-'.$i)) {
 							$preselected = 0;
 						}
-						print '<td class="right"><input type="text" class="width50 right" name="qty-'.$line->id.'-'.$i.'" value="'.$preselected.'"></td>';
+					
+						$disable = 'disabled';
+						if ( ($line->qty - $alreadyconsumed) > 0 )
+							$disable = '';
+
+						print '<td class="right"><input type="text" class="width50 right" name="qty-'.$line->id.'-'.$i.'" value="'.$preselected.'" '.$disable.' ></td>';
 						if ($permissiontoupdatecost && !empty($conf->global->MRP_SHOW_COST_FOR_CONSUMPTION)) {
 							print '<td></td>';
 						}
@@ -967,7 +972,8 @@ 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.'">';
+								print '<td>'.$formproduct->selectLotStock('', 'batch-'.$line->id.'-'.$i, '', 1, 0, $line->fk_product,'','','','','','',1).'</td>';
+								//print '<input type="text" class="width50" name="batch-'.$line->id.'-'.$i.'" value="'.$preselected.'">';
 							}
 							print '</td>';
 						}
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index 64517c25443..75e731873d1 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -536,10 +536,11 @@ class FormProduct
 	 *  @param	int		$forcecombo		1=Force combo iso ajax select2
 	 *  @param	array	$events			Events to add to select2
 	 *  @param  string  $morecss		Add more css classes to HTML select
+	 *  @param int $use_baseval 1=uses batch as value within select
 	 *
 	 * 	@return	string					HTML select
 	 */
-	public function selectLotStock($selected = '', $htmlname = 'batch_id', $filterstatus = '', $empty = 0, $disabled = 0, $fk_product = 0, $fk_entrepot = 0, $objectLines = array(), $empty_label = '', $forcecombo = 0, $events = array(), $morecss = 'minwidth200')
+	public function selectLotStock($selected = '', $htmlname = 'batch_id', $filterstatus = '', $empty = 0, $disabled = 0, $fk_product = 0, $fk_entrepot = 0, $objectLines = array(), $empty_label = '', $forcecombo = 0, $events = array(), $morecss = 'minwidth200', $use_baseval = 0)
 	{
 		global $conf, $langs;
 
@@ -590,7 +591,11 @@ class FormProduct
 						$label .= ' <span class=\'opacitymedium\'>('.$langs->trans("Stock").' '.$arraytypes['qty'].')</span>';
 					}
 
-					$out .= '<option value="'.$id.'"';
+					if ( $use_baseval = 1 )
+						$out .= '<option value="'.$arraytypes['batch'].'"';
+					else
+						$out .= '<option value="'.$id.'"';
+					
 					if ($selected == $id || ($selected == 'ifone' && $nboflot == 1)) {
 						$out .= ' selected';
 					}

From 526380a4b8994fe31cdc9a58de7d7852e5c6bc12 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 27 Sep 2021 08:10:49 +0000
Subject: [PATCH 2/7] Fixing style errors.

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

diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index 9bde31e2a53..ad95164a2af 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -945,7 +945,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 						if ($action == 'consumeorproduce' && !GETPOSTISSET('qty-'.$line->id.'-'.$i)) {
 							$preselected = 0;
 						}
-					
+
 						$disable = 'disabled';
 						if ( ($line->qty - $alreadyconsumed) > 0 )
 							$disable = '';
@@ -972,7 +972,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 '<td>'.$formproduct->selectLotStock('', 'batch-'.$line->id.'-'.$i, '', 1, 0, $line->fk_product,'','','','','','',1).'</td>';
+								print '<td>'.$formproduct->selectLotStock('', 'batch-'.$line->id.'-'.$i, '', 1, 0, $line->fk_product, '', '', '', '', '', '', 1).'</td>';
 								//print '<input type="text" class="width50" name="batch-'.$line->id.'-'.$i.'" value="'.$preselected.'">';
 							}
 							print '</td>';
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index 75e731873d1..b352264d8cb 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -593,9 +593,8 @@ class FormProduct
 
 					if ( $use_baseval = 1 )
 						$out .= '<option value="'.$arraytypes['batch'].'"';
-					else
-						$out .= '<option value="'.$id.'"';
-					
+					else $out .= '<option value="'.$id.'"';
+
 					if ($selected == $id || ($selected == 'ifone' && $nboflot == 1)) {
 						$out .= ' selected';
 					}

From 0ae0d13f8ba2835933fcd8632b72759f4f87eaa1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 28 Sep 2021 12:20:02 +0200
Subject: [PATCH 3/7] Update mo_production.php

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

diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index ad95164a2af..fe89eef05b3 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -946,10 +946,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 							$preselected = 0;
 						}
 
-						$disable = 'disabled';
-						if ( ($line->qty - $alreadyconsumed) > 0 )
-							$disable = '';
-
+						$disable = '';
+						if (!empty($conf->global->MRP_NEVER_CONSUME_MORE_THAN_EXPECTED) && ($line->qty - $alreadyconsumed) <= 0) {
+							$disable = 'disabled';
+						}
+						
 						print '<td class="right"><input type="text" class="width50 right" name="qty-'.$line->id.'-'.$i.'" value="'.$preselected.'" '.$disable.' ></td>';
 						if ($permissiontoupdatecost && !empty($conf->global->MRP_SHOW_COST_FOR_CONSUMPTION)) {
 							print '<td></td>';

From 9e951d9a51698451360b0ec3d358ab990401153e Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Tue, 28 Sep 2021 10:20:21 +0000
Subject: [PATCH 4/7] Fixing style errors.

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

diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index fe89eef05b3..11027cf718a 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -950,7 +950,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 						if (!empty($conf->global->MRP_NEVER_CONSUME_MORE_THAN_EXPECTED) && ($line->qty - $alreadyconsumed) <= 0) {
 							$disable = 'disabled';
 						}
-						
+
 						print '<td class="right"><input type="text" class="width50 right" name="qty-'.$line->id.'-'.$i.'" value="'.$preselected.'" '.$disable.' ></td>';
 						if ($permissiontoupdatecost && !empty($conf->global->MRP_SHOW_COST_FOR_CONSUMPTION)) {
 							print '<td></td>';

From 94cc75cb696debb235f9f3092d162d454860a00e Mon Sep 17 00:00:00 2001
From: Stephan Steininger <stephan.steininger@gw-it.eu>
Date: Thu, 30 Sep 2021 13:56:43 +0200
Subject: [PATCH 5/7] Changed input type from select to input. New function
 selectLot

---
 htdocs/mrp/mo_production.php                  |  4 +-
 .../product/class/html.formproduct.class.php  | 68 +++++++++++++++++--
 2 files changed, 65 insertions(+), 7 deletions(-)

diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index 11027cf718a..950f427ed87 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -973,8 +973,8 @@ 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 '<td>'.$formproduct->selectLotStock('', 'batch-'.$line->id.'-'.$i, '', 1, 0, $line->fk_product, '', '', '', '', '', '', 1).'</td>';
-								//print '<input type="text" class="width50" name="batch-'.$line->id.'-'.$i.'" value="'.$preselected.'">';
+								print '<input type="text" class="width50" name="batch-'.$line->id.'-'.$i.'" value="'.$preselected.'" list="batch-'.$line->id.'-'.$i.'">';
+								print $formproduct->selectLot('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 b352264d8cb..d627cb54151 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -536,11 +536,10 @@ class FormProduct
 	 *  @param	int		$forcecombo		1=Force combo iso ajax select2
 	 *  @param	array	$events			Events to add to select2
 	 *  @param  string  $morecss		Add more css classes to HTML select
-	 *  @param int $use_baseval 1=uses batch as value within select
 	 *
 	 * 	@return	string					HTML select
 	 */
-	public function selectLotStock($selected = '', $htmlname = 'batch_id', $filterstatus = '', $empty = 0, $disabled = 0, $fk_product = 0, $fk_entrepot = 0, $objectLines = array(), $empty_label = '', $forcecombo = 0, $events = array(), $morecss = 'minwidth200', $use_baseval = 0)
+	public function selectLotStock($selected = '', $htmlname = 'batch_id', $filterstatus = '', $empty = 0, $disabled = 0, $fk_product = 0, $fk_entrepot = 0, $objectLines = array(), $empty_label = '', $forcecombo = 0, $events = array(), $morecss = 'minwidth200' )
 	{
 		global $conf, $langs;
 
@@ -591,9 +590,7 @@ class FormProduct
 						$label .= ' <span class=\'opacitymedium\'>('.$langs->trans("Stock").' '.$arraytypes['qty'].')</span>';
 					}
 
-					if ( $use_baseval = 1 )
-						$out .= '<option value="'.$arraytypes['batch'].'"';
-					else $out .= '<option value="'.$id.'"';
+					$out .= '<option value="'.$id.'"';
 
 					if ($selected == $id || ($selected == 'ifone' && $nboflot == 1)) {
 						$out .= ' selected';
@@ -613,6 +610,67 @@ class FormProduct
 		return $out;
 	}
 
+
+
+	/**
+	 *  Return list of lot numbers (stock from product_batch) with stock location and stock qty
+	 *
+	 *  @param  string	$htmlname		Name of html select html
+	 *  @param  int		$empty			1=Can be empty, 0 if not
+	 * 	@param	int		$fk_product		show lot numbers of product with id fk_product. All from objectLines if 0.
+	 * 	@param	int		$fk_entrepot	filter lot numbers for warehouse with id fk_entrepot. All if 0.
+	 * 	@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.
+	 *  @param int $use_baseval 1=uses batch as value within select
+	 *
+	 * 	@return	string					HTML select
+	 */
+	public function selectLot( $htmlname = 'batch_id', $empty = 0, $fk_product = 0, $fk_entrepot = 0, $objectLines = array() )
+	{
+		global $conf, $langs;
+
+		dol_syslog(get_class($this)."::selectLot $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;
+			}
+		} else {
+			foreach ($objectLines as $line) {
+				if ($line->fk_product) {
+					$productIdArray[] = $line->fk_product;
+				}
+			}
+		}
+
+		$nboflot = $this->loadLotStock($productIdArray);
+
+		$out .= '<datalist id="'.$htmlname.'" >';
+
+		if (!empty($fk_product) && $fk_product > 0) {
+			$productIdArray = array((int) $fk_product); // only show lot stock for product
+		} else {
+			foreach ($this->cache_lot as $key => $value) {
+				$productIdArray[] = $key;
+			}
+		}
+
+		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>';
+				}
+			}
+		}
+		$out .= '</datalist>';
+
+		return $out;
+	}
+
+
 	/**
 	 * Load in cache array list of lot available in stock from a given list of products
 	 *

From b069f819653b9d9c715e782db99d10ffbe7d73ab Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 30 Sep 2021 11:58:20 +0000
Subject: [PATCH 6/7] Fixing style errors.

---
 htdocs/product/class/html.formproduct.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index d627cb54151..416e2333e68 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -539,7 +539,7 @@ class FormProduct
 	 *
 	 * 	@return	string					HTML select
 	 */
-	public function selectLotStock($selected = '', $htmlname = 'batch_id', $filterstatus = '', $empty = 0, $disabled = 0, $fk_product = 0, $fk_entrepot = 0, $objectLines = array(), $empty_label = '', $forcecombo = 0, $events = array(), $morecss = 'minwidth200' )
+	public function selectLotStock($selected = '', $htmlname = 'batch_id', $filterstatus = '', $empty = 0, $disabled = 0, $fk_product = 0, $fk_entrepot = 0, $objectLines = array(), $empty_label = '', $forcecombo = 0, $events = array(), $morecss = 'minwidth200')
 	{
 		global $conf, $langs;
 
@@ -624,7 +624,7 @@ class FormProduct
 	 *
 	 * 	@return	string					HTML select
 	 */
-	public function selectLot( $htmlname = 'batch_id', $empty = 0, $fk_product = 0, $fk_entrepot = 0, $objectLines = array() )
+	public function selectLot($htmlname = 'batch_id', $empty = 0, $fk_product = 0, $fk_entrepot = 0, $objectLines = array())
 	{
 		global $conf, $langs;
 

From 2e2048f6d83da812166124ae12ab2300923b4bde Mon Sep 17 00:00:00 2001
From: Stephan Steininger <stephan.steininger@gw-it.eu>
Date: Thu, 30 Sep 2021 15:06:57 +0200
Subject: [PATCH 7/7] Update documentation

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

diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index d627cb54151..845be10384d 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -617,12 +617,11 @@ class FormProduct
 	 *
 	 *  @param  string	$htmlname		Name of html select html
 	 *  @param  int		$empty			1=Can be empty, 0 if not
-	 * 	@param	int		$fk_product		show lot numbers of product with id fk_product. All from objectLines if 0.
-	 * 	@param	int		$fk_entrepot	filter lot numbers for warehouse with id fk_entrepot. All if 0.
-	 * 	@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.
-	 *  @param int $use_baseval 1=uses batch as value within select
+	 *  @param	int		$fk_product		show lot numbers of product with id fk_product. All from objectLines if 0.
+	 *  @param	int		$fk_entrepot	filter lot numbers for warehouse with id fk_entrepot. All if 0.
+	 *  @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 select
+	 *  @return	string					HTML datalist
 	 */
 	public function selectLot( $htmlname = 'batch_id', $empty = 0, $fk_product = 0, $fk_entrepot = 0, $objectLines = array() )
 	{