diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index abfd41a9c3f57e02441f4757b526f3799d6e5863..76f0f3ea9dc36e1a5a748f6d7a18bd68095e2a66 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -1346,9 +1346,11 @@ class Commande extends CommonObject
 	function nb_expedition()
 	{
         $sql = 'SELECT count(*)';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'expedition as e,';
-        $sql.= ' '.MAIN_DB_PREFIX."element_element as el ON el.fk_target = e.rowid AND el.targettype = 'shipping'";
-        $sql.= " WHERE el.fk_source = ".$this->id;
+        $sql.= ' FROM '.MAIN_DB_PREFIX.'expedition as e';
+        $sql.= ', '.MAIN_DB_PREFIX.'element_element as el';
+        $sql.= ' WHERE el.fk_source = '.$this->id;
+        $sql.= " AND el.fk_target = e.rowid";
+        $sql.= " AND el.targettype = 'shipping'";
 
         $resql = $this->db->query($sql);
         if ($resql)