diff --git a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
index c6b2eaf2cba..94c314e93ae 100644
--- a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
+++ b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
@@ -398,7 +398,7 @@ class pdf_sirocco extends ModelePDFDeliveryOrder
 		$pdf->rect(100, 40, 100, 40);
 
 
-		$pdf->SetTextColor(200,0,0);
+		$pdf->SetTextColor(0,0,60);
 		$pdf->SetFont('','B',11);
         $pdf->SetXY($this->page_largeur - $this->marge_droite - 100, 86);
 		$pdf->MultiCell(100, 2, $outputlangs->transnoentities("Date")." : " . dol_print_date(($object->date_delivery?$object->date_delivery:$date->valid),"day",false,$outputlangs,true), 0, 'R');
@@ -424,21 +424,27 @@ class pdf_sirocco extends ModelePDFDeliveryOrder
 			$outputlangs->load('orders');
 			foreach($object->linked_object as $key => $val)
 			{
-				if ($key == 'commande')
+				if ($key == 'shipping')     // Link to shipment
 				{
 					for ($i = 0; $i<sizeof($val);$i++)
 					{
-						$newobject=new Commande($this->db);
-						$result=$newobject->fetch($val[$i]);
-						if ($result >= 0)
-						{
-                            $posy=94;
-                            $pdf->SetXY(11,$posy);
-                            $pdf->SetFont('','',9);
-                            $text=$newobject->ref;
-                            if ($newobject->ref_client) $text.=' ('.$newobject->ref_client.')';
-                            $pdf->MultiCell(100, 4, $outputlangs->transnoentities("RefOrder")." : ".$outputlangs->transnoentities($text), '', 'R');
-						}
+					    $newtmp=new Expedition($this->db);
+                        $result=$newtmp->fetch($val[$i]);
+
+                        if (($newtmp->origin=='commande' || $newtmp->origin=='order') && $newtmp->origin_id)
+                        {
+    						$newobject=new Commande($this->db);
+    						$result=$newobject->fetch($newtmp->origin_id);
+    						if ($result >= 0)
+    						{
+                                $posy+=7;
+                                $pdf->SetXY($this->page_largeur - $this->marge_droite - 100,$posy);
+                                $pdf->SetFont('','',9);
+                                $text=$newobject->ref;
+                                if ($newobject->ref_client) $text.=' ('.$newobject->ref_client.')';
+                                $pdf->MultiCell(100, 4, $outputlangs->transnoentities("RefOrder")." : ".$outputlangs->transnoentities($text), '', 'R');
+    						}
+                        }
 					}
 				}
 			}
diff --git a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php
index e03bf78e294..c1029ac2408 100644
--- a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php
+++ b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php
@@ -553,7 +553,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 			$outputlangs->load('orders');
 			foreach($object->linked_object as $key => $val)
 			{
-				if ($key == 'commande')
+				if ($key == 'commande' || $key == 'order')
 				{
 					for ($i = 0; $i<sizeof($val);$i++)
 					{
diff --git a/htdocs/langs/en_US/deliveries.lang b/htdocs/langs/en_US/deliveries.lang
index 427b67b9bb4..561dc2b9fe8 100644
--- a/htdocs/langs/en_US/deliveries.lang
+++ b/htdocs/langs/en_US/deliveries.lang
@@ -12,6 +12,8 @@ QtyDelivered=Qty delivered
 SetDeliveryDate=Set shipping date
 ValidateDeliveryReceipt=Validate delivery receipt
 ValidateDeliveryReceiptConfirm=Are you sure you want to validate this delivery receipt ?
+DeleteDeliveryReceipt=Delete delivery receipt
+DeleteDeliveryReceiptConfirm=Are you sure you want to delete delivery receipt <b>%s</b> ?
 DeliveryMethod=Delivery method
 TrackingNumber=Tracking number
 
diff --git a/htdocs/langs/fr_FR/deliveries.lang b/htdocs/langs/fr_FR/deliveries.lang
index fd9afea7ddc..072ebdece1c 100644
--- a/htdocs/langs/fr_FR/deliveries.lang
+++ b/htdocs/langs/fr_FR/deliveries.lang
@@ -13,7 +13,7 @@ SetDeliveryDate=Définir la date de livraison
 ValidateDeliveryReceipt=Valider le bon de livraison
 ValidateDeliveryReceiptConfirm=Êtes-vous sûr de vouloir valider ce bon de livraison ?
 DeleteDeliveryReceipt=Supprimer le bon de livraison
-DeleteDeliveryReceiptConfirm=Êtes-vous sûr de vouloir supprimer ce bon de livraison ?
+DeleteDeliveryReceiptConfirm=Êtes-vous sûr de vouloir supprimer ce bon de livraison <b>%s</b> ?
 DeliveryMethod=Méthode de livraison
 TrackingNumber=Numéro de suivi
 
diff --git a/htdocs/livraison/fiche.php b/htdocs/livraison/fiche.php
index b1ffa8cbd1a..bbb26d33cc0 100644
--- a/htdocs/livraison/fiche.php
+++ b/htdocs/livraison/fiche.php
@@ -410,7 +410,7 @@ else
 			if ($_GET["action"] == 'delete')
 			{
 				$expedition_id = $_GET["expid"];
-				$ret=$html->form_confirm($_SERVER['PHP_SELF'].'?id='.$delivery->id.'&amp;expid='.$expedition_id,$langs->trans("DeleteDeliveryReceipt"),$langs->trans("DeleteDeliveryReceiptConfirm"),'confirm_delete','','',1);
+				$ret=$html->form_confirm($_SERVER['PHP_SELF'].'?id='.$delivery->id.'&amp;expid='.$expedition_id,$langs->trans("DeleteDeliveryReceipt"),$langs->trans("DeleteDeliveryReceiptConfirm",$delivery->ref),'confirm_delete','','',1);
 				if ($ret == 'html') print '<br>';
 			}
 
@@ -420,7 +420,7 @@ else
 			 */
 			if ($_GET["action"] == 'valid')
 			{
-				$ret=$html->form_confirm($_SERVER['PHP_SELF'].'?id='.$delivery->id,$langs->trans("ValidateDeliveryReceipt"),$langs->trans("ValidateDeliveryReceiptConfirm"),'confirm_valid','','',1);
+				$ret=$html->form_confirm($_SERVER['PHP_SELF'].'?id='.$delivery->id,$langs->trans("ValidateDeliveryReceipt"),$langs->trans("ValidateDeliveryReceiptConfirm",$delivery->ref),'confirm_valid','','',1);
 				if ($ret == 'html') print '<br>';
 			}
 
@@ -472,7 +472,7 @@ else
 			print '</tr>';
 
 			// Date delivery real / Received
-			// TODO Can edit this date, even if validated.
+			// TODO Can edit this date, even if delivery validated.
 			print '<tr><td>'.$langs->trans("DateReceived").'</td>';
 			print '<td colspan="3">'.dol_print_date($delivery->date_delivery,'daytext')."</td>\n";
 			print '</tr>';