67 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	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	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
Yohann D'ANELLO	823bcfe781	Fix CI	2020-03-27 14:19:55 +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
Pierre-antoine Comby	c50e17c555	error handling up to client	2020-03-26 23:05:37 +01:00
Pierre-antoine Comby	757dfdd914	serializer config	2020-03-26 17:45:24 +01:00
Yohann D'ANELLO	41aa6964d2	Store used aliases in transactions	2020-03-26 14:45:48 +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	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
Yohann D'ANELLO	3551568de5	Add remittance model	2020-03-22 17:29:31 +01:00
Yohann D'ANELLO	801f948a7d	Rename TemplateTransaction into RecurrentTransaction	2020-03-19 20:37:48 +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	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	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	c4f54d9d5b	Multiple select	2020-03-11 22:51:46 +01:00
ynerant	46e472ed6d	Merge branch 'master' into 'fix-what-i-broke' ... # Conflicts: # templates/base.html	2020-03-11 17:03:44 +01:00
Benjamin Graillot	c8f5451ea4	Added indexes for Transaction, Alias and Profile	2020-03-11 13:46:47 +01:00
Yohann D'ANELLO	f082f8523a	Update translations	2020-03-11 12:05:29 +01:00
Yohann D'ANELLO	d0206fb790	Make erdnaxe be happy	2020-03-07 22:28:59 +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	fd74080ce3	profile picture update view is working	2020-03-04 16:34:12 +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
Yohann D'ANELLO	3764bc44ff	Fix money creation, closes #25	2020-02-27 17:22:59 +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	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	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