Ludovic Stephan
|
05156f37c6
|
Update addExistingPurchase
|
2017-04-04 19:34:22 -03:00 |
|
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 |
|
Ludovic Stephan
|
5020037103
|
api_lock inside kfet.js
|
2017-04-03 16:08:40 -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 |
|
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 |
|
Ludovic Stephan
|
944a73eef7
|
Merge remote-tracking branch 'origin/master' into Aufinal/editions
|
2017-04-01 18:09:23 -03: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
|
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 |
|
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
|
49c84076de
|
Manage help_text and errors
|
2017-03-31 15:01:31 -03: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 |
|
Ludovic Stephan
|
c1b8849cb8
|
Idem for supplier_form
|
2017-03-30 21:16:47 -03:00 |
|
Ludovic Stephan
|
91d5fe234c
|
Idem for checkoutstatements
|
2017-03-30 21:10:50 -03:00 |
|
Ludovic Stephan
|
8e65298c7c
|
Idem for article_update
|
2017-03-30 19:34:22 -03:00 |
|
Ludovic Stephan
|
079666c0db
|
Use verbose names and form snippets for article_create
|
2017-03-30 19:32:11 -03:00 |
|
Ludovic Stephan
|
ca6e120a38
|
Fix ws stock update
|
2017-03-29 09:43:10 -03:00 |
|
Ludovic Stephan
|
08c752f1b3
|
Simplify addcost management
|
2017-03-26 18:10:26 -03:00 |
|
Ludovic Stephan
|
5101400f64
|
Use callback_as_dict for addcost
|
2017-03-26 17:57:51 -03:00 |
|
Aurélien Delobelle
|
842f2cecc1
|
fix import, fix ope with addcost enabled, move Config location
|
2017-03-26 15:12:03 +02:00 |
|
Aurélien Delobelle
|
bc6ecda0c8
|
fix addcost kspul
|
2017-03-26 14:59:21 +02:00 |
|
Ludovic Stephan
|
3bf7a066a2
|
Adapt history.html to new functions
|
2017-03-26 00:33:33 -03:00 |
|
Ludovic Stephan
|
dbcfc6df46
|
Remove duplicate kfet.js import
|
2017-03-26 00:21:17 -03:00 |
|
Ludovic Stephan
|
87943ea7b9
|
Adapt kpsul to new functions
|
2017-03-26 00:20:47 -03:00 |
|
Ludovic Stephan
|
5ff8f69bfa
|
Merge branch 'aureplop/kpsul_js_refactor' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/refactor_articles
|
2017-03-25 12:35:04 -03:00 |
|
Ludovic Stephan
|
bc0affc038
|
Remove autocomplete leftovers
|
2017-03-25 09:56:36 -03:00 |
|
Aurélien Delobelle
|
72970c6be7
|
Fix api call on new transfers
- Use django-js-reverse
- Replace old url (deleted) with standard url
|
2017-03-25 09:44:55 +01:00 |
|
Ludovic Stephan
|
44fbc92893
|
Merge branch 'master' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/editions
|
2017-03-24 21:07:32 -03:00 |
|
Ludovic Stephan
|
d7740e66fe
|
adapt code to is_checkout removal
|
2017-03-24 20:52:49 -03:00 |
|
Aurélien Delobelle
|
0d02d47d33
|
move utils functions
|
2017-03-24 22:05:04 +01:00 |
|
Aurélien Delobelle
|
cb13280458
|
Merge branch 'master' into 'Aufinal/merge_k-fet'
# Conflicts:
# kfet/static/kfet/css/index.css
|
2017-03-24 20:23:32 +01:00 |
|
Ludovic Stephan
|
aa247b465a
|
Fix search box (hackish)
|
2017-03-20 19:08:48 -03:00 |
|
Martin Pépin
|
59f57793ba
|
typo
|
2017-03-20 22:05:48 +00:00 |
|
Ludovic Stephan
|
fc3e86aea6
|
Add websocket support to ArticleManager
|
2017-03-18 22:06:30 -03:00 |
|
Ludovic Stephan
|
f0a80561ed
|
Add article display to Config callback
|
2017-03-16 22:24:57 -03:00 |
|
Martin Pépin
|
55b67f38c8
|
Notice the users about the α-numeric restriction
Add a help text above the two autocompletion inputs letting the users
know that non-alphanumeric characters will not be used.
|
2017-03-16 23:16:56 +00:00 |
|
Ludovic Stephan
|
3793863bab
|
Merge remote-tracking branch 'origin/k-fet' into Aufinal/merge_k-fet
|
2017-03-15 22:58:54 -03:00 |
|
Qwann
|
5ddcd2f1ff
|
Merge branch 'k-fet' into qwann/k-fet/home
|
2017-03-10 16:58:10 +01:00 |
|