From 28503baf43faa31995540ea2cf64be0052f957d0 Mon Sep 17 00:00:00 2001
From: Rodolphe Quiedeville <rodolphe@quiedeville.org>
Date: Mon, 4 Aug 2003 12:45:59 +0000
Subject: [PATCH] remplace index.php3 .php

---
 htdocs/fourn/facture/fiche.php3 | 23 +++++++++--------------
 htdocs/fourn/fiche.php3         |  2 +-
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/htdocs/fourn/facture/fiche.php3 b/htdocs/fourn/facture/fiche.php3
index 1ff2c616fd3..b274ab0b913 100644
--- a/htdocs/fourn/facture/fiche.php3
+++ b/htdocs/fourn/facture/fiche.php3
@@ -34,9 +34,6 @@ $db = new Db();
 
 $html = new Form($db);
 
-$yn[1] = "oui";
-$yn[0] = "<b>non</b>";
-	
 if ($action == 'valid') 
 {
   $sql = "UPDATE llx_facture_fourn set fk_statut = 1 WHERE rowid = $facid ;";
@@ -70,7 +67,6 @@ if ($action == 'update')
 
 }
 
-
 if ($action == 'add')
 {
   $datefacture = $db->idate(mktime(12, 
@@ -105,10 +101,8 @@ if ($action == 'add')
 	  $facfou->add_ligne($$label, $$amount, $$tauxtva, $$qty);
 	}
     }
-  if ($facfou->create($user))
-    {
-      Header("Location: index.php3");
-    }
+  $facid = $facfou->create($user);
+
 }
 
 if ($action == 'del_ligne')
@@ -306,7 +300,7 @@ else
 	   *
 	   */	  
 	  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 '<tr class="liste_titre"><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="center" class="small">Taux TVA</td>';
 	  print '<td align="center" class="small">TVA</td>';
 	  print '<td align="right" class="small">Total TTC</td><td>&nbsp;</td></tr>';
@@ -360,7 +354,7 @@ else
 	   */
 	  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=\"index.php3?socidp=$obj->socidp\">Autres factures</a></td>\n";
+	  print "<td align=\"right\"><a href=\"index.php?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>";
@@ -385,7 +379,8 @@ else
 	   * Paiements
 	   */
 	  $sql = "SELECT ".$db->pdate("datep")." as dp, p.amount, c.libelle as paiement_type, p.num_paiement, p.rowid";
-	  $sql .= " FROM llx_paiementfourn as p, c_paiement as c WHERE p.fk_facture_fourn = ".$fac->id." AND p.fk_paiement = c.id";
+	  $sql .= " FROM llx_paiementfourn as p, c_paiement as c ";
+	  $sql .= " WHERE p.fk_facture_fourn = ".$fac->id." AND p.fk_paiement = c.id";
 	  
 	  $result = $db->query($sql);
 
@@ -435,8 +430,8 @@ else
 	   * 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 '<p><table border="1" cellspacing="0" cellpadding="3" width="100%">';
+	  print '<tr class="liste_titre"><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="center" class="small">Taux TVA</td>';
 	  print '<td align="center" class="small">TVA</td>';
 	  print '<td align="right" class="small">Total TTC</td></tr>';
@@ -466,7 +461,7 @@ else
   
       if ($obj->statut == 0 && $user->societe_id == 0)
 	{
-	  print '<td align="center" width="25%">[<a href="index.php3?facid='.$facid.'&action=delete">Supprimer</a>]</td>';
+	  print '<td align="center" width="25%">[<a href="index.php?facid='.$facid.'&action=delete">Supprimer</a>]</td>';
 	}
       elseif ($obj->statut == 1 && $obj->paye == 0  && $user->societe_id == 0)
 	{
diff --git a/htdocs/fourn/fiche.php3 b/htdocs/fourn/fiche.php3
index 118886441ec..e717d6e57d2 100644
--- a/htdocs/fourn/fiche.php3
+++ b/htdocs/fourn/fiche.php3
@@ -250,7 +250,7 @@ if ($socid > 0) {
     if ($action == 'changevalue') {
 
       print "<HR noshade>";
-      print "<form action=\"index.php3?socid=$objsoc->idp\" method=\"post\">";
+      print "<form action=\"index.php?socid=$objsoc->idp\" method=\"post\">";
       print "<input type=\"hidden\" name=\"action\" value=\"cabrecrut\">";
       print "Cette société est un cabinet de recrutement : ";
       print "<select name=\"selectvalue\">";