diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index 1f81f38594482..01a40150a05d8 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -502,14 +502,15 @@ function select_juridicalstatus($selected='', $country_codeid=0, $filter='')
 	/**
 	 *    Return list of third parties
 	 *
-	 *  @param  Object		$object          Object we try to find contacts
-	 *  @param  string		$var_id          Name of id field
-	 *  @param  string		$selected        Pre-selected third party
-	 *  @param  string		$htmlname        Name of HTML form
-	 * 	@param	string		$limitto		 Disable answers that are not id in this array list
+	 *  @param  Object		$object         Object we try to find contacts
+	 *  @param  string		$var_id         Name of id field
+	 *  @param  string		$selected       Pre-selected third party
+	 *  @param  string		$htmlname       Name of HTML form
+	 * 	@param	string		$limitto		Disable answers that are not id in this array list
+	 *  @param	int			$forceid		This is to force antoher object id than object->id
 	 * 	@return	void
 	 */
-	function selectCompaniesForNewContact($object, $var_id, $selected='', $htmlname='newcompany', $limitto='')
+	function selectCompaniesForNewContact($object, $var_id, $selected='', $htmlname='newcompany', $limitto='', $forceid=0)
 	{
 		global $conf, $langs;
 
@@ -544,7 +545,7 @@ function selectCompaniesForNewContact($object, $var_id, $selected='', $htmlname=
 				}
 
 				// We call a page after a small delay when a new input has been selected
-				$javaScript = "window.location=\'./contact.php?".$var_id."=".$object->id."&".$htmlname."=\' + document.getElementById(\'".$htmlname."\').value;";
+				$javaScript = "window.location=\'./contact.php?".$var_id."=".($forceid>0?$forceid:$object->id)."&".$htmlname."=\' + document.getElementById(\'".$htmlname."\').value;";
                 $htmloption = 'onChange="ac_delay(\''.$javaScript.'\',\'500\');"';                              // When we select with mouse
 				$htmloption.= 'onKeyUp="if (event.keyCode== 13) { ac_delay(\''.$javaScript.'\',\'500\'); }"';   // When we select with keyboard
 
@@ -570,7 +571,7 @@ function selectCompaniesForNewContact($object, $var_id, $selected='', $htmlname=
 			}
 			else
 			{
-				$javaScript = "window.location='./contact.php?".$var_id."=".$object->id."&".$htmlname."=' + form.".$htmlname.".options[form.".$htmlname.".selectedIndex].value;";
+				$javaScript = "window.location='./contact.php?".$var_id."=".($forceid>0?$forceid:$object->id)."&".$htmlname."=' + form.".$htmlname.".options[form.".$htmlname.".selectedIndex].value;";
 				print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'" onChange="'.$javaScript.'">';
 				$num = $this->db->num_rows($resql);
 				$i = 0;
diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php
index 1055c494987d7..1a14077c8b669 100644
--- a/htdocs/core/lib/sendings.lib.php
+++ b/htdocs/core/lib/sendings.lib.php
@@ -53,6 +53,11 @@ function shipping_prepare_head($object)
 		$h++;
 	}
 
+	$head[$h][0] = DOL_URL_ROOT."/expedition/contact.php?id=".$object->id;
+	$head[$h][1] = $langs->trans("ContactsAddresses");
+	$head[$h][2] = 'contact';
+	$h++;
+
 	// Show more tabs from modules
 	// Entries must be declared in modules descriptor with line
 	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
@@ -133,7 +138,7 @@ function show_list_sending_receive($origin,$origin_id,$filter='')
 	$sql.= " AND obj.rowid = ed.fk_origin_line";
 	$sql.= " AND ed.fk_expedition = e.rowid";
 	if ($filter) $sql.= $filter;
-	
+
 	$sql.= " ORDER BY obj.fk_product";
 
 	dol_syslog("show_list_sending_receive sql=".$sql, LOG_DEBUG);
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 991959809ec0a..dd34f0ae8ac19 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -31,8 +31,7 @@
 
 
 /**
- *	\class      Expedition
- *	\brief      Class to manage shippings
+ *	Class to manage shipments
  */
 class Expedition extends CommonObject
 {
@@ -73,7 +72,7 @@ class Expedition extends CommonObject
 	var $date_expedition;	// Date delivery real
 	var $date_creation;
 	var $date_valid;
-	
+
 	// For Invoicing
 	var $total_ht;			// Total net of tax
 	var $total_ttc;			// Total with tax
@@ -81,14 +80,15 @@ class Expedition extends CommonObject
 	var $total_localtax1;   // Total Local tax 1
 	var $total_localtax2;   // Total Local tax 2
 
+
 	/**
 	 *	Constructor
 	 *
-	 *  @param		DoliDB		$DB      Database handler
+	 *  @param		DoliDB		$db      Database handler
 	 */
-	function Expedition($DB)
+	function Expedition($db)
 	{
-		$this->db = $DB;
+		$this->db = $db;
 		$this->lines = array();
 		$this->products = array();
 
@@ -865,16 +865,16 @@ function fetch_lines()
 		if ($resql)
 		{
 			include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php');
-			
+
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			
+
 			$this->total_ht = 0;
 			$this->total_tva = 0;
 			$this->total_ttc = 0;
 			$this->total_localtax1 = 0;
 			$this->total_localtax2 = 0;
-			
+
 			while ($i < $num)
 			{
 				$line = new ExpeditionLigne($this->db);
@@ -897,7 +897,7 @@ function fetch_lines()
 				$line->weight_units   	= $obj->weight_units;
 				$line->volume         	= $obj->volume;
 				$line->volume_units   	= $obj->volume_units;
-				
+
 				//Invoicing
 				$line->desc				= $obj->product_label;
 				$line->qty 				= $obj->qty_shipped;
@@ -912,14 +912,14 @@ function fetch_lines()
 				$line->price			= $obj->price;
 				$line->subprice			= $obj->subprice;
 				$line->remise_percent	= $obj->remise_percent;
-				
+
 				$tabprice = calcul_price_total($obj->qty_shipped, $obj->subprice, $obj->remise_percent, $obj->tva_tx, $obj->localtax1_tx, $obj->localtax2_tx, 0, 'HT', $info_bits);
 				$this->total_ht+= $tabprice[0];
 				$this->total_tva+= $tabprice[1];
 				$this->total_ttc+= $tabprice[2];
 				$this->total_localtax1+= $tabprice[9];
 				$this->total_localtax2+= $tabprice[10];
-				
+
 				$this->lines[$i] = $line;
 
 				$i++;
@@ -1209,7 +1209,7 @@ function GetUrlTrackingStatus($value='')
 			$this->tracking_url = $value;
 		}
 	}
-	
+
 	/**
 	 *	Classify the shipping as invoiced
 	 *
@@ -1218,7 +1218,7 @@ function GetUrlTrackingStatus($value='')
 	function set_billed()
 	{
 		global $conf;
-	
+
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'expedition SET fk_statut=2';
 		$sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > 0 ;';
 		if ($this->db->query($sql) )
@@ -1232,7 +1232,7 @@ function set_billed()
 			return -1;
 		}
 	}
-	
+
 }
 
 
@@ -1253,7 +1253,7 @@ class ExpeditionLigne
 	var $libelle;       // Label produit
 	var $product_desc;  // Description produit
 	var $ref;
-	
+
 	// Invoicing
 	var $remise_percent;
 	var $total_ht;			// Total net of tax
diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php
new file mode 100644
index 0000000000000..ce2a386440044
--- /dev/null
+++ b/htdocs/expedition/contact.php
@@ -0,0 +1,395 @@
+<?php
+/* Copyright (C) 2005      Patrick Rouillon     <patrick@rouillon.net>
+ * Copyright (C) 2005-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis@dolibarr.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *     \file       htdocs/expedition/contact.php
+ *     \ingroup    expedition
+ *     \brief      Onglet de gestion des contacts de expedition
+ */
+
+require("../main.inc.php");
+require_once(DOL_DOCUMENT_ROOT."/expedition/class/expedition.class.php");
+require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/sendings.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php");
+require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
+
+$langs->load("orders");
+$langs->load("sendings");
+$langs->load("companies");
+
+$id=GETPOST('id','int');
+$ref=GETPOST('ref','alpha');
+$action=GETPOST('action','alpha');
+
+// Security check
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'expedition', $id,'');
+
+$object = new expedition($db);
+if ($id > 0 || ! empty($ref))
+{
+    $object->fetch($id, $ref);
+
+    if (!empty($object->origin))
+    {
+        $typeobject = $object->origin;
+        $origin = $object->origin;
+        $object->fetch_origin();
+    }
+
+    // Linked documents
+    if ($typeobject == 'commande' && $object->$typeobject->id && $conf->commande->enabled)
+    {
+        $objectsrc=new Commande($db);
+        $objectsrc->fetch($object->$typeobject->id);
+    }
+    if ($typeobject == 'propal' && $object->$typeobject->id && $conf->propal->enabled)
+    {
+        $objectsrc=new Propal($db);
+        $objectsrc->fetch($object->$typeobject->id);
+    }
+}
+
+
+/*
+ * Actions
+ */
+
+if ($action == 'addcontact' && $user->rights->expedition->creer)
+{
+    if ($result > 0 && $id > 0)
+    {
+  		$result = $objectsrc->add_contact($_POST["contactid"], $_POST["type"], $_POST["source"]);
+    }
+
+	if ($result >= 0)
+	{
+		Header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+		exit;
+	}
+	else
+	{
+		if ($objectsrc->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+		{
+			$langs->load("errors");
+			$mesg = '<div class="error">'.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'</div>';
+		}
+		else
+		{
+			$mesg = '<div class="error">'.$objectsrc->error.'</div>';
+		}
+	}
+}
+
+// bascule du statut d'un contact
+else if ($action == 'swapstatut' && $user->rights->expedition->creer)
+{
+    $result=$objectsrc->swapContactStatus(GETPOST('ligne'));
+}
+
+// Efface un contact
+else if ($action == 'deleteline' && $user->rights->expedition->creer)
+{
+	$result = $objectsrc->delete_contact($_GET["lineid"]);
+
+	if ($result >= 0)
+	{
+		Header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+		exit;
+	}
+	else {
+		dol_print_error($db);
+	}
+}
+
+
+
+/*
+ * View
+ */
+
+llxHeader('',$langs->trans('Order'),'EN:Customers_Orders|FR:expeditions_Clients|ES:Pedidos de clientes');
+
+$form = new Form($db);
+$formcompany = new FormCompany($db);
+$formother = new FormOther($db);
+$contactstatic=new Contact($db);
+$userstatic=new User($db);
+
+
+/* *************************************************************************** */
+/*                                                                             */
+/* Mode vue et edition                                                         */
+/*                                                                             */
+/* *************************************************************************** */
+dol_htmloutput_mesg($mesg);
+
+if ($id > 0 || ! empty($ref))
+{
+	$langs->trans("OrderCard");
+
+	$soc = new Societe($db);
+	$soc->fetch($object->socid);
+
+
+	$head = shipping_prepare_head($object);
+	dol_fiche_head($head, 'contact', $langs->trans("Sending"), 0, 'sending');
+
+	if (is_null($object->client))	$object->fetch_thirdparty();
+
+   /*
+	*   Facture synthese pour rappel
+	*/
+	print '<table class="border" width="100%">';
+
+	// Ref
+	print '<tr><td width="18%">'.$langs->trans("Ref").'</td><td colspan="3">';
+	print $form->showrefnav($object,'ref','',1,'ref','ref');
+	print "</td></tr>";
+
+	// Customer
+	print '<tr><td width="20%">'.$langs->trans("Customer").'</td>';
+	print '<td colspan="3">'.$soc->getNomUrl(1).'</td>';
+	print "</tr>";
+
+	// Linked documents
+	if ($typeobject == 'commande' && $object->$typeobject->id && $conf->commande->enabled)
+	{
+		print '<tr><td>';
+		$objectsrc=new Commande($db);
+		$objectsrc->fetch($object->$typeobject->id);
+		print $langs->trans("RefOrder").'</td>';
+		print '<td colspan="3">';
+		print $objectsrc->getNomUrl(1,'commande');
+		print "</td>\n";
+		print '</tr>';
+	}
+	if ($typeobject == 'propal' && $object->$typeobject->id && $conf->propal->enabled)
+	{
+		print '<tr><td>';
+		$objectsrc=new Propal($db);
+		$objectsrc->fetch($object->$typeobject->id);
+		print $langs->trans("RefProposal").'</td>';
+		print '<td colspan="3">';
+		print $objectsrc->getNomUrl(1,'expedition');
+		print "</td>\n";
+		print '</tr>';
+	}
+
+	// Ref expedition client
+	print '<tr><td>';
+    print '<table class="nobordernopadding" width="100%"><tr><td nowrap>';
+	print $langs->trans('RefCustomer').'</td><td align="left">';
+    print '</td>';
+    print '</tr></table>';
+    print '</td><td colspan="3">';
+	print $objectsrc->ref_client;
+	print '</td>';
+	print '</tr>';
+
+	print "</table>";
+
+	print '</div>';
+
+	// Lignes de contacts
+	echo '<br><table class="noborder" width="100%">';
+
+	/*
+	 * Ajouter une ligne de contact. Non affiche en mode modification de ligne
+	 */
+	if ($action != 'editline' && $user->rights->expedition->creer)
+	{
+		print '<tr class="liste_titre">';
+		print '<td>'.$langs->trans("Source").'</td>';
+		print '<td>'.$langs->trans("Company").'</td>';
+		print '<td>'.$langs->trans("Contacts").'</td>';
+		print '<td>'.$langs->trans("ContactType").'</td>';
+		print '<td>&nbsp;</td>';
+		print '<td colspan="2">&nbsp;</td>';
+		print "</tr>\n";
+
+		$var = false;
+
+		print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="post">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print '<input type="hidden" name="action" value="addcontact">';
+		print '<input type="hidden" name="source" value="internal">';
+		print '<input type="hidden" name="id" value="'.$id.'">';
+
+		// Ligne ajout pour contact interne
+		print '<tr '.$bc[$var].'>';
+
+		print '<td nowrap="nowrap">';
+		print img_object('','user').' '.$langs->trans("Users");
+		print '</td>';
+
+		print '<td colspan="1">';
+		print $conf->global->MAIN_INFO_SOCIETE_NOM;
+		print '</td>';
+
+		print '<td colspan="1">';
+		//$userAlreadySelected = $object->getListContactId('internal');	// On ne doit pas desactiver un contact deja selectionne car on doit pouvoir le selectionner une deuxieme fois pour un autre type
+		$form->select_users($user->id,'contactid',0,$userAlreadySelected);
+		print '</td>';
+		print '<td>';
+		$formcompany->selectTypeContact($objectsrc, '', 'type','internal');
+		print '</td>';
+		print '<td align="right" colspan="3" ><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';
+		print '</tr>';
+
+		print '</form>';
+
+		print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="post">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print '<input type="hidden" name="action" value="addcontact">';
+		print '<input type="hidden" name="source" value="external">';
+		print '<input type="hidden" name="id" value="'.$id.'">';
+
+		// Ligne ajout pour contact externe
+		$var=!$var;
+		print '<tr '.$bc[$var].'>';
+
+		print '<td nowrap="nowrap">';
+		print img_object('','contact').' '.$langs->trans("ThirdPartyContacts");
+		print '</td>';
+
+		print '<td colspan="1">';
+		$selectedCompany = isset($_GET["newcompany"])?$_GET["newcompany"]:$object->client->id;
+		$selectedCompany = $formcompany->selectCompaniesForNewContact($objectsrc, 'id', $selectedCompany, 'newcompany', '', $object->id);
+		print '</td>';
+
+		print '<td colspan="1">';
+		$nbofcontacts=$form->select_contacts($selectedCompany, '', 'contactid');
+		if ($nbofcontacts == 0) print $langs->trans("NoContactDefined");
+		print '</td>';
+		print '<td>';
+
+		$formcompany->selectTypeContact($objectsrc, '', 'type','external');
+		print '</td>';
+		print '<td align="right" colspan="3" ><input type="submit" class="button" value="'.$langs->trans("Add").'"';
+		if (! $nbofcontacts) print ' disabled="disabled"';
+		print '></td>';
+		print '</tr>';
+
+		print "</form>";
+
+		print '<tr><td colspan="7">&nbsp;</td></tr>';
+	}
+
+	// List of linked contacts
+	print '<tr class="liste_titre">';
+	print '<td>'.$langs->trans("Source").'</td>';
+	print '<td>'.$langs->trans("Company").'</td>';
+	print '<td>'.$langs->trans("Contacts").'</td>';
+	print '<td>'.$langs->trans("ContactType").'</td>';
+	print '<td align="center">'.$langs->trans("Status").'</td>';
+	print '<td colspan="2">&nbsp;</td>';
+	print "</tr>\n";
+
+	$companystatic=new Societe($db);
+	$var = true;
+
+	foreach(array('internal','external') as $source)
+	{
+		$tab = $objectsrc->liste_contact(-1,$source);
+		$num=count($tab);
+
+		$i = 0;
+		while ($i < $num)
+		{
+			$var = !$var;
+
+			print '<tr '.$bc[$var].' valign="top">';
+
+			// Source
+			print '<td align="left">';
+			if ($tab[$i]['source']=='internal') print $langs->trans("User");
+			if ($tab[$i]['source']=='external') print $langs->trans("ThirdPartyContact");
+			print '</td>';
+
+			// Societe
+			print '<td align="left">';
+			if ($tab[$i]['socid'] > 0)
+			{
+				$companystatic->fetch($tab[$i]['socid']);
+				print $companystatic->getNomUrl(1);
+			}
+			if ($tab[$i]['socid'] < 0)
+			{
+				print $conf->global->MAIN_INFO_SOCIETE_NOM;
+			}
+			if (! $tab[$i]['socid'])
+			{
+				print '&nbsp;';
+			}
+			print '</td>';
+
+			// Contact
+			print '<td>';
+            if ($tab[$i]['source']=='internal')
+            {
+                $userstatic->id=$tab[$i]['id'];
+                $userstatic->lastname=$tab[$i]['lastname'];
+                $userstatic->firstname=$tab[$i]['firstname'];
+                print $userstatic->getNomUrl(1);
+            }
+            if ($tab[$i]['source']=='external')
+            {
+                $contactstatic->id=$tab[$i]['id'];
+                $contactstatic->lastname=$tab[$i]['lastname'];
+                $contactstatic->firstname=$tab[$i]['firstname'];
+                print $contactstatic->getNomUrl(1);
+            }
+			print '</td>';
+
+			// Type de contact
+			print '<td>'.$tab[$i]['libelle'].'</td>';
+
+			// Statut
+			print '<td align="center">';
+			// Activation desativation du contact
+			if ($object->statut >= 0)	print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=swapstatut&amp;ligne='.$tab[$i]['rowid'].'">';
+			print $contactstatic->LibStatut($tab[$i]['status'],3);
+			if ($object->statut >= 0)	print '</a>';
+			print '</td>';
+
+			// Icon update et delete
+			print '<td align="center" nowrap="nowrap" colspan="2">';
+			if ($object->statut < 5 && $user->rights->expedition->creer)
+			{
+				print '&nbsp;';
+				print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=deleteline&amp;lineid='.$tab[$i]['rowid'].'">';
+				print img_delete();
+				print '</a>';
+			}
+			print '</td>';
+
+			print "</tr>\n";
+
+			$i ++;
+		}
+	}
+	print "</table>";
+}
+
+llxFooter();
+
+$db->close();
+?>
\ No newline at end of file
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index 5937cfba5901b..d5d3406611a59 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -656,7 +656,7 @@
 }
 
 
-$db->close();
-
 llxFooter();
+
+$db->close();
 ?>