diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index 05f60f9d8eb..edac096c8f0 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -1521,6 +1521,10 @@ if ($action == 'create' && $user->rights->commande->creer)
 			$objectsrc->fetch($originid);
 			if (empty($objectsrc->lines) && method_exists($objectsrc,'fetch_lines'))  $objectsrc->fetch_lines();
 			$objectsrc->fetch_thirdparty();
+			
+			//Replicate extrafields
+			$objectsrc->fetch_optionals($originid);
+			$object->array_options=$objectsrc->array_options;
 
 			$projectid          = (!empty($objectsrc->fk_project)?$objectsrc->fk_project:'');
 			$ref_client         = (!empty($objectsrc->ref_client)?$objectsrc->ref_client:'');
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 1707d4acfaf..7e82e4d38d3 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -2022,6 +2022,10 @@ if ($action == 'create')
 			$remise_percent 	= (! empty($objectsrc->remise_percent)?$objectsrc->remise_percent:(! empty($soc->remise_percent)?$soc->remise_percent:0));
 			$remise_absolue 	= (! empty($objectsrc->remise_absolue)?$objectsrc->remise_absolue:(! empty($soc->remise_absolue)?$soc->remise_absolue:0));
 			$dateinvoice		= empty($conf->global->MAIN_AUTOFILL_DATE)?-1:0;
+			
+			//Replicate extrafields
+			$objectsrc->fetch_optionals($originid);
+			$object->array_options=$objectsrc->array_options;
 		}
 	}
 	else