diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index e8a716c10f0..04d895fd015 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -653,7 +653,6 @@ if (empty($reshook))
 	else if ($action == 'updateline' && $user->rights->expedition->creer && GETPOST('save'))
 	{
 		// Clean parameters
-
 		$qty=0;
 		$entrepot_id = 0;
 		$batch_id = 0;
@@ -662,9 +661,8 @@ if (empty($reshook))
 		$num_prod = count($lines);
 		for ($i = 0 ; $i < $num_prod ; $i++)
 		{
-			if ($lines[$i]->id == $line_id)
+			if ($lines[$i]->id == $line_id)		// we have found line to update
 			{
-				// line to update
 				$line = new ExpeditionLigne($db);
 				// Extrafields Lines
 				$extrafieldsline = new ExtraFields($db);
@@ -796,46 +794,61 @@ if (empty($reshook))
 				}
 				else
 				{
-					// line without lot
-					if ($lines[$i]->entrepot_id > 0)
+					if ($lines[$i]->fk_product > 0)
+					{
+						// line without lot
+						if ($lines[$i]->entrepot_id > 0)
+						{
+							// single warehouse shipment line
+							$stockLocation="entl".$line_id;
+							$qty = "qtyl".$line_id;
+							$line->id = $line_id;
+							$line->entrepot_id = GETPOST($stockLocation,'int');
+							$line->qty = GETPOST($qty, 'int');
+							if ($line->update($user) < 0) {
+								setEventMessages($line->error, $line->errors, 'errors');
+								$error++;
+							}
+							unset($_POST[$stockLocation]);
+							unset($_POST[$qty]);
+						}
+						else if (count($lines[$i]->details_entrepot) > 1)
+						{
+							// multi warehouse shipment lines
+							foreach ($lines[$i]->details_entrepot as $detail_entrepot)
+							{
+								if (! $error) {
+									$stockLocation="entl".$detail_entrepot->line_id;
+									$qty = "qtyl".$detail_entrepot->line_id;
+									$warehouse = GETPOST($stockLocation,'int');
+									if (!empty ($warehouse))
+									{
+										$line->id = $detail_entrepot->line_id;
+										$line->entrepot_id = $warehouse;
+										$line->qty = GETPOST($qty, 'int');
+										if ($line->update($user) < 0) {
+											setEventMessages($line->error, $line->errors, 'errors');
+											$error++;
+										}
+									}
+									unset($_POST[$stockLocation]);
+									unset($_POST[$qty]);
+								}
+							}
+						}
+					}
+					else	// Product no predefined
 					{
-						// single warehouse shipment line
-						$stockLocation="entl".$line_id;
 						$qty = "qtyl".$line_id;
 						$line->id = $line_id;
-						$line->entrepot_id = GETPOST($stockLocation,'int');
 						$line->qty = GETPOST($qty, 'int');
+						$line->entrepot_id = 0;
 						if ($line->update($user) < 0) {
 							setEventMessages($line->error, $line->errors, 'errors');
 							$error++;
 						}
-						unset($_POST[$stockLocation]);
 						unset($_POST[$qty]);
 					}
-					else if (count($lines[$i]->details_entrepot) > 1)
-					{
-						// multi warehouse shipment lines
-						foreach ($lines[$i]->details_entrepot as $detail_entrepot)
-						{
-							if (! $error) {
-								$stockLocation="entl".$detail_entrepot->line_id;
-								$qty = "qtyl".$detail_entrepot->line_id;
-								$warehouse = GETPOST($stockLocation,'int');
-								if (!empty ($warehouse))
-								{
-									$line->id = $detail_entrepot->line_id;
-									$line->entrepot_id = $warehouse;
-									$line->qty = GETPOST($qty, 'int');
-									if ($line->update($user) < 0) {
-										setEventMessages($line->error, $line->errors, 'errors');
-										$error++;
-									}
-								}
-								unset($_POST[$stockLocation]);
-								unset($_POST[$qty]);
-							}
-						}
-					}
 				}
 			}
 		}
@@ -2010,9 +2023,8 @@ else if ($id || $ref)
 		print '<div class="clearboth"></div>';
 
 
