.

doc/Makefile

@@ -21,6 +21,7 @@ DOC=manual
 DEBIANDOC2PS= debiandoc2ps
 DEBIANDOC2PDF= debiandoc2pdf
 DEBIANDOC2HTML= debiandoc2html
+DEBIANDOC2LATEX= debiandoc2latex
 
 OPTIONS=-v -lfr_FR.ISO8859-1 -pa4
 HOPTIONS=-lfr_FR.ISO8859-1
@@ -34,6 +35,9 @@ FRPAGES = $(shell find * -regex '.*\.sgml' -print )
 all: $(DOC).ps $(DOC).pdf $(DOC).html
 
 
+%.tex:	%.sgml $(FRPAGES)
+	$(DEBIANDOC2LATEX) $(HOPTIONS) $<
+
 %.ps:	%.sgml $(FRPAGES)
 	$(DEBIANDOC2PS) $(OPTIONS) $<
 

doc/don.sgml

@@ -28,8 +28,21 @@
 
 
 </chapt>
-<!--
-Local Variables: ***
-mode: xml ***
-End: ***
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:nil
+sgml-shorttag:t
+sgml-namecase-general:t
+sgml-general-insert-case:lower
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:("manual.sgml" "book" "chapt")
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
 -->
+

htdocs/adherent.class.php

@@ -367,6 +367,33 @@ class Adherent
 	  return 0;
 	}  
     }
+  /*
+   * Résiliation
+   *
+   *
+   */
+  Function resiliate($userid) 
+    {
+      
+      $sql = "UPDATE llx_adherent SET ";
+      $sql .= "statut=0";
+      $sql .= ",fk_user_valid=".$userid;
+
+      $sql .= " WHERE rowid = $this->id";
+      
+      $result = $this->db->query($sql);
+      
+      if ($result) 
+	{
+	  return 1;
+	}
+      else
+	{
+	  print $this->db->error();
+	  print "<h2><br>$sql<br></h2>";
+	  return 0;
+	}  
+    }
 
 
 }

htdocs/adherents/fiche.php

@@ -81,6 +81,12 @@ if ($HTTP_POST_VARS["action"] == 'confirm_valid' && $HTTP_POST_VARS["confirm"] =
   $adh->validate($user->id);
 }
 
+if ($HTTP_POST_VARS["action"] == 'confirm_resign' && $HTTP_POST_VARS["confirm"] == yes)
+{
+  $adh = new Adherent($db, $rowid);
+  $adh->resiliate($user->id);
+}
+
 
 llxHeader();
 
@@ -214,7 +220,7 @@ if ($rowid > 0)
        * Case 2
        */
       
-      if ($adh->statut == -1) 
+      if ($adh->statut < 1) 
 	{
 	  print "<td align=\"center\" width=\"25%\">[<a href=\"$PHP_SELF?rowid=$rowid&action=valid\">Valider l'adhésion</a>]</td>";
 	}
@@ -225,7 +231,14 @@ if ($rowid > 0)
       /*
        * Case 3
        */
-      print "<td align=\"center\" width=\"25%\">-</td>";
+      if ($adh->statut == 1) 
+	{
+	  print "<td align=\"center\" width=\"25%\">[<a href=\"$PHP_SELF?rowid=$rowid&action=resign\">Résilier l'adhésion</a>]</td>";
+	}
+      else
+	{
+	  print "<td align=\"center\" width=\"25%\">-</td>";
+	}
       
       /*
        * Case 4
@@ -239,7 +252,7 @@ if ($rowid > 0)
 
   /*
    *
-   *
+   * Liste des cotisations
    *
    */
   $sql = "SELECT d.rowid, d.prenom, d.nom, d.societe, c.cotisation, ".$db->pdate("c.dateadh")." as dateadh";
@@ -280,41 +293,44 @@ if ($rowid > 0)
     }
 
   /*
-   *
+   * Ajout d'une nouvelle cotis
    *
    *
    */
-  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><td width="15%">Fin adhésion</td><td width="35%" class="valeur">'.strftime("%d %B %Y",$adh->datefin).'&nbsp;</td>';
-
-  print '<td valign="top" width="50%">&nbsp;</td></tr>';
-
-  print '<tr><td colspan="3">Nouvelle adhésion</td></tr>';
-
-  print "<tr><td>Date de cotisation</td><td>";
-  if ($adh->datefin > 0)
+  if ($user->admin)
     {
-      print_date_select($adh->datefin + (3600*24));
-    }
-  else
-    {
-      print_date_select();
-    }
-  print "</td><td>&nbsp;</td></tr>";
-  print "<tr><td>Mode de paiement</td><td>\n";
-  
-  $paiement = new Paiement($db);
+      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">';
 
