diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 32863263d7f..a0552586ffe 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -260,7 +260,6 @@ if (empty($reshook))
 			$db->begin();
 
 			$object->date_commande = $datecommande;
-			$object->entity = (GETPOSTISSET('entity')?GETPOST('entity', 'int'):$conf->entity);
 			$object->note_private = GETPOST('note_private', 'none');
 			$object->note_public = GETPOST('note_public', 'none');
 			$object->source = GETPOST('source_id');
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 37f4ac4b9b2..d43e3eb6041 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -776,7 +776,6 @@ class Commande extends CommonOrder
 
 		// Clean parameters
 		$this->brouillon = 1;		// set command as draft
-		if (empty($this->entity)) $this->entity = $conf->entity;
 
 		// $date_commande is deprecated
 		$date = ($this->date_commande ? $this->date_commande : $this->date);
@@ -860,7 +859,7 @@ class Commande extends CommonOrder
 		$sql.= ", ".($this->remise_percent>0?$this->db->escape($this->remise_percent):0);
 		$sql.= ", ".(int) $this->fk_incoterms;
 		$sql.= ", '".$this->db->escape($this->location_incoterms)."'";
-		$sql.= ", ".$this->entity;
+		$sql.= ", ".setEntity($this);
         $sql.= ", ".($this->module_source ? "'".$this->db->escape($this->module_source)."'" : "null");
 		$sql.= ", ".($this->pos_source != '' ? "'".$this->db->escape($this->pos_source)."'" : "null");
 		$sql.= ", ".(int) $this->fk_multicurrency;
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 135fd2969d3..d965ca9f245 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -1238,7 +1238,7 @@ class FormFile
 						print '</a>';
 					}
 					// Preview link
-					if (! $editline) print $this->showPreview($file, $modulepart, $filepath, 0, '&entity='.(! empty($object->entity)?$object->entity:$onf->entity));
+					if (! $editline) print $this->showPreview($file, $modulepart, $filepath, 0, '&entity='.(! empty($object->entity)?$object->entity:$conf->entity));
 
 					print "</td>\n";
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 19b39fd776d..de52d3a74d1 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -75,7 +75,7 @@ function getDoliDBInstance($type, $host, $user, $pass, $name, $port)
  * 	@param	int		$shared			0=Return id of current entity only,
  * 									1=Return id of current entity + shared entities (default)
  *  @param	object	$currentobject	Current object if needed
- * 	@return	mixed				Entity id(s) to use
+ * 	@return	mixed					Entity id(s) to use
  */
 function getEntity($element, $shared = 1, $currentobject = null)
 {
@@ -95,6 +95,26 @@ function getEntity($element, $shared = 1, $currentobject = null)
 	}
 }
 
+/**
+ * 	Get entity id to use when to create an object
+ *
+ * 	@param	object	$currentobject	Current object
+ * 	@return	mixed					Entity id to use
+ */
+function setEntity($currentobject)
+{
+	global $conf, $mc;
+
+	if (is_object($mc))
+	{
+		return $mc->setEntity($currentobject);
+	}
+	else
+	{
+		return $conf->entity;
+	}
+}
+
 /**
  * Return information about user browser
  *