diff --git a/htdocs/commande/commande.class.php b/htdocs/commande/commande.class.php
index 61e3522d5a4..c8922de05c6 100644
--- a/htdocs/commande/commande.class.php
+++ b/htdocs/commande/commande.class.php
@@ -1442,35 +1442,35 @@ class Commande
         }
         if ($mode == 2)
         {
-        	if ($statut==-1) return img_picto($langs->trans('StatusOrderCanceled'),'statut6').' '.$this->status_label_short[$statut];
+        	if ($statut==-1) return img_picto($langs->trans('StatusOrderCanceled'),'statut5').' '.$this->status_label_short[$statut];
         	if ($statut==0) return img_picto($langs->trans('StatusOrderDraft'),'statut0').' '.$this->status_label_short[$statut];
         	if ($statut==1) return img_picto($langs->trans('StatusOrderValidated'),'statut1').' '.$this->status_label_short[$statut];
         	if ($statut==2) return img_picto($langs->trans('StatusOrderOnProcess'),'statut3').' '.$this->status_label_short[$statut];
-        	if ($statut==3) return img_picto($langs->trans('StatusOrderProcessed'),'statut5').' '.$this->status_label_short[$statut];
+        	if ($statut==3) return img_picto($langs->trans('StatusOrderProcessed'),'statut6').' '.$this->status_label_short[$statut];
         }
         if ($mode == 3)
         {
-        	if ($statut==-1) return img_picto($langs->trans('StatusOrderCanceled'),'statut6');
+        	if ($statut==-1) return img_picto($langs->trans('StatusOrderCanceled'),'statut5');
         	if ($statut==0) return img_picto($langs->trans('StatusOrderDraft'),'statut0');
         	if ($statut==1) return img_picto($langs->trans('StatusOrderValidated'),'statut1');
         	if ($statut==2) return img_picto($langs->trans('StatusOrderOnProcess'),'statut3');
-        	if ($statut==3) return img_picto($langs->trans('StatusOrderProcessed'),'statut5');
+        	if ($statut==3) return img_picto($langs->trans('StatusOrderProcessed'),'statut6');
         }
         if ($mode == 4)
         {
-        	if ($statut==-1) return img_picto($langs->trans('StatusOrderCanceled'),'statut6').' '.$this->statuts[$statut];
+        	if ($statut==-1) return img_picto($langs->trans('StatusOrderCanceled'),'statut5').' '.$this->statuts[$statut];
         	if ($statut==0) return img_picto($langs->trans('StatusOrderDraft'),'statut0').' '.$this->statuts[$statut];
         	if ($statut==1) return img_picto($langs->trans('StatusOrderValidated'),'statut1').' '.$this->statuts[$statut];
         	if ($statut==2) return img_picto($langs->trans('StatusOrderOnProcess'),'statut3').' '.$this->statuts[$statut];
-        	if ($statut==3) return img_picto($langs->trans('StatusOrderProcessed'),'statut5').' '.$this->statuts[$statut];
+        	if ($statut==3) return img_picto($langs->trans('StatusOrderProcessed'),'statut6').' '.$this->statuts[$statut];
         }
         if ($mode == 5)
         {
-        	if ($statut==-1) return $this->status_label_short[$statut].' '.img_picto($langs->trans('StatusOrderCanceled'),'statut6');
+        	if ($statut==-1) return $this->status_label_short[$statut].' '.img_picto($langs->trans('StatusOrderCanceled'),'statut5');
         	if ($statut==0) return $this->status_label_short[$statut].' '.img_picto($langs->trans('StatusOrderDraft'),'statut0');
         	if ($statut==1) return $this->status_label_short[$statut].' '.img_picto($langs->trans('StatusOrderValidated'),'statut1');
         	if ($statut==2) return $this->status_label_short[$statut].' '.img_picto($langs->trans('StatusOrderOnProcess'),'statut3');
-        	if ($statut==3) return $this->status_label_short[$statut].' '.img_picto($langs->trans('StatusOrderProcessed'),'statut5');
+        	if ($statut==3) return $this->status_label_short[$statut].' '.img_picto($langs->trans('StatusOrderProcessed'),'statut6');
         }
 	}
 
diff --git a/htdocs/expedition/commande.php b/htdocs/expedition/commande.php
index 26528b95aa1..07d076f39ba 100644
--- a/htdocs/expedition/commande.php
+++ b/htdocs/expedition/commande.php
@@ -356,6 +356,10 @@ if ($_GET["id"] > 0)
             {
                 print '<td align="center">'.$langs->trans("Stock").'</td>';
             }
+            else
+            {
+            	print '<td>&nbsp;</td>';	
+            }
             print "</tr>\n";
 
             $var=true;
@@ -406,19 +410,23 @@ if ($_GET["id"] > 0)
                         print '<td align="center">'.$product->stock_reel.'</td>';
                     }
                 }
+                else
+                {
+                	print '<td>&nbsp;</td>';
+                }
                 print "</tr>";
 
                 $i++;
                 $var=!$var;
             }
             $db->free();
-            print "</table>";
             
             if (! $num)
             {
-                print $langs->trans("NoArticleOfTypeProduct").'<br>';
+                print '<tr '.$bc[false].'><td colspan="5">'.$langs->trans("NoArticleOfTypeProduct").'<br>';
             }
 
+            print "</table>";
         }
         else
         {
diff --git a/htdocs/langs/fr_FR/orders.lang b/htdocs/langs/fr_FR/orders.lang
index 52cb8d79d05..82ea4b6b3b0 100755
--- a/htdocs/langs/fr_FR/orders.lang
+++ b/htdocs/langs/fr_FR/orders.lang
@@ -62,6 +62,7 @@ RefCdeClient=R
 RefCdeClientShort=Réf. com. client
 SendOrderByMail=Envoi commande par mail
 ActionsOnOrder=Actions sur la commande
+NoArticleOfTypeProduct=Pas d'article de type 'produit' et donc expédiable dans cette commande
 # Sources
 OrderSource0=Proposition commerciale
 OrderSource1=Internet