From 3878c8a79c5a1a1ed9584457657cd510756c7077 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Wed, 31 May 2006 18:06:04 +0000 Subject: [PATCH] Fix: doublon --- htdocs/expedition/commande.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/htdocs/expedition/commande.php b/htdocs/expedition/commande.php index c145e618065..a6d5d1c3854 100644 --- a/htdocs/expedition/commande.php +++ b/htdocs/expedition/commande.php @@ -499,9 +499,8 @@ if ($_GET["id"] > 0) if ($conf->livraison->enabled) $sql .= ", l.rowid as livraison_id, l.ref as livraison_ref"; $sql .= " FROM ".MAIN_DB_PREFIX."commandedet as cd"; $sql .= " , ".MAIN_DB_PREFIX."expeditiondet as ed, ".MAIN_DB_PREFIX."expedition as e"; - if ($conf->livraison->enabled) $sql .= " , ".MAIN_DB_PREFIX."livraison as l"; + if ($conf->livraison->enabled) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.fk_expedition = e.rowid"; $sql .= " WHERE cd.fk_commande = ".$commande->id; - if ($conf->livraison->enabled) $sql .= " AND l.fk_commande = cd.fk_commande"; $sql .= " AND cd.rowid = ed.fk_commande_ligne"; $sql .= " AND ed.fk_expedition = e.rowid"; $sql .= " AND e.fk_statut > 0";