lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

la propale li une commande est classe facture lorsque la commande l'est elle mme

Browse Source
This commit is contained in:
Regis Houssin 2006-06-01 16:12:39 +00:00
parent 3633cda7c3
commit f9be55e16a
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/compta/propal.php
View File

@ -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 = "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 .= " 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)
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"; $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); $resql = $db->query($sql);
if ($resql) if ($resql)