315 commits

Author	SHA1	Message	Date
Aurélien Delobelle	e4ccd88dfd	Merge branch 'master' into aureplop/kpsul_js_refactor	2017-04-05 23:18:33 +02: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
Aurélien Delobelle	42728e58be	Merge branch 'master' into qwann/k-fet/category_addcost	2017-04-05 14:57:26 +02: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	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
Ludovic Stephan	40da3bc299	Listen on input	2017-04-03 11:21:05 -03:00
Ludovic Stephan	b113a57b74	Fix update function	2017-04-03 11:20:56 -03:00
Aurélien Delobelle	769c37634d	delete debug msg	2017-04-03 15:43:56 +02: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	c01de558e1	Clean Article stats ... kfet.statistic - delete no longer used defs - new mixin - ScaleMixin - get scale args from GET params - chunkify querysets according to a scale Article stats - use SingleResumeStat for manifest - use ScaleMixin for sales - update urls - update permission required: teamkfet Account stats - update permission required: teamkfet - operations use ScaleMixin - fix manifests urls	2017-04-03 03:12:52 +02:00
Aurélien Delobelle	31261fd376	set height canvas graph & fix graph display	2017-04-02 23:38:42 +02:00
Aurélien Delobelle	6ebea6557c	Merge branch 'Aufinal/graph_size' into aureplop/fix_stats	2017-04-02 23:19:34 +02:00
Ludovic Stephan	48721b7dca	Reduce graph size	2017-04-02 17:54:13 -03:00
Aurélien Delobelle	78aa5df350	fix template error	2017-04-02 12:55:44 +02:00
Aurélien Delobelle	96597aa146	clean some kfet templates	2017-04-02 05:17:26 +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	e20ab2f352	Use set delete()	2017-04-01 09:18:40 -03:00
Ludovic Stephan	ccf5f80685	Merge remote-tracking branch 'origin/master' into Aufinal/editions	2017-04-01 02:43:19 -03:00
Ludovic Stephan	8da832c1f7	Use nice authentication in orders too	2017-04-01 00:36:39 -03:00
Ludovic Stephan	063446efb5	Use columns for authentication and submit	2017-04-01 00:32:09 -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	530aafad19	Use widget_tweaks	2017-03-31 11:07:37 -03:00