diff --git a/htdocs/delivery/card.php b/htdocs/delivery/card.php
index a845b7aff95..67a80084710 100644
--- a/htdocs/delivery/card.php
+++ b/htdocs/delivery/card.php
@@ -114,7 +114,7 @@ if ($action == 'add') {
 		$idl = "idl".$i;
 		$qtytouse = price2num(GETPOST($qty));
 		if ($qtytouse > 0) {
-			$object->addline(GETPOST($idl), price2num($qtytouse));
+			$object->addline(GETPOST($idl), price2num($qtytouse), $arrayoptions);
 		}
 	}
 
@@ -603,7 +603,7 @@ if ($action == 'create') {    // Create. Seems to no be used
 					print "</tr>";
 
 					// Display lines extrafields
-					if (!empty($extrafields)) {
+					//if (!empty($extrafields)) {
 						$colspan = 2;
 						$mode = ($object->statut == 0) ? 'edit' : 'view';
 
@@ -618,8 +618,13 @@ if ($action == 'create') {    // Create. Seems to no be used
 
 							$object->lines[$i]->array_options = array_merge($object->lines[$i]->array_options, $srcLine->array_options);
 						}
-						print $object->lines[$i]->showOptionals($extrafields, $mode, array('style' => 'class="oddeven"', 'colspan' => $colspan), $i);
-					}
+						else {
+						    $srcLine = new DeliveryLine($db);
+						    $extrafields->fetch_name_optionals_label($srcLine->table_element);
+
+						}
+						print $object->lines[$i]->showOptionals($extrafields, $mode, array('style' => 'class="oddeven"', 'colspan' => $colspan), '');
+					//}
 				}
 
 				$i++;
diff --git a/htdocs/delivery/class/delivery.class.php b/htdocs/delivery/class/delivery.class.php
index 019187fca28..775cd96e2c3 100644
--- a/htdocs/delivery/class/delivery.class.php
+++ b/htdocs/delivery/class/delivery.class.php
@@ -211,7 +211,7 @@ class Delivery extends CommonObject
 						$origin_id = $this->lines[$i]->commande_ligne_id; // For backward compatibility
 					}
 
-					if (!$this->create_line($origin_id, $this->lines[$i]->qty, $this->lines[$i]->fk_product, $this->lines[$i]->description)) {
+					if (!$this->create_line($origin_id, $this->lines[$i]->qty, $this->lines[$i]->fk_product, $this->lines[$i]->description, $this->lines[$i]->array_options)) {
 						$error++;
 					}
 				}
@@ -264,7 +264,7 @@ class Delivery extends CommonObject
 	 *	@param	string	$description			Description
 	 *	@return	int								<0 if KO, >0 if OK
 	 */
-	public function create_line($origin_id, $qty, $fk_product, $description)
+	public function create_line($origin_id, $qty, $fk_product, $description, $array_options = 0)
 	{
 		// phpcs:enable
 		$error = 0;
@@ -282,6 +282,15 @@ class Delivery extends CommonObject
 		if (!$this->db->query($sql)) {
 			$error++;
 		}
+		
+		$id = $this->db->last_insert_id(MAIN_DB_PREFIX."deliverydet");
+		
+		if (is_array($array_options) && count($array_options) > 0) {
+		    $line = new DeliveryLine($this->db);
+		    $line->id = $id;
+		    $line->array_options = $array_options;
+		    $result = $line->insertExtraFields();
+		}
 
 		if ($error == 0) {
 			return 1;
@@ -531,7 +540,9 @@ class Delivery extends CommonObject
 			$line->description       = $expedition->lines[$i]->description;
 			$line->qty               = $expedition->lines[$i]->qty_shipped;
 			$line->fk_product        = $expedition->lines[$i]->fk_product;
-
+			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($expedition->lines[$i]->array_options) && count($expedition->lines[$i]->array_options) > 0) { // For avoid conflicts if trigger used
+			    $line->array_options = $expedition->lines[$i]->array_options;
+			}
 			$this->lines[$i] = $line;
 		}
 
@@ -593,14 +604,18 @@ class Delivery extends CommonObject
 	 *	@param	int		$qty			Qty
 	 *	@return	void
 	 */
-	public function addline($origin_id, $qty)
+	public function addline($origin_id, $qty, $array_options = 0)
 	{
-		$num = count($this->lines);
+		global $conf;
+
+	    	$num = count($this->lines);
 		$line = new DeliveryLine($this->db);
 
 		$line->origin_id = $origin_id;
 		$line->qty = $qty;
-
+		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options) > 0) { // For avoid conflicts if trigger used
+		    $line->array_options = $array_options;
+		}
 		$this->lines[$num] = $line;
 	}