From 24f3c68b56ccd7d7567787cd5f0b6ec38bf244e1 Mon Sep 17 00:00:00 2001 From: Rodolphe Quiedeville Date: Mon, 30 Dec 2002 21:07:11 +0000 Subject: [PATCH] . --- doc/Makefile | 4 + doc/don.sgml | 21 ++++- htdocs/adherent.class.php | 27 +++++++ htdocs/adherents/fiche.php | 106 ++++++++++++++++++-------- htdocs/conf/conf.class.php3.sample | 9 +++ htdocs/soc.php3 | 20 +++-- htdocs/theme/dev/img/1downarrow.png | Bin 0 -> 520 bytes htdocs/theme/dev/img/1leftarrow.png | Bin 0 -> 700 bytes htdocs/theme/dev/img/1rightarrow.png | Bin 0 -> 431 bytes htdocs/theme/dev/img/1uparrow.png | Bin 0 -> 260 bytes htdocs/theme/dev/img/editdelete.png | Bin 0 -> 558 bytes htdocs/theme/dev/img/fileclose.png | Bin 0 -> 510 bytes htdocs/theme/dev/img/filenew.png | Bin 0 -> 474 bytes htdocs/theme/dev/img/filter.png | Bin 0 -> 253 bytes htdocs/theme/dev/img/player_start.png | Bin 0 -> 722 bytes htdocs/theme/dev/img/start.png | Bin 0 -> 1112 bytes htdocs/user/pre.inc.php3 | 1 - 17 files changed, 142 insertions(+), 46 deletions(-) create mode 100644 htdocs/theme/dev/img/1downarrow.png create mode 100644 htdocs/theme/dev/img/1leftarrow.png create mode 100644 htdocs/theme/dev/img/1rightarrow.png create mode 100644 htdocs/theme/dev/img/1uparrow.png create mode 100644 htdocs/theme/dev/img/editdelete.png create mode 100644 htdocs/theme/dev/img/fileclose.png create mode 100644 htdocs/theme/dev/img/filenew.png create mode 100644 htdocs/theme/dev/img/filter.png create mode 100644 htdocs/theme/dev/img/player_start.png create mode 100644 htdocs/theme/dev/img/start.png 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 0000000000000000000000000000000000000000..f67f46deb3e590cc5ab7b28421be4638260c9f7c GIT binary patch literal 520 zcmV+j0{8uiP)`<*%Ns@#t%P__OAR@oLnw3(dY07ju z6G);-32;=*{vewGp-X8UOomQ*G!@~oU$%OHE%wn-XMDRS1LZQI!?k>${lO#z< zl7u*p$+Apo0O#C=bM9Pg&GGRuX__*bOqkE-%w{tHN~IE&N`){C>GgVqVMq`Jyn6nq zI?rEO{y+`i|DXWb+S=meY!0qiV2zqf+k|1rP=<;roB=+deSjbEWwgA_ zxg`wX@bHk)XvEFU4bC~Pudj*YnBi~<;TL30SC#eIS}To4L;C%`)M_=^-`|(*?QL1* zuiw1;7xA*JwQ_lRDMv>~Ymooa>OyO+c%CN|KL3@z|I;~LZhiuP7v?u?F0P6I0000< KMNUMnLSTY5?Dum3 literal 0 HcmV?d00001 diff --git a/htdocs/theme/dev/img/1leftarrow.png b/htdocs/theme/dev/img/1leftarrow.png new file mode 100644 index 0000000000000000000000000000000000000000..137115c039780b76525f596ec53ddbfdb8dbaeb5 GIT binary patch literal 700 zcmV;t0z>_YP)NEAGH0dTu@@f(3(Q$*)(50#e7F+_ z9|F7_JWZ;PYpq2oB@Ul@+vo7vcn40wwAQk;v?Re`P#mYu!45Z`(%Xr)<5z$@T5CzA zQpDqN0A97%U$^7--|7zT!6@bK`!^z<}JDaOagxw*Nar^b%s{@QfV z`S7dNsyaJ6r^Tgh_rIts~`1|GpBmF({p(Nkw`>lXJ;juOv>`| zvIGJF@okfS@H=^QbX4Z&=Vf7G;m>-7>+pT=ywesfvq(4`7Ok}yhT#hL{{TGibIvlK iWng4vfEhLS;OG56*Slr&bz2wfy z9}K%Q`<>a{*(Iq$PnEoK7FK|6G8HzH$ws<*S>mHv_%Yaut+<##JKtp!pA&GOptO;} zr#XCxyUCs!5Va2a{;3D?A-=~T#PaoGK7C^1w~m(vR^gfM#j7}ockyLK^&)pB`01P1 zP4)go_&TQD96QFjvj%_PfaMfE1~n!|emF9A>a86EqSQs9#+6xS<(5yWGHn~)_=;L9 z#j-Q++chzAj*dG%8X8(}@uxXTQ@K=IGjcUUwSHySE9Y>Xx^ctJ23>62ZN;=beOxnk z#sa#Q!TWh;MLdreu^pm~UW%_%iB_dm4{X=rOO|eV zmdl)DtZb=JCd(V57lKZKqaa@2K_ZU6{x8!K1@Jlky9(@K3fEy=Bb+0000< KMNUMnLSTZ!)^G*@ literal 0 HcmV?d00001 diff --git a/htdocs/theme/dev/img/editdelete.png b/htdocs/theme/dev/img/editdelete.png new file mode 100644 index 0000000000000000000000000000000000000000..5999892c878cd7785f10d4b701fc434c8c6b09e1 GIT binary patch literal 558 zcmV+}0@3}6P)KrWX9(5w)(TFsc(>+_;eC?sC$o}Kb(|A1^Z3!vvA>;D#KGMNQHDwX2? zmv7|r`M;?tWC4&A>2w;?G-DHB5d9v?9})Q@UOA1}%|y>TxYmL{9Pnc};AQiKZnqb| w7&uE`7e*gdg07*qoM6N<$f~2DI0{{R3 literal 0 HcmV?d00001 diff --git a/htdocs/theme/dev/img/fileclose.png b/htdocs/theme/dev/img/fileclose.png new file mode 100644 index 0000000000000000000000000000000000000000..87faccb61ba33447141f8504d84746cd7fec37ad GIT binary patch literal 510 zcmVWEbP-5hy)=E3b#dyEj(g%XO>G)$W+75%(wr{?21OCamog^ zwMj8Raa|y>i5k8RvDRXYp?+4UP%6~^R1o^18c)WGBAgtbP&uj~%aX^ZN4njv3jI*6 z1%!U6ViOYt0Te-&B^6o0_kE-<0l2-pWf|fCo?o8PpPE5`K-7tdO^mna5qJTkw-JlQ zB7@`riA|I|kd$^xS+ITIX7Vv1>PIVQ-nZ3`@@7gJ@ z9#%6y9U{QR`Gu>XP%6~S+$b|PPS1935kfe{X}+TXpw(;vAcQ~&;q;uIE$8I`Q$4LM z2Ul6E*8#)$DX8-^I07*qoM6N<$f}*6& Avj6}9 literal 0 HcmV?d00001 diff --git a/htdocs/theme/dev/img/filenew.png b/htdocs/theme/dev/img/filenew.png new file mode 100644 index 0000000000000000000000000000000000000000..563f859eda012468a45ec7cb0350f441877de716 GIT binary patch literal 474 zcmV<00VV#4P)>-bV?k@ zL{Y?iKK~rIX0TpC5DK)=TG&hLL z5N8mZA}+7I`|}8@s4vPR%d_f>DxhYd;t`iGzi3Kzm*H)Skv;OzWjU8u1>0EiLlxaG}@ QO#lD@07*qoM6N<$f*hp8c>n+a literal 0 HcmV?d00001 diff --git a/htdocs/theme/dev/img/filter.png b/htdocs/theme/dev/img/filter.png new file mode 100644 index 0000000000000000000000000000000000000000..4baa3a3be8e1741ae21a1c4dc149351c1fb07bbd GIT binary patch literal 253 zcmVJP00004XF*Lt006O% z3;baP0002ANkluDk2YpqN}$RdQ*+kpRoG{03b0f8a^yS7v$x6ZApK?@J0-00000NkvXXu0mjf D(adL9 literal 0 HcmV?d00001 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 GIT binary patch literal 722 zcmV;@0xkWCP)kdg00004XF*Lt006O% z3;baP00002VoOIv0063uBQgL0010qNS#tmY3kCoH3kCsXH0dM&000McNliru&<7t7 z7aVC6R{sD10#ivuK~#90<TxAr-@z1@zF=Wb!8La58Zn7wd2wl5zD|8#NQ?jZX zaUtT)g&Q|+)kR^Dib7X)(?38`5Xoq#(3l7YQ&WGWrnNKb49#ScA$1FuBR{H%_V z9lN=~&}&ZlxZs`}zA$CUhA%a>^vy=jwhiz>*(M{k>qToN@4Ai?w!Ee3vYy$^gyp^+MG2xvoa!?CAR4c5zp= zNsCFU_;j&r>1o7*mY$A#dbaJU6}R=Vnj@pH5eqKqYwPN{ZzL&i_uEV`n2ifA>07en zfd@v2M+znw@Pn3hHP74j6h@djq?z!P-%nP3YRkZ;XHBW8l@mCY!Ls*~pL}oGz%O1f zZCYmU_y%_@dpB8i$FhH|I4v{%NI^>KXMfr$c^~{^b3h)x0Yb%qLeO zLBmz-`LR@Gux8Cc=J9u7c1w!+5LTw{$oE+R>Hym+2lBbxnijpb8&2sxucJdZ}51;|7W)Zv0ZbBcK`qY07*qoM6N<$ Eg27KwDgXcg literal 0 HcmV?d00001 diff --git a/htdocs/theme/dev/img/start.png b/htdocs/theme/dev/img/start.png new file mode 100644 index 0000000000000000000000000000000000000000..9bf7f03ff83b43ab77f56cd2efcbf294165f6386 GIT binary patch literal 1112 zcmWksacmQH6u#Y9HxBkAoZDqPW5q-JM?(sBQnl!X9iy=7>g>oVGn`w6x^=OcWmarV zGaIu=)dKyaY8fR|EwsaCJM>~sQfGsWJM@gFIZQLp*y#})DW;P9qanrPkMDi?Uh?wt zeeWF~cJ1p#a0G&&&cXcyZk@N>MMtY%2R@0GbXxav|4=^!EuGkKd%O*T;8Vj-AJ}{6 z&K($r!DvWUswrN?!kIvVg-s;NN&aXC*l8?Na(ctTB^o7JqPO0K?7WK|qqj?i27;_~P9ja>$qr*e{Bkly}<7ERz6l)q9 zXU(NDniFD@3LIYCPRsQMS(Kbg)nKx@N@b(d3nQpiROnm@u#%aV07<(;$-GjnXieY_ zpmRB1t@#ryo-P54gP<5&stA$=hLfaP1B6l$NyU@Akri+zY@>s)k;Gj-*y4vm(KZrksH11Vw8)iZZ8Ei6jRSJZyFtj26Iz&2#`E8N_7w$1;EppmY$} zTvDYDf~iKMS*~eitx1(6wo(J>lDQzGcG>`N%ohjbDC&*Ll`6)|wz5ij!yw8M4vzsd zS=@e3)c_qb2^G}kw-iK-4x(uxm|!KPO6rL@{bo*#OKQ2U84%3EORQ2=wFVkW%}FX2 zW9RfM7bT@u$GkCEHnqUA>W z@;1HMJ~KG9xBaJ9_?}H|o8KpT^qC!l1N{e%&A&9(^WN;cv$uO;M13K3#q|Am9Y;Q# z${eVSoa_}B-snC7Z|5ersmCs!{OhnhHlCavdF!F;SoX>E#Z%L>nJxdpmwp*<{hfZb zXZOgKtMvKHeS6&O&QZ(6&5haKOBbK*odYh6>3+*niyo_%ffw8wQec6>r!Sy|fbr@koe8J_=`X|ApgY3Fa; z*wnMLr+YE|I6GaBj-CpAcJ#XV5jX_CwkFzZY_RpK>moeTG#T!yJ^a=iP2wp;Dc#1iv){p&ye(c^>$_qqo1)L7(y!3*ty literal 0 HcmV?d00001 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); }