diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index a44054cdfd0..dea2d0c0ed8 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1758,7 +1758,15 @@ if ($action == 'create' && $usercancreate)
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action);
 	print $hookmanager->resPrint;
 	if (empty($reshook)) {
-		print $object->showOptionals($extrafields, 'edit');
+		if (! empty($conf->global->THIRDPARTY_PROPAGATE_EXTRAFIELDS_TO_ORDER))
+		// copy from thirdparty
+				$tpExtrafields = new Extrafields($db);
+				$tpExtrafieldLabels = $tpExtrafields->fetch_name_optionals_label($soc->table_element);
+				if ($soc->fetch_optionals() > 0) {
+					$object->array_options = array_merge($object->array_options, $soc->array_options);
+				}
+		};
+				print $object->showOptionals($extrafields, 'edit');
 	}
 
 	// Template to use by default