Mise jour mise en forme
This commit is contained in:
Rodolphe Quiedeville
parent
fa564098d4
commit
9a4ddf8b92
@ -99,35 +99,6 @@ if ($action == 'add')
|
||||
}
|
||||
$facfou->create($user);
|
||||
|
||||
/*
|
||||
|
||||
$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);";
|
||||
$result = $db->query($sql);
|
||||
|
||||
if ($result)
|
||||
{
|
||||
$sql = "SELECT rowid, facnumber FROM llx_facture_fourn WHERE facnumber='$facnumber';";
|
||||
$result = $db->query($sql);
|
||||
if ($result)
|
||||
{
|
||||
$objfac = $db->fetch_object( 0);
|
||||
$facid = $objfac->rowid;
|
||||
$facnumber = $objfac->facnumber;
|
||||
$action = '';
|
||||
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
print "<p><b>Erreur : la facture n'a pas été créée !</b>$sql<br>". $db->error();
|
||||
print "<p>Retour à la <a href=\"propal.php3?propalid=$propalid\">propal</a>";
|
||||
}
|
||||
$facid = $facid;
|
||||
$action = '';
|
||||
|
||||
*/
|
||||
|
||||
}
|
||||
/*
|
||||
*
|
||||
@ -184,10 +155,10 @@ if ($action == 'create')
|
||||
$html->select_date();
|
||||
print '</td></tr>';
|
||||
|
||||
print '<tr bgcolor="#e0e0e0"><td>Montant HT :</td>';
|
||||
print '<tr><td>Montant HT :</td>';
|
||||
print '<td><input type="text" size="8" name="amount"></td></tr>';
|
||||
|
||||
print '<tr bgcolor="#e0e0e0"><td>TVA :</td>';
|
||||
print '<tr><td>TVA :</td>';
|
||||
print '<td><select name="tva_taux">';
|
||||
print '<option value="19.6">19.6';
|
||||
print '<option value="5.5">5.5';
|
||||
@ -243,15 +214,21 @@ else
|
||||
|
||||
$result = $db->query( $sql);
|
||||
|
||||
if ($result) {
|
||||
$num = $db->num_rows();
|
||||
if ($num) {
|
||||
$obj = $db->fetch_object( $i);
|
||||
if ($result)
|
||||
{
|
||||
$num = $db->num_rows();
|
||||
if ($num)
|
||||
{
|
||||
$obj = $db->fetch_object( $i);
|
||||
}
|
||||
$db->free();
|
||||
}
|
||||
$db->free();
|
||||
} else {
|
||||
print $db->error();
|
||||
}
|
||||
else
|
||||
{
|
||||
print $db->error();
|
||||
}
|
||||
|
||||
print_titre ('Facture : '.$obj->facnumber);
|
||||
|
||||
/*
|
||||
* Edition
|
||||
@ -260,7 +237,6 @@ else
|
||||
*/
|
||||
if ($action == "edit")
|
||||
{
|
||||
|
||||
print "<form action=\"$PHP_SELF?facid=$obj->rowid\" method=\"post\">";
|
||||
print '<input type="hidden" name="action" value="update">';
|
||||
|
||||
@ -284,8 +260,8 @@ else
|
||||
print stripslashes($obj->libelle). '<br>';
|
||||
print '<input size="30" name="libelle" type="text" value="'.stripslashes($obj->libelle).'"></td></tr>';
|
||||
|
||||
print '<tr bgcolor="#e0e0e0"><td>Montant HT :</td>';
|
||||
print '<td valign="top">'.$obj->amount.'<br><input type="text" size="8" name="amount" value="'.$obj->amount.'"></td></tr>';
|
||||
print '<tr><td>Montant HT :</td>';
|
||||
print '<td valign="top"><br><input type="text" size="8" name="amount" value="'.$obj->amount.'"></td></tr>';
|
||||
|
||||
print '<tr bgcolor="#e0e0e0"><td>TVA :</td>';
|
||||
print '<td><select name="tva_taux">';
|
||||
@ -306,115 +282,115 @@ else
|
||||
print "</table>";
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
* Affichage
|
||||
*
|
||||
*
|
||||
*/
|
||||
|
||||
print "<table border=\"0\" cellspacing=\"0\" cellpadding=\"2\" width=\"100%\">";
|
||||
print "<tr>";
|
||||
print '<td><div class="titre">Facture : '.$obj->facnumber.'</div></td>';
|
||||
print "<td align=\"right\"><a href=\"facture.php3?socidp=$obj->socidp\">Autres factures de $obj->socnom</a></td>\n";
|
||||
print "</tr>";
|
||||
print "<tr><td width=\"50%\">";
|
||||
/*
|
||||
* Facture
|
||||
*/
|
||||
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>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 class="small">Auteur</td><td class="small" colspan="3">'.$obj->author.' </td>';
|
||||
|
||||
print '<tr><td>Total HT</td><td align="right"><b>'.price($fac->total_ht)."</b></td>";
|
||||
print '<td align="right">TVA</td><td align="right">'.price($fac->total_tva)."</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 "<td>Paye</td><td align=\"center\" bgcolor=\"#f0f0f0\"><b>".$yn[$obj->paye]."</b></td>";
|
||||
|
||||
print "</tr>";
|
||||
print "</table>";
|
||||
|
||||
print "</td><td valign=\"top\">";
|
||||
|
||||
print nl2br(stripslashes($obj->note));
|
||||
|
||||
|
||||
$_MONNAIE="euros";
|
||||
|
||||
/*
|
||||
* Paiements
|
||||
*/
|
||||
$sql = "SELECT ".$db->pdate("datep")." as dp, p.amount, c.libelle as paiement_type, p.num_paiement, p.rowid";
|
||||
$sql .= " FROM llx_paiement as p, c_paiement as c WHERE p.fk_facture = $facid AND p.fk_paiement = c.id";
|
||||
|
||||
//$result = $db->query($sql);
|
||||
$result = 0;
|
||||
if ($result) {
|
||||
$num = $db->num_rows();
|
||||
$i = 0; $total = 0;
|
||||
print "<p><b>Paiements</b>";
|
||||
echo '<TABLE border="1" width="100%" cellspacing="0" cellpadding="3">';
|
||||
print "<TR class=\"liste_titre\">";
|
||||
print "<td>Date</td>";
|
||||
print "<td>Type</td>";
|
||||
print "<td align=\"right\">Montant</TD><td> </td>";
|
||||
print "</TR>\n";
|
||||
|
||||
$var=True;
|
||||
while ($i < $num) {
|
||||
$objp = $db->fetch_object( $i);
|
||||
$var=!$var;
|
||||
print "<TR $bc[$var]>";
|
||||
print "<TD>".strftime("%d %B %Y",$objp->dp)."</TD>\n";
|
||||
print "<TD>$objp->paiement_type $objp->num_paiement</TD>\n";
|
||||
print "<TD align=\"right\">".price($objp->amount)."</TD><td>$_MONNAIE</td>\n";
|
||||
print "</tr>";
|
||||
$total = $total + $objp->amount;
|
||||
$i++;
|
||||
}
|
||||
print "<tr><td colspan=\"2\" align=\"right\">Total :</td><td align=\"right\"><b>".price($total)."</b></td><td>$_MONNAIE</td></tr>\n";
|
||||
print "<tr><td colspan=\"2\" align=\"right\">Facturé :</td><td align=\"right\" bgcolor=\"#d0d0d0\">".price($obj->total)."</td><td bgcolor=\"#d0d0d0\">$_MONNAIE</td></tr>\n";
|
||||
|
||||
$resteapayer = $obj->total - $total;
|
||||
|
||||
print "<tr><td colspan=\"2\" align=\"right\">Reste a payer :</td>";
|
||||
print "<td align=\"right\" bgcolor=\"#f0f0f0\"><b>".price($resteapayer)."</b></td><td bgcolor=\"#f0f0f0\">$_MONNAIE</td></tr>\n";
|
||||
|
||||
print "</table>";
|
||||
$db->free();
|
||||
} else {
|
||||
// print $db->error();
|
||||
}
|
||||
|
||||
print "</td></tr>";
|
||||
|
||||
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++)
|
||||
else
|
||||
{
|
||||
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>";
|
||||
/*
|
||||
* Affichage
|
||||
*
|
||||
*
|
||||
*/
|
||||
|
||||
print "<table border=\"0\" cellspacing=\"0\" cellpadding=\"2\" width=\"100%\">";
|
||||
print "<tr><td width=\"50%\">";
|
||||
/*
|
||||
* Facture
|
||||
*/
|
||||
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 "<td align=\"right\"><a href=\"facture.php3?socidp=$obj->socidp\">Autres factures</a></td>\n";
|
||||
print "</tr>";
|
||||
print "<tr><td>Date</td><td colspan=\"4\">".strftime("%A %d %B %Y",$obj->df)."</td></tr>\n";
|
||||
print "<tr><td>Libelle</td><td colspan=\"4\">$obj->libelle</td>";
|
||||
print '<tr><td>Auteur</td><td colspan="4">'.$fac->author.' </td>';
|
||||
|
||||
print '<tr><td> </td><td>Total HT</td><td align="right"><b>'.price($fac->total_ht)."</b></td>";
|
||||
print '<td align="right">TVA</td><td align="right">'.price($fac->total_tva)."</td></tr>";
|
||||
print '<tr><td> </td><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 "<td>Paye</td><td align=\"center\" bgcolor=\"#f0f0f0\"><b>".$yn[$obj->paye]."</b></td>";
|
||||
|
||||
print "</tr>";
|
||||
print "</table>";
|
||||
|
||||
print "</td><td valign=\"top\"> ";
|
||||
|
||||
print nl2br(stripslashes($obj->note));
|
||||
|
||||
$_MONNAIE="euros";
|
||||
|
||||
/*
|
||||
* Paiements
|
||||
*/
|
||||
$sql = "SELECT ".$db->pdate("datep")." as dp, p.amount, c.libelle as paiement_type, p.num_paiement, p.rowid";
|
||||
$sql .= " FROM llx_paiement as p, c_paiement as c WHERE p.fk_facture = $facid AND p.fk_paiement = c.id";
|
||||
|
||||
//$result = $db->query($sql);
|
||||
$result = 0;
|
||||
if ($result)
|
||||
{
|
||||
$num = $db->num_rows();
|
||||
$i = 0; $total = 0;
|
||||
print "<p><b>Paiements</b>";
|
||||
echo '<TABLE border="1" width="100%" cellspacing="0" cellpadding="3">';
|
||||
print "<TR class=\"liste_titre\">";
|
||||
print "<td>Date</td>";
|
||||
print "<td>Type</td>";
|
||||
print "<td align=\"right\">Montant</TD><td> </td>";
|
||||
print "</TR>\n";
|
||||
|
||||
$var=True;
|
||||
while ($i < $num)
|
||||
{
|
||||
$objp = $db->fetch_object( $i);
|
||||
$var=!$var;
|
||||
print "<TR $bc[$var]>";
|
||||
print "<TD>".strftime("%d %B %Y",$objp->dp)."</TD>\n";
|
||||
print "<TD>$objp->paiement_type $objp->num_paiement</TD>\n";
|
||||
print "<TD align=\"right\">".price($objp->amount)."</TD><td>$_MONNAIE</td>\n";
|
||||
print "</tr>";
|
||||
$total = $total + $objp->amount;
|
||||
$i++;
|
||||
}
|
||||
print "<tr><td colspan=\"2\" align=\"right\">Total :</td><td align=\"right\"><b>".price($total)."</b></td><td>$_MONNAIE</td></tr>\n";
|
||||
print "<tr><td colspan=\"2\" align=\"right\">Facturé :</td><td align=\"right\" bgcolor=\"#d0d0d0\">".price($obj->total)."</td><td bgcolor=\"#d0d0d0\">$_MONNAIE</td></tr>\n";
|
||||
|
||||
$resteapayer = $obj->total - $total;
|
||||
|
||||
print "<tr><td colspan=\"2\" align=\"right\">Reste a payer :</td>";
|
||||
print '<td align="right"><b>'.price($resteapayer)."</b></td><td>$_MONNAIE</td></tr>\n";
|
||||
|
||||
print "</table>";
|
||||
$db->free();
|
||||
} else {
|
||||
// print $db->error();
|
||||
}
|
||||
|
||||
print "</td></tr>";
|
||||
|
||||
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
|
||||
@ -444,6 +420,7 @@ else
|
||||
{
|
||||
print "<td align=\"center\" width=\"25%\">-</td>";
|
||||
}
|
||||
|
||||
if ($obj->statut == 0)
|
||||
{
|
||||
print "<td align=\"center\" bgcolor=\"#e0e0e0\" width=\"25%\">[<a href=\"$PHP_SELF?facid=$facid&action=valid\">Valider</a>]</td>";
|
||||
@ -492,149 +469,7 @@ else
|
||||
print "<p>output :<br><small>$output</small><br>";
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Propales
|
||||
*/
|
||||
|
||||
$sql = "SELECT ".$db->pdate("p.datep")." as dp, p.price, p.ref, p.rowid as propalid";
|
||||
$sql .= " FROM llx_propal as p, llx_fa_pr as fp WHERE fp.fk_propal = p.rowid AND fp.fk_facture = $facid";
|
||||
|
||||
$result = $db->query($sql);
|
||||
if ($result) {
|
||||
$num = $db->num_rows();
|
||||
if ($num) {
|
||||
$i = 0; $total = 0;
|
||||
print "<p><b>Proposition(s) commerciale(s) associée(s)</b>";
|
||||
print '<TABLE border="1" width="100%" cellspacing="0" cellpadding="4">';
|
||||
print "<TR class=\"liste_titre\">";
|
||||
print "<td>Num</td>";
|
||||
print "<td>Date</td>";
|
||||
print "<td align=\"right\">Prix</TD>";
|
||||
print "</TR>\n";
|
||||
|
||||
$var=True;
|
||||
while ($i < $num) {
|
||||
$objp = $db->fetch_object( $i);
|
||||
$var=!$var;
|
||||
print "<TR $bc[$var]>";
|
||||
print "<TD><a href=\"propal.php3?propalid=$objp->propalid\">$objp->ref</a></TD>\n";
|
||||
print "<TD>".strftime("%d %B %Y",$objp->dp)."</TD>\n";
|
||||
print '<TD align="right">'.price($objp->price).'</TD>';
|
||||
print "</tr>";
|
||||
$total = $total + $objp->price;
|
||||
$i++;
|
||||
}
|
||||
print "<tr><td align=\"right\" colspan=\"3\">Total : <b>".price($total)."</b> $_MONNAIE HT</td></tr>\n";
|
||||
print "</table>";
|
||||
}
|
||||
} else {
|
||||
print $db->error();
|
||||
}
|
||||
|
||||
} else {
|
||||
/*
|
||||
*
|
||||
* Liste
|
||||
*
|
||||
*
|
||||
*/
|
||||
print_barre_liste("Factures",$page,$PHP_SELF);
|
||||
|
||||
$sql = "SELECT s.nom,s.idp,f.facnumber,f.amount,".$db->pdate("f.datef")." as df,f.paye,f.rowid as facid";
|
||||
$sql .= " FROM societe as s,llx_facture as f WHERE f.fk_soc = s.idp";
|
||||
|
||||
if ($socidp) {
|
||||
$sql .= " AND s.idp = $socidp";
|
||||
}
|
||||
|
||||
if ($month > 0) {
|
||||
$sql .= " AND date_format(f.datef, '%m') = $month";
|
||||
}
|
||||
if ($year > 0) {
|
||||
$sql .= " AND date_format(f.datef, '%Y') = $year";
|
||||
}
|
||||
|
||||
$sql .= " ORDER BY f.fk_statut, f.paye, f.datef DESC ";
|
||||
|
||||
$result = $db->query($sql);
|
||||
if ($result) {
|
||||
$num = $db->num_rows();
|
||||
|
||||
$i = 0;
|
||||
print "<TABLE border=\"0\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\">";
|
||||
print '<TR class="liste_titre">';
|
||||
print "<TD>Numéro</TD><td>";
|
||||
print_liste_field_titre("Société",$PHP_SELF,"s.nom");
|
||||
print "</td><TD align=\"right\">Date</TD><TD align=\"right\">Montant</TD>";
|
||||
print "<TD align=\"right\">Payé</TD>";
|
||||
print "</TR>\n";
|
||||
|
||||
if ($num > 0) {
|
||||
$var=True;
|
||||
while ($i < $num) {
|
||||
$objp = $db->fetch_object( $i);
|
||||
$var=!$var;
|
||||
|
||||
if ($objp->paye && !$sep) {
|
||||
print "<tr><td colspan=\"3\" align=\"right\">";
|
||||
print " </small></td>";
|
||||
print "<td align=\"right\">Sous Total :<b> ".price($total)."</b></td><td>euros HT</td></tr>";
|
||||
|
||||
print '<TR class="liste_titre">';
|
||||
print "<TD>Numéro</TD><td>";
|
||||
print_liste_field_titre("Société",$PHP_SELF,"s.nom");
|
||||
print "</td><TD align=\"right\">Date</TD><TD align=\"right\">Montant</TD>";
|
||||
print "<TD align=\"right\">Payé</TD></TR>\n";
|
||||
$sep = 1 ; $j = 0;
|
||||
$subtotal = 0;
|
||||
}
|
||||
|
||||
print "<TR $bc[$var]>";
|
||||
print "<td><a href=\"facture.php3?facid=$objp->facid\">$objp->facnumber</a></TD>\n";
|
||||
print "<TD><a href=\"fiche.php3?socid=$objp->idp\">$objp->nom</a></TD>\n";
|
||||
|
||||
if ($objp->df > 0 ) {
|
||||
print "<TD align=\"right\">";
|
||||
$y = strftime("%Y",$objp->df);
|
||||
$m = strftime("%m",$objp->df);
|
||||
|
||||
print strftime("%d",$objp->df)."\n";
|
||||
print " <a href=\"facture.php3?year=$y&month=$m\">";
|
||||
print strftime("%B",$objp->df)."</a>\n";
|
||||
print " <a href=\"facture.php3?year=$y\">";
|
||||
print strftime("%Y",$objp->df)."</a></TD>\n";
|
||||
} else {
|
||||
print "<TD align=\"right\"><b>!!!</b></TD>\n";
|
||||
}
|
||||
|
||||
print "<TD align=\"right\">".price($objp->amount)."</TD>\n";
|
||||
|
||||
$total = $total + $objp->amount;
|
||||
$subtotal = $subtotal + $objp->amount;
|
||||
print "<TD align=\"right\">".$yn[$objp->paye]."</TD>\n";
|
||||
|
||||
print "</TR>\n";
|
||||
$i++;
|
||||
$j++;
|
||||
|
||||
}
|
||||
}
|
||||
if ($i == 0) { $i=1; } if ($j == 0) { $j=1; }
|
||||
print "<tr><td></td><td>$j factures</td><td colspan=\"1\" align=\"right\"> </td>";
|
||||
print "<td align=\"right\">Sous Total :<b> ".price($subtotal)."</b></td><td>euros HT</td></tr>";
|
||||
|
||||
print "<tr bgcolor=\"#d0d0d0\"><td></td><td>$i factures</td><td colspan=\"1\" align=\"right\"> </td>";
|
||||
print "<td align=\"right\"><b>Total : ".price($total)."</b></td><td>euros HT</td></tr>";
|
||||
|
||||
print "</TABLE>";
|
||||
$db->free();
|
||||
} else {
|
||||
print $db->error();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
$db->close();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user