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)