diff --git a/doc/Makefile b/doc/Makefile index 6fecb030b51040401d7c7e9f3dfcbef6418eca32..6a3da63a199aae977e87f685a340339039d78d02 100644 --- a/doc/Makefile +++ b/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) $< diff --git a/doc/don.sgml b/doc/don.sgml index 256fc23fe94ec15c0d0cca4ce221f40423033826..f5a41269b133277df6c688170781f187190d1e6b 100644 --- a/doc/don.sgml +++ b/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: --> + diff --git a/htdocs/adherent.class.php b/htdocs/adherent.class.php index 9889a6817455788b5ff8d85097cbd7f4efd92964..8b252812da42c7e855c53b6e269cd1b53c8db24d 100644 --- a/htdocs/adherent.class.php +++ b/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; + } + } } diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php index 36cde90d0e08cc226016e685471cb8a97bb8aa88..32769af34f13eee004071d87c42d39ad9775945c 100644 --- a/htdocs/adherents/fiche.php +++ b/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).' </td>'; - - print '<td valign="top" width="50%"> </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 + if ($user->admin) { - print_date_select(); - } - print "</td><td> </td></tr>"; - print "<tr><td>Mode de paiement</td><td>\n"; - - $paiement = new Paiement($db); - - $paiement->select("modepaiement","cr�dit"); + 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 "</td><td> </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).' </td>'; + + print '<td valign="top" width="50%"> </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> </td></tr>"; + print "<tr><td>Mode de paiement</td><td>\n"; + + $paiement = new Paiement($db); + + $paiement->select("modepaiement","cr�dit"); + + print "</td><td> </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>"; + } } diff --git a/htdocs/conf/conf.class.php3.sample b/htdocs/conf/conf.class.php3.sample index bc755fc3df959c5d16b0095016367c54895cec0e..305921029e57a804baed9b3d70163676d3da207e 100644 --- a/htdocs/conf/conf.class.php3.sample +++ b/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() { diff --git a/htdocs/soc.php3 b/htdocs/soc.php3 index b806daa527a451dce8be2357e0c1002658731cd6..67e60198445fe1e5e23a4af8923fff34940a27c5 100644 --- a/htdocs/soc.php3 +++ b/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).' </td></tr>'; - print '<tr><td>CP</td><td>'.$soc->cp.' '.$soc->ville.'</td></tr>'; + 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).' </td></tr>'; + print '<tr><td>CP</td><td class="valeur">'.$soc->cp.' '.$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 '<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.' </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"; diff --git a/htdocs/theme/dev/img/1downarrow.png b/htdocs/theme/dev/img/1downarrow.png new file mode 100644 index 0000000000000000000000000000000000000000..f67f46deb3e590cc5ab7b28421be4638260c9f7c Binary files /dev/null and b/htdocs/theme/dev/img/1downarrow.png differ diff --git a/htdocs/theme/dev/img/1leftarrow.png b/htdocs/theme/dev/img/1leftarrow.png new file mode 100644 index 0000000000000000000000000000000000000000..137115c039780b76525f596ec53ddbfdb8dbaeb5 Binary files /dev/null and b/htdocs/theme/dev/img/1leftarrow.png differ diff --git a/htdocs/theme/dev/img/1rightarrow.png b/htdocs/theme/dev/img/1rightarrow.png new file mode 100644 index 0000000000000000000000000000000000000000..fbac1f112941d713093eb5addb8cfb11df4be922 Binary files /dev/null and b/htdocs/theme/dev/img/1rightarrow.png differ diff --git a/htdocs/theme/dev/img/1uparrow.png b/htdocs/theme/dev/img/1uparrow.png new file mode 100644 index 0000000000000000000000000000000000000000..44e54e0cdcf9a2745e1db0bbd3bc56f0ab9a89f2 Binary files /dev/null and b/htdocs/theme/dev/img/1uparrow.png differ diff --git a/htdocs/theme/dev/img/editdelete.png b/htdocs/theme/dev/img/editdelete.png new file mode 100644 index 0000000000000000000000000000000000000000..5999892c878cd7785f10d4b701fc434c8c6b09e1 Binary files /dev/null and b/htdocs/theme/dev/img/editdelete.png differ diff --git a/htdocs/theme/dev/img/fileclose.png b/htdocs/theme/dev/img/fileclose.png new file mode 100644 index 0000000000000000000000000000000000000000..87faccb61ba33447141f8504d84746cd7fec37ad Binary files /dev/null and b/htdocs/theme/dev/img/fileclose.png differ diff --git a/htdocs/theme/dev/img/filenew.png b/htdocs/theme/dev/img/filenew.png new file mode 100644 index 0000000000000000000000000000000000000000..563f859eda012468a45ec7cb0350f441877de716 Binary files /dev/null and b/htdocs/theme/dev/img/filenew.png differ diff --git a/htdocs/theme/dev/img/filter.png b/htdocs/theme/dev/img/filter.png new file mode 100644 index 0000000000000000000000000000000000000000..4baa3a3be8e1741ae21a1c4dc149351c1fb07bbd Binary files /dev/null and b/htdocs/theme/dev/img/filter.png differ diff --git a/htdocs/theme/dev/img/player_start.png b/htdocs/theme/dev/img/player_start.png new file mode 100644 index 0000000000000000000000000000000000000000..ccc8bc1b66a9e6a8d8b9fcee3dea1cf43a7ecb8e Binary files /dev/null and b/htdocs/theme/dev/img/player_start.png differ diff --git a/htdocs/theme/dev/img/start.png b/htdocs/theme/dev/img/start.png new file mode 100644 index 0000000000000000000000000000000000000000..9bf7f03ff83b43ab77f56cd2efcbf294165f6386 Binary files /dev/null and b/htdocs/theme/dev/img/start.png differ diff --git a/htdocs/user/pre.inc.php3 b/htdocs/user/pre.inc.php3 index 21d2d9bad0ed69c36fe408c9961c2db8d742f06e..ab8a7276867c1c1d5e5eaff26da8449780e9db3e 100644 --- a/htdocs/user/pre.inc.php3 +++ b/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); }