Refonte totale

This commit is contained in:
Rodolphe Quiedeville 2003-03-12 18:52:03 +00:00
parent e9a5fc6932
commit 6618bd0e0b
2 changed files with 489 additions and 436 deletions

View File

@ -25,6 +25,8 @@ llxHeader();
$db = new Db(); $db = new Db();
$html = new Form($db);
$yn[1] = "oui"; $yn[1] = "oui";
$yn[0] = "<b>non</b>"; $yn[0] = "<b>non</b>";
@ -43,7 +45,7 @@ if ($action == 'payed')
if ($action == 'update') if ($action == 'update')
{ {
$tva = ($HTTP_POST_VARS["tva_taux"] * $HTTP_POST_VARS["amount"]) / 100 ; $tva = ($HTTP_POST_VARS["tauxtva"] * $HTTP_POST_VARS["amount"]) / 100 ;
$remise = 0; $remise = 0;
$total = $tva + $amount ; $total = $tva + $amount ;
@ -62,15 +64,43 @@ if ($action == 'update')
} }
if ($action == 'add') if ($action == 'add')
{ {
$datefacture = $db->idate(mktime(12, 0 , 0, $pmonth, $pday, $pyear)); $datefacture = $db->idate(mktime(12,
0,
0,
$HTTP_POST_VARS["remonth"],
$HTTP_POST_VARS["reday"],
$HTTP_POST_VARS["reyear"]));
$tva = 0; $tva = 0;
$tva = ($tva_taux * $amount) / 100 ; $tva = ($tva_taux * $amount) / 100 ;
$remise = 0; $remise = 0;
$total = $tva + $amount ; $total = $tva + $amount ;
$facfou = new FactureFourn($db);
$facfou->number = $HTTP_POST_VARS["facnumber"];
$facfou->socid = $HTTP_POST_VARS["socidp"];
$facfou->libelle = $HTTP_POST_VARS["libelle"];
$facfou->date = $datefacture;
$facfou->note = $HTTP_POST_VARS["note"];
for ($i = 1 ; $i < 5 ; $i++)
{
$label = "label$i";
$amount = "amount$i";
$tauxtva = "tauxtva$i";
if (strlen($$label))
{
// print "Ajour ligne $i " . $$label . " " . $$amount . " " . $$tauxtva ; // DEBUG
$facfou->add_ligne($$label, $$amount, $$tauxtva);
}
}
$facfou->create($user);
/*
$sql = "INSERT INTO llx_facture_fourn (facnumber, libelle, fk_soc, datec, datef, note, amount, remise, tva, total, fk_user_author) "; $sql = "INSERT INTO llx_facture_fourn (facnumber, libelle, fk_soc, datec, datef, note, amount, remise, tva, total, fk_user_author) ";
$sql .= " VALUES ('$facnumber','$libelle', $socidp, now(), $datefacture,'$note', $amount, $remise, $tva, $total, $user->id);"; $sql .= " VALUES ('$facnumber','$libelle', $socidp, now(), $datefacture,'$note', $amount, $remise, $tva, $total, $user->id);";
$result = $db->query($sql); $result = $db->query($sql);
@ -96,6 +126,8 @@ if ($action == 'add')
$facid = $facid; $facid = $facid;
$action = ''; $action = '';
*/
} }
/* /*
* *
@ -107,11 +139,12 @@ if ($action == 'add')
if ($action == 'create') if ($action == 'create')
{ {
print_titre("Emettre une facture"); print_titre("Saisir une facture");
print "<form action=\"$PHP_SELF\" method=\"post\">"; print '<form action="'.$PHP_SELF.'" method="post">';
print '<table cellspacing="0" border="1" width="100%">'; print '<input type="hidden" name="action" value="add">';
print "<tr bgcolor=\"#e0e0e0\"><td>Société :</td>"; print '<table cellspacing="0" cellpadding="3" border="1" width="100%">';
print '<tr bgcolor="#e0e0e0"><td>Société :</td>';
print '<td><select name="socidp">'; print '<td><select name="socidp">';
@ -139,12 +172,18 @@ if ($action == 'create')
} }
} }
print '</select></td>'; print '</select></td>';
print "<td rowspan=6>Commentaires :<br>"; print "<td>Commentaires :</td></tr>";
print "<textarea name=\"note\" wrap=\"soft\" cols=\"30\" rows=\"15\"></textarea></td></tr>";
print '<tr><td>Numéro :</td><td><input name="facnumber" type="text"></td>';
print '<td rowspan="6"><textarea name="note" wrap="soft" cols="30" rows="10"></textarea></td></tr>';
print '<tr><td>Numéro :</td><td><input name="facnumber" type="text"></td></tr>';
print '<tr><td>Libellé :</td><td><input size="30" name="libelle" type="text"></td></tr>'; print '<tr><td>Libellé :</td><td><input size="30" name="libelle" type="text"></td></tr>';
print '<tr><td>Date :</td><td>';
$html->select_date();
print '</td></tr>';
print '<tr bgcolor="#e0e0e0"><td>Montant HT :</td>'; print '<tr bgcolor="#e0e0e0"><td>Montant HT :</td>';
print '<td><input type="text" size="8" name="amount"></td></tr>'; print '<td><input type="text" size="8" name="amount"></td></tr>';
@ -155,67 +194,49 @@ if ($action == 'create')
print '<option value="0">0'; print '<option value="0">0';
print '</select></td></tr>'; print '</select></td></tr>';
print "<input type=\"hidden\" name=\"action\" value=\"add\">";
$strmonth[1] = "Janvier"; $strmonth[2] = "F&eacute;vrier"; $strmonth[3] = "Mars"; $strmonth[4] = "Avril";
$strmonth[5] = "Mai"; $strmonth[6] = "Juin"; $strmonth[7] = "Juillet"; $strmonth[8] = "Ao&ucirc;t";
$strmonth[9] = "Septembre"; $strmonth[10] = "Octobre";
$strmonth[11] = "Novembre"; $strmonth[12] = "D&eacute;cembre";
print "<tr><td>Date :</td><td>";
$cday = date("d", time());
print "<select name=\"pday\">";
for ($day = 1 ; $day < $sday + 32 ; $day++)
{
if ($day == $cday)
{
print "<option value=\"$day\" SELECTED>$day";
}
else
{
print "<option value=\"$day\">$day";
}
}
print "</select>";
$cmonth = date("n", time());
print "<select name=\"pmonth\">";
for ($month = 1 ; $month <= 12 ; $month++)
{
if ($month == $cmonth)
{
print "<option value=\"$month\" SELECTED>" . $strmonth[$month];
}
else
{
print "<option value=\"$month\">" . $strmonth[$month];
}
}
print "</select>";
print "<select name=\"pyear\">";
$syear = date("Y", time() ) ;
print "<option value=\"".($syear-1)."\">".($syear-1);
print "<option value=\"$syear\" SELECTED>$syear";
for ($year = $syear +1 ; $year < $syear + 5 ; $year++)
{
print "<option value=\"$year\">$year";
}
print "</select></td></tr>";
$author = $GLOBALS["REMOTE_USER"]; $author = $GLOBALS["REMOTE_USER"];
print "<input type=\"hidden\" name=\"author\" value=\"$author\">"; print "<input type=\"hidden\" name=\"author\" value=\"$author\">";
print "<tr><td>Auteur :</td><td>".$user->fullname."</td></tr>"; print "<tr><td>Auteur :</td><td>".$user->fullname."</td></tr>";
print "<tr><td colspan=\"3\" align=\"center\"><input type=\"submit\" value=\"Enregistrer\"></td></tr>";
print '<tr><td>Ligne 1 :</td>';
print '<td><input size="30" name="label1" type="text"></td>';
print '<td><input type="text" size="8" name="amount1">&nbsp;TVA&nbsp;';
$html->select_tva("tauxtva1");
print '</td></tr>';
print '<tr><td>Ligne 2 :</td>';
print '<td><input size="30" name="label2" type="text"></td>';
print '<td><input type="text" size="8" name="amount2">&nbsp;TVA&nbsp;';
$html->select_tva("tauxtva2");
print '</td></tr>';
print '<tr><td>Ligne 3 :</td>';
print '<td><input size="30" name="label3" type="text"></td>';
print '<td><input type="text" size="8" name="amount3">&nbsp;TVA&nbsp;';
$html->select_tva("tauxtva3");
print '</td></tr>';
print '<tr><td>Ligne 4 :</td>';
print '<td><input size="30" name="label4" type="text"></td>';
print '<td><input type="text" size="8" name="amount4">&nbsp;TVA&nbsp;';
$html->select_tva("tauxtva4");
print '</td></tr>';
print '<tr><td colspan="3" align="center"><input type="submit" value="Enregistrer"></td></tr>';
print "</form>"; print "</form>";
print "</table>"; print "</table>";
} }
else else
{ {
if ($facid > 0) if ($facid > 0)
{ {
$fac = new FactureFourn($db);
$fac->fetch($facid);
$sql = "SELECT s.nom as socnom, s.idp as socidp, f.facnumber, f.amount, f.tva, f.total, ".$db->pdate("f.datef")." as df, f.paye, f.fk_statut as statut, f.note, f.libelle, f.rowid"; $sql = "SELECT s.nom as socnom, s.idp as socidp, f.facnumber, f.amount, f.tva, f.total, ".$db->pdate("f.datef")." as df, f.paye, f.fk_statut as statut, f.note, f.libelle, f.rowid";
$sql .= " FROM societe as s,llx_facture_fourn as f WHERE f.fk_soc = s.idp AND f.rowid = $facid"; $sql .= " FROM societe as s,llx_facture_fourn as f WHERE f.fk_soc = s.idp AND f.rowid = $facid";
@ -248,14 +269,17 @@ else
print '<td width="20%">'.stripslashes($obj->socnom); print '<td width="20%">'.stripslashes($obj->socnom);
print '</td>'; print '</td>';
print '<td rowspan="8" width="60%">Commentaires :<br>'; print '<td width="60%" valign="top">Commentaires :</tr>';
print '<textarea name="note" wrap="soft" cols="60" rows="30">';
print stripslashes($obj->note);
print '</textarea></td></tr>';
print '<tr><td valign="top">Numéro :</td><td valign="top">'; print '<tr><td valign="top">Numéro :</td><td valign="top">';
print $obj->facnumber .'<br>'; print $obj->facnumber .'<br>';
print '<input name="facnumber" type="text" value="'.$obj->facnumber.'"></td></tr>'; print '<input name="facnumber" type="text" value="'.$obj->facnumber.'"></td>';
print '<td rowspan="8" width="60%" valign="top">';
print '<textarea name="note" wrap="soft" cols="60" rows="10">';
print stripslashes($obj->note);
print '</textarea></td></tr>';
print '<tr><td valign="top">Libellé :</td><td>'; print '<tr><td valign="top">Libellé :</td><td>';
print stripslashes($obj->libelle). '<br>'; print stripslashes($obj->libelle). '<br>';
print '<input size="30" name="libelle" type="text" value="'.stripslashes($obj->libelle).'"></td></tr>'; print '<input size="30" name="libelle" type="text" value="'.stripslashes($obj->libelle).'"></td></tr>';
@ -289,7 +313,6 @@ else
* *
*/ */
print "<table border=\"0\" cellspacing=\"0\" cellpadding=\"2\" width=\"100%\">"; print "<table border=\"0\" cellspacing=\"0\" cellpadding=\"2\" width=\"100%\">";
print "<tr>"; print "<tr>";
print '<td><div class="titre">Facture : '.$obj->facnumber.'</div></td>'; print '<td><div class="titre">Facture : '.$obj->facnumber.'</div></td>';
@ -302,16 +325,13 @@ else
print "<table border=\"1\" cellspacing=\"0\" cellpadding=\"2\" width=\"100%\">"; print "<table border=\"1\" cellspacing=\"0\" cellpadding=\"2\" width=\"100%\">";
print "<tr><td>Société</td><td colspan=\"3\"><b><a href=\"fiche.php3?socid=$obj->socidp\">$obj->socnom</a></b></td>"; print "<tr><td>Société</td><td colspan=\"3\"><b><a href=\"fiche.php3?socid=$obj->socidp\">$obj->socnom</a></b></td>";
print "<tr><td>Date</td><td colspan=\"3\">".strftime("%A %d %B %Y",$obj->df)."</td></tr>\n"; print "<tr><td>Date</td><td colspan=\"3\">".strftime("%A %d %B %Y",$obj->df)."</td></tr>\n";
print "<tr><td>Libelle</td><td colspan=\"3\">$obj->libelle</td>"; print "<tr><td>Libelle</td><td colspan=\"3\">$obj->libelle</td>";
print "<tr><td>Auteur</td><td colspan=\"3\">$obj->author&nbsp;</td>"; print '<tr><td class="small">Auteur</td><td class="small" colspan="3">'.$obj->author.'&nbsp;</td>';
print "<tr><td>Montant</td><td align=\"right\"><b>".price($obj->amount)."</b></td><td>euros HT</td></tr>"; print '<tr><td>Total HT</td><td align="right"><b>'.price($fac->total_ht)."</b></td>";
print "<tr><td>TVA</td><td align=\"right\">".price($obj->tva)."</td><td>euros</td></tr>"; print '<td align="right">TVA</td><td align="right">'.price($fac->total_tva)."</td></tr>";
print "<tr><td>Total</td><td align=\"right\">".price($obj->total)."</td><td>euros TTC</td></tr>"; print '<tr><td>Total TTC</td><td colspan="3" align="center">'.price($fac->total_ttc)."</td></tr>";
print "<tr><td>Statut</td><td align=\"center\">$obj->statut</td>"; print "<tr><td>Statut</td><td align=\"center\">$obj->statut</td>";
print "<td>Paye</td><td align=\"center\" bgcolor=\"#f0f0f0\"><b>".$yn[$obj->paye]."</b></td>"; print "<td>Paye</td><td align=\"center\" bgcolor=\"#f0f0f0\"><b>".$yn[$obj->paye]."</b></td>";
@ -374,6 +394,33 @@ else
print "</td></tr>"; print "</td></tr>";
print "</table>"; print "</table>";
/*
* Lignes
*
*/
print '<p><table border="1" cellspacing="0" cellpadding="2" width="100%">';
print '<tr><td class="small">Libellé</td><td align="center" class="small">P.U. HT</td><td align="center" class="small">Qty</td><td align="center" class="small">Total HT</td>';
print '<td align="right" class="small">Total TTC</td><td align="center" class="small">TVA</td><td align="center" class="small">Taux TVA</td></tr>';
for ($i = 0 ; $i < sizeof($fac->lignes) ; $i++)
{
print '<tr><td>'.$fac->lignes[$i][0]."</td>";
print '<td align="right">'.$fac->lignes[$i][4]."</td>";
print '<td align="center">'.$fac->lignes[$i][3]."</td>";
print '<td align="right">'.$fac->lignes[$i][1]."</td>";
print '<td align="right">'.price($fac->lignes[$i][6])."</td>";
print '<td align="right" class="small">'.price($fac->lignes[$i][5])."</td>";
print '<td align="right" class="small">'.$fac->lignes[$i][2]."</td>";
print '</tr>';
}
print "</table>";
/*
* Barre de commande
*
*
*/
print "<p><TABLE border=\"1\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\"><tr>"; print "<p><TABLE border=\"1\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\"><tr>";

