diff --git a/htdocs/compta/commande/fiche.php b/htdocs/compta/commande/fiche.php
index 8c43ba831f8..7e147156bd3 100644
--- a/htdocs/compta/commande/fiche.php
+++ b/htdocs/compta/commande/fiche.php
@@ -629,13 +629,16 @@ if ($_GET["id"] > 0)
             {
                 if ($somethingshown) print '<br>';
                 
-                print_titre($langs->trans("SendingsForSameOrder"));
+                print_titre($langs->trans("SendingsAndReceivingForSameOrder"));
                 print '<table class="liste" width="100%">';
                 print '<tr class="liste_titre">';
-                print '<td align="left">'.$langs->trans("Sending").'</td>';
                 print '<td>'.$langs->trans("Product").'</td>';
                 print '<td align="center">'.$langs->trans("QtyShipped").'</td>';
-                print '<td align="center">'.$langs->trans("Date").'</td>';
+                print '<td align="center">'.$langs->trans("DateSending").'</td>';
+                if ($conf->expedition->enabled)
+                {
+                	print '<td>'.$langs->trans("SendingSheet").'</td>';
+                }
                 if ($conf->livraison->enabled)
                 {
                 	print '<td>'.$langs->trans("DeliveryOrder").'</td>';
@@ -648,7 +651,6 @@ if ($_GET["id"] > 0)
                     $var=!$var;
                     $objp = $db->fetch_object($resql);
                     print "<tr $bc[$var]>";
-                    print '<td align="left"><a href="'.DOL_URL_ROOT.'/expedition/fiche.php?id='.$objp->expedition_id.'">'.img_object($langs->trans("ShowSending"),'sending').' '.$objp->ref.'<a></td>';
                     
                     if ($objp->fk_product > 0)
                     {
@@ -662,10 +664,14 @@ if ($_GET["id"] > 0)
                     }
                     else
                     {
-                        print "<td>".stripslashes(nl2br($objp->description))."</td>\n";
+                        print "<td>".nl2br($objp->description)."</td>\n";
                     }
                     print '<td align="center">'.$objp->qty_livre.'</td>';
                     print '<td align="center">'.dolibarr_print_date($objp->date_expedition).'</td>';
+                    if ($conf->expedition->enabled)
+                    {
+	                    print '<td align="left"><a href="'.DOL_URL_ROOT.'/expedition/fiche.php?id='.$objp->expedition_id.'">'.img_object($langs->trans("ShowSending"),'sending').' '.$objp->ref.'<a></td>';
+                    }
                     if ($conf->livraison->enabled)
                     {
                     	if ($objp->livraison_id)
@@ -674,7 +680,7 @@ if ($_GET["id"] > 0)
                     	}
                     	else
                     	{
-                    		print '<td><a href="'.DOL_URL_ROOT.'/expedition/fiche.php?id='.$objp->expedition_id.'&amp;action=create_delivery">'.$langs->trans("CreateDeliveryOrder").'<a></td>';
+                    		print '<td>&nbsp;</td>';
                     	}
                     }
 					print '</tr>';
diff --git a/htdocs/expedition/commande.php b/htdocs/expedition/commande.php
index 59129802572..6c68bfc63ad 100644
--- a/htdocs/expedition/commande.php
+++ b/htdocs/expedition/commande.php
@@ -513,13 +513,16 @@ if ($_GET["id"] > 0)
             {
                 if ($somethingshown) print '<br>';
                 
-                print_titre($langs->trans("SendingsForSameOrder"));
+                print_titre($langs->trans("SendingsAndReceivingForSameOrder"));
                 print '<table class="liste" width="100%">';
                 print '<tr class="liste_titre">';
-                print '<td align="left">'.$langs->trans("Sending").'</td>';
                 print '<td>'.$langs->trans("Product").'</td>';
                 print '<td align="center">'.$langs->trans("QtyShipped").'</td>';
-                print '<td align="center">'.$langs->trans("Date").'</td>';
+                print '<td align="center">'.$langs->trans("DateSending").'</td>';
+                if ($conf->expedition->enabled)
+                {
+                	print '<td>'.$langs->trans("SendingSheet").'</td>';
+                }
                 if ($conf->livraison->enabled)
                 {
                 	print '<td>'.$langs->trans("DeliveryOrder").'</td>';
@@ -532,7 +535,6 @@ if ($_GET["id"] > 0)
                     $var=!$var;
                     $objp = $db->fetch_object($resql);
                     print "<tr $bc[$var]>";
-                    print '<td align="left"><a href="'.DOL_URL_ROOT.'/expedition/fiche.php?id='.$objp->expedition_id.'">'.img_object($langs->trans("ShowSending"),'sending').' '.$objp->ref.'<a></td>';
                     
                     if ($objp->fk_product > 0)
                     {
@@ -546,10 +548,14 @@ if ($_GET["id"] > 0)
                     }
                     else
                     {
-                        print "<td>".stripslashes(nl2br($objp->description))."</td>\n";
+                        print "<td>".nl2br($objp->description)."</td>\n";
                     }
                     print '<td align="center">'.$objp->qty_livre.'</td>';
                     print '<td align="center">'.dolibarr_print_date($objp->date_expedition).'</td>';
+                    if ($conf->expedition->enabled)
+                    {
+	                    print '<td align="left"><a href="'.DOL_URL_ROOT.'/expedition/fiche.php?id='.$objp->expedition_id.'">'.img_object($langs->trans("ShowSending"),'sending').' '.$objp->ref.'<a></td>';
+                    }
                     if ($conf->livraison->enabled)
                     {
                     	if ($objp->livraison_id)
@@ -558,7 +564,7 @@ if ($_GET["id"] > 0)
                     	}
                     	else
                     	{
-                    		print '<td><a href="'.DOL_URL_ROOT.'/expedition/fiche.php?id='.$objp->expedition_id.'&amp;action=create_delivery">'.$langs->trans("CreateDeliveryOrder").'<a></td>';
+                    		print '<td>&nbsp;</td>';
                     	}
                     }
 					print '</tr>';
diff --git a/htdocs/expedition/mods/pdf/pdf_expedition_merou.modules.php b/htdocs/expedition/mods/pdf/pdf_expedition_merou.modules.php
index 02ecd64f656..7f57f152037 100644
--- a/htdocs/expedition/mods/pdf/pdf_expedition_merou.modules.php
+++ b/htdocs/expedition/mods/pdf/pdf_expedition_merou.modules.php
@@ -321,10 +321,10 @@ Class pdf_expedition_merou extends ModelePdfExpedition
 		$pdf->SetXY(60,7);
 		$pdf->SetFont('Arial','B',14);
 		$pdf->SetTextColor(0,0,0);
-		$pdf->MultiCell(0, 8, $langs->trans("SendingSheet"), '' , 'L');
+		$pdf->MultiCell(0, 8, $langs->trans("SendingSheet"), '' , 'L');	// Bordereau expedition
 		//Num Expedition
 		$Yoff = $Yoff+7;
-		$Xoff = 115;
+		$Xoff = 140;
 //		$pdf->rect($Xoff, $Yoff, 85, 8);
 		$pdf->SetXY($Xoff,$Yoff);
 		$pdf->SetFont('Arial','',8);
@@ -338,6 +338,8 @@ Class pdf_expedition_merou extends ModelePdfExpedition
 		$pdf->SetFont('Arial','',8);
 		$pdf->SetTextColor(0,0,0);
 		$pdf->MultiCell(0, 8, $langs->trans("RefOrder").': '.$exp->commande->ref, '' , 'L');
+
+		$Xoff = 115;
 		//$this->Code39($Xoff+43, $Yoff+1, $exp->commande->ref,$ext = true, $cks = false, $w = 0.4, $h = 4, $wide = true);
 		//Definition Emplacement du bloc Societe
 		$blSocX=11;
diff --git a/htdocs/expedition/mods/pdf/pdf_expedition_rouget.modules.php b/htdocs/expedition/mods/pdf/pdf_expedition_rouget.modules.php
index 8be3f3d388a..98c14ebde3c 100644
--- a/htdocs/expedition/mods/pdf/pdf_expedition_rouget.modules.php
+++ b/htdocs/expedition/mods/pdf/pdf_expedition_rouget.modules.php
@@ -98,7 +98,7 @@ Class pdf_expedition_rouget extends ModelePdfExpedition
         $pdf->SetDrawColor(128,128,128);
 
 		$pdf->SetFont('Arial','', 14);
-		$pdf->Text($posx, 16, $outputlangs->trans("SendingReceipt"));
+		$pdf->Text($posx, 16, $outputlangs->trans("SendingSheet"));	// Bordereau expedition
 		$pdf->Text($posx, 22, $outputlangs->trans("Ref") ." : ".$this->expe->ref);
 		$pdf->Text($posx, 28, $outputlangs->trans("Date")." : ".dolibarr_print_date($this->expe->date,"%d %b %Y"));
 		$pdf->Text($posx, 34, $outputlangs->trans("Page")." : ".$pdf->PageNo() ."/{nb}", 0);
diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang
index 4afb8322f63..eea49995e79 100644
--- a/htdocs/langs/en_US/sendings.lang
+++ b/htdocs/langs/en_US/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. sending
 Sending=Sending
 Sendings=Sendings
+Receivings=Receivings
 SendingsArea=Sendings area
 ListOfSendings=List of sendings
 SendingMethod=Sending method
@@ -21,6 +22,7 @@ QtyToShip=Qty to ship
 KeepToShip=Keep to ship
 OtherSendingsForSameOrder=Other sendings for this order
 SendingsForSameOrder=Sendings for this order
+SendingsAndReceivingForSameOrder=Sendings and receivings for this order
 SendingsToValidate=Sending to validate
 StatusSendingDraft=Draft
 StatusSendingValidated=Validated (products to ship or already received)
diff --git a/htdocs/langs/fr_FR/sendings.lang b/htdocs/langs/fr_FR/sendings.lang
index f58f5f28a90..ce05fb80d71 100644
--- a/htdocs/langs/fr_FR/sendings.lang
+++ b/htdocs/langs/fr_FR/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Réf. expédition
 Sending=Expédition
 Sendings=Expéditions
+Receivings=Réceptions
 SendingsArea=Espace expéditions
 ListOfSendings=Liste des expéditions
 SendingMethod=Méthode d'expédition
@@ -20,10 +21,11 @@ QtyToShip=Qt
 QtyReceived=Qté reçue
 KeepToShip=Reste à expédier
 OtherSendingsForSameOrder=Autres expéditions pour cette commande
-SendingsForSameOrder=Expéditions pour cette commandes
+SendingsForSameOrder=Expéditions pour cette commande
+SendingsAndReceivingForSameOrder=Expéditions et réceptions pour cette commande
 SendingsToValidate=Expéditions à valider
 StatusSendingDraft=Brouillon
 StatusSendingValidated=Validée (produits à envoyer ou reçus)
 StatusSendingDraftShort=Brouillon
 StatusSendingValidatedShort=Validée
-SendingSheet=Bon d'expédition
\ No newline at end of file
+SendingSheet=Bordereau d'expédition
\ No newline at end of file
diff --git a/htdocs/lib/order.lib.php b/htdocs/lib/order.lib.php
index ad06bbf4354..ce110ba94ca 100644
--- a/htdocs/lib/order.lib.php
+++ b/htdocs/lib/order.lib.php
@@ -49,7 +49,9 @@ function commande_prepare_head($commande)
     if (($conf->expedition->enabled || $conf->livraison->enabled) && $user->rights->expedition->lire)
     {
         $head[$h][0] = DOL_URL_ROOT.'/expedition/commande.php?id='.$commande->id;
-        $head[$h][1] = $langs->trans("Sendings");
+        if ($conf->expedition->enabled) $text=$langs->trans("Sendings");
+        if ($conf->livraison->enabled)  $text.='/'.$langs->trans("Receivings");
+        $head[$h][1] = $text;
     	$head[$h][2] = 'shipping';
         $h++;
     }