Commit graph

1697 commits

Author SHA1 Message Date
Ludovic Stephan
d96f4ead87 Revert "remove immediate mail"
This reverts commit 8953d3de07.
2017-02-16 09:55:19 -02:00
Ludovic Stephan
8953d3de07 remove immediate mail 2017-02-16 09:22:15 -02:00
Ludovic Stephan
d524d9286f better annulation check 2017-02-16 02:28:57 -02:00
Ludovic Stephan
d9402e1059 change resell and reinit forms 2017-02-16 01:52:44 -02:00
Evarin
ddbcfe0c69 JS commenté et plus propre 2017-02-15 22:25:26 +01:00
Evarin
0fcb29252b Frontend tout en JS 2017-02-15 21:01:54 +01:00
Qwann
46f343b1ab la K-Fêt se réveille à 7h 2017-02-15 14:44:58 +01:00
Qwann
1c90608f6d some cleaning 2017-02-15 14:21:00 +01:00
Martin Pépin
451fddaff0 Fix CI script
Finally, the old test database is destroyed before the build which
is simpler and makes more sense.
2017-02-13 17:43:10 +01:00
Martin Pépin
e8d21882fb Fix CI config
cleanup is not a stage by default, it has to be specified
2017-02-13 17:33:35 +01:00
Martin Pépin
85e593ddb8 Removes the test database if the build fails
Sometime the test database is not destroyed because the build is
interrupted by an uncaught error. This causes an error during the next
build.
2017-02-13 17:27:27 +01:00
Aurélien Delobelle
ef864cec32 Merge branch 'Aufinal/visibilite_stock' into 'k-fet'
K-Psul

Articles
- Ajout d'une surbrillance pour les articles dont le stock est bas
  (entre -5 et 5)

Panier
- Ajout d'indications de stocks sur chaque ligne (stock, warning visuel)
- Les ajouts/retraits d'articles déjà dans le panier mettent à jour la
  ligne associée à celui-ci déjà existante
- Les flèches haut/bas permettent de modifier la quantité d'un article

Fix #111

See merge request !133
2017-02-13 16:42:22 +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
Ludovic Stephan
83e41c292e css tweaks 2017-02-13 11:34:47 -02:00
Ludovic Stephan
43aab26530 Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/visibilite_stock 2017-02-13 10:51:24 -02:00
Martin Pépin
d7a13229ad Fix CI config
- The setting file has moved to `gestioCOF/`
2017-02-13 13:41:34 +01:00
Aurélien Delobelle
1a684471c2 Merge branch 'Aufinal/fix_amounts' into 'k-fet'
K-Psul:
- fix #163: different rounding for UKF accounts balances / UKF articles prices

See merge request !171
2017-02-13 08:25:13 +01:00
Ludovic Stephan
3fa0e4de6c different rounding for accounts 2017-02-12 19:05:41 -02:00
Ludovic Stephan
3dfd8bf616 interface for order_to_inventory 2017-02-12 18:04:50 -02:00
Martin Pépin
7f5132961f Add the cof_members group
GestioCOF cannot run without it.
There is no permission associated to it: this has to been thought about
2017-02-12 19:49:30 +01:00
Martin Pépin
659c6e720a Merge branch 'master' into supportBDS 2017-02-12 19:36:17 +01:00
Martin Pépin
e1a8c0e8dd Add missing files 2017-02-12 19:21:53 +01:00
Martin Pépin
1d7499d3b2 simplify profile edition and test it 2017-02-12 19:21:53 +01:00
Martin Pépin
f5b23174de Fix test_database issue in bootstrap
The test database shouldn't be created manually
2017-02-12 17:39:30 +01:00
Martin Pépin
266a789d97 Merge branch 'Kerl/messages'
- Utilise une version à jour de jquery via un cdn
- Traite les messages
- Remplace les vieux simili-messages par des messages en utilisant le
  framework messages de Django
