From bdd6bcc1af4aad62092b7a3b7d2948b102229668 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Thu, 1 Jun 2006 16:16:02 +0000 Subject: [PATCH] =?UTF-8?q?la=20propale=20li=E9=20=E0=20une=20commande=20e?= =?UTF-8?q?st=20class=E9e=20factur=E9e=20lorsque=20la=20commande=20l'est?= =?UTF-8?q?=20elle=20m=EAme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/compta/propal.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/compta/propal.php b/htdocs/compta/propal.php index 474b9324698..1f1595b8e9d 100644 --- a/htdocs/compta/propal.php +++ b/htdocs/compta/propal.php @@ -667,12 +667,12 @@ if ($_GET["propalid"] > 0) $sql .= " FROM ".MAIN_DB_PREFIX."facture as f"; if (!$conf->commande->enabled) { - $sql .= " FROM ".MAIN_DB_PREFIX."fa_pr as fp"; + $sql .= ", ".MAIN_DB_PREFIX."fa_pr as fp"; $sql .= " WHERE fp.fk_facture = f.rowid AND fp.fk_propal = ".$propal->id; } else { - $sql .= " FROM ".MAIN_DB_PREFIX."co_pr as cp, ".MAIN_DB_PREFIX."co_fa as cf"; + $sql .= ", ".MAIN_DB_PREFIX."co_pr as cp, ".MAIN_DB_PREFIX."co_fa as cf"; $sql .= " WHERE cp.fk_propale = ".$propal->id." AND cf.fk_commande = cp.fk_commande AND cf.fk_facture = f.rowid"; }