NEW : allow stock management by product

htdocs/core/lib/product.lib.php

@@ -137,7 +137,7 @@ function product_prepare_head($object)
 		$h++;
 	}
 
-	if ($object->isProduct() || ($object->isService() && getDolGlobalString('STOCK_SUPPORTS_SERVICES'))) {    // If physical product we can stock (or service with option)
+	if (($object->isProduct() || ($object->isService() && getDolGlobalString('STOCK_SUPPORTS_SERVICES'))) && $object->stockable_product == Product::ENABLED_STOCK) {    // If physical product we can stock (or service with option)
 		if (isModEnabled('stock') && $user->hasRight('stock', 'lire')) {
 			$head[$h][0] = DOL_URL_ROOT."/product/stock/product.php?id=".$object->id;
 			$head[$h][1] = $langs->trans("Stock");

htdocs/expedition/card.php

@@ -295,6 +295,7 @@
 			$subtotalqty = 0;
 
 			$j = 0;
+
 			$batch = "batchl".$i."_0";
 			$stockLocation = "ent1".$i."_0";
 			$qty = "qtyl".$i;
@@ -1276,7 +1277,7 @@
 						$text = $product_static->getNomUrl(1);
 						$text .= ' - '.(!empty($line->label) ? $line->label : $line->product_label);
 						$description = ($showdescinproductdesc ? '' : dol_htmlentitiesbr($line->desc));
-
+						$description .= empty($product->stockable_product) ? $langs->trans('StockDisabled') : $langs->trans('StockEnabled');
 						print $form->textwithtooltip($text, $description, 3, 0, '', $i);
 
 						// Show range
@@ -1386,7 +1387,11 @@
 										if (!getDolGlobalInt('STOCK_ALLOW_NEGATIVE_TRANSFER')) {
 											$stockMin = 0;
 										}
-										print $formproduct->selectWarehouses($tmpentrepot_id, 'entl'.$indiceAsked, '', 1, 0, $line->fk_product, '', 1, 0, array(), 'minwidth200', array(), 1, $stockMin, 'stock DESC, e.ref');
+										if ($product->stockable_product == Product::ENABLED_STOCK) {
+											print $formproduct->selectWarehouses($tmpentrepot_id, 'entl'.$indiceAsked, '', 1, 0, $line->fk_product, '', 1, 0, array(), 'minwidth200', array(), 1, $stockMin, 'stock DESC, e.ref');
+										} else {
+											print img_warning().' '.$langs->trans('StockDisabled');
+										}
 
 										if ($tmpentrepot_id > 0 && $tmpentrepot_id == $warehouse_id) {
 											//print $stock.' '.$quantityToBeDelivered;
@@ -1620,10 +1625,13 @@
 									if (isModEnabled('stock')) {
 										print '<td class="left">';
 										if ($line->product_type == Product::TYPE_PRODUCT || getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
-											print $tmpwarehouseObject->getNomUrl(0).' ';
-
-											print '<!-- Show details of stock -->';
-											print '('.$stock.')';
+											if ($product->stockable_product == Product::ENABLED_STOCK) {
+												print $tmpwarehouseObject->getNomUrl(0).' ';
+												print '<!-- Show details of stock -->';
+												print '('.$stock.')';
+											} else {
+												print img_warning().' '.$langs->trans('StockDisabled');
+											}
 										} else {
 											print '<span class="opacitymedium">('.$langs->trans("Service").')</span>';
 										}
@@ -1783,6 +1791,10 @@
 								if ($warehouse_selected_id <= 0) {		// We did not force a given warehouse, so we won't have no warehouse to change qty.
 									$disabled = 'disabled="disabled"';
 								}
+								// finally we overwrite the input with the product status stockable_product if it's disabled
+								if ($product->stockable_product == Product::DISABLED_STOCK) {
+									$disabled = '';
+								}
 								print '<input class="qtyl right" name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="0"'.($disabled ? ' '.$disabled : '').'> ';
 								if (empty($disabled) && getDolGlobalString('STOCK_ALLOW_NEGATIVE_TRANSFER')) {
 									print '<input name="ent1' . $indiceAsked . '_' . $subj . '" type="hidden" value="' . $warehouse_selected_id . '">';
@@ -1812,7 +1824,11 @@
 									print img_warning().' '.$langs->trans("NoProductToShipFoundIntoStock", $warehouseObject->label);
 								} else {
 									if ($line->fk_product) {
-										print img_warning().' '.$langs->trans("StockTooLow");
+										if ($product->stockable_product == Product::ENABLED_STOCK) {
+											print img_warning().' '.$langs->trans('StockTooLow');
+										} else {
+											print img_warning().' '.$langs->trans('StockDisabled');
+										}
 									} else {
 										print '';
 									}
@@ -2443,6 +2459,7 @@
 				$product_static->surface_units = $lines[$i]->surface_units;
 				$product_static->volume = $lines[$i]->volume;
 				$product_static->volume_units = $lines[$i]->volume_units;
+				$product_static->stockable_product = $lines[$i]->stockable_product;
 
 				$text = $product_static->getNomUrl(1);
 				$text .= ' - '.$label;
@@ -2613,7 +2630,7 @@
 					print '<td class="linecolwarehousesource tdoverflowmax200">';
 					if ($lines[$i]->product_type == Product::TYPE_SERVICE && getDolGlobalString('SHIPMENT_SUPPORTS_SERVICES')) {
 						print '<span class="opacitymedium">('.$langs->trans("Service").')</span>';
-					} elseif ($lines[$i]->entrepot_id > 0) {
+					} elseif ($lines[$i]->entrepot_id > 0 && $lines[$i]->stockable_product == Product::ENABLED_STOCK) {
 						$entrepot = new Entrepot($db);
 						$entrepot->fetch($lines[$i]->entrepot_id);
 						print $entrepot->getNomUrl(1);

htdocs/expedition/class/expedition.class.php

@@ -1002,18 +1002,16 @@ public function addline($entrepot_id, $id, $qty, $array_options = [])
 		$line->product_type = $orderline->product_type;
 
 		if (isModEnabled('stock') && !empty($orderline->fk_product)) {
-			$fk_product = $orderline->fk_product;
+			$product = new Product($this->db);
+			$product->fetch($orderline->fk_product);
 
-			if (!($entrepot_id > 0) && !getDolGlobalString('STOCK_WAREHOUSE_NOT_REQUIRED_FOR_SHIPMENTS') && !(getDolGlobalString('SHIPMENT_SUPPORTS_SERVICES') && $line->product_type == Product::TYPE_SERVICE)) {
+			if (!($entrepot_id > 0) && !getDolGlobalString('STOCK_WAREHOUSE_NOT_REQUIRED_FOR_SHIPMENTS') && !(getDolGlobalString('SHIPMENT_SUPPORTS_SERVICES') && $line->product_type == Product::TYPE_SERVICE) && $product->stockable_product == Product::ENABLED_STOCK) {
 				$langs->load("errors");
 				$this->error = $langs->trans("ErrorWarehouseRequiredIntoShipmentLine");
 				return -1;
 			}
 
 			if (getDolGlobalString('STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT')) {
-				$product = new Product($this->db);
-				$product->fetch($fk_product);
-
 				// Check must be done for stock of product into warehouse if $entrepot_id defined
 				if ($entrepot_id > 0) {
 					$product->load_stock('warehouseopen');
@@ -1027,7 +1025,7 @@ public function addline($entrepot_id, $id, $qty, $array_options = [])
 					$isavirtualproduct = ($product->hasFatherOrChild(1) > 0);
 					// The product is qualified for a check of quantity (must be enough in stock to be added into shipment).
 					if (!$isavirtualproduct || !getDolGlobalString('PRODUIT_SOUSPRODUITS') || ($isavirtualproduct && !getDolGlobalString('STOCK_EXCLUDE_VIRTUAL_PRODUCTS'))) {  // If STOCK_EXCLUDE_VIRTUAL_PRODUCTS is set, we do not manage stock for kits/virtual products.
-						if ($product_stock < $qty) {
+						if ($product_stock < $qty && $product->stockable_product == Product::ENABLED_STOCK) {
 							$langs->load("errors");
 							$this->error = $langs->trans('ErrorStockIsNotEnoughToAddProductOnShipment', $product->ref);
 							$this->errorhidden = 'ErrorStockIsNotEnoughToAddProductOnShipment';
@@ -1702,7 +1700,9 @@ public function fetch_lines()
 		$sql .= ", cd.fk_multicurrency, cd.multicurrency_code, cd.multicurrency_subprice, cd.multicurrency_total_ht, cd.multicurrency_total_tva, cd.multicurrency_total_ttc, cd.rang, cd.date_start, cd.date_end";
 		$sql .= ", ed.rowid as line_id, ed.qty as qty_shipped, ed.fk_element, ed.fk_elementdet, ed.element_type, ed.fk_entrepot";
 		$sql .= ", p.ref as product_ref, p.label as product_label, p.fk_product_type, p.barcode as product_barcode";
-		$sql .= ", p.weight, p.weight_units, p.length, p.length_units, p.width, p.width_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units, p.tosell as product_tosell, p.tobuy as product_tobuy, p.tobatch as product_tobatch";
+		$sql .= ", p.weight, p.weight_units, p.length, p.length_units, p.width, p.width_units, p.height, p.height_units";
+		$sql .= ", p.surface, p.surface_units, p.volume, p.volume_units, p.tosell as product_tosell, p.tobuy as product_tobuy";
+		$sql .= ", p.tobatch as product_tobatch, p.stockable_product";
 		$sql .= " FROM ".MAIN_DB_PREFIX."expeditiondet as ed, ".MAIN_DB_PREFIX."commandedet as cd";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = cd.fk_product";
 		$sql .= " WHERE ed.fk_expedition = ".((int) $this->id);
@@ -1731,12 +1731,12 @@ public function fetch_lines()
 
 			$shipmentlinebatch = new ExpeditionLineBatch($this->db);
 
+			$line = new ExpeditionLigne($this->db); // always set $line for PHAN analyser. @phan-var-force muse be used after an assignation, and there is no assignation for $line.
 			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
 
-
 				if ($originline > 0 && $originline == $obj->fk_elementdet) {
-					'@phan-var-force ExpeditionLigne $line';  // $line from previous loop
+					// '@phan-var-force ExpeditionLigne $line'; // $line from previous loop
 					$line->entrepot_id = 0; // entrepod_id in details_entrepot
 					$line->qty_shipped += $obj->qty_shipped;
 				} else {
@@ -1765,6 +1765,7 @@ public function fetch_lines()
 
 				$line->fk_expedition    = $this->id; // id of parent
 
+				$line->stockable_product = $obj->stockable_product;
 				$line->product_type     = $obj->product_type;
 				$line->fk_product     	= $obj->fk_product;
 				$line->fk_product_type	= $obj->fk_product_type;
@@ -1792,8 +1793,9 @@ public function fetch_lines()
 				$line->surface        	= $obj->surface;
 				$line->surface_units = $obj->surface_units;
 				$line->volume         	= $obj->volume;
-				$line->volume_units   	= $obj->volume_units;
-				$line->fk_unit = $obj->fk_unit;
+				$line->volume_units         = $obj->volume_units;
+				$line->stockable_product    = $obj->stockable_product;
+				$line->fk_unit              = $obj->fk_unit;
 
 				$line->pa_ht = $obj->pa_ht;
 

htdocs/expedition/class/expeditionligne.class.php

@@ -262,6 +262,13 @@ class ExpeditionLigne extends CommonObjectLine
 	 */
 	public $volume_units;
 
+	/**
+	 * 0=This service or product is not managed in stock, 1=This service or product is managed in stock
+	 *
+	 * @var int
+	 */
+	public $stockable_product = 1;
+
 	/**
 	 * @var float|string
 	 */

htdocs/expedition/dispatch.php

@@ -580,7 +580,7 @@
 
 		//$sql = "SELECT l.rowid, l.fk_product, l.subprice, l.remise_percent, l.ref AS sref, SUM(l.qty) as qty,";
 		$sql = "SELECT l.rowid, l.fk_product, l.subprice, l.remise_percent, '' AS sref, l.qty as qty,";
-		$sql .= " p.ref, p.label, p.tobatch, p.fk_default_warehouse, p.barcode";
+		$sql .= " p.ref, p.label, p.tobatch, p.fk_default_warehouse, p.barcode, p.stockable_product";
 		// Enable hooks to alter the SQL query (SELECT)
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks(
@@ -909,13 +909,19 @@
 
 								// Warehouse
 								print '<td class="right">';
-								if (count($listwarehouses) > 1) {
-									print $formproduct->selectWarehouses(GETPOST("entrepot".$suffix) ? GETPOST("entrepot".$suffix) : $objd->fk_entrepot, "entrepot".$suffix, '', 1, 0, $objp->fk_product, '', 1, 0, array(), 'csswarehouse'.$suffix);
-								} elseif (count($listwarehouses) == 1) {
-									print $formproduct->selectWarehouses(GETPOST("entrepot".$suffix) ? GETPOST("entrepot".$suffix) : $objd->fk_entrepot, "entrepot".$suffix, '', 0, 0, $objp->fk_product, '', 1, 0, array(), 'csswarehouse'.$suffix);
+								if ($objp->stockable_product == Product::ENABLED_STOCK) {
+									if (count($listwarehouses) > 1) {
+										print $formproduct->selectWarehouses(GETPOST("entrepot".$suffix) ? GETPOST("entrepot".$suffix) : $objd->fk_entrepot, "entrepot".$suffix, '', 1, 0, $objp->fk_product, '', 1, 0, array(), 'csswarehouse'.$suffix);
+									} elseif (count($listwarehouses) == 1) {
+										print $formproduct->selectWarehouses(GETPOST("entrepot".$suffix) ? GETPOST("entrepot".$suffix) : $objd->fk_entrepot, "entrepot".$suffix, '', 0, 0, $objp->fk_product, '', 1, 0, array(), 'csswarehouse'.$suffix);
+									} else {
+										$langs->load("errors");
+										print $langs->trans("ErrorNoWarehouseDefined");
+									}
 								} else {
-									$langs->load("errors");
-									print $langs->trans("ErrorNoWarehouseDefined");
+									// on force l'entrepot pour passer le test d'ajout de ligne dans expedition.class.php
+									print '<input id="entrepot'.$suffix.'" name="entrepot'.$suffix.'" type="hidden" value="'.$objd->fk_entrepot.'">';
+									print img_warning().' '.$langs->trans('StockDisabled');
 								}
 								print "</td>\n";
 
@@ -1168,7 +1174,7 @@
 			var errortab3 = [];
 			var errortab4 = [];
 
-			function barcodescannerjs(){
+			function barcodescannerjs() {
 				console.log("We catch inputs in scanner box");
 				jQuery("#scantoolmessage").text();
 
@@ -1185,11 +1191,11 @@ function barcodescannerjs(){
 				errortab3 = [];
 				errortab4 = [];
 
-				textarray = textarray.filter(function(value){
+				textarray = textarray.filter(function(value) {
 					return value != "";
 				});
-				if(textarray.some((element) => element != "")){
-					$(".qtydispatchinput").each(function(){
+				if (textarray.some((element) => element != "")) {
+					$(".qtydispatchinput").each(function() {
 						id = $(this).attr(\'id\');
 						idarray = id.split(\'_\');
 						idproduct = idarray[2];
@@ -1200,33 +1206,33 @@ function barcodescannerjs(){
 						productbarcode = $("#product_"+idproduct).attr(\'data-barcode\');
 						console.log(productbarcode);
 						productbatchcode = $("#lot_number_"+id).val();
-						if(productbatchcode == undefined){
+						if (productbatchcode == undefined) {
 							productbatchcode = "";
 						}
 						console.log(productbatchcode);
 
 						if (barcodemode != "barcodeforproduct") {
 							tabproduct.forEach(product=>{
 								console.log("product.Batch="+product.Batch+" productbatchcode="+productbatchcode);
-								if(product.Batch != "" && product.Batch == productbatchcode){
+								if (product.Batch != "" && product.Batch == productbatchcode) {
 									console.log("duplicate batch code found for batch code "+productbatchcode);
 									duplicatedbatchcode.push(productbatchcode);
 								}
 							})
 						}
 						productinput = $("#qty_"+id).val();
-						if(productinput == ""){
+						if (productinput == "") {
 							productinput = 0
 						}
 						tabproduct.push({\'Id\':id,\'Warehouse\':warehouse,\'Barcode\':productbarcode,\'Batch\':productbatchcode,\'Qty\':productinput,\'fetched\':false});
 					});
 					console.log("Loop on each record entered in the textarea");
 
-					textarray.forEach(function(element,index){
+					textarray.forEach(function(element,index) {
 						console.log("Process record element="+element+" id="+id);
 						var verify_batch = false;
 						var verify_barcode = false;
-						switch(barcodemode){
+						switch(barcodemode) {
 							case "barcodeforautodetect":
 								verify_barcode = barcodeserialforproduct(tabproduct,index,element,barcodeproductqty,warehousetouse,selectaddorreplace,"barcode",true);
 								verify_batch = barcodeserialforproduct(tabproduct,index,element,barcodeproductqty,warehousetouse,selectaddorreplace,"lotserial",true);
@@ -1257,12 +1263,12 @@ function barcodescannerjs(){
 
 					if (Object.keys(errortab1).length < 1 && Object.keys(errortab2).length < 1 && Object.keys(errortab3).length < 1) {
 						tabproduct.forEach(product => {
-							if(product.Qty!=0){
-								if(product.hasOwnProperty("reelqty")){
+							if (product.Qty!=0) {
+								if (product.hasOwnProperty("reelqty")) {
 									idprod = $("td[data-idproduct=\'"+product.fk_product+"\']").attr("id");
 									idproduct = idprod.split("_")[1];
 									console.log("We create a new line for product_"+idproduct);
-									if(product.Barcode != null){
+									if (product.Barcode != null) {
 										modedispatch = "dispatch";
 									} else {
 										modedispatch = "batch";
@@ -1274,7 +1280,7 @@ function barcodescannerjs(){
 									$("#qty_"+(nbrTrs-1)+"_"+idproduct).val(product.Qty);
 									$("#entrepot_"+(nbrTrs-1)+"_"+idproduct).val(product.Warehouse);
 
-									if(modedispatch == "batch"){
+									if (modedispatch == "batch") {
 										$("#lot_number_"+(nbrTrs-1)+"_"+idproduct).val(product.Batch);
 									}
 
@@ -1325,7 +1331,7 @@ function barcodescannerjs(){
 			}
 
 			/* This methode is called by parent barcodescannerjs() */
-			function barcodeserialforproduct(tabproduct,index,element,barcodeproductqty,warehousetouse,selectaddorreplace,mode,autodetect=false){
+			function barcodeserialforproduct(tabproduct,index,element,barcodeproductqty,warehousetouse,selectaddorreplace,mode,autodetect=false) {
 				BarcodeIsInProduct=0;
 				newproductrow=0
 				result=false;
@@ -1335,13 +1341,13 @@ function barcodeserialforproduct(tabproduct,index,element,barcodeproductqty,ware
 						type: \'POST\',
 						async: false,
 						success: function(response) {
-							if (response.status == "success"){
+							if (response.status == "success") {
 								console.log(response.message);
-								if(!newproductrow){
+								if (!newproductrow) {
 									newproductrow = response.object;
 								}
 							}else{
-								if (mode!="lotserial" && autodetect==false && !errortab4.includes(element)){
+								if (mode!="lotserial" && autodetect==false && !errortab4.includes(element)) {
 									errortab4.push(element);
 									console.error(response.message);
 								}
@@ -1352,18 +1358,18 @@ function barcodeserialforproduct(tabproduct,index,element,barcodeproductqty,ware
 						},
 					});
 					console.log("Product "+(index+=1)+": "+element);
-					if(mode == "barcode"){
+					if (mode == "barcode") {
 						testonproduct = product.Barcode
-					}else if (mode == "lotserial"){
+					}else if (mode == "lotserial") {
 						testonproduct = product.Batch
 					}
 					testonwarehouse = product.Warehouse;
-					if(testonproduct == element && testonwarehouse == warehousetouse){
-						if(selectaddorreplace == "add"){
+					if (testonproduct == element && testonwarehouse == warehousetouse) {
+						if (selectaddorreplace == "add") {
 							productqty = parseInt(product.Qty,10);
 							product.Qty = productqty + parseInt(barcodeproductqty,10);
-						}else if(selectaddorreplace == "replace"){
-							if(product.fetched == false){
+						}else if (selectaddorreplace == "replace") {
+							if (product.fetched == false) {
 								product.Qty = barcodeproductqty
 								product.fetched=true
 							}else{
@@ -1374,11 +1380,11 @@ function barcodeserialforproduct(tabproduct,index,element,barcodeproductqty,ware
 						BarcodeIsInProduct+=1;
 					}
 				})
-				if(BarcodeIsInProduct==0 && newproductrow!=0){
+				if (BarcodeIsInProduct==0 && newproductrow!=0) {
 					tabproduct.push({\'Id\':tabproduct.length-1,\'Warehouse\':newproductrow.fk_warehouse,\'Barcode\':mode=="barcode"?element:null,\'Batch\':mode=="lotserial"?element:null,\'Qty\':barcodeproductqty,\'fetched\':true,\'reelqty\':newproductrow.reelqty,\'fk_product\':newproductrow.fk_product,\'mode\':mode});
 					result = true;
 				}
-				if(BarcodeIsInProduct > 0){
+				if (BarcodeIsInProduct > 0) {
 					result = true;
 				}
 				return result;
@@ -1402,7 +1408,7 @@ function barcodeserialforproduct(tabproduct,index,element,barcodeproductqty,ware
 
 			$("#autoreset").click(function() {
 				console.log("we click on autoreset");
-				$(".autoresettr").each(function(){
+				$(".autoresettr").each(function() {
 					id = $(this).attr("name");
 					idtab = id.split("_");
 					console.log("we process line "+id+" "+idtab);
@@ -1425,8 +1431,8 @@ function barcodeserialforproduct(tabproduct,index,element,barcodeproductqty,ware
 				return false;
 			});
 
-			$("#resetalltoexpected").click(function(){
-				$(".qtydispatchinput").each(function(){
+			$("#resetalltoexpected").click(function() {
+				$(".qtydispatchinput").each(function() {
 					console.log("We reset to expected "+$(this).attr("id")+" qty to dispatch");
 					$(this).val($(this).data("expected"));
 				});