From f9be55e16a30cba8d3454bbf2709ca428b48a75b Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Thu, 1 Jun 2006 16:12:39 +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 | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/htdocs/compta/propal.php b/htdocs/compta/propal.php index 1d6a0b9f67f..474b9324698 100644 --- a/htdocs/compta/propal.php +++ b/htdocs/compta/propal.php @@ -665,9 +665,16 @@ if ($_GET["propalid"] > 0) */ $sql = "SELECT f.facnumber, f.total,".$db->pdate("f.datef")." as df, f.rowid as facid, f.fk_user_author, f.fk_statut, f.paye"; $sql .= " FROM ".MAIN_DB_PREFIX."facture as f"; - $sql .= "LEFT JOIN ".MAIN_DB_PREFIX."fa_pr as fp ON fp.fk_facture = f.rowid AND fp.fk_propal = ".$propal->id; - if ($conf->commande->enabled) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."co_pr as cp ON cp.fk_propale = ".$propal->id; - if ($conf->commande->enabled) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."co_fa as cf ON cf.fk_commande = cp.fk_commande AND cf.fk_facture = f.rowid"; + if (!$conf->commande->enabled) + { + $sql .= " FROM ".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 .= " WHERE cp.fk_propale = ".$propal->id." AND cf.fk_commande = cp.fk_commande AND cf.fk_facture = f.rowid"; + } $resql = $db->query($sql); if ($resql)