Ludovic Stephan
ac33e6302e
Fix addExistingPurchase + few other bugs
2017-05-15 17:39:33 -03:00
Ludovic Stephan
ad42687293
Fix tranfers page
2017-05-15 15:27:46 -03:00
Ludovic Stephan
31b742fdb7
Move ws update to respective classes
2017-05-14 17:19:09 -03:00
Ludovic Stephan
8b8a3f8a25
Update button in history
2017-04-24 14:46:16 -03:00
Ludovic Stephan
20d635137c
Merge remote-tracking branch 'origin/aureplop/kpsul_js_refactor' into Aufinal/refactor_history
2017-04-24 11:30:01 -03:00
Aurélien Delobelle
b0d35667b3
Merge branch 'master' into aureplop/kpsul_js_refactor
2017-04-14 15:56:44 +02:00
Martin Pepin
a68002d0f6
Merge branch 'aureplop/fix_double_js' into 'master'
...
Fix stats on some browsers
See merge request !219
2017-04-10 23:59:02 +02:00
Ludovic Stephan
8c02e5da0c
Trigger event on history itself
2017-04-10 15:40:29 -03:00
Ludovic Stephan
2eba6892a2
Revert "Change event triggered when canceling opes"
...
This reverts commit ce3d8aa6f7
.
2017-04-10 15:34:57 -03:00
Ludovic Stephan
ce3d8aa6f7
Change event triggered when canceling opes
2017-04-10 15:08:17 -03:00
Ludovic Stephan
983a55780f
Add cancel_history event
2017-04-10 12:32:35 -03:00
Aurélien Delobelle
c75b2946e3
Merge branch 'master' into aureplop/kpsul_js_refactor
2017-04-10 13:08:23 +02:00
Ludovic Stephan
688d5bba29
Adapt history to new structure
2017-04-09 17:54:37 -03:00
Ludovic Stephan
051231a031
Merge remote-tracking branch 'origin/aureplop/kpsul_js_refactor' into Aufinal/refactor_history
2017-04-09 16:47:05 -03:00
Aurélien Delobelle
ebfe5c41d4
Fix stats on some browsers
...
- Delete double import in account_read template
- Syntax on account_read
Stats didn't show on Chrome (at least v57) cause of these.
2017-04-09 01:52:26 +02:00
Aurélien Delobelle
784ba9bd10
Merge branch 'master' into aureplop/kfet_config
2017-04-08 18:36:28 +02:00
Aurélien Delobelle
15861824b6
Merge branch 'Aufinal/tabs' into 'master'
...
K-Fêt
- Détails d'un compte: historique et stats sont accessibles par des onglets.
See merge request !218
2017-04-08 14:41:36 +02:00
Ludovic Stephan
4a6bfd5e3d
Better button distinction
2017-04-07 12:58:03 -03:00
Ludovic Stephan
052e7b2b6e
Move navigation to content-left
2017-04-07 12:17:36 -03:00
Ludovic Stephan
e26668e5eb
Add tabs to account_read
2017-04-06 21:17:47 -03:00
Aurélien Delobelle
e2d7192b23
fix perform opes after account reset
2017-04-06 00:11:41 +02:00
Aurélien Delobelle
c849306a32
fix kfet home template
2017-04-06 00:00:53 +02:00
Aurélien Delobelle
e4ccd88dfd
Merge branch 'master' into aureplop/kpsul_js_refactor
2017-04-05 23:18:33 +02:00
Ludovic Stephan
ed0a82ed5d
Add no_trigramme option
2017-04-05 16:51:17 -03:00
Ludovic Stephan
f57c292184
Rename history var
2017-04-05 12:13:24 -03:00
Ludovic Stephan
8d13c0a4bb
Add fetch method
2017-04-05 10:59:59 -03:00
Aurélien Delobelle
3ee9de93d9
few improvements on article category
...
- add verbose names to ArticleCategory fields
- add button to view categories list from articles list
- fix article_update template in form validation
- improve interface for articlecategory_update
- revert vanished urls (happened in merge with master...)
2017-04-05 15:34:28 +02:00
Ludovic Stephan
290d4ecb6e
Merge branch 'Aufinal/refactor_articles' into Aufinal/refactor_history
2017-04-05 10:03:30 -03:00
Aurélien Delobelle
42728e58be
Merge branch 'master' into qwann/k-fet/category_addcost
2017-04-05 14:57:26 +02:00
Ludovic Stephan
7ec7ed2696
Rename History class
2017-04-05 09:53:12 -03:00
Ludovic Stephan
e051631a34
Use WebSocket classes
2017-04-05 09:28:32 -03:00
Ludovic Stephan
360c442a4e
Remove useless class
2017-04-05 09:24:27 -03:00
Ludovic Stephan
a29de134f1
Move focus ; move is_low_stock to method
2017-04-05 08:58:46 -03:00
Ludovic Stephan
021937a38e
Small bugfixes
2017-04-04 19:52:12 -03:00
Ludovic Stephan
cb28b928c4
Remove articleSelect from _env
2017-04-04 19:42:30 -03:00
Martin Pepin
fe66a6ef6b
Merge branch 'aureplop/fix_stats' into 'master'
...
Stats K-Fêt - Python side
See merge request !208
2017-04-05 00:41:47 +02:00
Ludovic Stephan
e5791efe4d
Remove last traces of old articles
2017-04-04 19:41:15 -03:00
Ludovic Stephan
05156f37c6
Update addExistingPurchase
2017-04-04 19:34:22 -03:00
Qwann
ba11aa49db
categories are updatable
2017-04-04 21:36:02 +02:00
Qwann
72615bf400
small fixes
2017-04-04 16:57:17 +02:00
Ludovic Stephan
ec9f47274a
Fix WS update functions
2017-04-03 21:24:07 -03:00
Ludovic Stephan
07290f6fec
Merge branch 'Aufinal/refactor_articles' into Aufinal/refactor_history
2017-04-03 21:00:12 -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
Ludovic Stephan
51acb4e00a
Use new WS class
2017-04-03 16:05:18 -03:00
Ludovic Stephan
32474a6865
Don't update input when unchecking
2017-04-03 16:03:22 -03:00
Ludovic Stephan
f46ba0dd6c
Merge branch 'master' into Aufinal/inventaires
2017-04-03 16:01:51 -03:00
Aurélien Delobelle
85caa6b058
Use django-djconfig for kfet app.
...
Old configuration(/settings), based on Settings model, system is
deleted: SettingsForm, Settings.
New system use `django-djconfig` module.
- `kfet.config` module provides `kfet_config` to access configuration concerning
kfet app.
- Views, forms, models, etc now use this object to retrieve conf values.
- Views no longer add config values to context, instead templates use
`kfet_config` provided by a new context_processor.
- Enhance list and update views of settings.
- Fix: settings can directly be used without having to visit a specific
page...
Misc
- Delete some py2/3 imports
- Delete unused imports in kfet.models and kfet.views
- Some PEP8 compliance
2017-04-03 20:32:16 +02:00