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

Gestion du champs projet

Browse Source
This commit is contained in:
Rodolphe Quiedeville 2003-05-16 20:35:47 +00:00
parent be8c5adb81
commit 85d3abfb02
2 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
htdocs/compta/facture.php3
View File

@ -23,6 +23,7 @@ require("./pre.inc.php3");
require("../facture.class.php3"); require("../facture.class.php3");
require("../lib/CMailFile.class.php3"); require("../lib/CMailFile.class.php3");
require("../paiement.class.php"); require("../paiement.class.php");
require("../project.class.php3");
require("./bank/account.class.php"); require("./bank/account.class.php");
llxHeader(); llxHeader();
@ -120,7 +121,7 @@ if ($action == 'add')
$facture = new Facture($db, $socid); $facture = new Facture($db, $socid);
$facture->number = $facnumber; $facture->number = $facnumber;
$facture->date = $datefacture; $facture->date = $datefacture;
$facture->projetid = $HTTP_POST_VARS["projetid"];
$facture->note = $note; $facture->note = $note;
$facture->amount = $amount; $facture->amount = $amount;
$facture->remise = $remise; $facture->remise = $remise;
@ -232,8 +233,8 @@ if ($action == 'create')
if ($propalid) 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 = "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"; $sql .= " AND p.rowid = $propalid";
} }
else else
@ -257,10 +258,26 @@ if ($action == 'create')
print '<table cellspacing="0" border="1" width="100%">'; print '<table cellspacing="0" border="1" width="100%">';
print "<tr bgcolor=\"#e0e0e0\"><td>Client :</td><td>$obj->nom</td>"; print "<tr><td>Client :</td><td>$obj->nom</td>";
print "<td>Commentaire</td></tr>";
print "<input type=\"hidden\" name=\"author\" value=\"$author\">";
print "<tr><td>Auteur :</td><td>".$user->fullname."</td>";
print '<td rowspan="4">'; print '<td rowspan="4">';
print '<textarea name="note" wrap="soft" cols="60" rows="15"></textarea></td></tr>'; print '<textarea name="note" wrap="soft" cols="60" rows="8"></textarea></td></tr>';
print "<tr><td>Date :</td><td>";
print_date_select(time());
print "</td></tr>";
print "<tr><td>Numéro :</td><td> <input name=\"facnumber\" type=\"text\" value=\"$numfa\"></td></tr>";
print "<tr><td>Projet :</td><td>";
$proj = new Project($db);
$html->select_array("projetid",$proj->liste_array($socidp));
print "</td></tr>";
if ($propalid) if ($propalid)
{ {
@ -272,24 +289,11 @@ if ($action == 'create')
print '<input type="hidden" name="propalid" value="'.$propalid.'">'; print '<input type="hidden" name="propalid" value="'.$propalid.'">';
print "<tr><td>Propal :</td><td>$obj->ref</td></tr>"; print "<tr><td>Propal :</td><td>$obj->ref</td></tr>";
print '<tr bgcolor="#e0e0e0"><td>Montant HT :</td><td>'.price($amount).'</td></tr>'; print '<tr><td>Montant HT :</td><td>'.price($amount).'</td></tr>';
print "<tr bgcolor=\"#e0e0e0\"><td>TVA 19.6% :</td><td>".price($obj->tva)."</td></tr>"; print "<tr><td>TVA 19.6% :</td><td>".price($obj->tva)."</td></tr>";
print "<tr bgcolor=\"#e0e0e0\"><td>Total TTC :</td><td>".price($obj->total)."</td></tr>"; print "<tr><td>Total TTC :</td><td>".price($obj->total)."</td></tr>";
}
else
{
} }
print "<input type=\"hidden\" name=\"author\" value=\"$author\">";
print "<tr><td>Auteur :</td><td>".$user->fullname."</td></tr>";
print "<tr><td>Date :</td><td>";
print_date_select(time());
print "</td></tr>";
print "<tr><td>Numéro :</td><td> <input name=\"facnumber\" type=\"text\" value=\"$numfa\"></td></tr>";
print '<tr><td colspan="3" align="center"><input type="submit" value="Créer"></td></tr>'; print '<tr><td colspan="3" align="center"><input type="submit" value="Créer"></td></tr>';
print "</form>\n"; print "</form>\n";
@ -373,7 +377,7 @@ else
print '<tr><td>Statut</td><td align="center">'.$obj->statut.'</td>'; print '<tr><td>Statut</td><td align="center">'.$obj->statut.'</td>';
print "<td>Payé</td>"; print "<td>Payé</td>";
print "<td align=\"center\" bgcolor=\"#f0f0f0\"><b>".$yn[$obj->paye]."</b></td></tr>"; print "<td align=\"center\"><b>".$yn[$obj->paye]."</b></td></tr>";
print "</table>"; print "</table>";
print "</td><td valign=\"top\">"; print "</td><td valign=\"top\">";

10
htdocs/facture.class.php3
View File

@ -41,7 +41,7 @@ class Facture {
var $note; var $note;
var $db_table; var $db_table;
var $propalid; var $propalid;
var $projetid;
/* /*
* Initialisation * Initialisation
* *
@ -82,8 +82,8 @@ class Facture {
$tva = tva($totalht); $tva = tva($totalht);
$total = $totalht + $tva; $total = $totalht + $tva;
$sql = "INSERT INTO $this->db_table (facnumber, fk_soc, datec, amount, remise, tva, total, datef, note, fk_user_author) "; $sql = "INSERT INTO $this->db_table (facnumber, fk_soc, datec, amount, remise, tva, total, datef, note, fk_user_author,fk_projet) ";
$sql .= " VALUES ('$number', $socid, now(), $totalht, $remise, $tva, $total, $this->date,'$note',$userid);"; $sql .= " VALUES ('$number', $socid, now(), $totalht, $remise, $tva, $total, $this->date,'$note',$userid, $this->projetid);";
if ( $this->db->query($sql) ) if ( $this->db->query($sql) )
{ {
@ -107,7 +107,8 @@ class Facture {
Function fetch($rowid) Function fetch($rowid)
{ {
$sql = "SELECT fk_soc,facnumber,amount,tva,total,remise,".$this->db->pdate(datef)."as df FROM llx_facture WHERE rowid=$rowid;"; $sql = "SELECT fk_soc,facnumber,amount,tva,total,remise,".$this->db->pdate(datef)."as df,fk_projet";
$sql .= " FROM llx_facture WHERE rowid=$rowid;";
if ($this->db->query($sql) ) if ($this->db->query($sql) )
{ {
@ -124,6 +125,7 @@ class Facture {
$this->total_ttc = $obj->total; $this->total_ttc = $obj->total;
$this->remise = $obj->remise; $this->remise = $obj->remise;
$this->socidp = $obj->fk_soc; $this->socidp = $obj->fk_soc;
$this->projetid = $obj->fk_projet;
$this->lignes = array(); $this->lignes = array();
$this->db->free(); $this->db->free();