2017-02-12 16:47:44 +01:00
Martin Pépin
0420839b20 Test the authentication
- An "outsider" must use django's authentication backend
- A user with a login_clipper should use CAS
2017-02-12 15:38:20 +01:00
Martin Pépin
8b620a5319 PEP8 in gestion/tests.py 2017-02-12 15:38:20 +01:00
Martin Pépin
a28c00e474 Move the auth stuff to gestion/
- The login views are in `gestion/`
- The templates are under `gestion/templates/gestion/`
- `cof/shared.py` moves to `gestion/` and is splitted into 3 files:
    - The auth backends are in `backends.py`.
    - The context_processor is in `context_processor.py`
    - The LOCK/UNLOCK functions remain in `shared.py`
2017-02-12 15:38:14 +01:00
Ludovic Stephan
031b992fa3 fix brackets & lowstock indication 2017-02-12 11:09:03 -02:00
Ludovic Stephan
99d04fb75e bugfix 2017-02-12 11:02:54 -02:00
Aurélien Delobelle
4a5d9f880a Merge branch 'Aufinal/fix_amounts' into 'k-fet'
Corrige l'affichage du prix

!124 était overkill ; `amountToUKF` peut prendre en argument des valeurs positives ou négatives, et il me semble que le `round` ne sert quà corriger les erreurs de `float`, ce qui conduit à #128. Du coup, on revert une partie.

fixes #128

See merge request !163
2017-02-12 05:09:30 +01:00
Ludovic Stephan
db899a891b css tweaks 2017-02-12 02:03:41 -02:00
Martin Pépin
50b667993f Merge branch 'master' into supportBDS
- Mise en page
- Cleanup des petits cours
- Utilisation de custommail
- Utilisation du ldap du SPI pour fetch les nouveaux comptes
2017-02-12 04:26:43 +01:00
Ludovic Stephan
15d79aff2d add help tooltips 2017-02-12 00:48:24 -02:00
Ludovic Stephan
be8eb4ac28 add (temporary) better presentation 2017-02-12 00:01:22 -02:00
Michele Orrù
94937fc7cd Add groups cof_members and cof_buro.
- remove is_buro from the database in the same way we did for is_cof
- make a decent migration that *SHOULD* take into account is_cof for old
  databases. note, this has been tested only through unittests.
- make unittests pass again accordin=gly fixing views.

Note: we should make a method for filtering with specific group members,
something like
map(lambda x: x.profile.cof, filter… group…)
2017-02-11 23:05:51 +01:00
Aurélien Delobelle
49e6101156 Merge branch 'qwann/k-fet/decimal_issue2' into 'k-fet'
Qwann/k fet/decimal issue2

`grant` is a Decimal and thus can not be casted implicitly to float.

See merge request !158
2017-02-11 22:04:10 +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
Martin Pepin
dc822d3c72 Add license 2017-02-11 21:35:29 +01:00
Martin Pépin
427859c2f5 Oublis 2017-02-11 21:33:25 +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
70e89e3737 Merge branch 'master' into Kerl/messages 2017-02-11 20:55:17 +01:00
Martin Pépin
65341f0ecb Minor error 2017-02-11 20:43:49 +01:00
Qwann
b5037329dd small fixes + migration
enable admin interface for bds
2017-02-11 20:36:16 +01:00
Qwann
d46ab87e9b Merge branch 'michele.orru/gestioCOF-supportBDS' into supportBDS 2017-02-11 20:17:23 +01:00
Qwann
f53ced6a33 Merge branch 'supportBDS' into michele.orru/gestioCOF-supportBDS 2017-02-11 19:21:23 +01:00
Michele Orrù
ee1f29b17d Make is_cof a property and start developing permissions.
Rmeove the is_cof flag to check permission and start implementing
a group and a permission for the respective cof members.
XXX. note: migrations do NOT add old is_cof members to the new group
(as actually they're just on the tests…)
2017-02-11 18:48:13 +01:00