diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index ebfe7f1abee..26102b9b42a 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -4517,7 +4517,7 @@ abstract class CommonObject
 
 		$parameters = array('modelspath'=>$modelspath,'modele'=>$modele,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'hidedesc'=>$hidedesc,'hideref'=>$hideref, 'moreparams'=>$moreparams);
 		$reshook = $hookmanager->executeHooks('commonGenerateDocument', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-		
+
 		if(empty($reshook))
 		{
 		dol_syslog("commonGenerateDocument modele=".$modele." outputlangs->defaultlang=".(is_object($outputlangs)?$outputlangs->defaultlang:'null'));
@@ -4902,13 +4902,12 @@ abstract class CommonObject
 		if (! is_array($optionsArray))
 		{
 			// If $extrafields is not a known object, we initialize it. Best practice is to have $extrafields defined into card.php or list.php page.
-			// TODO Use of existing $extrafield is not yet ready (must mutualize code that use extrafields in form first)
-			// global $extrafields;
-			//if (! is_object($extrafields))
-			//{
+			global $extrafields;
+			if (! isset($extrafields) || ! is_object($extrafields))
+			{
 				require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 				$extrafields = new ExtraFields($this->db);
-			//}
+			}
 
 			// Load array of extrafields for elementype = $this->table_element
 			if (empty($extrafields->attributes[$this->table_element]['loaded']))