cst1/kpsul
1
0
Fork 0
forked from DGNum/gestioCOF
Code Pull requests Activity
1200 commits 38 branches 17 tags 11 MiB
Commit graph

163 commits

Author SHA1 Message Date
Ludovic Stephan
aa29621c7c Prevents special opes on LIQ 2017-03-31 18:28:03 -03:00
Ludovic Stephan
3793863bab Merge remote-tracking branch 'origin/k-fet' into Aufinal/merge_k-fet 2017-03-15 22:58:54 -03:00
Qwann
f52aba8ca6 Merge branch 'k-fet' into qwann/k-fet/home 2017-03-05 19:21:20 +01:00
Aurélien Delobelle
95b129e396 resolved merge conflict in kfet views imports 2017-02-25 02:00:56 +01:00
Evarin
0fcb29252b Frontend tout en JS 2017-02-15 21:01:54 +01:00
Qwann
1c90608f6d some cleaning 2017-02-15 14:21:00 +01:00
Aurélien Delobelle
2e8fc45a1b Merge branch 'Aufinal/own_password' into 'k-fet' 
Changement de son propre mot de passe

Permet à un K-Fêteux (disposant de la permission `kfet.is_team`) de modifier son propre mot de passe sur la page `account/XXX/edit`.

Accessoirement, la fonction `account_update` est maintenant conforme à PEP8.

Fix #121

See merge request !148
 2017-02-13 16:32:40 +01:00
Ludovic Stephan
46e9e82da8 move account save 2017-02-13 12:19:47 -02:00
Qwann
9cae3ad0bd Merge branch 'k-fet' into qwann/k-fet/stats 2017-02-13 14:37:29 +01:00
Aurélien Delobelle
db4786abf8 Merge branch 'manet/correction-commandes' into 'k-fet' 
Manet/correction commandes

- Fix création de commandes (fournisseur)

Fix #97
See merge request !128
 2017-02-11 22:00:45 +01:00
Qwann
a4fdb99267 Revert "WS : quand la K-Fêt est ouverte ?" 
This reverts commit ce9f717f06.
 2017-02-08 12:42:07 +01:00
Qwann
ce9f717f06 WS : quand la K-Fêt est ouverte ? 2017-01-27 21:46:21 +01:00
Qwann
0ac1eaf414 fixing decimal_issue 2017-01-27 13:08:50 +01:00
Qwann
5cedabf5a8 Merge branch 'qwann/k-fet/stats' into qwann/k-fet/home 2017-01-27 12:15:47 +01:00
Qwann
2f1fe15be3 fixing decimal_issue merging 2017-01-27 12:08:18 +01:00
Qwann
aa1afccf1f adding argumement hidden to Article 
in order to avoid some articles to appear in the menu
 2017-01-26 19:22:38 +01:00
Qwann
3ca38bd8e9 Carte done. 2017-01-26 17:19:42 +01:00
Qwann
a63966b2f6 carte styling done 2017-01-25 23:41:16 +01:00
Martin Pépin
bd7f767953 Cleanup 
- Un peu de PEP8
- Suppression d'une partie de la py2 compat
- Typos
 2017-01-25 23:23:53 +01:00
Qwann
df2a9bb1b3 factorising BalanceStat views 2017-01-24 16:56:26 +01:00
Qwann
232b293052 typos fixed 2017-01-20 20:27:24 +01:00
Qwann
f8c49ae90c docstring instead of comments 2017-01-20 20:19:28 +01:00
Qwann
de3db1405e Merge branch 'qwann/decimal_fixes' into qwann/k-fet/stats 2017-01-20 18:53:49 +01:00
Qwann
8b4f7ad60c decimal cast for operation.amount 2017-01-20 18:34:45 +01:00
Qwann
bdbb252a05 Revert "first fixes" 
This reverts commit 5877218af5.
 2017-01-17 17:16:53 +01:00
Qwann
5877218af5 first fixes 2017-01-14 16:23:45 +01:00
Ludovic Stephan
fabd0949e2 correct imports 
Signed-off-by: Ludovic Stephan <lstephan@clipper.ens.fr>
 2017-01-10 15:15:53 -02:00
Ludovic Stephan
6315ddf6b8 move pwd change to method 
Signed-off-by: Ludovic Stephan <lstephan@clipper.ens.fr>
 2017-01-10 12:58:35 -02:00
Martin Pépin
540b6f38b8 Merge branch 'master' into Kerl/ldap 2017-01-09 15:47:12 +01:00
Ludovic Stephan
7dc7d57a5e restrict to team even if malicious POST edit 2017-01-07 13:57:54 -02:00
Ludovic Stephan
fcf76b4af8 can change own password (actually working now) 2017-01-07 13:32:05 -02:00
Ludovic Stephan
2a20beeb59 pep8 2017-01-07 13:28:53 -02:00
Ludovic Stephan
1c5c1fe94d can change own password 2017-01-07 12:47:43 -02:00
Martin Pépin
3c7558c853 The end of Clipper 
GestioCOF fetches the clipper accounts from an LDAP database and doesn't
need to store clippers in a table anymore.
 2016-12-25 11:57:50 +01:00
Qwann
219835be17 putting away some code for future improvments 2016-12-24 12:42:35 +01:00
Qwann
de9387c6ad cleaning: PEP8, html, permissions 2016-12-24 12:34:11 +01:00
Qwann
7070129add evolution de la balance\n premier jet 2016-12-21 11:51:08 +01:00
Qwann
ccf7c4a484 ma conso added 2016-12-20 22:46:38 +01:00
Qwann
0c3c41a812 small changes 2016-12-19 16:36:23 +01:00
Qwann
4da9327666 Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into qwann/k-fet/stats 2016-12-11 20:45:52 +01:00
Qwann
14f021b5b0 WIP articleCategory stat 2016-12-10 23:06:38 +01:00
Qwann
d19daa04b1 resuming views for stat 2016-12-10 17:33:24 +01:00
Qwann
3a7ffefacf week & day stat 2016-12-09 21:45:34 +01:00
Hugo Manet
92ec85dbbd Ajout d'un .distinct() dans la selection des articles liés à un supplier 2016-12-07 21:35:27 +01:00
Ludovic Stephan
a7f3b85b25 exclut #13 du négatif total 2016-12-01 01:44:41 -02:00
Ludovic Stephan
45cc7cfa33 correction négatif total 2016-12-01 01:39:16 -02:00
Aurélien Delobelle
f39e1a653e Ajout account pour compte générique 
Lors de la connexion avec l'utilisateur kfet standard, un Account avec le
trigramme GNR est créé pour cet utilisateur

+ Clean et comment
 2016-09-29 21:36:17 +02:00
Aurélien Delobelle
3a777a7045 Merge branch 'issue63' into k-fet 2016-09-24 18:51:41 +02:00
Aurélien Delobelle
59dcb72542 K-Psul - Fix erreur 500 caisse inexistante 2016-09-24 18:49:40 +02:00
Aurélien Delobelle
3ead35e171 clean 2016-09-24 18:27:40 +02:00