diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index eb8c384e37e..ab30f083ebe 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -715,6 +715,80 @@ if (empty($reshook))
 						unset($_POST[$batch]);
 						unset($_POST[$qty]);
 					}
+					// add new batch
+					$lotStock = new Productbatch($db);
+					$batch="batchl".$line_id."_0";
+					$qty = "qtyl".$line_id."_0";
+					$batch_id = GETPOST($batch,'int');
+					$batch_qty = GETPOST($qty, 'int');
+					$lineIdToAddLot = 0;
+					if ($batch_qty > 0 && ! empty($batch_id))
+					{
+						if ($lotStock->fetch($batch_id) > 0)
+						{
+							// check if lotStock warehouse id is same as line warehouse id
+							if ($lines[$i]->entrepot_id > 0)
+							{
+								// single warehouse shipment line
+								if ($lines[i]->entrepot_id == $lotStock->warehouseid)
+								{
+									$lineIdToAddLot = $line_id;
+								}
+							}
+							else if (count($lines[$i]->details_entrepot) > 1)
+							{
+								// multi warehouse shipment lines
+								foreach ($lines[$i]->details_entrepot as $detail_entrepot)
+								{
+									if ($detail_entrepot->entrepot_id == $lotStock->warehouseid)
+									{
+										$lineIdToAddLot = $detail_entrepot->line_id;
+									}
+								}
+							}
+							if ($lineIdToAddLot) 
+							{
+								// add lot to existing line
+								if ($line->fetch($lineIdToAddLot) > 0)
+								{
+									$line->detail_batch->fk_origin_stock = $batch_id;
+									$line->detail_batch->batch = $lotStock->batch;
+									$line->detail_batch->entrepot_id = $lotStock->warehouseid;
+									$line->detail_batch->dluo_qty = $batch_qty;
+									if ($line->update($user) < 0) {
+										setEventMessages($line->error, $line->errors, 'errors');
+										$error++;
+									}
+								}
+								else
+								{
+									setEventMessages($line->error, $line->errors, 'errors');
+									$error++;
+								}
+							}
+							else
+							{
+								// create new line with new lot
+								$line->origin_line_id = $lines[$i]->origin_line_id;
+								$line->entrepot_id = $lotStock->warehouseid;
+								$line->detail_batch[0] = new ExpeditionLineBatch($db);
+								$line->detail_batch[0]->fk_origin_stock = $batch_id;
+								$line->detail_batch[0]->batch = $lotStock->batch;
+								$line->detail_batch[0]->entrepot_id = $lotStock->warehouseid;
+								$line->detail_batch[0]->dluo_qty = $batch_qty;
+								if ($object->create_line_batch($line, $line->array_options) < 0)
+								{
+									setEventMessages($object->error, $object->errors, 'errors');
+									$error++;
+								}
+							}
+						}
+						else 
+						{
+							setEventMessages($lotStock->error, $lotStock->errors, 'errors');
+							$error++;
+						}
+					}
 				}
 				else 
 				{
@@ -2180,6 +2254,13 @@ else if ($id || $ref)
 						print '<td>' . $formproduct->selectLotStock($detail_batch->fk_origin_stock, 'batchl'.$detail_batch->fk_expeditiondet.'_'.$detail_batch->fk_origin_stock, '', 1, 0, $lines[$i]->fk_product, $line->entrepot_id). '</td>';
 						print '</tr>';
 					}
+					// add a 0 qty lot row to be able to add a lot
+					print '<tr>';
+					// Qty to ship or shipped
+					print '<td>' . '<input name="qtyl'.$line_id.'_0" id="qtyl'.$line_id.'_0" type="text" size="4" value="0">' . '</td>';
+					// Batch number managment
+					print '<td>' . $formproduct->selectLotStock('', 'batchl'.$line_id.'_0', '', 1, 0, $lines[$i]->fk_product). '</td>';
+					print '</tr>';
 				}
 				else if (! empty($conf->stock->enabled))
 				{
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 3e341e6d5be..0e45248aab4 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -2547,7 +2547,7 @@ class ExpeditionLigne extends CommonObjectLine
 		{
 			dol_syslog(get_class($this)."::update expedition batch id=$expedition_batch_id, batch_id=$batch_id, batch=$batch");			
 			
-			if (empty($batch_id) || empty($expedition_batch_id) || empty($this->fk_product)) {
+			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';
 				$error++;
@@ -2555,7 +2555,7 @@ class ExpeditionLigne extends CommonObjectLine
 
 			// fetch remaining lot qty
 			require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionbatch.class.php';
-			if (($lotArray = ExpeditionLineBatch::fetchAll($this->db, $this->id)) < 0)
+			if (! $error && ($lotArray = ExpeditionLineBatch::fetchAll($this->db, $this->id)) < 0)
 			{
 				$this->errors[]=$this->db->lasterror()." - ExpeditionLineBatch::fetchAll";
 				$error++;
@@ -2582,34 +2582,34 @@ class ExpeditionLigne extends CommonObjectLine
 					$this->errors[] = $lot->errors;
 					$error++;
 				}
-				else
+				if (! $error && ! empty($expedition_batch_id))
 				{
 					// delete lot expedition line
 					$sql = "DELETE FROM ".MAIN_DB_PREFIX."expeditiondet_batch";
 					$sql.= " WHERE fk_expeditiondet = ".$this->id;
 					$sql.= " AND rowid = ".$expedition_batch_id;
-		
 					if (!$this->db->query($sql))
 					{
 						$this->errors[]=$this->db->lasterror()." - sql=$sql";
 						$error++;
 					}
-					else if ($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;
+						$shipmentLot->eatby = $lot->eatby;
+						$shipmentLot->sellby = $lot->sellby;
+						$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) 
 						{
-							$shipmentLot = new ExpeditionLineBatch($this->db);
-							$shipmentLot->batch = $lot->batch;
-							$shipmentLot->eatby = $lot->eatby;
-							$shipmentLot->sellby = $lot->sellby;
-							$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) 
-							{
-								$this->errors[]=$shipmentLot->errors;
-								$error++;
-							}
+							$this->errors[]=$shipmentLot->errors;
+							$error++;
 						}
 					}
 				}