-		/*
-		 * Lines of products
-		 */
+		// Lines of products
+
 		if ($action == 'editline')
 		{
 			print '	<form name="updateline" id="updateline" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;lineid=' . $line_id . '" method="POST">
@@ -2027,11 +2039,14 @@ else if ($id || $ref)
         print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
+		// #
 		if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
 		{
 			print '<td width="5" align="center">&nbsp;</td>';
 		}
+		// Product/Service
 		print '<td>'.$langs->trans("Products").'</td>';
+		// Qty
 		print '<td align="center">'.$langs->trans("QtyOrdered").'</td>';
 		if ($origin && $origin_id > 0)
 		{
@@ -2107,7 +2122,7 @@ else if ($id || $ref)
 			}
 		}
 
-        // Get list of products already sent for same source object
+		// Get list of products already sent for same source object into $alreadysent
 		$alreadysent = array();
 		if ($origin && $origin_id > 0)
 		{
@@ -2156,6 +2171,7 @@ else if ($id || $ref)
 		    print '<!-- origin line id = '.$lines[$i]->origin_line_id.' -->'; // id of order line
 			print '<tr class="oddeven">';
 
+			// #
 			if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
 			{
 				print '<td align="center">'.($i+1).'</td>';
@@ -2195,7 +2211,7 @@ else if ($id || $ref)
 			else
 			{
 				print "<td>";
-				if ($lines[$i]->fk_product_type==1) $text = img_object($langs->trans('Service'),'service');
+				if ($lines[$i]->product_type == Product::TYPE_SERVICE) $text = img_object($langs->trans('Service'),'service');
 				else $text = img_object($langs->trans('Product'),'product');
 
 				if (! empty($lines[$i]->label)) {
@@ -2246,9 +2262,10 @@ else if ($id || $ref)
 			if ($action == 'editline' && $lines[$i]->id == $line_id)
 			{
 				// edit mode
-				print '<td colspan="'.$editColspan.'"><table>';
+				print '<td colspan="'.$editColspan.'" align="center"><table class="nobordernopadding">';
 				if (is_array($lines[$i]->detail_batch) && count($lines[$i]->detail_batch) > 0)
 				{
+					print '<!-- case edit 1 -->';
 					$line = new ExpeditionLigne($db);
 					foreach ($lines[$i]->detail_batch as $detail_batch)
 					{
@@ -2274,30 +2291,52 @@ else if ($id || $ref)
 				}
 				else if (! empty($conf->stock->enabled))
 				{
-					if ($lines[$i]->entrepot_id > 0)
+					if ($lines[$i]->fk_product > 0)
 					{
-						print '<tr>';
-						// Qty to ship or shipped
-						print '<td>' . '<input name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'">' . '</td>';
-						// Warehouse source
-						print '<td>' . $formproduct->selectWarehouses($lines[$i]->entrepot_id, 'entl'.$line_id, '', 1, 0, $lines[$i]->fk_product, '', 1). '</td>';
-						// Batch number managment
-						print '<td> - ' . $langs->trans("NA") . '</td>';
-						print '</tr>';
-					}
-					else if (count($lines[$i]->details_entrepot) > 1)
-					{
-						foreach ($lines[$i]->details_entrepot as $detail_entrepot)
+						if ($lines[$i]->entrepot_id > 0)
 						{
+							print '<!-- case edit 2 -->';
 							print '<tr>';
 							// Qty to ship or shipped
-							print '<td>' . '<input name="qtyl'.$detail_entrepot->line_id.'" id="qtyl'.$detail_entrepot->line_id.'" type="text" size="4" value="'.$detail_entrepot->qty_shipped.'">' . '</td>';
+							print '<td>' . '<input name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'">' . '</td>';
 							// Warehouse source
-							print '<td>' . $formproduct->selectWarehouses($detail_entrepot->entrepot_id, 'entl'.$detail_entrepot->line_id, '', 1, 0, $lines[$i]->fk_product, '', 1) . '</td>';
+							print '<td>' . $formproduct->selectWarehouses($lines[$i]->entrepot_id, 'entl'.$line_id, '', 1, 0, $lines[$i]->fk_product, '', 1). '</td>';
 							// Batch number managment
 							print '<td> - ' . $langs->trans("NA") . '</td>';
 							print '</tr>';
 						}
+						else if (count($lines[$i]->details_entrepot) > 1)
+						{
+							print '<!-- case edit 3 -->';
+							foreach ($lines[$i]->details_entrepot as $detail_entrepot)
+							{
+								print '<tr>';
+								// Qty to ship or shipped
+								print '<td>' . '<input name="qtyl'.$detail_entrepot->line_id.'" id="qtyl'.$detail_entrepot->line_id.'" type="text" size="4" value="'.$detail_entrepot->qty_shipped.'">' . '</td>';
+								// Warehouse source
+								print '<td>' . $formproduct->selectWarehouses($detail_entrepot->entrepot_id, 'entl'.$detail_entrepot->line_id, '', 1, 0, $lines[$i]->fk_product, '', 1) . '</td>';
+								// Batch number managment
+								print '<td> - ' . $langs->trans("NA") . '</td>';
+								print '</tr>';
+							}
+						}
+						else
+						{
+							print '<!-- case edit 4 -->';
+							print '<tr><td colspan="3">'.$langs->trans("NotEnoughStock").'</td></tr>';
+						}
+					}
+					else
+					{
+						print '<!-- case edit 5 -->';
+						print '<tr>';
+						// Qty to ship or shipped
+						print '<td>' . '<input name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'">' . '</td>';
+						// Warehouse source
+						print '<td>' . '</td>';
+						// Batch number managment
+						print '<td>' . '</td>';
+						print '</tr>';
 					}
 				}
 				print '</table></td>';
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 4807564e65f..342b7a3aa1f 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -2544,8 +2544,8 @@ class ExpeditionLigne extends CommonObjectLine
 
 		if (! empty($batch) && $conf->productbatch->enabled)
 		{
-			dol_syslog(get_class($this)."::update expedition batch id=$expedition_batch_id, batch_id=$batch_id, batch=$batch");			
-			
+			dol_syslog(get_class($this)."::update expedition batch id=$expedition_batch_id, batch_id=$batch_id, batch=$batch");
+
 			if (empty($batch_id) || empty($this->fk_product)) {
 				dol_syslog(get_class($this).'::update missing fk_origin_stock (batch_id) and/or fk_product', LOG_ERR);
 				$this->errors[]='ErrorMandatoryParametersNotProvided';
@@ -2594,10 +2594,10 @@ class ExpeditionLigne extends CommonObjectLine
 						$error++;
 					}
 				}
-				if (! $error && $this->detail_batch->dluo_qty > 0) 
+				if (! $error && $this->detail_batch->dluo_qty > 0)
 				{
 					// create lot expedition line
-					if (isset($lot->id)) 
+					if (isset($lot->id))
 					{
 						$shipmentLot = new ExpeditionLineBatch($this->db);
 						$shipmentLot->batch = $lot->batch;
@@ -2606,7 +2606,7 @@ class ExpeditionLigne extends CommonObjectLine
 						$shipmentLot->entrepot_id = $this->detail_batch->entrepot_id;
 						$shipmentLot->dluo_qty = $this->detail_batch->dluo_qty;
 						$shipmentLot->fk_origin_stock = $batch_id;
-						if ($shipmentLot->create($this->id) < 0) 
+						if ($shipmentLot->create($this->id) < 0)
 						{
 							$this->errors[]=$shipmentLot->errors;
 							$error++;
@@ -2619,7 +2619,7 @@ class ExpeditionLigne extends CommonObjectLine
 		{
 			// update line
 			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
-			$sql.= " fk_entrepot = ".$this->entrepot_id;
+			$sql.= " fk_entrepot = ".($this->entrepot_id > 0 ? $this->entrepot_id : 'null');
 			$sql.= " , qty = ".$qty;
 			$sql.= " WHERE rowid = ".$this->id;
 
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index 3d3d8a0de6c..a358d349531 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -774,7 +774,7 @@ if ($id > 0 || ! empty($ref))
 					$product->load_stock('warehouseopen');
 				}
 
-				if ($objp->fk_product > 0 && $type == 0 && ! empty($conf->stock->enabled))
+				if ($objp->fk_product > 0 && ($type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES)) && ! empty($conf->stock->enabled))
 				{
 					print '<td align="center">';
 					print $product->stock_reel;