-  $paiement->select("modepaiement","crédit");
-
-  print "</td><td>&nbsp;</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>";  
+      print '<tr><td width="15%">Fin adhésion</td><td width="35%" class="valeur">'.strftime("%d %B %Y",$adh->datefin).'&nbsp;</td>';
+      
+      print '<td valign="top" width="50%">&nbsp;</td></tr>';
+      
+      print '<tr><td colspan="3">Nouvelle adhésion</td></tr>';
+      
+      print "<tr><td>Date de cotisation</td><td>";
+      if ($adh->datefin > 0)
+	{
+	  print_date_select($adh->datefin + (3600*24));
+	}
+      else
+	{
+	  print_date_select();
+	}
+      print "</td><td>&nbsp;</td></tr>";
+      print "<tr><td>Mode de paiement</td><td>\n";
+      
+      $paiement = new Paiement($db);
+      
+      $paiement->select("modepaiement","crédit");
+      
+      print "</td><td>&nbsp;</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>";  
+    }
 
   /*
    * Confirmation de la suppression de l'adhérent
@@ -368,6 +384,30 @@ if ($rowid > 0)
       print "</form>";  
     }
 
+  /*
+   * Confirmation de la Résiliation
+   *
+   */
+
+  if ($action == 'resign')
+    {
+
+      print '<form method="post" action="'.$PHP_SELF.'?rowid='.$rowid.'">';
+      print '<input type="hidden" name="action" value="confirm_resign">';
+      print '<table cellspacing="0" border="1" width="100%" cellpadding="3">';
+      
+      print '<tr><td colspan="3">Résilier une adhésion</td></tr>';
+      
+      print '<tr><td class="delete">Etes-vous sur de vouloir résilier cette adhésion ?</td><td class="delete">';
+      $htmls = new Form($db);
+      
+      $htmls->selectyesno("confirm","no");
+      
+      print "</td>";
+      print '<td class="delete" align="center"><input type="submit" value="Confirmer"</td></tr>';
+      print '</table>';
+      print "</form>";  
+    }
 
 }
 

htdocs/conf/conf.class.php3.sample

@@ -36,6 +36,7 @@ class Conf {
     $this->commercial = 0;
     $this->voyage     = 0;
 
+    $this->compta   = new ComptaConf();
     $this->propal = new PropalConf();
     $this->facture = new FactureConf();
     $this->fichinter = new FicheInterConf();
@@ -55,6 +56,14 @@ class Conf {
   }  
 }
 
+class ComptaConf
+{
+  Function ComptaConf() 
+    {
+      $this->tva = 1;
+    }
+}
+
 class PropalConf {
   Function PropalConf() {
 

htdocs/soc.php3

@@ -96,7 +96,7 @@ if ($action == 'create')
 }
 elseif ($action == 'edit')
 {
-  print '<div class="titre">Edition de la société</div><br>';
+  print_titre("Edition de la société");
 
   $soc = new Societe($db);
   $soc->id = $socid;
@@ -136,17 +136,19 @@ elseif ($action == 'edit')
 
 } else {
 
+  print_titre("Fiche société");
+
   $soc = new Societe($db);
   $soc->id = $socid;
   $soc->fetch($socid);
-  print "[<a href=\"soc.php3?socid=$socid&action=edit\">Editer</a>]";
-  print '<table border="1" cellpadding="3" cellspacing="0">';
-  print '<tr><td>Nom</td><td>'.$soc->nom.'</td></tr>';
-  print '<tr><td valign="top">Adresse</td><td>'.nl2br($soc->adresse).'&nbsp;</td></tr>';
-  print '<tr><td>CP</td><td>'.$soc->cp.'&nbsp;'.$soc->ville.'</td></tr>';
 
-  print '<tr><td>Tel</td><td>'.$soc->tel.'</td></tr>';
-  print '<tr><td>Fax</td><td>'.$soc->fax.'</td></tr>';
+  print '<table border="1" cellpadding="3" cellspacing="0">';
+  print '<tr><td>Nom</td><td class="valeur">'.$soc->nom.'</td></tr>';
+  print '<tr><td valign="top">Adresse</td><td class="valeur">'.nl2br($soc->adresse).'&nbsp;</td></tr>';
+  print '<tr><td>CP</td><td class="valeur">'.$soc->cp.'&nbsp;'.$soc->ville.'</td></tr>';
+
+  print '<tr><td>Tel</td><td class="valeur">'.$soc->tel.'</td></tr>';
+  print '<tr><td>Fax</td><td class="valeur">'.$soc->fax.'</td></tr>';
   print '<tr><td>Web</td><td><a href="http://'.$soc->url.'">http://'.$soc->url.'</a></td></tr>';
 
   print '<tr><td>Siren</td><td>'.$soc->siren.'&nbsp;</td></tr>';
@@ -154,6 +156,8 @@ elseif ($action == 'edit')
   print '<tr><td>Fournisseur</td><td>'.$soc->fournisseur.'</td></tr>';
   print '</table>';
 
+  print "[<a href=\"soc.php3?socid=$socid&action=edit\">Editer</a>]";
+
   clearstatcache();
 
   $docdir = $GLOBALS["DOCUMENT_ROOT"] . "/document/societe/$socid";

htdocs/user/pre.inc.php3

@@ -38,7 +38,6 @@ function llxHeader($head = "", $urlp = "") {
       $menu->add_submenu("fiche.php3?&action=create","Nouvel utilisateur");
     }
 
-  $menu->add("/info.php3", "Configuration");
 
   left_menu($menu->liste);
 }