Ludovic Stephan
290d4ecb6e
Merge branch 'Aufinal/refactor_articles' into Aufinal/refactor_history
2017-04-05 10:03:30 -03: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
1761c5f1bd
Change fromAPI logic
2017-04-05 09:13:00 -03:00
Ludovic Stephan
840010b63f
Merge remote-tracking branch 'origin/aureplop/kpsul_js_refactor' into Aufinal/refactor_articles
2017-04-05 09:03:59 -03:00
Ludovic Stephan
a29de134f1
Move focus ; move is_low_stock to method
2017-04-05 08:58:46 -03:00
Aurélien Delobelle
2e0de75471
kpsul - fix account balance ukf
2017-04-05 13:18:01 +02:00
Aurélien Delobelle
6bb9280b0d
Merge branch 'aureplop/clean_js' into 'aureplop/kpsul_js_refactor'
...
Enhance APIModelObject
See merge request !213
2017-04-05 04:30:34 +02:00
Aurélien Delobelle
6be6202b3f
few cleans
2017-04-05 04:26:50 +02:00
Aurélien Delobelle
f1aaad7317
Better jquery ajax calls management
...
It becomes the same as the original jQuery ajax object.
For example, callbacks can be queued.
get_by_apipk and from_API of ModelObject returns the ajax object.
Example (js):
Account.get_by_apipk('AAA')
.done(function (data) {
console.log(data)
})
.fail( () => console.log('cool') )
...
.done( ...
2017-04-05 04:05:31 +02:00
Aurélien Delobelle
efbcde163b
clean some js
...
- clean buttons code on account and checkout
- merge CheckoutRead and kpsul_checkout_data views (the first won)
APIModelObject interface
- add url_create, url_update, url_update_for
- rename url_object_for and url_object to url_read_for and url_read
2017-04-05 03:43:51 +02:00
Ludovic Stephan
3b9affb3f3
Add focus methods
2017-04-04 20:18:53 -03:00
Ludovic Stephan
9c559d9ec3
Add articles reset to kpsul.reset
2017-04-04 19:54:03 -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
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
Ludovic Stephan
514f1da6df
Fix SpecialOpeFormatter
2017-04-03 21:26:33 -03:00
Ludovic Stephan
ec9f47274a
Fix WS update functions
2017-04-03 21:24:07 -03:00
Ludovic Stephan
20b7156e1f
Improve type display
2017-04-03 21:18:07 -03:00
Ludovic Stephan
a173be4f7d
Use api_with_auth in history
2017-04-03 21:14:06 -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
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
