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
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
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
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
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
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
5b54d76e36
Merge branch 'Kerl/use_django_custommail'
2017-02-11 16:30:12 +01:00
Qwann
ec7012ee47
Merge branch 'Kerl/use_django_custommail' of git.eleves.ens.fr:cof-geek/gestioCOF into Kerl/use_django_custommail
2017-02-11 16:22:09 +01:00
Qwann
924a289a78
cleaning UGLY django template style
...
and moving some template files
2017-02-11 16:21:13 +01:00
Martin Pépin
27bf59d4c0
Merge branch 'Kerl/use_django_custommail' of git.eleves.ens.fr:cof-geek/gestioCOF into Kerl/use_django_custommail
2017-02-11 16:16:00 +01:00
Martin Pépin
b4bf437447
Minor fixes
2017-02-11 16:15:17 +01:00
Qwann
5d35112c87
Merge branch 'Kerl/use_django_custommail' of git.eleves.ens.fr:cof-geek/gestioCOF into Kerl/use_django_custommail
2017-02-11 15:34:04 +01:00
Qwann
62dc04c19f
cleaning ugly html
2017-02-11 15:33:22 +01:00
Martin Pépin
0e759405c7
Change the migration index
2017-02-11 15:13:29 +01:00
Martin Pépin
675ff99414
Supprime les doublons avec jquery
2017-02-11 11:50:49 +01:00
Martin Pépin
99a19f850a
typo
2017-02-11 11:41:49 +01:00
Martin Pépin
71fb020e10
Merge branch 'master' into Kerl/messages
2017-02-11 11:40:47 +01:00
Martin Pépin
6e55905781
Merge branch 'master' into Kerl/use_django_custommail
2017-02-11 03:20:29 +01:00
Qwann
06eafdae47
Merge branch 'master' of git.eleves.ens.fr:cof-geek/gestioCOF
2017-02-11 02:54:54 +01:00
Qwann
5136e394d4
Merge branch 'Kerl/modernize_petitscours'
2017-02-11 02:54:22 +01:00
Qwann
ed01508481
using context_object_name and moving template
2017-02-11 02:51:43 +01:00
Robin Champenois
1060a0a368
Merge branch 'Kerl/ldap' into 'master'
...
The end of Clipper
GestioCOF fetches the clipper accounts from an LDAP database and doesn't
need to store clippers in a table anymore.
You need to run migrations to apply this patch
The default behaviour is not to fetch data from the LDAP because you may not have access to it.
To test over a ldap database server or in production, you need to set `settings.LDAP_SERVER_URL`
to the correct value.
Fixes #13
See merge request !140
2017-02-11 02:42:00 +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
Martin Pépin
d4b696db70
Merge branch 'master' into Kerl/ldap
2017-02-11 01:55:02 +01:00
Martin Pepin
f0774a3e3c
Merge branch 'robin' into 'master'
...
Support des touch-events et clean des deps jquery-ui
Fixes #80
See merge request !167
2017-02-11 00:37:16 +01:00
Qwann
f87f1ceff1
kfetOpen bullet working
2017-02-11 00:29:12 +01:00
Evarin
839d60e48f
Support tactile jquery-ui
2017-02-11 00:11:14 +01:00
Evarin
80d8cb6b7e
Mise à jour des dépendances jquery-ui et jquery
...
Should fix #80 - à tester sur mobile (via dev.cof)
2017-02-10 23:47:49 +01:00
Evarin
399e5ca16d
Jolie mise en page pour les demandes de petit cours
...
Closes #6
2017-02-10 20:42:54 +01:00
Evarin
f7ec5ef9ee
Grise les spectacles passés dans la liste des spectacles pour le BdA
2017-02-10 19:58:22 +01:00
Qwann
4808650fa0
kfet_open is updatable
2017-02-09 14:05:29 +01:00
