diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index c16ee425cad..9d0c1d2c00b 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -5082,8 +5082,9 @@ abstract class CommonObject
 			$table_element = $this->table_element;
 			if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility
 
+			dol_syslog(get_class($this)."::insertExtraFields delete then insert", LOG_DEBUG);
+
 			$sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$table_element."_extrafields WHERE fk_object = ".$this->id;
-			dol_syslog(get_class($this)."::insertExtraFields delete", LOG_DEBUG);
 			$this->db->query($sql_del);
 
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX.$table_element."_extrafields (fk_object";
@@ -5094,6 +5095,14 @@ abstract class CommonObject
 				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator
 					$sql.=",".$attributeKey;
 			}
+			// We must insert a default value for fields for other entities that are mandatory to avoid not null error
+			if (is_array($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities']))
+			{
+    			foreach($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as  $tmpkey => $tmpval)
+    			{
+    			    $sql.=",".$tmpkey;
+    			}
+			}
 			$sql .= ") VALUES (".$this->id;
 
 			foreach($new_array_options as $key => $value)
@@ -5112,10 +5121,20 @@ abstract class CommonObject
 					}
 				}
 			}
+			// We must insert a default value for fields for other entities that are mandatory to avoid not null error
+			if (is_array($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities']))
+			{
+			    foreach($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as  $tmpkey => $tmpval)
+    			{
+    			    if (in_array($tmpval, array('int', 'double'))) $sql.=", 0";
+    			    else $sql.=", ''";
+    			}
+			}
+
 			$sql.=")";
 
-			dol_syslog(get_class($this)."::insertExtraFields insert", LOG_DEBUG);
 			$resql = $this->db->query($sql);
+
 			if (! $resql)
 			{
 				$this->error=$this->db->lasterror();
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index a52a759f841..448cfafeee0 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -770,7 +770,7 @@ class ExtraFields
 	 * 	@param	boolean		$forceload			Force load of extra fields whatever is option MAIN_EXTRAFIELDS_DISABLED. Deprecated. Should not be required.
 	 * 	@return	array							Array of attributes keys+label for all extra fields.
 	 */
-	function fetch_name_optionals_label($elementtype,$forceload=false)
+	function fetch_name_optionals_label($elementtype, $forceload=false)
 	{
         // phpcs:enable
 		global $conf;
@@ -807,8 +807,8 @@ class ExtraFields
 
 		$sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired,param,pos,alwayseditable,perms,langs,list,totalizable,fielddefault,fieldcomputed,entity,enabled,help";
 		$sql.= " FROM ".MAIN_DB_PREFIX."extrafields";
-		$sql.= " WHERE entity IN (0,".$conf->entity.")";
-		if ($elementtype) $sql.= " AND elementtype = '".$elementtype."'";	// Filed with object->table_element
+		//$sql.= " WHERE entity IN (0,".$conf->entity.")";    // Filter is done later
+		if ($elementtype) $sql.= " WHERE elementtype = '".$elementtype."'";	// Filed with object->table_element
 		$sql.= " ORDER BY pos";
 
 		$resql=$this->db->query($sql);
@@ -818,6 +818,16 @@ class ExtraFields
 			{
 				while ($tab = $this->db->fetch_object($resql))
 				{
+				    if ($tab->entity != 0 && $tab->entity != $conf->entity)
+				    {
+				        // This field is not in current entity. We discard but before we save it into the array of mandatory fields if it is a mandatory field
+				        if ($tab->fieldrequired && is_null($tab->fielddefault))
+				        {
+				            $this->attributes[$tab->elementtype]['mandatoryfieldsofotherentities'][$tab->name]=$tab->type;
+				        }
+				        continue;
+				    }
+
 					// We can add this attribute to object. TODO Remove this and return $this->attributes[$elementtype]['label']
 					if ($tab->type != 'separate')
 					{
diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
index 185ebe1a56f..53203c46bf4 100644
--- a/htdocs/core/db/mysqli.class.php
+++ b/htdocs/core/db/mysqli.class.php
@@ -867,7 +867,7 @@ class DoliDBMysqli extends DoliDB
         if ($field_desc['default'] != '')
         {
 			if ($field_desc['type'] == 'double' || $field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int') $sql.=" DEFAULT ".$this->escape($field_desc['default']);
-        	elseif ($field_desc['type'] == 'text') $sql.=" DEFAULT '".$this->escape($field_desc['default'])."'";							// Default not supported on text fields
+			elseif ($field_desc['type'] != 'text') $sql.=" DEFAULT '".$this->escape($field_desc['default'])."'";							// Default not supported on text fields
         }
 
         dol_syslog(get_class($this)."::DDLUpdateField ".$sql,LOG_DEBUG);
diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
index 3973931ffd7..0ef9465ab01 100644
--- a/htdocs/core/db/pgsql.class.php
+++ b/htdocs/core/db/pgsql.class.php
@@ -1175,7 +1175,7 @@ class DoliDBPgsql extends DoliDB
 		if ($field_desc['default'] != '')
 		{
 			if ($field_desc['type'] == 'double' || $field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int') $sql.=" DEFAULT ".$this->escape($field_desc['default']);
-        	elseif ($field_desc['type'] == 'text') $sql.=" DEFAULT '".$this->escape($field_desc['default'])."'";							// Default not supported on text fields
+        	elseif ($field_desc['type'] != 'text') $sql.=" DEFAULT '".$this->escape($field_desc['default'])."'";							// Default not supported on text fields
 		}
 
 		dol_syslog($sql,LOG_DEBUG);