From ecaea4c575af1c85957fadf369d0b06c6124a809 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a?= <marcosgdf@gmail.com>
Date: Sat, 27 Apr 2013 13:51:05 +0200
Subject: [PATCH 1/2] Corrected incorrect lang trans key

---
 htdocs/expedition/tpl/linkedobjectblock.tpl.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/expedition/tpl/linkedobjectblock.tpl.php b/htdocs/expedition/tpl/linkedobjectblock.tpl.php
index 1b84b543ece..fd723650561 100644
--- a/htdocs/expedition/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/expedition/tpl/linkedobjectblock.tpl.php
@@ -33,7 +33,7 @@ print_titre($langs->trans('RelatedShippings'));
 <tr class="liste_titre">
 	<td><?php echo $langs->trans("Ref"); ?></td>
 	<td align="center"><?php echo $langs->trans("Date"); ?></td>
-	<td align="center"><?php echo $langs->trans("DateSendingShort"); ?></td>
+	<td align="center"><?php echo $langs->trans("DateDeliveryPlanned"); ?></td>
 	<td align="right"><?php echo $langs->trans("AmountHTShort"); ?></td>
 	<td align="right"><?php echo $langs->trans("Status"); ?></td>
 </tr>

From 7a115a92166968e5b7f03940e2f437304743fba3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a?= <marcosgdf@gmail.com>
Date: Sat, 27 Apr 2013 13:55:20 +0200
Subject: [PATCH 2/2] Expedition class name was not being translated when
 creating invoice from it

---
 htdocs/compta/facture.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index d5e24eb61f8..07f989272df 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -2084,6 +2084,7 @@ if ($action == 'create')
         $newclassname=$classname;
         if ($newclassname == 'Propal') $newclassname = 'CommercialProposal';
         elseif ($newclassname == 'Commande') $newclassname = 'Order';
+        elseif ($newclassname == 'Expedition') $newclassname = 'Sending';
 
         print '<tr><td>'.$langs->trans($newclassname).'</td><td colspan="2">'.$objectsrc->getNomUrl(1).'</td></tr>';
         print '<tr><td>'.$langs->trans('TotalHT').'</td><td colspan="2">'.price($objectsrc->total_ht).'</td></tr>';