From 61481714db918a9f6a0a672055221aeb1f89a682 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Tue, 30 May 2006 19:14:33 +0000 Subject: [PATCH] mise en page --- htdocs/commande/commande.class.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/htdocs/commande/commande.class.php b/htdocs/commande/commande.class.php index f120e5ddc4b..161ba408049 100644 --- a/htdocs/commande/commande.class.php +++ b/htdocs/commande/commande.class.php @@ -962,11 +962,17 @@ class Commande $sql = 'SELECT l.fk_product, l.description, l.price, l.qty, l.rowid, l.tva_tx, l.remise_percent, l.subprice'; if ($only_product==1) { - $sql .= ' FROM '.MAIN_DB_PREFIX.'commandedet as l LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON (p.rowid = l.fk_product) WHERE l.fk_commande = '.$this->id.' AND p.fk_product_type <> 1 ORDER BY l.rowid'; + $sql .= ' FROM '.MAIN_DB_PREFIX.'commandedet as l'; + $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON (p.rowid = l.fk_product)'; + $sql .= ' WHERE l.fk_commande = '.$this->id; + $sql .= ' AND p.fk_product_type <> 1'; + $sql .= ' ORDER BY l.rowid'; } else { - $sql .= ' FROM '.MAIN_DB_PREFIX."commandedet as l WHERE l.fk_commande = $this->id ORDER BY l.rowid"; + $sql .= ' FROM '.MAIN_DB_PREFIX.'commandedet as l'; + $sql .= ' WHERE l.fk_commande = '.$this->id; + $sql .= ' ORDER BY l.rowid'; } $result = $this->db->query($sql); if ($result)