diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index e5ce64715e6..4a02a1ca4ee 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004      Eric Seigne           <eric.seigne@ryxeo.com>
  * Copyright (C) 2004-2009 Laurent Destailleur   <eldy@users.sourceforge.net>
  * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
- * Copyright (C) 2005-2010 Regis Houssin         <regis@dolibarr.fr>
+ * Copyright (C) 2005-2011 Regis Houssin         <regis@dolibarr.fr>
  * Copyright (C) 2006      Andre Cianfarani      <acianfa@free.fr>
  * Copyright (C) 2008      Raphael Bertrand (Resultic)   <raphael.bertrand@resultic.fr>
  * Copyright (C) 2010      Juanjo Menent         <jmenent@2byte.es>
@@ -91,7 +91,9 @@ class Propal extends CommonObject
 	var $remise_absolue;
 	var $note;
 	var $note_public;
-	var $fk_delivery_address;
+	var $fk_delivery_address;		// deprecated (for compatibility)
+	var $fk_address;
+	var $address_type;
 	var $adresse;
 
 	var $products=array();
@@ -952,7 +954,8 @@ class Propal extends CommonObject
 				$this->datep                = $this->db->jdate($obj->dp);
 				$this->fin_validite         = $this->db->jdate($obj->dfv);
 				$this->date_livraison       = $this->db->jdate($obj->date_livraison);
-				$this->fk_delivery_address  = $obj->fk_adresse_livraison;
+				$this->fk_delivery_address  = $obj->fk_adresse_livraison;	// TODO obsolete
+				$this->fk_address  			= $obj->fk_adresse_livraison;
 
 				$this->mode_reglement_id       = $obj->fk_mode_reglement;
 				$this->mode_reglement_code     = $obj->mode_reglement_code;
@@ -1201,16 +1204,16 @@ class Propal extends CommonObject
 	 *      \param      adresse_livraison      Adresse de livraison
 	 *      \return     int         		<0 si ko, >0 si ok
 	 */
-	function set_adresse_livraison($user, $address_id)
+	function set_adresse_livraison($user, $fk_address)
 	{
 		if ($user->rights->propale->creer)
 		{
-			$sql = "UPDATE ".MAIN_DB_PREFIX."propal SET fk_adresse_livraison = '".$address_id."'";
+			$sql = "UPDATE ".MAIN_DB_PREFIX."propal SET fk_adresse_livraison = '".$fk_address."'";
 			$sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";
 
 			if ($this->db->query($sql) )
 			{
-				$this->fk_delivery_address = $address_id;
+				$this->fk_delivery_address = $fk_address;
 				return 1;
 			}
 			else
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index a035b0aa1f6..c92f96255a5 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -412,7 +412,7 @@ class CommonObject
 		$sql.= " ".MAIN_DB_PREFIX."c_type_contact as tc";
 		$sql.= " WHERE ec.element_id = ".$this->id;
 		$sql.= " AND ec.fk_socpeople = c.rowid";
-		$sql.= " AND c.entity = ".$conf->entity;
+		$sql.= " AND c.entity IN (0,".$conf->entity.")";
 		$sql.= " AND ec.fk_c_type_contact = tc.rowid";
 		$sql.= " AND tc.element = '".$this->element."'";
 		$sql.= " AND tc.source = '".$source."'";
@@ -507,17 +507,17 @@ class CommonObject
 	}
 
 	/**
-	 *		\brief      Charge l'adresse de livraison d'id $this->fk_delivery_address dans this->deliveryaddress
-	 *		\param      userid 		Id du contact
-	 *		\return		int			<0 if KO, >0 if OK
+	 *		Charge l'adresse d'id $this->fk_address dans this->address
+	 *		@param      fk_address 		Id de l'adresse
+	 *		@return		int				<0 if KO, >0 if OK
 	 */
-	function fetch_adresse_livraison($deliveryaddressid)
+	function fetch_address($fk_address)
 	{
-		$address = new Societe($this->db);
-		$result=$address->fetch_adresse_livraison($deliveryaddressid);
-		$this->deliveryaddress = $address;
-		$this->adresse = $address; // TODO obsolete
-		$this->address = $address;
+		$object = new Societe($this->db);
+		$result=$object->fetch_address($fk_address);
+		$this->deliveryaddress = $object;	// TODO obsolete
+		$this->adresse = $object; 			// TODO obsolete
+		$this->address = $object;
 		return $result;
 	}
 
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 8e817f92ba4..847686f671c 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -163,12 +163,14 @@ class User extends CommonObject
 			$obj = $this->db->fetch_object($result);
 			if ($obj)
 			{
-				$this->id = $obj->rowid;
-				$this->ref = $obj->rowid;
+				$this->id 			= $obj->rowid;
+				$this->ref 			= $obj->rowid;
 
-				$this->ldap_sid = $obj->ldap_sid;
-				$this->nom = $obj->name;
-				$this->prenom = $obj->firstname;
+				$this->ldap_sid 	= $obj->ldap_sid;
+				$this->nom 			= $obj->name;		// TODO deprecated
+				$this->lastname		= $obj->name;
+				$this->prenom 		= $obj->firstname;	// TODO deprecated
+				$this->firstname 	= $obj->firstname;
 
 				$this->login = $obj->login;
 				$this->pass_indatabase = $obj->pass;