293 Commits

Author	SHA1	Message	Date
Yohann D'ANELLO	fdf373d1d5	Merge remote-tracking branch 'origin/master' into import_nk15 ... # Conflicts: # apps/treasury/signals.py	2020-05-07 19:01:23 +02:00
ynerant	395c52220f	Merge branch 'master' into 'tranfer_front' ... # Conflicts: # apps/activity/views.py # apps/permission/backends.py # locale/de/LC_MESSAGES/django.po # locale/fr/LC_MESSAGES/django.po # static/js/base.js # templates/base.html # templates/member/user_list.html	2020-05-07 18:48:35 +02:00
Yohann D'ANELLO	5ea531fe68	Filter buttons list with visible buttons only	2020-04-27 03:56:22 +02:00
Yohann D'ANELLO	2bc2048076	RecurrentTransaction amount history	2020-04-27 03:21:13 +02:00
Yohann D'ANELLO	b23814aef0	Handle credits from the Société générale	2020-04-22 03:26:45 +02:00
Pierre-antoine Comby	cc97948c24	clean specialTransaction	2020-04-18 15:59:06 +02:00
Yohann D'ANELLO	ea8e25a7b3	Create WEI	2020-04-12 02:43:22 +02:00
Yohann D'ANELLO	658d402242	Notes of users that don't have validated their email addresses are displayed with a different background	2020-04-10 02:56:56 +02:00
Yohann D'ANELLO	6477590cd4	Fix devalidation	2020-04-10 00:09:10 +02:00
Yohann D'ANELLO	751147f254	Don't display a note that we can't see, fix CI, fix distinct fields on PostgresSQL DB	2020-04-10 00:02:22 +02:00
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	bd41560f45	Update permission fixtures	2020-04-06 10:45:32 +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	c513759515	Credit note for membership renewals	2020-04-05 21:56:56 +02:00
Yohann D'ANELLO	fbc25240e6	Validate registrations, closes #14, #18, #19	2020-04-05 09:09:21 +02:00
Yohann D'ANELLO	f10497bac3	List pending users	2020-04-05 06:40:03 +02:00
Yohann D'ANELLO	3f5faa0b05	Add tab for user list	2020-04-01 20:56:24 +02:00
Yohann D'ANELLO	d5b010980b	Full membership support	2020-04-01 03:42:19 +02:00
Yohann D'ANELLO	dd3b7bd7e5	Remove note activities	2020-03-31 14:57:44 +02:00
Yohann D'ANELLO	12945945bc	Update translations	2020-03-31 14:10:30 +02:00
Yohann D'ANELLO	1aae18e6a6	Improved permissions, 404 and 403 errors will be more frequent (when we type an invalid URL)	2020-03-31 04:16:30 +02:00
Yohann D'ANELLO	c384ee02eb	Implement a new type of note (see #45)	2020-03-31 01:03:30 +02:00
Yohann D'ANELLO	b0b3aa35a9	Guests can't be invited if the activity is not validated	2020-03-30 17:35:47 +02:00
Yohann D'ANELLO	fcb4da2db3	Guests can't be invited since the activity is started	2020-03-30 17:27:02 +02:00
Yohann D'ANELLO	fb5796d35e	Guests can't be invited more than 5 times a year and a member can't invite more than 3 people per activity.	2020-03-30 00:42:32 +02:00
Pierre-antoine Comby	6ea59a4603	Merge branch 'master' into tranfer_front	2020-03-28 17:47:20 +01:00
Pierre-antoine Comby	d8949a993a	get alias and note infos together	2020-03-28 17:42:29 +01:00
Yohann D'ANELLO	c8b72cf1ff	Guests can pay with CB or coins, lot of other improvements	2020-03-28 16:52:58 +01:00
Yohann D'ANELLO	8c1d902c30	Open and validate activities	2020-03-27 22:48:20 +01:00
Yohann D'ANELLO	ceb5690838	Invite people	2020-03-27 18:02:22 +01:00
Yohann D'ANELLO	4f4bbf6d0e	Fix server starting	2020-03-27 16:32:46 +01:00
Yohann D'ANELLO	f09364d3d8	Custom auto-complete fields, remove DAL requirement	2020-03-27 16:19:33 +01:00
Yohann D'ANELLO	823bcfe781	Fix CI	2020-03-27 14:19:55 +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	a3a8fd601c	revert to ReadProtectedViewset	2020-03-27 13:26:47 +01:00
Pierre-antoine Comby	c50e17c555	error handling up to client	2020-03-26 23:05:37 +01:00
Pierre-antoine Comby	61b6aceb36	crappy name -> crappy behavior	2020-03-26 23:04:14 +01:00
Yohann D'ANELLO	a00e43bc26	Fix alias deletion	2020-03-26 21:04:32 +01:00
Pierre-antoine Comby	92ca835d0e	switch to template column	2020-03-26 17:47:49 +01:00
Pierre-antoine Comby	271fab3b75	use small btn in table	2020-03-26 17:46:38 +01:00
Pierre-antoine Comby	757dfdd914	serializer config	2020-03-26 17:45:24 +01:00
Pierre-antoine Comby	d9cdb01350	remove alias handling backend, gonna use DRF	2020-03-26 17:44:01 +01:00
Pierre-antoine Comby	7568abb681	some minor cleaning	2020-03-26 17:41:11 +01:00
Yohann D'ANELLO	01410d2b23	Store used aliases in transactions	2020-03-26 15:59:51 +01:00
Yohann D'ANELLO	41aa6964d2	Store used aliases in transactions	2020-03-26 14:45:48 +01:00
Pierre-antoine Comby	1b26df6481	move template_category to own fixture ... TemplateCategory are not essential for running a base instance.	2020-03-26 14:08:18 +01:00
Pierre-antoine Comby	c41999422f	Merge branch 'front_club' into 'master' ... Front club See merge request bde/nk20!68	2020-03-25 17:02:55 +01:00
Pierre-antoine Comby	2d18cb983f	fee in cents for fixture and initial picture	2020-03-25 16:12:57 +01:00
Yohann D'ANELLO	bc3fdbe7a7	Add docstring	2020-03-25 14:54:26 +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
ynerant	57a01c48a8	Merge branch 'master' into 'tresorerie' ... # Conflicts: # apps/note/fixtures/initial.json # templates/base.html	2020-03-25 00:30:14 +01:00
Pierre-antoine Comby	f85f292d5b	linter compliance	2020-03-25 00:12:56 +01:00
Pierre-antoine Comby	0411646ae6	make the CI pass and nicer front	2020-03-25 00:03:48 +01:00
Pierre-antoine Comby	20ea017e96	row color to show if display	2020-03-24 23:32:48 +01:00
Pierre-antoine Comby	9be93db9af	les boeufs avant la charrue, a faire sur une autre branche	2020-03-24 23:14:13 +01:00
Pierre-antoine Comby	9f53bda1cd	clean code	2020-03-24 23:02:12 +01:00
Pierre-antoine Comby	41568916b8	error fixes	2020-03-24 22:28:03 +01:00
Pierre-antoine Comby	ba04a6555f	dynamically delete buttons	2020-03-24 22:12:59 +01:00
Pierre-antoine Comby	33139bdbde	Dynamic search of buttons	2020-03-24 00:07:25 +01:00
Yohann D'ANELLO	884a7d0f08	Use a proxy for special transactions in treasury app for modularity (not a clean way, but without any other solution...)	2020-03-23 21:15:59 +01:00
Pierre-antoine Comby	7cd8a37aec	non dynamic search for button	2020-03-23 20:21:25 +01:00
Pierre-antoine Comby	41a0529d0c	fixin the merge...	2020-03-23 15:35:24 +01:00
Pierre-antoine Comby	bbda99a3ac	Merge branch 'master' into manage_button	2020-03-23 15:31:39 +01:00
Pierre-antoine Comby	3cdb3f6d38	Refactor and comment noteView	2020-03-23 15:28:09 +01:00
Yohann D'ANELLO	b9fac82d89	Fixtures are more natural	2020-03-22 22:09:41 +01:00
Yohann D'ANELLO	3551568de5	Add remittance model	2020-03-22 17:29:31 +01:00
Yohann D'ANELLO	1e5065b80b	Fixtures are more natural	2020-03-22 14:54:05 +01:00
Yohann D'ANELLO	70cf186233	Fix fixtures, another time...	2020-03-22 14:12:45 +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	1c6d69ab9d	We store amounts in cents but users enter euros	2020-03-21 18:59:13 +01:00
Yohann D'ANELLO	091c427707	Restructurate code	2020-03-20 14:43:35 +01:00
Yohann D'ANELLO	02817c5626	Fix CI	2020-03-20 02:20:13 +01:00
Yohann D'ANELLO	3f2b21f7f4	Fix CI	2020-03-20 02:14:43 +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	74c0fcca83	Notes are read-only in the API, but can be modified with scripts (ie. transactions)	2020-03-19 19:29:52 +01:00
Yohann D'ANELLO	7794210cc8	Being superuser is not enough (must have the correct mask), add some initial fixtures	2020-03-19 18:53:06 +01:00
Yohann D'ANELLO	95315cdbe2	Implements permission masks	2020-03-19 16:12:52 +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	730d37c620	Protect views from viewing if the user has no right to view an object	2020-03-19 02:26:06 +01:00
Yohann D'ANELLO	e461d70b14	Improve add permissions	2020-03-18 15:49:52 +01:00
Yohann D'ANELLO	057f42fdb6	Handle permissions (and it seems working!)	2020-03-18 14:42:35 +01:00
Yohann D'ANELLO	4909a7f09c	Transaction types are now properties	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	c42a7745bc	Add most used buttons	2020-03-17 17:48:55 +01:00
Yohann D'ANELLO	717891869d	Auto-complete first and last name for credits and debits	2020-03-17 17:48:55 +01:00
Yohann D'ANELLO	040bb27528	Credit/debit support	2020-03-17 17:48:55 +01:00
Benjamin Graillot	321927ba1e	[note] tranfert --> transfer	2020-03-17 17:48:55 +01:00
Benjamin Graillot	49952355e6	[note] Added type property to transactions	2020-03-17 17:48:55 +01:00
Yohann D'ANELLO	5d15b8c613	Fix (de)validation of transactions	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	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	7b69ffdefe	Better transfers	2020-03-12 23:12:49 +01:00
Yohann D'ANELLO	f9451da7f1	Better JS	2020-03-12 16:53:35 +01:00
Yohann D'ANELLO	e0c650a039	Add true note name if we use an alias	2020-03-12 11:12:21 +01:00
Yohann D'ANELLO	538af6afc5	Buttons are ordered	2020-03-12 01:22:07 +01:00
Yohann D'ANELLO	a2f54d48a7	Improve a lot the interface	2020-03-12 01:10:52 +01:00
Yohann D'ANELLO	c4f54d9d5b	Multiple select	2020-03-11 22:51:46 +01:00
Yohann D'ANELLO	cebbe65eef	Button create a transaction through the API	2020-03-11 21:47:04 +01:00
ynerant	46e472ed6d	Merge branch 'master' into 'fix-what-i-broke' ... # Conflicts: # templates/base.html	2020-03-11 17:03:44 +01:00
Yohann D'ANELLO	523e27694a	Remove useless code	2020-03-11 15:14:51 +01:00
Yohann D'ANELLO	58ea6abce4	Fix template tags to make tox happy	2020-03-11 15:13:34 +01:00
Benjamin Graillot	c8f5451ea4	Added indexes for Transaction, Alias and Profile	2020-03-11 13:46:47 +01:00
Yohann D'ANELLO	a128ed4803	Use environment rather than hardcoding strings, closes #36	2020-03-11 13:24:48 +01:00
Yohann D'ANELLO	f082f8523a	Update translations	2020-03-11 12:05:29 +01:00
Yohann D'ANELLO	417cd5da04	Improve REST API with filters	2020-03-11 11:15:03 +01:00
Yohann D'ANELLO	38ad870939	Add one missing model to the API	2020-03-11 01:03:15 +01:00
Yohann D'ANELLO	0f1d662d25	Anonymous users don't have any access to the API (fix it later with rights...), fix CI	2020-03-11 00:47:43 +01:00
Pierre-antoine Comby	8abc789895	fix parameter name, works better.	2020-03-10 20:17:56 +01:00
Yohann D'ANELLO	aa731d1ae4	Regexp must begin with ^	2020-03-10 17:16:03 +01:00
Alexandre Iooss	94ab2c81f7	Use TableView for conso page	2020-03-10 08:07:09 +01:00
Yohann D'ANELLO	fffd674c44	Fix initial fixture hardcode	2020-03-09 22:29:14 +01:00
Pierre-antoine Comby	f4fe0c9866	use django_tables2 for transactionTemplate	2020-03-09 20:59:04 +01:00
Pierre-antoine Comby	46ec16d8c9	PEP8 compliance	2020-03-09 19:19:56 +01:00
Pierre-antoine Comby	526744052e	pretty print in transaction tables	2020-03-09 18:53:13 +01:00
Pierre-antoine Comby	08d692c0da	fix #39	2020-03-09 18:10:24 +01:00
Benjamin Graillot	79b9131049	[note] Fix template for TemplateTransaction in Conso form	2020-03-09 11:51:20 +01:00
Yohann D'ANELLO	d0206fb790	Make erdnaxe be happy	2020-03-07 22:28:59 +01:00
Yohann D'ANELLO	21fd121ba7	Add signup link, customize templates	2020-03-07 18:55:18 +01:00
Pierre-antoine Comby	38feb693f3	crop,resized, and save picture at the right place	2020-03-06 20:07:15 +01:00
Pierre-antoine Comby	08b97e722b	add support for cropping image. WIP.	2020-03-05 23:32:01 +01:00
Pierre-antoine Comby	fd74080ce3	profile picture update view is working	2020-03-04 16:34:12 +01:00
Pierre-antoine Comby	14ccc8da75	Add ImageForm	2020-03-03 14:26:31 +01:00
Pierre-antoine Comby	211859e940	add default profile pic	2020-03-03 14:24:07 +01:00
Pierre-antoine Comby	b7e68722aa	front improvement on alias page	2020-03-01 16:20:13 +01:00
Pierre-antoine Comby	35d5bcdf0f	Deletion of alias now possible!	2020-03-01 00:25:53 +01:00
Pierre-antoine Comby	db95944574	add delete boutons, work with only one alias	2020-02-28 15:25:45 +01:00
Pierre-antoine Comby	9133c84ef2	comment bug	2020-02-28 13:49:50 +01:00
Pierre-antoine Comby	f77351b444	Add view for aliases	2020-02-28 13:37:31 +01:00
Yohann D'ANELLO	3764bc44ff	Fix money creation, closes #25	2020-02-27 17:22:59 +01:00
Pierre-antoine Comby	25fc35c857	Merge branch 'import_nk15' into 'master' ... Import nk15 See merge request bde/nk20!23	2020-02-25 20:31:41 +01:00
Pierre-antoine Comby	0cd0b11fa5	remove name Field of TemplateTransaction ... Redundant with `reason` from Transaction	2020-02-25 14:15:59 +01:00
Pierre-antoine Comby	33eba8a403	add last_negative field to note	2020-02-25 14:15:36 +01:00
Benjamin Graillot	640e48b5df	[note] no transaction_type	2020-02-24 18:33:51 +01:00
Benjamin Graillot	c2fbb1bcdf	Polymorphic transaction	2020-02-24 10:36:04 +01:00
Pierre-antoine Comby	f5a80dd0a5	fix typo	2020-02-23 21:05:51 +01:00
Pierre-antoine Comby	4de817bd75	Merge branch 'import_nk15' of gitlab.crans.org:bde/nk20 into import_nk15	2020-02-23 18:56:58 +01:00
Pierre-antoine Comby	7230f9c535	transaction_type -> category	2020-02-23 18:56:03 +01:00
Pierre-antoine Comby	b18e5b03a4	add boutons import	2020-02-23 18:45:21 +01:00
Benjamin Graillot	40a7d3b295	[note] TransactionCategory --> TemplateCategory	2020-02-23 17:27:55 +01:00
Pierre-antoine Comby	126686ab03	add a TransactionType model	2020-02-23 16:50:14 +01:00
Pierre-antoine Comby	f3ec0836f8	add display field to TransactionTemplate	2020-02-23 16:48:35 +01:00