From 1ede5b34999860da64dd6f837fad5d0f4974dcbe Mon Sep 17 00:00:00 2001
From: Rodolphe Quiedeville <rodolphe@quiedeville.org>
Date: Wed, 15 Jan 2003 00:03:47 +0000
Subject: [PATCH] Change copyright notice Nouvelle presentation des cotisations

---
 htdocs/adherents/fiche.php | 39 +++++++++++++++++++++++++-------------
 1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php
index 212e16be823..566b61ee656 100644
--- a/htdocs/adherents/fiche.php
+++ b/htdocs/adherents/fiche.php
@@ -1,6 +1,7 @@
 <?PHP
-/* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- *                         Jean-Louis Bergamo <jlb@j1b.org>
+/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2002-2003 Jean-Louis Bergamo <jlb@j1b.org>
+ *
  * 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
  * the Free Software Foundation; either version 2 of the License, or
@@ -337,6 +338,18 @@ if ($rowid > 0)
       print "</tr></table></form><p>\n";
     }
 
+  /*
+   * Cotisations
+   *
+   *
+   */
+
+  print '<table cellspacing="0" border="1" width="100%" cellpadding="3">';
+  
+  print '<tr>';
+
+  print '<td rowspan="6" valign="top">';
+
   /*
    *
    * Liste des cotisations
@@ -379,6 +392,11 @@ if ($rowid > 0)
       print $db->error();
     }
 
+  print '</td>';
+
+
+
+
   /*
    * Ajout d'une nouvelle cotis
    *
@@ -388,13 +406,6 @@ if ($rowid > 0)
     {
       print '<form method="post" action="'.$PHP_SELF.'?rowid='.$rowid.'&action=edit">';
       print '<input type="hidden" name="action" value="cotisation">';
-      print '<table cellspacing="0" border="1" width="100%" cellpadding="3">';
-
-      print '<tr>';
-
-      print '<td rowspan="6">';
-
-      print '</td>';
 
       print '<td width="15%">Fin adhésion</td>';
       if ($adh->datefin < time())
@@ -407,9 +418,9 @@ if ($rowid > 0)
 	}
       print strftime("%d %B %Y",$adh->datefin).'&nbsp;</td>';
 
-      print '<td valign="top" width="50%">&nbsp;</td></tr>';
+      print '</tr>';
       
-      print '<tr><td colspan="3">Nouvelle adhésion</td></tr>';
+      print '<tr><td colspan="2">Nouvelle adhésion</td></tr>';
       
       print "<tr><td>Date de cotisation</td><td>\n";
       if ($adh->datefin > 0)
@@ -427,14 +438,16 @@ if ($rowid > 0)
       
       $paiement->select("modepaiement","crédit");
       
-      print "</td><td>&nbsp;</td></tr>\n";
+      print "</td></tr>\n";
       print '<tr><td>Cotisation</td><td colspan="2"><input type="text" name="cotisation" size="6"> euros</td></tr>';
       print '<tr><td colspan="2" align="center"><input type="submit" value="Enregistrer"</td></tr>';
-      print '</table>';
       print "</form>\n";  
     }
 
 
+  print '</table>';
+
+
 }
 
 $db->close();