View File

@ -1,5 +1,5 @@
<?PHP <?PHP
/* Copyright (C) 2002 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -57,11 +57,8 @@ if ($action == 'stcomm') {
if ($action == 'delete') { if ($action == 'delete') {
$sql = "DELETE FROM llx_facture_fourn WHERE rowid = $facid;"; $fac = new FactureFourn($db);
$fac->delete($facid);
if (! $db->query( $sql) ) {
print $db->error();
}
$facid = 0 ; $facid = 0 ;
} }
@ -79,14 +76,18 @@ $pagenext = $page + 1;
* *
* *
*/ */
if ($mode == 'search') { if ($mode == 'search')
if ($mode-search == 'soc') { {
if ($mode-search == 'soc')
{
$sql = "SELECT s.idp FROM societe as s "; $sql = "SELECT s.idp FROM societe as s ";
$sql .= " WHERE lower(s.nom) like '%".strtolower($socname)."%'"; $sql .= " WHERE lower(s.nom) like '%".strtolower($socname)."%'";
} }
if ( $db->query($sql) ) { if ( $db->query($sql) )
if ( $db->num_rows() == 1) { {
if ( $db->num_rows() == 1)
{
$obj = $db->fetch_object(0); $obj = $db->fetch_object(0);
$socid = $obj->idp; $socid = $obj->idp;
} }
@ -99,9 +100,12 @@ if ($mode == 'search') {
* *
* *
*/ */
if ($socid > 0) { if ($socid > 0)
{
} else { }
else
{
/* /*
* Mode Liste * Mode Liste
* *
@ -120,7 +124,7 @@ if ($socid > 0) {
} }
$sql = "SELECT s.idp as socid, s.nom, ".$db->pdate("s.datec")." as datec, ".$db->pdate("s.datea")." as datea, s.prefix_comm, fac.amount, fac.paye, fac.libelle, ".$db->pdate("fac.datef")." as datef, fac.rowid as facid"; $sql = "SELECT s.idp as socid, s.nom, ".$db->pdate("s.datec")." as datec, ".$db->pdate("s.datea")." as datea, s.prefix_comm, fac.amount, fac.paye, fac.libelle, ".$db->pdate("fac.datef")." as datef, fac.rowid as facid, fac.facnumber";
$sql .= " FROM societe as s, llx_facture_fourn as fac "; $sql .= " FROM societe as s, llx_facture_fourn as fac ";
$sql .= " WHERE fac.fk_soc = s.idp"; $sql .= " WHERE fac.fk_soc = s.idp";
@ -140,6 +144,7 @@ if ($socid > 0) {
} }
print "<p><TABLE border=\"0\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\">"; print "<p><TABLE border=\"0\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\">";
print '<TR class="liste_titre">'; print '<TR class="liste_titre">';
print "<TD>Numéro</TD><td>";
print "<TD>Libelle</TD><td>"; print "<TD>Libelle</TD><td>";
print_liste_field_titre("Société",$PHP_SELF,"s.nom"); print_liste_field_titre("Société",$PHP_SELF,"s.nom");
print '</td><TD align="right">Montant</TD>'; print '</td><TD align="right">Montant</TD>';
@ -152,6 +157,7 @@ if ($socid > 0) {
$var=!$var; $var=!$var;
print "<TR $bc[$var]>"; print "<TR $bc[$var]>";
print "<TD><a href=\"fiche.php3?facid=$obj->facid\">$obj->facnumber</A></td>\n";
print "<TD><a href=\"fiche.php3?facid=$obj->facid\">$obj->libelle</A></td>\n"; print "<TD><a href=\"fiche.php3?facid=$obj->facid\">$obj->libelle</A></td>\n";
print "<TD><a href=\"../fiche.php3?socid=$obj->socid\">$obj->nom</A></td>\n"; print "<TD><a href=\"../fiche.php3?socid=$obj->socid\">$obj->nom</A></td>\n";
print '<TD align="right">'.price($obj->amount).'</TD>'; print '<TD align="right">'.price($obj->amount).'</TD>';