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:16:02 +00:00
parent f9be55e16a
commit bdd6bcc1af
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/compta/propal.php
View File

@ -667,12 +667,12 @@ if ($_GET["propalid"] > 0)
$sql .= " FROM ".MAIN_DB_PREFIX."facture as f"; $sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
if (!$conf->commande->enabled) 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; $sql .= " WHERE fp.fk_facture = f.rowid AND fp.fk_propal = ".$propal->id;
} }
else 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"; $sql .= " WHERE cp.fk_propale = ".$propal->id." AND cf.fk_commande = cp.fk_commande AND cf.fk_facture = f.rowid";
} }