Morpheus/gestioCOF
1
0
Fork 0
forked from DGNum/gestioCOF
Code Pull requests Activity
1602 commits 40 branches 17 tags 11 MiB
Commit graph

1602 commits

This branch
This branch
All branches
Author SHA1 Message Date
Qwann
1275fdff99 fixes #127 
fixing stock update
 2017-01-31 16:00:44 +01:00
Qwann
a400832c6d fixing stock update 2017-01-31 15:55:38 +01:00
Martin Pépin
cf4a3ec64b Traitement des messages 
- Les messages sont affichés à l'utilisateurs dans les vues de GestioCOF
- On utilise une autre version de bootstrap et jquery (plus récent)

Fixes #48
 2017-01-28 19:51:56 +01:00
Qwann
ce9f717f06 WS : quand la K-Fêt est ouverte ? 2017-01-27 21:46:21 +01:00
Qwann
ddf6343826 Merge branch 'qwann/k-fet/stats' into qwann/k-fet/home 2017-01-27 13:13:28 +01:00
Qwann
df824a3a70 Merge branch 'k-fet' into qwann/k-fet/stats 2017-01-27 13:10:31 +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
5ee188e4df Merge branch 'qwann/k-fet/stats' of git.eleves.ens.fr:cof-geek/gestioCOF into qwann/k-fet/stats 2017-01-27 11:56:39 +01:00
Qwann
a13c40736c Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into qwann/k-fet/stats 2017-01-27 11:54:50 +01:00
Qwann
7ab4e949d8 k-fet in gestiocof menu 2017-01-26 20:40:55 +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
Martin Pepin
c2b74ea625 Merge branch 'Kerl/bda_models_update' into 'master' 
Typo et suppression de la py2 compat



See merge request !150
 2017-01-25 23:58:23 +01:00
Martin Pepin
75ff77c4ec Merge branch 'Aufinal/search_account' into 'k-fet' 
Popup de recherche de compte

Quand on clique sur l'icone de recherche (ou qu'on appuie sur Ctrl+F depuis la zone de saisie de trigramme) un popup apparaît pour rechercher les comptes par prénom ou par nom, en utilisant `autocomplete`.

Fix #109

See merge request !153
 2017-01-25 23:58:08 +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
9607fab046 future removed 2017-01-25 16:00:48 +01:00
Qwann
30cebac6e6 Merge branch 'hotfix/bda-static' 2017-01-24 20:39:14 +01:00
Martin Pépin
045f3f58e5 Met inscription-formset àa la bonne place 2017-01-24 20:34:53 +01:00
Qwann
6b95403318 Merge branch 'master' of git.eleves.ens.fr:cof-geek/gestioCOF 2017-01-24 20:05:34 +01:00
Qwann
b52c0bf6c9 Merge branch 'Kerl/csv' 2017-01-24 20:03:33 +01:00
Qwann
0d1cece6db adding columns features 2017-01-24 19:56:58 +01:00
Martin Pepin
939e0f32a2 Merge branch 'qwann/decimal_fixes' into 'k-fet' 
Qwann/decimal fixes

Répare les problèmes suivants : 
* On ne pouvait pas lire la balance d'un compte à l'aide du templatetag correspond sur lequel était effectué un mauvais cast en float
* On ne pouvait pas effectuer d'opération à cause d'une absence de cast en Decimal pour operation.amount

See merge request !154
 2017-01-24 19:49:33 +01:00
Qwann
f48f6c57a7 Merge branch 'qwann/decimal_fixes' into qwann/k-fet/stats 2017-01-24 19:43:08 +01:00
Qwann
94f8705ea4 wrong merge fixed 2017-01-24 19:42:15 +01:00
Qwann
df2a9bb1b3 factorising BalanceStat views 2017-01-24 16:56:26 +01:00
Qwann
947de3b638 wrong months in 'last months' stats 2017-01-20 21:21:58 +01:00
Qwann
61a7f2df1e sourcing get_thing in a js file 2017-01-20 21:05:22 +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
e6854d7987 using strftime instead of a personnal function 2017-01-20 20:19:16 +01:00
Qwann
de3db1405e Merge branch 'qwann/decimal_fixes' into qwann/k-fet/stats 2017-01-20 18:53:49 +01:00
Qwann
fff7a2022b conflict solved 2017-01-20 18:45:28 +01:00
Qwann
8b4f7ad60c decimal cast for operation.amount 2017-01-20 18:34:45 +01:00
Qwann
7e5910e0b3 balance templatetag fixed 2017-01-20 18:10:49 +01:00
Ludovic Stephan
1b0144691f No need for len of query 2017-01-20 07:32:11 -02:00
Ludovic Stephan
832dc0ce10 Search shortcut 2017-01-19 22:54:11 -02:00
Ludovic Stephan
016989c4de search results css 2017-01-19 22:53:58 -02:00
Ludovic Stephan
e7956f3b62 Account search w/ autocomplete 2017-01-19 12:36:40 -02:00
Ludovic Stephan
eff37f6c89 plain text highlighting 2017-01-19 01:42:00 -02:00
Ludovic Stephan
88aec52141 PEP8 + typo 2017-01-19 01:22:04 -02:00
Qwann
bdbb252a05 Revert "first fixes" 
This reverts commit 5877218af5.
 2017-01-17 17:16:53 +01:00
Ludovic Stephan
d6e13dbd61 Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/visibilite_stock 2017-01-16 23:57:27 -02:00
Qwann
1ddd34d50e Merge branch 'qwann/k-fet/stats' of git.eleves.ens.fr:cof-geek/gestioCOF into qwann/k-fet/stats 2017-01-14 16:24:56 +01:00
Qwann
a14f1db9a1 doc added for kfet new fixtures 2017-01-14 16:23:45 +01:00
Michele Orrù
76db0c86a3 Add fixtures. 
Create fixtures for kfet application:
- Add a bunch of non-cof profiles whose "last_name" is "Romain";
- Add k-fet articles using the real ones as a template;
- Add LIQ account;
- Add groups K-fet Chef and K-fet Girl;
- Add "caisse".
We also added some template for future tests (well, actually it's the script
used to generate the fixtures…).
 2017-01-14 16:23:45 +01:00
Qwann
5877218af5 first fixes 2017-01-14 16:23:45 +01:00
Martin Pépin
993b8ae87b Merge branch 'master' into Kerl/use_django_custommail 2017-01-13 01:02:01 +01:00