diff --git a/htdocs/commande/commande.class.php b/htdocs/commande/commande.class.php
index 19b9409f431..20d52c01193 100644
--- a/htdocs/commande/commande.class.php
+++ b/htdocs/commande/commande.class.php
@@ -59,7 +59,8 @@ class Commande extends CommonObject
 	var $cond_reglement_code;
 	var $mode_reglement_id;
 	var $mode_reglement_code;
-	var $adresse_livraison_id;
+	var $adresse_livraison_id; // TODO obsolete
+	var $fk_delivery_address;
 	var $adresse;
 	var $date;				// Date commande
 	var $date_commande;		// Date commande (deprecated)
@@ -970,7 +971,8 @@ class Commande extends CommonObject
 				$this->cond_reglement         = $obj->cond_reglement_libelle;
 				$this->cond_reglement_facture = $obj->cond_reglement_libelle_facture;
 				$this->date_livraison         = $obj->date_livraison;
-				$this->adresse_livraison_id   = $obj->fk_adresse_livraison;
+				$this->adresse_livraison_id   = $obj->fk_adresse_livraison; // TODO obsolete
+				$this->fk_delivery_address    = $obj->fk_adresse_livraison;
 				$this->propale_id             = $obj->fk_propale;
 				$this->lignes                 = array();
 
diff --git a/htdocs/expedition/expedition.class.php b/htdocs/expedition/expedition.class.php
index f5332cd66e8..748edbf69bc 100644
--- a/htdocs/expedition/expedition.class.php
+++ b/htdocs/expedition/expedition.class.php
@@ -98,6 +98,7 @@ class Expedition extends CommonObject
 		$sql.= ", fk_user_author";
 		$sql.= ", date_expedition";
 		$sql.= ", fk_soc";
+		$sql.= ", fk_adresse_livraison";
 		$sql.= ", fk_expedition_methode";
 		$sql.= ", tracking_number";
 		$sql.= ", weight";
@@ -114,6 +115,7 @@ class Expedition extends CommonObject
 		$sql.= ", ".$user->id;
 		$sql.= ", ".$this->db->idate($this->date_expedition);
 		$sql.= ", ".$this->socid;
+		$sql.= ", ".($this->fk_delivery_address>0?$this->fk_delivery_address:"null");
 		$sql.= ", ".($this->expedition_method_id>0?$this->expedition_method_id:"null");
 		$sql.= ", '". $this->tracking_number."'";
 		$sql.= ", ".$this->weight;
@@ -277,7 +279,8 @@ class Expedition extends CommonObject
 				$this->livraison_id         = $obj->livraison_id;
 				$this->user_author_id       = $obj->fk_user_author;
 				$this->date                 = $obj->date_expedition;
-				$this->adresse_livraison_id = $obj->fk_adresse_livraison;
+				$this->adresse_livraison_id = $obj->fk_adresse_livraison; // TODO obsolete
+				$this->fk_delivery_address  = $obj->fk_adresse_livraison;
 				$this->modelpdf             = $obj->model_pdf;
 				$this->expedition_method_id = $obj->fk_expedition_methode;
 				$this->tracking_number      = $obj->tracking_number;
@@ -800,7 +803,8 @@ class Expedition extends CommonObject
 		}
 		$this->date                 = time();
 		$this->entrepot_id          = 0;
-		$this->adresse_livraison_id = 0;
+		$this->adresse_livraison_id = 0; // TODO obsolete
+		$this->fk_delivery_address  = 0;
 		$this->socid = $socids[$socid];
 
 		$this->commande_id          = 0;
diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php
index 8e24805cc44..3e594894606 100644
--- a/htdocs/expedition/fiche.php
+++ b/htdocs/expedition/fiche.php
@@ -89,6 +89,7 @@ if ($_POST["action"] == 'add')
 	//$object->fetch_lines();
 
 	$expedition->socid  = $object->socid;
+	$expedition->fk_delivery_address = $object->fk_delivery_address;
 	$expedition->expedition_method_id = $_POST["expedition_method_id"];
 	$expedition->tracking_number = $_POST["tracking_number"];