247 commits

Author	SHA1	Message	Date
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	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	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	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	bc0affc038	Remove autocomplete leftovers	2017-03-25 09:56:36 -03: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	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
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
Qwann	ca17e36b5a	clean display for is_sold	2017-03-06 02:03:19 +01:00
Qwann	dcc19bd9e8	article.hidden in article & article_read	2017-03-06 01:58:33 +01:00
Ludovic Stephan	8e31fae340	last tweaks	2017-03-05 21:29:20 -03:00
Ludovic Stephan	61e2fedb08	Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/command_interface	2017-03-05 21:12:53 -03:00
Qwann	197da29366	css include added...	2017-03-05 20:05:35 +01:00
Qwann	b0b2210e93	Merge branch 'qwann/k-fet/home' of git.eleves.ens.fr:cof-geek/gestioCOF into qwann/k-fet/home	2017-03-05 19:44:08 +01:00
Qwann	9f94262b82	removing inapropriate message	2017-03-05 19:43:26 +01:00
Qwann	f52aba8ca6	Merge branch 'k-fet' into qwann/k-fet/home	2017-03-05 19:21:20 +01:00
Aurélien Delobelle	95b129e396	resolved merge conflict in kfet views imports	2017-02-25 02:00:56 +01:00
Evarin	0fcb29252b	Frontend tout en JS	2017-02-15 21:01:54 +01:00
Qwann	9cae3ad0bd	Merge branch 'k-fet' into qwann/k-fet/stats	2017-02-13 14:37:29 +01:00
Ludovic Stephan	83e41c292e	css tweaks	2017-02-13 11:34:47 -02:00
Ludovic Stephan	43aab26530	Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/visibilite_stock	2017-02-13 10:51:24 -02:00
Ludovic Stephan	3fa0e4de6c	different rounding for accounts	2017-02-12 19:05:41 -02:00
Ludovic Stephan	3dfd8bf616	interface for order_to_inventory	2017-02-12 18:04:50 -02:00
Ludovic Stephan	031b992fa3	fix brackets & lowstock indication	2017-02-12 11:09:03 -02:00
Ludovic Stephan	99d04fb75e	bugfix	2017-02-12 11:02:54 -02:00
Ludovic Stephan	db899a891b	css tweaks	2017-02-12 02:03:41 -02:00
Ludovic Stephan	15d79aff2d	add help tooltips	2017-02-12 00:48:24 -02:00
Ludovic Stephan	be8eb4ac28	add (temporary) better presentation	2017-02-12 00:01:22 -02:00
Qwann	6be2adc47a	removing "open-Kfet-feature" ... to keep it for an other merge request	2017-02-08 12:47:11 +01:00
Qwann	a4fdb99267	Revert "WS : quand la K-Fêt est ouverte ?" ... This reverts commit ce9f717f06.	2017-02-08 12:42:07 +01:00