diff --git a/htdocs/compta/facture.php3 b/htdocs/compta/facture.php3 index bab28856f35..b3e63357261 100644 --- a/htdocs/compta/facture.php3 +++ b/htdocs/compta/facture.php3 @@ -23,6 +23,7 @@ require("./pre.inc.php3"); require("../facture.class.php3"); require("../lib/CMailFile.class.php3"); require("../paiement.class.php"); +require("../project.class.php3"); require("./bank/account.class.php"); llxHeader(); @@ -120,7 +121,7 @@ if ($action == 'add') $facture = new Facture($db, $socid); $facture->number = $facnumber; $facture->date = $datefacture; - + $facture->projetid = $HTTP_POST_VARS["projetid"]; $facture->note = $note; $facture->amount = $amount; $facture->remise = $remise; @@ -232,8 +233,8 @@ if ($action == 'create') if ($propalid) { $sql = "SELECT s.nom, s.prefix_comm, s.idp, p.price, p.remise, p.tva, p.total, p.ref, ".$db->pdate("p.datep")." as dp, c.id as statut, c.label as lst"; - $sql .= " FROM societe as s, llx_propal as p, c_propalst as c WHERE p.fk_soc = s.idp AND p.fk_statut = c.id"; - + $sql .= " FROM societe as s, llx_propal as p, c_propalst as c"; + $sql .= " WHERE p.fk_soc = s.idp AND p.fk_statut = c.id"; $sql .= " AND p.rowid = $propalid"; } else @@ -257,10 +258,26 @@ if ($action == 'create') print '
| Client : | $obj->nom | "; + print "||
| Client : | $obj->nom | "; + print "Commentaire | |
| Auteur : | ".$user->fullname." | "; + print ''; - print ' | |
| Date : | "; + + print_date_select(time()); + + print " | ||
| Numéro : | |||
| Projet : | "; + $proj = new Project($db); + $html->select_array("projetid",$proj->liste_array($socidp)); + print " | ||
| Propal : | $obj->ref | ||
| Montant HT : | '.price($amount).' | ||
| TVA 19.6% : | ".price($obj->tva)." | ||
| Total TTC : | ".price($obj->total)." | ||
| Montant HT : | '.price($amount).' | ||
| TVA 19.6% : | ".price($obj->tva)." | ||
| Total TTC : | ".price($obj->total)." | ||
| Auteur : | ".$user->fullname." | ||
| Date : | "; - - print_date_select(time()); - - print " | ||
| Numéro : | |||
| Statut | '.$obj->statut.' | '; print "Payé | "; - print "".$yn[$obj->paye]." | ".$yn[$obj->paye]." | "; print "