diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 099a6c419be..3b9bc76ea6e 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -8550,7 +8550,7 @@ class Form
 					if (empty($conf->supplier_proposal->enabled)) {
 						continue; // Do not show if module disabled
 					}
-				} elseif ($objecttype == 'shipping' || $objecttype == 'shipment') {
+				} elseif ($objecttype == 'shipping' || $objecttype == 'shipment' || $objecttype == 'expedition') {
 					$tplpath = 'expedition';
 					if (empty($conf->expedition->enabled)) {
 						continue; // Do not show if module disabled
@@ -8668,6 +8668,11 @@ class Form
 					'perms'=>1,
 					'label'=>'LinkToProposal',
 					'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".$this->db->prefix()."societe as s, ".$this->db->prefix()."propal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('propal').')'),
+        'shipping'=>array(
+          'enabled'=>$conf->expedition->enabled,
+          'perms'=>1,
+          'label'=>'LinkToExpedition',
+          'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref FROM ".$this->db->prefix()."societe as s, ".$this->db->prefix()."expedition as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('shipping').')'),
 				'order'=>array(
 					'enabled'=>(!empty($conf->commande->enabled) ? $conf->commande->enabled : 0),
 					'perms'=>1,
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 0b91499e5b9..02a5e41b2c0 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -2569,8 +2569,8 @@ if ($action == 'create' || (empty($action) && empty($id))) {
 
 
 		// Show links to link elements
-		//$linktoelem = $form->showLinkToObjectBlock($object, null, array('order'));
-		$somethingshown = $form->showLinkedObjectBlock($object, '');
+		$linktoelem = $form->showLinkToObjectBlock($object, null, array('shipping'));
+		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 
 
 		print '</div><div class="fichehalfright">';
diff --git a/htdocs/expedition/tpl/linkedobjectblock.tpl.php b/htdocs/expedition/tpl/linkedobjectblock.tpl.php
index 2305b0d4fac..8825cde4b67 100644
--- a/htdocs/expedition/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/expedition/tpl/linkedobjectblock.tpl.php
@@ -60,8 +60,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 			// For now, shipments must stay linked to order, so link is not deletable
 			if ($object->element != 'commande') {
 				?>
-				<a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
-				<?php
+			<a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&token='.newToken().'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>				<?php
 			}
 			?>
 	</tr>
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 9241120c9db..bfab238dc27 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -801,6 +801,7 @@ URLPhoto=URL of photo/logo
 SetLinkToAnotherThirdParty=Link to another third party
 LinkTo=Link to
 LinkToProposal=Link to proposal
+LinkToExpedition= Link to expedition
 LinkToOrder=Link to order
 LinkToInvoice=Link to invoice
 LinkToTemplateInvoice=Link to template invoice
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index 41b6188e16e..ce61fdbed8c 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -801,6 +801,7 @@ URLPhoto=URL de la photo/logo
 SetLinkToAnotherThirdParty=Lier vers un autre tiers
 LinkTo=Lier à
 LinkToProposal=Lier à une proposition commerciale
+LinkToExpedition=Lier à une expédition
 LinkToOrder=Lier à une commande
 LinkToInvoice=Lier à une facture
 LinkToTemplateInvoice=Lien vers le modèle de facture