DGNum/gestioCOF
16
2
Fork 1
Code Issues 78 Pull requests 14 Projects Releases 12 Packages Wiki Activity
1154 commits 40 branches 17 tags 59 MiB
Commit graph

396 commits

Author SHA1 Message Date
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
Martin Pépin
d41d905366 PEP8 2017-02-11 21:20:51 +01:00
Martin Pépin
313b5cf61d Merge branch 'master' into Aufinal/dev_data_kfet 2017-02-11 21:01:37 +01:00
Martin Pépin
02a8e74e3b Optimize code, better queries 
- Remove useless Q queries
- Optimize with sets
- Queries over clipper id too
 2017-02-11 02:39:59 +01:00
Ludovic Stephan
9ade88d076 add stdout log 2017-02-08 15:54:49 -02:00
Ludovic Stephan
01dbf7293c withdrawals cost money 2017-02-08 15:38:59 -02:00
Ludovic Stephan
5ea9705528 use decimal 2017-02-08 15:38:27 -02:00
Ludovic Stephan
b692b92f74 correct return value for get_or_create 2017-02-08 15:33:35 -02:00
Ludovic Stephan
3b318cf623 correct timedelta 2017-02-08 15:31:10 -02:00
Ludovic Stephan
c6e84b8cb4 bug 2017-02-08 15:29:40 -02:00
Ludovic Stephan
4e62eb0aee create checkout dynamically 2017-02-08 15:26:56 -02:00
Ludovic Stephan
066df73b62 add different operation types 2017-02-08 15:11:38 -02:00
Qwann
ef59c115f6 avec le css c'est mieux 2017-02-08 15:40:58 +01:00
Qwann
6be2adc47a removing "open-Kfet-feature" 
to keep it for an other merge request
 2017-02-08 12:47:11 +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
Ludovic Stephan
bb78091cc5 checkout fixture 2017-02-07 23:59:49 -02:00
Ludovic Stephan
8346dd65d1 dev data kfet 2017-02-07 23:22:31 -02:00
Ludovic Stephan
2013fec68b move fixtures 2017-02-07 18:42:31 -02:00
Ludovic Stephan
8d0f803639 Corrige l'affichage du prix 
fixes #128
 2017-02-06 16:42:19 -02:00
Ludovic Stephan
5654fd84e8 Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/own_password 2017-02-06 16:37:48 -02:00
Ludovic Stephan
2394a5e5d2 add low stock css to WS 2017-02-05 21:38:13 -02:00
Ludovic Stephan
95e96d8ce5 Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/visibilite_stock 2017-02-05 19:56:34 -02:00
Qwann
44202811ae not supporting future.builtins anymore in templatetags 2017-02-05 22:39:20 +01:00
Martin Pepin
5b0dc1a07f Merge branch 'fix/117' into 'k-fet' 
Fix #117.

Not tested because there's no unittests.
Reviewed by @manet.

See merge request !134
 2017-02-04 11:23:30 +01:00
Aurélien Delobelle
1bf5352097 Merge branch 'Aufinal/fix_87' into 'k-fet' 
Fixes #87

Le field `groups` de `UserGroupForm` accepte les valeurs vides, ce qui permet la destitution de K-Fêt.

See merge request !157
 2017-02-02 12:28:56 +01:00
Qwann
bc14205d29 fixing decimal issue2 2017-02-01 19:32:18 +01:00
Ludovic Stephan
47d7a3ec6e fixes #87 2017-01-31 16:35:52 -02:00
Qwann
1275fdff99 fixes #127 
fixing stock update
 2017-01-31 16:00:44 +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
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
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
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
0d1cece6db adding columns features 2017-01-24 19:56:58 +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
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
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
Martin Pépin
703921a314 Supprime du code mort 2017-01-07 17:36:18 +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
Aurélien Delobelle
dd43f9d868 Merge branch 'Aufinal/previous_op' into 'k-fet' 
Rappel de l'opération précédente sur K-Psul

Rajoute un champ d'informations sur la précédente opération validée (sur
la machine, pas sur le serveur) : valeur du panier et solde restant dans
le cas d'un utilisateur, et valeur du panier et rendus de monnaie dans
le cas d'une opération en liquide.

Fix #110

See merge request !146
 2017-01-07 02:33:53 +01:00
Aurélien Delobelle
a34732cc9d ajouts supp. previous_op 
- Le trigramme est obtenu à partir de ``account_data`` qui contient les
  données traitées et validées relatives au compte en train de commander.
- L'opération précédente disparaît en cas de ``hard reset``
 2017-01-07 02:28:19 +01:00
Aurélien Delobelle
7ed9c90726 fix whitespaces 2017-01-07 01:56:33 +01:00
Aurélien Delobelle
86286b662a Merge branch 'Aufinal/search_icon' into k-fet 
- Ajoute une icône de recherche dans K-Psul pour accéder à la liste des comptes
 2017-01-07 01:12:13 +01:00
Aurélien Delobelle
1bae76a405 Merge branch 'Aufinal/arrondi_ukf' into k-fet 
- Arrondis cohérents des UKF lors des divers affichages
- Remplace les arrondis par des floor pour éviter les négatifs de quelques
centimes

Fix #92

See merge request !124
 2017-01-07 01:02:07 +01:00
Aurélien Delobelle
792c4177ec Merge branch 'master' into k-fet 2017-01-07 00:38:54 +01:00
Ludovic Stephan
c58ac3a904 Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/search_icon 2017-01-06 19:01:00 -02:00
Ludovic Stephan
a78a4393d0 Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/arrondi_ukf 2017-01-06 19:00:17 -02:00
Ludovic Stephan
20079c37e9 Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/previous_op 2017-01-06 18:20:54 +01:00
Aurélien Delobelle
e292318245 Fix WebSocket failure on K-Psul 2017-01-05 14:27:25 +01:00
Martin Pépin
bc5a323dfe Add missing migration 2017-01-04 15:29:28 +01:00
Michele Orrù
0b54972aa8 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-03 01:35:56 +01:00
Martin Pépin
01ce955784 Fixes 
- Fixes bugs
- Removes useless scripts
 2016-12-25 12:27:42 +01: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
Ludovic Stephan
b27a2d0720 mise en valeur du trigramme 2016-12-22 01:29:40 -02:00
Ludovic Stephan
5267a8a368 add previous op recap 2016-12-22 01:13:14 -02:00
Ludovic Stephan
38dbebb05e Merge branch 'Aufinal/arrondi_ukf' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/arrondi_ukf 2016-12-22 00:25:07 -02: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
Ludovic Stephan
e981cad405 css tweaks 2016-12-20 16:48:09 -02:00
Ludovic Stephan
5784b4d20a change stock warning CSS for basket 2016-12-20 01:09:22 -02:00
Michele Orrù
783332bbe0 Fix #117. 
Not tested because there's no unittests.
Reviewed by @manet.
 2016-12-19 19:52:30 +01:00
Qwann
0c3c41a812 small changes 2016-12-19 16:36:23 +01:00
Ludovic Stephan
4db55efb67 change stock warning threshold 2016-12-14 23:40:42 -02:00
Ludovic Stephan
75be9fd2a6 display stock with mouse selection 2016-12-14 23:40:23 -02:00
Ludovic Stephan
b7ebf4ee1c add stock to article selection 2016-12-13 22:31:52 -02:00
Ludovic Stephan
71fee9bf8a temporary low stock css 2016-12-13 20:58:40 -02:00