diff --git a/doc/Makefile b/doc/Makefile index 6fecb030b51..6a3da63a199 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 256fc23fe94..f5a41269b13 100644 --- a/doc/don.sgml +++ b/doc/don.sgml @@ -28,8 +28,21 @@ - + diff --git a/htdocs/adherent.class.php b/htdocs/adherent.class.php index 9889a681745..8b252812da4 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 "


$sql

"; + return 0; + } + } } diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php index 36cde90d0e0..32769af34f1 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 "[Valider l'adhésion]"; } @@ -225,7 +231,14 @@ if ($rowid > 0) /* * Case 3 */ - print "-"; + if ($adh->statut == 1) + { + print "[Résilier l'adhésion]"; + } + else + { + print "-"; + } /* * 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 '
'; - print ''; - print ''; - - print ''; - - print ''; - - print ''; - - print ""; - print "'; + + print ''; + + print ''; + + print ""; + print "\n"; + print ''; + print ''; + print '
Fin adhésion'.strftime("%d %B %Y",$adh->datefin).'  
Nouvelle adhésion
Date de cotisation"; - if ($adh->datefin > 0) + if ($user->admin) { - print_date_select($adh->datefin + (3600*24)); - } - else - { - print_date_select(); - } - print " 
Mode de paiement\n"; - - $paiement = new Paiement($db); + print ''; + print ''; + print ''; - $paiement->select("modepaiement","crédit"); - - print "\n"; - print ''; - print ''; - print '
 
Cotisation euros
'; - print ""; + print '
Fin adhésion'.strftime("%d %B %Y",$adh->datefin).'  
Nouvelle adhésion
Date de cotisation"; + if ($adh->datefin > 0) + { + print_date_select($adh->datefin + (3600*24)); + } + else + { + print_date_select(); + } + print " 
Mode de paiement\n"; + + $paiement = new Paiement($db); + + $paiement->select("modepaiement","crédit"); + + print " 
Cotisation euros
'; + print ""; + } /* * Confirmation de la suppression de l'adhérent @@ -368,6 +384,30 @@ if ($rowid > 0) print ""; } + /* + * Confirmation de la Résiliation + * + */ + + if ($action == 'resign') + { + + print '
'; + print ''; + print ''; + + print ''; + + print '"; + print ''; + print '
Résilier une adhésion
Etes-vous sur de vouloir résilier cette adhésion ?'; + $htmls = new Form($db); + + $htmls->selectyesno("confirm","no"); + + print "
'; + print "
"; + } } diff --git a/htdocs/conf/conf.class.php3.sample b/htdocs/conf/conf.class.php3.sample index bc755fc3df9..305921029e5 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 b806daa527a..67e60198445 100644 --- a/htdocs/soc.php3 +++ b/htdocs/soc.php3 @@ -96,7 +96,7 @@ if ($action == 'create') } elseif ($action == 'edit') { - print '
Edition de la société

'; + 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 "[Editer]"; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; + print '
Nom'.$soc->nom.'
Adresse'.nl2br($soc->adresse).' 
CP'.$soc->cp.' '.$soc->ville.'
Tel'.$soc->tel.'
Fax'.$soc->fax.'
'; + print ''; + print ''; + print ''; + + print ''; + print ''; print ''; print ''; @@ -154,6 +156,8 @@ elseif ($action == 'edit') print ''; print '
Nom'.$soc->nom.'
Adresse'.nl2br($soc->adresse).' 
CP'.$soc->cp.' '.$soc->ville.'
Tel'.$soc->tel.'
Fax'.$soc->fax.'
Webhttp://'.$soc->url.'
Siren'.$soc->siren.' 
Fournisseur'.$soc->fournisseur.'
'; + print "[Editer]"; + 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 00000000000..f67f46deb3e 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 00000000000..137115c0397 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 00000000000..fbac1f11294 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 00000000000..44e54e0cdcf 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 00000000000..5999892c878 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 00000000000..87faccb61ba 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 00000000000..563f859eda0 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 00000000000..4baa3a3be8e 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 00000000000..ccc8bc1b66a 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 00000000000..9bf7f03ff83 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 21d2d9bad0e..ab8a7276867 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); }