From 325ad45bca794a69f12c0d45e5ad9954f3328529 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Fri, 3 Dec 2021 16:04:23 +0100
Subject: [PATCH] update scan inventory error gestion

---
 htdocs/langs/en_US/stocks.lang                |  3 +-
 .../inventory/ajax/searchfrombarcode.php      | 17 ++--
 htdocs/product/inventory/inventory.php        | 77 +++++++++++--------
 3 files changed, 60 insertions(+), 37 deletions(-)

diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index 75b6ea1bd4e..c26a8819a1d 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -265,4 +265,5 @@ ProductBarcodeDoesNotExist=Product with barcode does not exist
 WarehouseId=Warehouse ID
 WarehouseRef=Warehouse Ref
 SaveQtyFirst=Save the real inventoried quantities first, before asking creation of the stock movement.
-InventoryStartedShort=Started
\ No newline at end of file
+InventoryStartedShort=Started
+ErrorOnElementsInventory=Scan was aborted due to following barcode or batch number on error
\ No newline at end of file
diff --git a/htdocs/product/inventory/ajax/searchfrombarcode.php b/htdocs/product/inventory/ajax/searchfrombarcode.php
index c4d53719d65..8dfac96c32b 100644
--- a/htdocs/product/inventory/ajax/searchfrombarcode.php
+++ b/htdocs/product/inventory/ajax/searchfrombarcode.php
@@ -60,18 +60,25 @@ $warehouseid = 0;
 $objectreturn = array();
 
 if ($action == "existbarcode" && !empty($barcode)) {
-	$sql = "SELECT ps.fk_entrepot, ps.fk_product, p.barcode,ps.reel";
-	$sql .= " FROM ".MAIN_DB_PREFIX."product_stock as ps JOIN ".MAIN_DB_PREFIX."product as p ON ps.fk_product = p.rowid";
-	$sql .= " WHERE p.barcode = '".$db->escape($barcode)."'";
+	if (!empty($mode) && $mode == "lotserial") {
+		$sql = "SELECT ps.fk_entrepot, ps.fk_product, p.barcode, ps.reel, pb.batch";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_batch as pb";
+		$sql .= " JOIN ".MAIN_DB_PREFIX."product_stock as ps ON pb.fk_product_stock = ps.rowid JOIN ".MAIN_DB_PREFIX."product as p ON ps.fk_product = p.rowid";
+		$sql .= " WHERE pb.batch = '".$db->escape($barcode)."'";
+	} else {
+		$sql = "SELECT ps.fk_entrepot, ps.fk_product, p.barcode,ps.reel";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_stock as ps JOIN ".MAIN_DB_PREFIX."product as p ON ps.fk_product = p.rowid";
+		$sql .= " WHERE p.barcode = '".$db->escape($barcode)."'";
+	}
 	if (!empty($fk_entrepot)) {
-		$sql .= "AND ps.fk_entrepot = '".$db->escape($fk_entrepot)."'";
+		$sql .= " AND ps.fk_entrepot = '".$db->escape($fk_entrepot)."'";
 	}
 	$result = $db->query($sql);
 	if ($result) {
 		$nbline = $db->num_rows($result);
 		for ($i=0; $i < $nbline; $i++) {
 			$object = $db->fetch_object($result);
-			if ($barcode == $object->barcode) {
+			if (($mode == "barcode" && $barcode == $object->barcode) || ($mode == "lotserial" && $barcode == $object->batch)) {
 				$warehouse->fetch(0, $product["Warehouse"]);
 				if (!empty($object->fk_entrepot) && $warehouse->id == $object->fk_entrepot) {
 					$warehousefound++;
diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index 9376d583ad4..51c2e9d2bc5 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -541,7 +541,10 @@ if ($object->id > 0) {
 	if ($action == 'updatebyscaning') {
 		if ($permissiontoadd) {
 			print '<script>';
-			print 'function barcodescannerjs(){
+
+			print '
+			var errortab = [];
+			function barcodescannerjs(){
 				console.log("We catch inputs in sacnner box");
 				var selectaddorreplace = $("select[name=selectaddorreplace]").val();
 				var barcodemode = $("input[name=barcodemode]:checked").val();
@@ -561,9 +564,9 @@ if ($object->id > 0) {
 						productbatchcode = $("#"+id+"_batch").text();
 						if(barcodemode != "barcodeforproduct"){
 							tabproduct.forEach(product=>{
-								if(product.Batch == productbatchcode){
-									alert("'.$langs->trans('ErrorSameBatchNumber').': "+productbatchcode);
-									throw"'.$langs->trans('ErrorSameBatchNumber').': "+productbatchcode;
+								if(product.Batch != "" && product.Batch == productbatchcode){
+									alert("'.$langs->transnoentities('ErrorSameBatchNumber').': "+productbatchcode);
+									throw"'.$langs->transnoentities('ErrorSameBatchNumber').': "+productbatchcode;
 								}
 							})
 						}
@@ -590,32 +593,41 @@ if ($object->id > 0) {
 								throw "'.$langs->trans('ErrorWrongBarcodemode').' \""+barcodemode+"\"";
 						}
 					});
-					tabproduct.forEach(product => {
-						if(product.Qty!=0){
-							console.log("We change #"+product.Id+"_input to match input in scanner box");
-							if(product.hasOwnProperty("reelqty")){
-								$.ajax({ url: \''.DOL_URL_ROOT.'/product/inventory/ajax/searchfrombarcode.php\',
-									data: { "action":"addnewlineproduct","fk_entrepot":product.Warehouse,"batch":product.Batch,"fk_inventory":'.dol_escape_js($object->id).',"fk_product":product.fk_product,"reelqty":product.reelqty,"qty":product.Qty},
-									type: \'POST\',
-									async: false,
-									success: function(response) {
-										response = JSON.parse(response);
-										if(response.status == "success"){
-											console.log(response.message);
-										}else{
-											console.error(response.message);
-										}
-									},
-									error : function(output) {
-									   console.error("Error on barcodeserialforproduct function");
-									},
-								});
-							} else {
-								$("#"+product.Id+"_input").val(product.Qty);
+					if (Object.keys(errortab).length < 1){
+						tabproduct.forEach(product => {
+							if(product.Qty!=0){
+								console.log("We change #"+product.Id+"_input to match input in scanner box");
+								if(product.hasOwnProperty("reelqty")){
+									$.ajax({ url: \''.DOL_URL_ROOT.'/product/inventory/ajax/searchfrombarcode.php\',
+										data: { "action":"addnewlineproduct","fk_entrepot":product.Warehouse,"batch":product.Batch,"fk_inventory":'.dol_escape_js($object->id).',"fk_product":product.fk_product,"reelqty":product.reelqty,"qty":product.Qty},
+										type: \'POST\',
+										async: false,
+										success: function(response) {
+											response = JSON.parse(response);
+											if(response.status == "success"){
+												console.log(response.message);
+											}else{
+												console.error(response.message);
+											}
+										},
+										error : function(output) {
+											console.error("Error on barcodeserialforproduct function");
+										},
+									});
+								} else {
+									$("#"+product.Id+"_input").val(product.Qty);
+								}
 							}
-						}
-					})
-					document.forms["formrecord"].submit();
+						})
+						document.forms["formrecord"].submit();
+					}else{
+						let stringerror = "";
+						errortab.forEach(element => {
+							stringerror += (element + ",")
+						});
+						stringerror = stringerror.slice(0, -1);
+						alert("'.$langs->trans("ErrorOnElementsInventory").' :\n" + stringerror);
+					}
 				}
 
 			}
@@ -625,7 +637,7 @@ if ($object->id > 0) {
 				newproductrow=0
 				tabproduct.forEach(product => {
 					$.ajax({ url: \''.DOL_URL_ROOT.'/product/inventory/ajax/searchfrombarcode.php\',
-						data: { "action":"existbarcode",'.(!empty($object->fk_warehouse)?'"fk_entrepot":'.$object->fk_warehouse.',':'').'"barcode":element,"product":product},
+						data: { "action":"existbarcode",'.(!empty($object->fk_warehouse)?'"fk_entrepot":'.$object->fk_warehouse.',':'').'"barcode":element,"product":product,"mode":mode},
 						type: \'POST\',
 						async: false,
 						success: function(response) {
@@ -636,7 +648,10 @@ if ($object->id > 0) {
 									newproductrow = response.object;
 								}
 							}else{
-								console.error(response.message);
+								if (!errortab.includes(element)){
+									errortab.push(element);
+									console.error(response.message);
+								}
 							}
 						},
 						error : function(output) {