110 Commits

Author	SHA1	Message	Date
Yohann D'ANELLO	bac81cd13e	Merge branch 'master' into tranfer_front ... # Conflicts: # static/js/base.js	2020-04-09 22:49:52 +02:00
Yohann D'ANELLO	f833f1c46c	Comment code	2020-04-06 08:58:39 +02:00
Yohann D'ANELLO	9d584ae87a	Add shortcuts for transfers and credits in the activity entry page	2020-04-06 07:06:52 +02:00
Yohann D'ANELLO	515edc4459	Credit note for new memberships	2020-04-05 18:37:04 +02:00
ynerant	72e5df0cf5	Merge branch 'new-note-type' into 'master' ... Memberships Closes #43 and #16 See merge request bde/nk20!71	2020-04-05 02:06:19 +02:00
Yohann D'ANELLO	04f9ae51ed	Fix docker setup, remove select2 files (unused)	2020-04-03 04:03:58 +02:00
Yohann D'ANELLO	c384ee02eb	Implement a new type of note (see #45)	2020-03-31 01:03:30 +02:00
Pierre-antoine Comby	935ebf291a	use note id , not alias id	2020-03-28 21:31:22 +01:00
Pierre-antoine Comby	aaf49c9b99	balance on a second line	2020-03-28 21:30:55 +01:00
Pierre-antoine Comby	6ea59a4603	Merge branch 'master' into tranfer_front	2020-03-28 17:47:20 +01:00
Pierre-antoine Comby	948263a867	color codes from note balances	2020-03-28 17:44:22 +01:00
Yohann D'ANELLO	8c1d902c30	Open and validate activities	2020-03-27 22:48:20 +01:00
Yohann D'ANELLO	f09364d3d8	Custom auto-complete fields, remove DAL requirement	2020-03-27 16:19:33 +01:00
Yohann D'ANELLO	dadd840645	Merge remote-tracking branch 'origin/master' into activity	2020-03-27 14:16:10 +01:00
Pierre-antoine Comby	09fb0e1470	Merge branch 'master' into front_club	2020-03-27 14:07:22 +01:00
ynerant	bef4958759	Merge branch 'master' into 'devalidation_reason' ... # Conflicts: # locale/de/LC_MESSAGES/django.po # locale/fr/LC_MESSAGES/django.po	2020-03-27 13:52:48 +01:00
Yohann D'ANELLO	f81e2b5b5b	Use custom inputs for date picker and amounts	2020-03-27 13:50:02 +01:00
Pierre-antoine Comby	f7a66920e0	move common script to alias.js	2020-03-26 23:05:08 +01:00
Pierre-antoine Comby	49dd88dbb7	add errMsg function	2020-03-26 23:04:51 +01:00
Yohann D'ANELLO	41aa6964d2	Store used aliases in transactions	2020-03-26 14:45:48 +01:00
Yohann D'ANELLO	5cf75ebf9e	When a transaction can't becreated because the user don't have the permission to take too much money, then we create an invalid transaction	2020-03-25 15:27:38 +01:00
Yohann D'ANELLO	e5ab391236	Better user interface	2020-03-25 14:50:21 +01:00
Yohann D'ANELLO	23db42e448	Give a reason when a transaction is invalidated	2020-03-25 13:13:01 +01:00
Yohann D'ANELLO	1b03eac95b	Last and first name didn't auto-complete because of a bug	2020-03-24 01:34:47 +01:00
Yohann D'ANELLO	2defb04d52	Remove my own VPS DNS	2020-03-23 22:42:56 +01:00
Yohann D'ANELLO	18f6daf2ac	Merge remote-tracking branch 'origin/master' into tresorerie ... # Conflicts: # locale/de/LC_MESSAGES/django.po # locale/fr/LC_MESSAGES/django.po # note_kfet/settings/base.py # templates/base.html	2020-03-22 01:04:03 +01:00
Yohann D'ANELLO	a772cea760	Add products on billings	2020-03-21 16:49:18 +01:00
Yohann D'ANELLO	1c12494a67	Register the BDE in billings	2020-03-21 00:41:55 +01:00
Yohann D'ANELLO	0ce6cd88b3	More optimisation	2020-03-20 02:05:41 +01:00
Yohann D'ANELLO	6fc43e651e	More optimisation	2020-03-20 01:46:59 +01:00
Yohann D'ANELLO	801f948a7d	Rename TemplateTransaction into RecurrentTransaction	2020-03-19 20:37:48 +01:00
Yohann D'ANELLO	d083894e9b	Fix note display for users that don't have enough rights	2020-03-19 14:25:43 +01:00
Yohann D'ANELLO	6c002aacaa	JS from transfer page is now externalized	2020-03-17 18:47:16 +01:00
Yohann D'ANELLO	4909a7f09c	Transaction types are now properties	2020-03-17 17:48:55 +01:00
Yohann D'ANELLO	7313e5a337	Fix minor front bugs	2020-03-17 17:48:55 +01:00
Yohann D'ANELLO	dac14b13df	Alerts are dismissible	2020-03-17 17:48:55 +01:00
Yohann D'ANELLO	7b98244360	Add transaction type field	2020-03-17 17:48:55 +01:00
Yohann D'ANELLO	a1f37f0eea	Validation/devalidation of a transaction on profile page	2020-03-17 17:48:55 +01:00
Yohann D'ANELLO	da12733508	Replace arrays with objects	2020-03-17 17:48:55 +01:00
Yohann D'ANELLO	c42a7745bc	Add most used buttons	2020-03-17 17:48:55 +01:00
Yohann D'ANELLO	cc5185b3ed	(Un)validate transactions	2020-03-17 17:48:55 +01:00
Yohann D'ANELLO	8a4baa1960	Fix empty patterns	2020-03-17 17:25:32 +01:00
Yohann D'ANELLO	6747f4340d	Enter key clicks on the first alias	2020-03-13 12:21:33 +01:00
Yohann D'ANELLO	1e6891e1c7	Aliases are now asynchronously queried	2020-03-13 12:21:16 +01:00
Yohann D'ANELLO	a1f7f8f5b7	Fixed alias research	2020-03-13 10:34:47 +01:00
Yohann D'ANELLO	8c795c38dc	Minor fixes on consumptions page, research is now faster	2020-03-13 10:29:27 +01:00
Yohann D'ANELLO	a1f8ef721a	Minor fixes on consumptions page	2020-03-13 09:26:39 +01:00
Yohann D'ANELLO	bb0fc8c2cc	Consumptions with item selected before	2020-03-13 01:34:20 +01:00
Yohann D'ANELLO	7b69ffdefe	Better transfers	2020-03-12 23:12:49 +01:00
Yohann D'ANELLO	5782e91aa8	Auto-completer is more independant, comment code	2020-03-12 21:05:43 +01:00
Yohann D'ANELLO	f9451da7f1	Better JS	2020-03-12 16:53:35 +01:00
ynerant	0193a4d898	Merge branch 'cas' into 'master' ... CAS See merge request bde/nk20!29	2020-03-06 21:38:57 +01:00
Pierre-antoine Comby	70c09da9f8	add static files	2020-02-25 22:15:46 +01:00
Yohann D'ANELLO	4b7f40a046	CAS Server support	2020-02-22 14:20:22 +01:00
Alexandre Iooss	91ccff1d1b	Serperlistpopette! I forgot the favicon	2020-02-18 22:54:10 +01:00
Pierre-antoine Comby	cc41409f5e	Merge branch 'master' into 'app_member' ... # Conflicts: # apps/member/views.py	2019-08-15 19:53:40 +00:00
Pierre-antoine Comby	70c5bc06f3	place custom config of js in template	2019-08-15 21:50:53 +02:00
Pierre-antoine Comby	40c697e57f	interface pour ajouter des membres à un club	2019-08-14 18:47:46 +02:00
Alexandre Iooss	b76d4d69e0	Remove custom CSS from base.html	2019-08-14 15:17:14 +02:00
Pierre-antoine Comby	28a747ac17	start frontend	2019-08-10 19:00:16 +02:00