cst1/kpsul
1
0
Fork 0
forked from DGNum/gestioCOF
Code Pull requests Activity
1391 commits 38 branches 17 tags 11 MiB
Commit graph

1391 commits

This branch
This branch
All branches
Author SHA1 Message Date
Qwann
ccf7c4a484 ma conso added 2016-12-20 22:46:38 +01:00
Martin Pépin
330b45fb2c Style + commentaires 2016-12-20 22:24:07 +01:00
Ludovic Stephan
e981cad405 css tweaks 2016-12-20 16:48:09 -02:00
Ludovic Stephan
5784b4d20a change stock warning CSS for basket 2016-12-20 01:09:22 -02:00
Michele Orrù
783332bbe0 Fix #117. 
Not tested because there's no unittests.
Reviewed by @manet.
 2016-12-19 19:52:30 +01:00
Qwann
0c3c41a812 small changes 2016-12-19 16:36:23 +01:00
Ludovic Stephan
4db55efb67 change stock warning threshold 2016-12-14 23:40:42 -02:00
Ludovic Stephan
75be9fd2a6 display stock with mouse selection 2016-12-14 23:40:23 -02:00
Ludovic Stephan
b7ebf4ee1c add stock to article selection 2016-12-13 22:31:52 -02:00
Ludovic Stephan
71fee9bf8a temporary low stock css 2016-12-13 20:58:40 -02:00
Ludovic Stephan
080ff0f821 warning if not enough stock 2016-12-13 01:41:59 -02:00
Ludovic Stephan
711ef7e97b one line by article id 2016-12-13 01:13:16 -02:00
Ludovic Stephan
9443f86298 use arrow keys to add/remove article 2016-12-13 01:11:35 -02:00
Ludovic Stephan
437233fd10 functions to change purchase amount 2016-12-13 00:33:25 -02:00
Ludovic Stephan
5492ecf534 add ukf for price visibility 2016-12-13 00:32:52 -02:00
Ludovic Stephan
f06a732da5 remove unnecessary function 2016-12-11 23:29:05 -02:00
Ludovic Stephan
e52c44580f pluralize function 2016-12-11 23:23:12 -02:00
Ludovic Stephan
ee54b36696 minor imprevements to history 2016-12-11 23:22:59 -02:00
Ludovic Stephan
a9e1cd01db add transfersonly option 2016-12-11 23:22:14 -02:00
Ludovic Stephan
3f35dc2c06 unite transfer history 2016-12-11 23:21:36 -02:00
Ludovic Stephan
1dbbad38b9 transfer cancellation html 2016-12-11 21:00:42 -02:00
Qwann
4da9327666 Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into qwann/k-fet/stats 2016-12-11 20:45:52 +01:00
Ludovic Stephan
66304359c0 unite cancel_ope and cancel_transfer 2016-12-11 16:22:55 -02:00
Ludovic Stephan
49bef61e53 filter transfers frop opes 2016-12-11 14:45:52 -02:00
Ludovic Stephan
2c2da60e54 send data for cancel 2016-12-10 23:52:26 -02:00
Ludovic Stephan
0b61a48c65 fix selection 2016-12-10 23:13:43 -02:00
Qwann
83d49ad3a4 WIP articleCategory stat 2016-12-10 23:08:17 +01:00
Qwann
14f021b5b0 WIP articleCategory stat 2016-12-10 23:06:38 +01:00
Qwann
d19daa04b1 resuming views for stat 2016-12-10 17:33:24 +01:00
Qwann
3a7ffefacf week & day stat 2016-12-09 21:45:34 +01:00
Qwann
e4c8209df8 first tests 2016-12-09 21:44:38 +01:00
Qwann
cb9b967d78 debug toolbar 2016-12-09 21:43:42 +01:00
Ludovic Stephan
7485308436 Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/search_icon 2016-12-09 17:32:21 -02:00
Ludovic Stephan
85af7fe485 filter on id 2016-12-09 17:29:40 -02:00
Ludovic Stephan
b3b49d5768 Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/transferts_historique 2016-12-09 16:48:18 -02:00
Aurélien Delobelle
e63e56371d Merge branch 'Aufinal/encode_trigramme' into 'k-fet' 
K-Psul - Fix: Lien -> création/modification de comptes

Le javascript de K-Psul encode maintenant les caractères spéciaux (dont `, / ? : @ & = + $ # "`) afin de pouvoir avoir accès aux comptes en question sans bugs.

See merge request !131
 2016-12-09 17:30:11 +01:00
Aurélien Delobelle
222e614648 Merge branch 'Aufinal/F2_invert' into 'k-fet' 
K-Psul

Inverse les raccourcis clavier entre le reset du compte (Shift+F2) et du panier (F2) pour plus d'ergonomie

Fix #112

See merge request !129
 2016-12-09 16:55:33 +01:00
Ludovic Stephan
b0a21119fa Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/transferts_historique 2016-12-09 01:25:40 -02:00
Ludovic Stephan
cc94785fdf Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/arrondi_ukf 2016-12-09 01:25:02 -02:00
Ludovic Stephan
21cf783144 add special character encoding 2016-12-09 01:05:30 -02:00
Ludovic Stephan
d05ed86c17 Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/F2_invert 2016-12-09 00:44:39 -02:00
Ludovic Stephan
4453b504da Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/search_icon 2016-12-09 00:44:07 -02:00
Ludovic Stephan
3a68c6c9f1 add search button 2016-12-09 00:43:23 -02:00
Ludovic Stephan
d972af6854 update help 2016-12-09 00:33:18 -02:00
Ludovic Stephan
e725a10026 invert F2 and Shift+F2 2016-12-09 00:32:44 -02:00
Ludovic Stephan
36edc334d4 add transfer information 2016-12-09 00:26:25 -02:00
Ludovic Stephan
ac0356386a add css for transfers 2016-12-09 00:26:07 -02:00
Hugo Manet
92ec85dbbd Ajout d'un .distinct() dans la selection des articles liés à un supplier 2016-12-07 21:35:27 +01:00
Aurélien Delobelle
202199cc18 Merge branch 'Aufinal/correction_negatifs' into 'k-fet' 
Corrige le négatif total

Le système de `balance_offset` (assez obscur par ailleurs) était compté dans la mauvais sens dans le calcul du négatif total.

Prend aussi en compte maintenant le statut spécial de `#13`, pour ne pas le ranger avec les négatifs habituels.

Fix #104

See merge request !125
 2016-12-04 15:06:25 +01:00
Aurélien Delobelle
4fe17f3922 Merge branch 'Aufinal/capslock_indicator' into 'k-fet' 
Indicateur capslock

Détecteur de capslock en js.

Détecte les incohérences du capslock (majuscule entrée quand shift non enfoncé) puis suit aussi la pression de la touche capslock.

Nécessite un caractère affecté par capslock pour commencer à fonctionner (au départ, l'état de la touche capslock est inconnu)

Fix #96

See merge request !119
 2016-12-04 14:42:45 +01:00