diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index 603d7778aa9..15a88dea730 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -216,6 +216,7 @@ print '</tr>'."\n";
 
 $found = 0;
 
+print '<!-- STOCK_CALCULATE_ON_BILL -->';
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("DeStockOnBill").'</td>';
 print '<td class="right">';
@@ -237,6 +238,7 @@ print "</td>\n</tr>\n";
 $found++;
 
 
+print '<!-- STOCK_CALCULATE_ON_VALIDATE_ORDER -->';
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("DeStockOnValidateOrder").'</td>';
 print '<td class="right">';
@@ -260,6 +262,7 @@ $found++;
 //if (isModEnabled('expedition'))
 //{
 
+print '<!-- STOCK_CALCULATE_ON_SHIPMENT -->';
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("DeStockOnShipment").'</td>';
 print '<td class="right">';
@@ -276,7 +279,7 @@ if (isModEnabled("expedition")) {
 print "</td>\n</tr>\n";
 $found++;
 
-
+print '<!-- STOCK_CALCULATE_ON_SHIPMENT_CLOSE -->';
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("DeStockOnShipmentOnClosing").'</td>';
 print '<td class="right">';
@@ -309,6 +312,7 @@ print '</tr>'."\n";
 
 $found = 0;
 
+print '<!-- STOCK_CALCULATE_ON_SUPPLIER_BILL -->';
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("ReStockOnBill").'</td>';
 print '<td class="right">';
@@ -330,7 +334,7 @@ print "</td>\n</tr>\n";
 $found++;
 
 
-
+print '<!-- STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER -->';
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("ReStockOnValidateOrder").'</td>';
 print '<td class="right">';
@@ -352,6 +356,7 @@ print "</td>\n</tr>\n";
 $found++;
 
 if (isModEnabled("reception")) {
+	print '<!-- STOCK_CALCULATE_ON_RECEPTION_CLOSE -->';
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("StockOnReception").'</td>';
 	print '<td class="right">';
@@ -380,6 +385,7 @@ if (isModEnabled("reception")) {
 	print "</td>\n</tr>\n";
 	$found++;
 } else {
+	print '<!-- STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER -->';
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("ReStockOnDispatchOrder").'</td>';
 	print '<td class="right">';
diff --git a/htdocs/core/lib/reception.lib.php b/htdocs/core/lib/reception.lib.php
index 6cdbe2cd5eb..2b4944c99f2 100644
--- a/htdocs/core/lib/reception.lib.php
+++ b/htdocs/core/lib/reception.lib.php
@@ -46,7 +46,7 @@ function reception_prepare_head(Reception $object)
 	$head[$h][2] = 'reception';
 	$h++;
 
-	if ($object->statut ==  Reception::STATUS_DRAFT) {
+	if ($object->statut ==  Reception::STATUS_DRAFT || ($object->statut == Reception::STATUS_VALIDATED && empty($conf->global->STOCK_CALCULATE_ON_RECEPTION))) {
 		$head[$h][0] = DOL_URL_ROOT."/reception/dispatch.php?id=".$object->id;
 		$head[$h][1] = $langs->trans("ReceptionDistribution");
 		$head[$h][2] = 'dispatch';
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 79dec7b7ebd..318d66635ec 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -2532,6 +2532,10 @@ if ($action == 'create') {
 
 	// TODO Show also lines ordered but not delivered
 
+	if (empty($num_prod)) {
+		print '<tr><td colspan="8"><span class="opacitymedium">'.$langs->trans("NoLineGoOnTabToAddSome", $langs->transnoentitiesnoconv("ShipmentDistribution")).'</span></td></tr>';
+	}
+
 	print "</table>\n";
 	print '</tbody>';
 	print '</div>';
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index dd79f20bea4..df4b92fe76f 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -757,7 +757,7 @@ class Expedition extends CommonObject
 
 		// If stock increment is done on sending (recommanded choice)
 		if (!$error && isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)) {
-			$result = $this->manageStockMvtOnEvt($user);
+			$result = $this->manageStockMvtOnEvt($user, "ShipmentValidatedInDolibarr");
 			if ($result < 0) {
 				return -2;
 			}
@@ -1091,14 +1091,11 @@ class Expedition extends CommonObject
 			$this->model_pdf = trim($this->model_pdf);
 		}
 
-
-
 		// Check parameters
 		// Put here code to add control on parameters values
 
 		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX."expedition SET";
-
 		$sql .= " ref=".(isset($this->ref) ? "'".$this->db->escape($this->ref)."'" : "null").",";
 		$sql .= " ref_ext=".(isset($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'" : "null").",";
 		$sql .= " ref_customer=".(isset($this->ref_customer) ? "'".$this->db->escape($this->ref_customer)."'" : "null").",";
@@ -1124,7 +1121,6 @@ class Expedition extends CommonObject
 		$sql .= " note_public=".(isset($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "null").",";
 		$sql .= " model_pdf=".(isset($this->model_pdf) ? "'".$this->db->escape($this->model_pdf)."'" : "null").",";
 		$sql .= " entity=".$conf->entity;
-
 		$sql .= " WHERE rowid=".((int) $this->id);
 
 		$this->db->begin();
@@ -1596,11 +1592,12 @@ class Expedition extends CommonObject
 			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
 
+
 				if ($originline > 0 && $originline == $obj->fk_origin_line) {
 					$line->entrepot_id = 0; // entrepod_id in details_entrepot
 					$line->qty_shipped += $obj->qty_shipped;
 				} else {
-					$line = new ExpeditionLigne($this->db);
+					$line = new ExpeditionLigne($this->db);		// new group to start
 					$line->entrepot_id    	= $obj->fk_entrepot;	// this is a property of a shipment line
 					$line->qty_shipped    	= $obj->qty_shipped;	// this is a property of a shipment line
 				}
@@ -2196,12 +2193,14 @@ class Expedition extends CommonObject
 
 	/**
 	 * Manage Stock MVt onb Close or valid Shipment
-	 * @param      User 	$user        		Object user that modify
-	 * @return     int     <0 if ko, >0 if ok
+	 *
+	 * @param      	User 	$user        		Object user that modify
+	 * @param		string	$labelmovement		Label of movement
+	 * @return     	int     					<0 if KO, >0 if OK
 	 * @throws Exception
 	 *
 	 */
-	private function manageStockMvtOnEvt($user)
+	private function manageStockMvtOnEvt($user, $labelmovement = 'ShipmentClassifyClosedInDolibarr')
 	{
 		global $langs;
 
@@ -2248,7 +2247,7 @@ class Expedition extends CommonObject
 					// line without batch detail
 
 					// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
-					$result = $mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ShipmentClassifyClosedInDolibarr", $obj->ref));
+					$result = $mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans($labelmovement, $obj->ref));
 					if ($result < 0) {
 						$this->error = $mouvS->error;
 						$this->errors = $mouvS->errors;
@@ -2259,7 +2258,7 @@ class Expedition extends CommonObject
 					// line with batch detail
 
 					// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
-					$result = $mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ShipmentClassifyClosedInDolibarr", $obj->ref), '', $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch, $obj->fk_origin_stock);
+					$result = $mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans($labelmovement, $obj->ref), '', $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch, $obj->fk_origin_stock);
 					if ($result < 0) {
 						$this->error = $mouvS->error;
 						$this->errors = $mouvS->errors;
diff --git a/htdocs/expedition/dispatch.php b/htdocs/expedition/dispatch.php
index 25c0295e2ab..01b98c22a0c 100644
--- a/htdocs/expedition/dispatch.php
+++ b/htdocs/expedition/dispatch.php
@@ -25,9 +25,9 @@
  */
 
 /**
- * \file htdocs/expedition/dispatch.php
+ * \file 	htdocs/expedition/dispatch.php
  * \ingroup expedition
- * \brief Page to dispatch shipments
+ * \brief 	Page to dispatch shipments
  */
 
 // Load Dolibarr environment
@@ -60,6 +60,9 @@ $fk_default_warehouse = GETPOST('fk_default_warehouse', 'int');
 $cancel = GETPOST('cancel', 'alpha');
 $confirm = GETPOST('confirm', 'alpha');
 
+$error = 0;
+$errors = array();
+
 if ($user->socid) {
 	$socid = $user->socid;
 }
@@ -75,6 +78,7 @@ if (GETPOSTISSET("projectid")) {
 $object = new Expedition($db);
 $objectorder = new Commande($db);
 
+
 if ($id > 0 || !empty($ref)) {
 	$result = $object->fetch($id, $ref);
 	if ($result <= 0) {
@@ -271,8 +275,9 @@ if ($action == 'updatelines' && $usercancreate) {
 						}
 					}
 
-					// If module stock is enabled and the stock increase is done on purchase order dispatching
-					if (!$error && GETPOST($ent, 'int') > 0 && isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)) {
+					// If module stock is enabled and the stock decrease is done on edtion of this page
+					/*
+					if (!$error && GETPOST($ent, 'int') > 0 && isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_DISPATCH_ORDER)) {
 						$mouv = new MouvementStock($db);
 						$product = GETPOST($prod, 'int');
 						$entrepot = GETPOST($ent, 'int');
@@ -307,6 +312,7 @@ if ($action == 'updatelines' && $usercancreate) {
 							}
 						}
 					}
+					*/
 				}
 			}
 		}
@@ -317,6 +323,9 @@ if ($action == 'updatelines' && $usercancreate) {
 	} else {
 		$db->commit();
 		setEventMessages($langs->trans("ReceptionUpdated"), null);
+
+		header("Location: ".DOL_URL_ROOT.'/expedition/dispatch.php?id='.$object->id);
+		exit;
 	}
 } elseif ($action == 'setdate_livraison' && $usercancreate) {
 	$datedelivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
@@ -346,7 +355,8 @@ $morejs = array('/expedition/js/lib_dispatch.js.php');
 llxHeader('', $title, $help_url, '', 0, 0, $morejs);
 
 if ($object->id > 0 || !empty($object->ref)) {
-	$lines = $object->lines;
+	$lines = $object->lines;	// This is an array of detail of line, on line per source order line found intolines[]->fk_origin_line, then each line may have sub data
+	//var_dump($lines[0]->fk_origin_line); exit;
 
 	$num_prod = count($lines);
 
@@ -493,7 +503,7 @@ if ($object->id > 0 || !empty($object->ref)) {
 	print '<br>';
 	$disabled = 0;	// This is used to disable or not the bulk selection of target warehouse. No reason to have it disabled so forced to 0.
 
-	if ($object->statut == Reception::STATUS_DRAFT) {
+	if ($object->statut == Expedition::STATUS_DRAFT) {
 		require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 		$formproduct = new FormProduct($db);
 		$formproduct->loadWarehouses();
@@ -847,8 +857,10 @@ if ($object->id > 0 || !empty($object->ref)) {
 								}
 								// Qty to dispatch
 								print '<td class="right">';
-								print '<a href="#" id="reset'.$suffix.'" class="resetline">'.img_picto($langs->trans("Reset"), 'eraser', 'class="pictofixedwidth opacitymedium"').'</a>';
-								print '<input id="qty'.$suffix.'" onchange="onChangeDispatchLineQty($(this))" name="qty'.$suffix.'" data-type="'.$type.'" data-index="'.$i.'" class="width50 right qtydispatchinput" value="'.(GETPOSTISSET('qty'.$suffix) ? GETPOST('qty'.$suffix, 'int') : $objd->qty).'" data-expected="'.$objd->qty.'">';
+								print '<a href="" id="reset'.$suffix.'" class="resetline">'.img_picto($langs->trans("Reset"), 'eraser', 'class="pictofixedwidth opacitymedium"').'</a>';
+								$suggestedvalue = (GETPOSTISSET('qty'.$suffix) ? GETPOST('qty'.$suffix, 'int') : $objd->qty);
+								//var_dump($suggestedvalue);exit;
+								print '<input id="qty'.$suffix.'" onchange="onChangeDispatchLineQty($(this))" name="qty'.$suffix.'" data-type="'.$type.'" data-index="'.$i.'" class="width50 right qtydispatchinput" value="'.$suggestedvalue.'" data-expected="'.$objd->qty.'">';
 								print '</td>';
 								print '<td>';
 								if (isModEnabled('productbatch') && $objp->tobatch > 0) {
@@ -991,7 +1003,7 @@ if ($object->id > 0 || !empty($object->ref)) {
 							}
 							// Qty to dispatch
 							print '<td class="right">';
-							print '<a href="#" id="reset'.$suffix.'" class="resetline">'.img_picto($langs->trans("Reset"), 'eraser', 'class="pictofixedwidth opacitymedium"').'</a>';
+							print '<a href="" id="reset'.$suffix.'" class="resetline">'.img_picto($langs->trans("Reset"), 'eraser', 'class="pictofixedwidth opacitymedium"').'</a>';
 							$amounttosuggest = (GETPOSTISSET('qty'.$suffix) ? GETPOST('qty'.$suffix, 'int') : (empty($conf->global->SUPPLIER_ORDER_DISPATCH_FORCE_QTY_INPUT_TO_ZERO) ? $remaintodispatch : 0));
 							if (count($products_dispatched)) {
 								// There is already existing lines into llx_expeditiondet, this means a plan for the shipment has already been started.
@@ -1055,14 +1067,14 @@ if ($object->id > 0 || !empty($object->ref)) {
 		print '</div>';
 
 		if ($nbproduct) {
-			$checkboxlabel = $langs->trans("CloseReceivedSupplierOrdersAutomatically", $langs->transnoentitiesnoconv('StatusOrderReceivedAll'));
+			//$checkboxlabel = $langs->trans("CloseReceivedSupplierOrdersAutomatically", $langs->transnoentitiesnoconv('StatusOrderReceivedAll'));
 
 			print '<div class="center">';
 			$parameters = array();
 			$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
 			// modified by hook
 			if (empty($reshook)) {
-				if (empty($conf->reception->enabled)) {
+				/*if (empty($conf->reception->enabled)) {
 					print $langs->trans("Comment").' : ';
 					print '<input type="text" class="minwidth400" maxlength="128" name="comment" value="';
 					print GETPOSTISSET("comment") ? GETPOST("comment") : $langs->trans("DispatchSupplierOrder", $object->ref);
@@ -1075,6 +1087,8 @@ if ($object->id > 0 || !empty($object->ref)) {
 				$dispatchBt = empty($conf->reception->enabled) ? $langs->trans("Receive") : $langs->trans("CreateReception");
 
 				print '<br>';
+				*/
+
 				print '<input type="submit" id="submitform" class="button" name="dispatch" value="'.$langs->trans("Save").'"';
 				$disabled = 0;
 				if (!$usercancreate) {
@@ -1111,11 +1125,13 @@ if ($object->id > 0 || !empty($object->ref)) {
 	print '<script type="text/javascript">
 		$(document).ready(function () {
 			$("select[name=fk_default_warehouse]").change(function() {
+				console.log("warehouse is modified");
 				var fk_default_warehouse = $("option:selected", this).val();
 				$("select[name^=entrepot_]").val(fk_default_warehouse).change();
 			});
 
 			$("#autoreset").click(function() {
+				console.log("we click on autoreset");
 				$(".autoresettr").each(function(){
 					id = $(this).attr("name");
 					idtab = id.split("_");
@@ -1146,7 +1162,8 @@ if ($object->id > 0 || !empty($object->ref)) {
 				return false;
 			});
 
-			$(".resetline").click(function(){
+			$(".resetline").on("click", function(event) {
+				event.preventDefault();
 				id = $(this).attr("id");
 				id = id.split("reset_");
 				console.log("Reset trigger for id = qty_"+id[1]);
diff --git a/htdocs/expedition/js/lib_dispatch.js.php b/htdocs/expedition/js/lib_dispatch.js.php
index 30b5cd7cc40..dfcfbc54f83 100644
--- a/htdocs/expedition/js/lib_dispatch.js.php
+++ b/htdocs/expedition/js/lib_dispatch.js.php
@@ -68,7 +68,7 @@ if (empty($dolibarr_nocache)) {
 function addDispatchLine(index, type, mode) {
 	mode = mode || 'qtymissing'
 
-	console.log("fourn/js/lib_dispatch.js.php addDispatchLine Split line type="+type+" index="+index+" mode="+mode);
+	console.log("expedition/js/lib_dispatch.js.php addDispatchLine Split line type="+type+" index="+index+" mode="+mode);
 
 	var $row0 = $("tr[name='"+type+'_0_'+index+"']");
 	var $dpopt = $row0.find('.hasDatepicker').first().datepicker('option', 'all'); // get current datepicker options to apply the same to the cloned datepickers
@@ -81,7 +81,7 @@ function addDispatchLine(index, type, mode) {
 		qty = '';
 	}
 
-	console.log("fourn/js/lib_dispatch.js.php addDispatchLine Split line nbrTrs="+nbrTrs+" qtyOrdered="+qtyOrdered+" qty="+qty);
+	console.log("expedition/js/lib_dispatch.js.php addDispatchLine Split line nbrTrs="+nbrTrs+" qtyOrdered="+qtyOrdered+" qty="+qty);
 
 	var	qtyDispatched;
 
@@ -96,7 +96,7 @@ function addDispatchLine(index, type, mode) {
 			mode = 'lessone';
 		}
 	}
-	console.log("qtyDispatched=" + qtyDispatched + " qtyOrdered=" + qtyOrdered+ " qty=" + qty);
+	console.log("expedition/js/lib_dispatch.js.php qtyDispatched=" + qtyDispatched + " qtyOrdered=" + qtyOrdered+ " qty=" + qty);
 
 	if (qty <= 1) {
 		window.alert("Remain quantity to dispatch is too low to be split");
@@ -146,17 +146,18 @@ function addDispatchLine(index, type, mode) {
 		$("tr[name^='" + type + "_'][name$='_" + index + "'] .splitbutton").hide();
 		$("tr[name^='" + type + "_'][name$='_" + index + "']:last .splitbutton").show();
 
-		$("#reset_" + (nbrTrs) + "_" + index).click(function () {
+		$("#reset_" + (nbrTrs) + "_" + index).click(function (event) {
+			event.preventDefault();
 			id = $(this).attr("id");
 			id = id.split("reset_");
 			idrow = id[1];
 			idlast = $("tr[name^='" + type + "_'][name$='_" + index + "']:last .qtydispatchinput").attr("id");
 			if (idlast == $("#qty_" + idrow).attr("id")) {
-				console.log("Remove trigger for tr name = " + type + "_" + idrow);
+				console.log("expedition/js/lib_dispatch.js.php Remove trigger for tr name = " + type + "_" + idrow);
 				$('tr[name="' + type + '_' + idrow + '"').remove();
 				$("tr[name^='" + type + "_'][name$='_" + index + "']:last .splitbutton").show();
 			} else {
-				console.log("Reset trigger for id = #qty_" + idrow);
+				console.log("expedition/js/lib_dispatch.js.php Reset trigger for id = qty_" + idrow);
 				$("#qty_" + idrow).val("");
 			}
 		});
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index 20afd632933..307d82ebdd3 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2004-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2023 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005      Eric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2010-2021 Juanjo Menent        <jmenent@2byte.es>
@@ -51,7 +51,7 @@ if (isModEnabled('productbatch')) {
 	$langs->load('productbatch');
 }
 
-	// Security check
+// Security check
 $id = GETPOST("id", 'int');
 $ref = GETPOST('ref');
 $lineid = GETPOST('lineid', 'int');
@@ -381,6 +381,8 @@ if ($action == 'dispatch' && $permissiontoreceive) {
 	if ($result >= 0 && !$error) {
 		$db->commit();
 
+		setEventMessages($langs->trans("ReceptionsRecorded"), null, 'mesgs');
+
 		header("Location: dispatch.php?id=".$id);
 		exit();
 	} else {
diff --git a/htdocs/fourn/js/lib_dispatch.js.php b/htdocs/fourn/js/lib_dispatch.js.php
index 9d0f6ef8892..d8df7dc2da8 100644
--- a/htdocs/fourn/js/lib_dispatch.js.php
+++ b/htdocs/fourn/js/lib_dispatch.js.php
@@ -146,7 +146,8 @@ function addDispatchLine(index, type, mode) {
 		$("tr[name^='" + type + "_'][name$='_" + index + "'] .splitbutton").hide();
 		$("tr[name^='" + type + "_'][name$='_" + index + "']:last .splitbutton").show();
 
-		$("#reset_" + (nbrTrs) + "_" + index).click(function () {
+		$("#reset_" + (nbrTrs) + "_" + index).click(function (event) {
+			event.preventDefault();
 			id = $(this).attr("id");
 			id = id.split("reset_");
 			idrow = id[1];
@@ -156,7 +157,7 @@ function addDispatchLine(index, type, mode) {
 				$('tr[name="' + type + '_' + idrow + '"').remove();
 				$("tr[name^='" + type + "_'][name$='_" + index + "']:last .splitbutton").show();
 			} else {
-				console.log("Reset trigger for id = #qty_" + idrow);
+				console.log("fourn/js/lib_dispatch.js.php Reset trigger for id = qty_" + idrow);
 				$("#qty_" + idrow).val("");
 			}
 		});
diff --git a/htdocs/langs/en_US/receptions.lang b/htdocs/langs/en_US/receptions.lang
index 17a8202ffc6..a2990fd51e9 100644
--- a/htdocs/langs/en_US/receptions.lang
+++ b/htdocs/langs/en_US/receptions.lang
@@ -53,5 +53,6 @@ ReceptionBackToDraftInDolibarr=Reception %s back to draft
 ReceptionClassifyClosedInDolibarr=Reception %s classified Closed
 ReceptionUnClassifyCloseddInDolibarr=Reception %s re-open
 RestoreWithCurrentQtySaved=Fill quantities with latest saved values
+ReceptionsRecorded=Receptions recorded
 ReceptionUpdated=Reception sucessfully updated
 ReceptionDistribution=Reception distribution
\ No newline at end of file
diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang
index 84f85fb13b4..b3fc779dd2f 100644
--- a/htdocs/langs/en_US/sendings.lang
+++ b/htdocs/langs/en_US/sendings.lang
@@ -62,6 +62,7 @@ ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from open purchase
 NoProductToShipFoundIntoStock=No product to ship found in warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
 WeightVolShort=Weight/Vol.
 ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
+NoLineGoOnTabToAddSome=No line, go on tab "%s" to add
 
 # Sending methods
 # ModelDocument
diff --git a/htdocs/product/stock/class/productlot.class.php b/htdocs/product/stock/class/productlot.class.php
index 44253d6f25d..7e54fd90622 100644
--- a/htdocs/product/stock/class/productlot.class.php
+++ b/htdocs/product/stock/class/productlot.class.php
@@ -980,9 +980,7 @@ class Productlot extends CommonObject
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $maxlen = 24, $morecss = '', $save_lastsearch_value = -1)
 	{
-		global $langs, $conf, $hookmanager, $db;
-		global $dolibarr_main_authentication, $dolibarr_main_demo;
-		global $menumanager;
+		global $langs, $conf, $hookmanager;
 
 		$result = '';
 		$params = [
@@ -1039,7 +1037,7 @@ class Productlot extends CommonObject
 
 		$result .= $linkstart;
 		if ($withpicto) {
-			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : $dataparams.' class="'.(($withpicto != 2) ? 'paddingright ' : '').$classfortooltip.'"'), 0, 0, $notooltip ? 0 : 1);
+			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'"'), 0, 0, $notooltip ? 0 : 1);
 		}
 		if ($withpicto != 2) {
 			$result .= $this->batch;
diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index b9a52cc8f60..dfe2c51df4f 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -143,6 +143,7 @@ if ($user->socid) {
 	$socid = $user->socid;
 }
 
+// TODO Test on reception module on only
 if (isModEnabled("reception") || $origin == 'reception' || empty($origin)) {
 	$result = restrictedArea($user, 'reception', $object->id);
 } else {
diff --git a/htdocs/reception/contact.php b/htdocs/reception/contact.php
index 333bc0b723f..df3b61f9069 100644
--- a/htdocs/reception/contact.php
+++ b/htdocs/reception/contact.php
@@ -67,6 +67,8 @@ if ($id > 0 || !empty($ref)) {
 if ($user->socid > 0) {
 	$socid = $user->socid;
 }
+
+// TODO Test on reception module on only
 if ($origin == 'reception') {
 	$result = restrictedArea($user, $origin, $object->id);
 } else {
diff --git a/htdocs/reception/dispatch.php b/htdocs/reception/dispatch.php
index 6faca7674ea..81dd15a5745 100644
--- a/htdocs/reception/dispatch.php
+++ b/htdocs/reception/dispatch.php
@@ -25,9 +25,9 @@
  */
 
 /**
- * \file htdocs/fourn/commande/dispatch.php
+ * \file 	htdocs/reception/dispatch.php
  * \ingroup commande
- * \brief Page to dispatch receiving
+ * \brief 	Page to dispatch receptions.
  */
 
 // Load Dolibarr environment
@@ -40,11 +40,7 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.dispatch.class
 require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/reception.lib.php';
-
-
-if (isModEnabled('project')) {
-	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-}
+require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("bills", "orders", "sendings", "companies", "deliveries", "products", "stocks", "receptions"));
@@ -62,6 +58,9 @@ $fk_default_warehouse = GETPOST('fk_default_warehouse', 'int');
 $cancel = GETPOST('cancel', 'alpha');
 $confirm = GETPOST('confirm', 'alpha');
 
+$error = 0;
+$errors = array();
+
 if ($user->socid) {
 	$socid = $user->socid;
 }
@@ -107,16 +106,7 @@ if (empty($conf->reception->enabled)) {
 }
 
 // $id is id of a reception
-if (isModEnabled("reception") || $origin == 'reception' || empty($origin)) {
-	$result = restrictedArea($user, 'reception', $object->id);
-} else {
-	// We do not use the reception module, so we test permission on the supplier orders
-	if ($origin == 'supplierorder' || $origin == 'order_supplier') {
-		$result = restrictedArea($user, 'fournisseur', $origin_id, 'commande_fournisseur', 'commande');
-	} elseif (!$user->hasRight($origin, 'lire') && !$user->hasRight($origin, 'read')) {
-		accessforbidden();
-	}
-}
+$result = restrictedArea($user, 'reception', $object->id);
 
 if (!isModEnabled('stock')) {
 	accessforbidden('Module stock disabled');
@@ -215,7 +205,8 @@ if ($action == 'updatelines' && $permissiontoreceive) {
 								$error++;
 							}
 
-							// If module stock is enabled and the stock increase is done on purchase order dispatching
+							// If module stock is enabled and the stock decrease is done on edtion of this page
+							/*
 							if (!$error && GETPOST($ent, 'int') > 0 && isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)) {
 								$mouv = new MouvementStock($db);
 								$product = GETPOST($prod, 'int');
@@ -251,6 +242,7 @@ if ($action == 'updatelines' && $permissiontoreceive) {
 									}
 								}
 							}
+							*/
 						}
 					} else {
 						$result = $objectsrc->dispatchProduct($user, GETPOST($prod, 'int'), GETPOST($qty), GETPOST($ent, 'int'), GETPOST($pu), GETPOST('comment'), $dDLUO, $dDLC, $lot, GETPOST($fk_commandefourndet, 'int'), 0, $object->id);
@@ -291,6 +283,9 @@ if ($action == 'updatelines' && $permissiontoreceive) {
 	} else {
 		$db->commit();
 		setEventMessages($langs->trans("ReceptionUpdated"), null);
+
+		header("Location: ".DOL_URL_ROOT.'/reception/dispatch.php?id='.$object->id);
+		exit;
 	}
 }
 
@@ -436,7 +431,7 @@ if ($id > 0 || !empty($ref)) {
 	print '</tr>';
 	print '</table>';
 
-	print '<br><center>';
+	print '<br><br><center>';
 	print '<a href="#" id="resetalltoexpected" class="marginrightonly paddingright marginleftonly paddingleft">'.img_picto("", 'autofill', 'class="pictofixedwidth"').$langs->trans("RestoreWithCurrentQtySaved").'</a></td>';
 	// Link to clear qty
 	print '<a href="#" id="autoreset" class="marginrightonly paddingright marginleftonly paddingleft">'.img_picto("", 'eraser', 'class="pictofixedwidth"').$langs->trans("ClearQtys").'</a></td>';
@@ -445,14 +440,13 @@ if ($id > 0 || !empty($ref)) {
 	print '<br>';
 	$disabled = 0;	// This is used to disable or not the bulk selection of target warehouse. No reason to have it disabled so forced to 0.
 
-	if ($object->statut == Reception::STATUS_DRAFT) {
+	if ($object->statut == Reception::STATUS_DRAFT || ($object->statut == Reception::STATUS_VALIDATED && empty($conf->global->STOCK_CALCULATE_ON_RECEPTION))) {
 		require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 		$formproduct = new FormProduct($db);
 		$formproduct->loadWarehouses();
 		$entrepot = new Entrepot($db);
 		$listwarehouses = $entrepot->list_array(1);
 
-
 		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 
 		print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -1055,13 +1049,13 @@ if ($id > 0 || !empty($ref)) {
 		print '</div>';
 
 		if ($nbproduct) {
-			$checkboxlabel = $langs->trans("CloseReceivedSupplierOrdersAutomatically", $langs->transnoentitiesnoconv('StatusOrderReceivedAll'));
-
 			print '<div class="center">';
 			$parameters = array();
 			$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
 			// modified by hook
 			if (empty($reshook)) {
+				/*$checkboxlabel = $langs->trans("CloseReceivedSupplierOrdersAutomatically", $langs->transnoentitiesnoconv('StatusOrderReceivedAll'));
+
 				if (empty($conf->reception->enabled)) {
 					print $langs->trans("Comment").' : ';
 					print '<input type="text" class="minwidth400" maxlength="128" name="comment" value="';
@@ -1075,6 +1069,8 @@ if ($id > 0 || !empty($ref)) {
 				$dispatchBt = empty($conf->reception->enabled) ? $langs->trans("Receive") : $langs->trans("CreateReception");
 
 				print '<br>';
+				*/
+
 				print '<input type="submit" id="submitform" class="button" name="dispatch" value="'.$langs->trans("Save").'"';
 				$disabled = 0;
 				if (!$permissiontoreceive) {
@@ -1146,11 +1142,13 @@ if ($id > 0 || !empty($ref)) {
 				return false;
 			});
 
-			$(".resetline").click(function(){
+			$(".resetline").click(function(e){
+				e.preventDefault();
 				id = $(this).attr("id");
 				id = id.split("reset_");
 				console.log("Reset trigger for id = qty_"+id[1]);
 				$("#qty_"+id[1]).val("");
+				return false;
 			});
 		});
 	</script>';
diff --git a/htdocs/reception/note.php b/htdocs/reception/note.php
index b227a3e4a43..bbcd91e32a2 100644
--- a/htdocs/reception/note.php
+++ b/htdocs/reception/note.php
@@ -83,22 +83,18 @@ if (isModEnabled("reception")) {
 }
 $permissionnote = $user->rights->reception->creer; // Used by the include of actions_setnotes.inc.php
 
+// TODO Test on reception module on only
 if ($origin == 'reception') {
 	$result = restrictedArea($user, $origin, $object->id);
 } else {
-	if ($origin == 'reception') {
-		$result = restrictedArea($user, $origin, $object->id);
-	} else {
-		if ($origin == 'supplierorder' || $origin == 'order_supplier') {
-			$result = restrictedArea($user, 'fournisseur', $object, 'commande_fournisseur', 'commande');
-		} elseif (empty($user->rights->{$origin}->lire) && empty($user->rights->{$origin}->read)) {
-			accessforbidden();
-		}
+	if ($origin == 'supplierorder' || $origin == 'order_supplier') {
+		$result = restrictedArea($user, 'fournisseur', $object, 'commande_fournisseur', 'commande');
+	} elseif (empty($user->rights->{$origin}->lire) && empty($user->rights->{$origin}->read)) {
+		accessforbidden();
 	}
 }
 
 
-
 /*
  * Actions
  */