Ludovic Stephan
3ce4dc5c85
Add article stock management
2017-04-03 20:14:45 -03:00
Ludovic Stephan
b91edc9c7d
Merge remote-tracking branch 'origin/aureplop/kpsul_js_refactor' into Aufinal/refactor_articles
2017-04-03 20:03:58 -03:00
Aurélien Delobelle
9d2298a089
Merge branch 'master' into aureplop/kpsul_js_refactor
...
Not chill.
2017-04-04 00:51:49 +02:00
Aurélien Delobelle
dcda67aaf7
Merge branch 'Aufinal/dialog_utils' into 'aureplop/kpsul_js_refactor'
...
Utilitaires de dialogue
Ajoute deux type de dialogue avec l'utilisateur
- une classe UserDialog pour ouvrir un simple dialogue jconfirm
- une fonction api_with_auth pour gérer toutes les requêtes API pouvant
nécessiter un mot de passe
See merge request !199
2017-04-03 23:25:55 +02:00
Ludovic Stephan
5020037103
api_lock inside kfet.js
2017-04-03 16:08:40 -03:00
Aurélien Delobelle
b3418db33d
Merge branch 'Aufinal/edit_migration' into 'master'
...
Migrations oubliées
See merge request !209
2017-04-03 20:58:00 +02:00
Ludovic Stephan
5607d7c9a4
Migration pour kfet_forms
2017-04-03 15:54:02 -03:00
Ludovic Stephan
ad2c8537e3
Add Runpython (oops)
2017-04-03 15:50:18 -03:00
Aurélien Delobelle
7dc233c0e2
Merge branch 'Aufinal/editions' into 'master'
...
K-Fêt
- Fix: Les éditions ne touchent plus la caisse
- Fix: Seuls les achats sont possibles sur LIQ
See merge request !198
2017-04-03 14:39:53 +02:00
Aurélien Delobelle
b157ffac4c
Merge branch 'Aufinal/kfet_forms' into 'master'
...
K-Fêt
- Affichage des formulaires amélioré
See merge request !203
2017-04-03 13:40:41 +02:00
Ludovic Stephan
c9973cde75
Help text for password length
2017-04-01 23:25:47 -03:00
Aurélien Delobelle
55116f7179
Merge branch 'Aufinal/stat_article' into 'master'
...
Fix article stat display
See merge request !207
2017-04-02 02:49:54 +02:00
Martin Pépin
e4d51de569
Merge branch 'hotfix/autocomplete_no_value'
2017-04-01 22:11:36 +01:00
Ludovic Stephan
91a057873d
Merge migrations
2017-04-01 18:10:51 -03:00
Ludovic Stephan
944a73eef7
Merge remote-tracking branch 'origin/master' into Aufinal/editions
2017-04-01 18:09:23 -03:00
Martin Pépin
a793e9a2e7
exclude empty strings from ldap results
...
The uid attribute in a LDAP's entry cannot be an empty string. We need
to get an actual identifier.
2017-04-01 22:07:32 +01:00
Martin Pépin
9cdf064005
Handle incomplete values from the LDAP
...
Sometime `uid` is not set in the objects fetched from the LDAP. This
case has to be handled. Also, the `.uid` and `.cn` attributes of these
objects in the python abstractions have a `.value` method which we
should use.
2017-04-01 21:45:05 +01:00
Ludovic Stephan
cce0411ee9
Merge both 0048 migrations
2017-04-01 17:37:29 -03:00
Martin Pepin
1eed2283f5
Merge branch 'Roussille/bda' into 'master'
...
Catalogue BdA
See merge request !187
2017-04-01 18:56:26 +02:00
Hugo Roussille
66dd7848b8
Correction du format de l'URL
2017-04-01 16:48:18 +02:00
Hugo Roussille
6b8001db56
Correction des messages d'erreur et de la gestion des exceptions
2017-04-01 16:34:17 +02:00
Ludovic Stephan
bbb517fbd3
Fix article stat display
2017-04-01 10:37:40 -03:00
Ludovic Stephan
6797c92a1f
Ok ok je me rends
2017-04-01 09:35:37 -03:00
Ludovic Stephan
4af2562121
More clarity in argument names
2017-04-01 09:34:02 -03:00
Ludovic Stephan
29836fd15c
Remove deprecated option
2017-04-01 09:24:18 -03:00
Ludovic Stephan
271654b447
No need for intermediate error reporting
2017-04-01 08:47:09 -03:00
Aurélien Delobelle
c355316045
Merge branch 'Aufinal/fix_stock_ws' into 'master'
...
K-Psul
- Fix: indicateur de stock bas
See merge request !201
2017-04-01 12:36:59 +02:00
Ludovic Stephan
ccf5f80685
Merge remote-tracking branch 'origin/master' into Aufinal/editions
2017-04-01 02:43:19 -03:00
Ludovic Stephan
cf03fba1cc
Remove whitespace by using elif
2017-03-31 23:54:38 -03:00
Ludovic Stephan
7d93d91af9
Merge remote-tracking branch 'origin/aureplop/kpsul_js_refactor' into Aufinal/refactor_articles
2017-03-31 23:50:33 -03:00
Ludovic Stephan
9c9ad21d73
Add variable for article line
2017-03-31 23:46:10 -03:00
Ludovic Stephan
92fd94d1f9
Merge remote-tracking branch 'origin/master' into Aufinal/fix_stock_ws
2017-03-31 23:43:19 -03:00
Aurélien Delobelle
1286606f7a
Merge branch 'Aufinal/hotfix/liq_withdraw' into 'master'
...
K-Fêt :
- Empêche les retraits/charges sur LIQ
See merge request !205
2017-03-31 23:49:33 +02:00
Aurélien Delobelle
fafa7e536e
Merge branch 'Aufinal/websockets' into 'master'
...
K-Fêt :
- Ajout d'une classe générale pour les websockets
See merge request !204
2017-03-31 23:40:02 +02:00
Ludovic Stephan
aa29621c7c
Prevents special opes on LIQ
2017-03-31 18:28:03 -03:00
Ludovic Stephan
236dcb4644
Tweaks to UserDialog
2017-03-31 18:10:06 -03:00
Ludovic Stephan
582cdebaa1
Better callback management
2017-03-31 17:49:22 -03:00
Ludovic Stephan
ab15dbae76
Add handler management
2017-03-31 17:37:39 -03:00
Ludovic Stephan
38bfccf331
Change class name
2017-03-31 15:57:15 -03:00
Ludovic Stephan
8bf1bd5343
Websocket as member
2017-03-31 15:45:15 -03:00
Ludovic Stephan
413df0806d
Add url get method
2017-03-31 15:10:41 -03:00
Ludovic Stephan
49c84076de
Manage help_text and errors
2017-03-31 15:01:31 -03:00
Ludovic Stephan
1d8e084a19
websocket update when addcost
2017-03-31 14:37:00 -03:00
Martin Pépin
67b4421933
PEP8 does not like \
2017-03-31 17:54:31 +01:00
Martin Pépin
8a1af73ee0
A migration for the new field appear_catalogue
2017-03-31 17:53:35 +01:00
Ludovic Stephan
499c081565
Websocket class and instance
2017-03-31 12:23:27 -03:00
Ludovic Stephan
fdcd2e864c
Use widget_tweaks everywhere
2017-03-31 11:24:38 -03:00
Hugo Roussille
8cf14d3f6b
Possibilité de filtrer sur plusieurs salles/catégories
2017-03-31 04:33:13 +02:00
Hugo Roussille
73c21d83ee
Correction des exceptions et de l'URL des images
2017-03-31 03:47:32 +02:00
Hugo Roussille
f3b9266e35
Simplification du code avec des méthodes de Django
2017-03-31 03:35:09 +02:00
