290 Commits

Author	SHA1	Message	Date
Yohann D'ANELLO	0df0f3f66b	Membership fees for paid and unpaid students, closes #43	2020-04-01 04:07:55 +02:00
Yohann D'ANELLO	d5b010980b	Full membership support	2020-04-01 03:42:19 +02:00
Yohann D'ANELLO	bf9789bd9e	Restructurate memberships, closes #16	2020-03-31 23:54:14 +02:00
Yohann D'ANELLO	e98693b214	Memberships are optional for clubs	2020-03-31 16:22:11 +02:00
Yohann D'ANELLO	dd3b7bd7e5	Remove note activities	2020-03-31 14:57:44 +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	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	691a03ecad	Add some initial permissions for activities	2020-03-28 19:05:21 +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	c8b72cf1ff	Guests can pay with CB or coins, lot of other improvements	2020-03-28 16:52:58 +01:00
Yohann D'ANELLO	81cfaf12fa	People can join activities	2020-03-28 13:38:31 +01:00
Yohann D'ANELLO	a8422411bc	Entry page (we can search people)	2020-03-28 01:45:13 +01:00
Yohann D'ANELLO	8c1d902c30	Open and validate activities	2020-03-27 22:48:20 +01:00
Yohann D'ANELLO	d6e202a26f	Display guests list	2020-03-27 21:18:27 +01:00
Yohann D'ANELLO	0d43d74c60	Display activity details	2020-03-27 19:47:43 +01:00
Yohann D'ANELLO	ceb5690838	Invite people	2020-03-27 18:02:22 +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
Pierre-antoine Comby	ee3d441a56	add parent club link	2020-03-27 14:04:30 +01:00
Yohann D'ANELLO	f81e2b5b5b	Use custom inputs for date picker and amounts	2020-03-27 13:50:02 +01:00
Yohann D'ANELLO	45b14ed1bd	Create activities	2020-03-27 01:31:54 +01:00
Yohann D'ANELLO	841d56d5b3	Merge remote-tracking branch 'origin/master' into activity ... # Conflicts: # note_kfet/urls.py # templates/base.html	2020-03-27 00:32:22 +01:00
Pierre-antoine Comby	f7a66920e0	move common script to alias.js	2020-03-26 23:05:08 +01:00
Pierre-antoine Comby	e125601f52	almost working javascript	2020-03-26 17:48:17 +01:00
Pierre-antoine Comby	04b39f09af	remove forms	2020-03-26 17:45:49 +01:00
Pierre-antoine Comby	7568abb681	some minor cleaning	2020-03-26 17:41:11 +01:00
Pierre-antoine Comby	33e3657120	add aliases view to clubs	2020-03-25 18:00:40 +01:00
Pierre-antoine Comby	a41e51e23a	add member get side information	2020-03-25 17:42:54 +01:00
Pierre-antoine Comby	26d70c4ef9	page title and edit buttons	2020-03-25 17:25:44 +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	ff17f1e877	Club view should as good as profile ones	2020-03-25 16:11:44 +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	0411646ae6	make the CI pass and nicer front	2020-03-25 00:03:48 +01:00
Pierre-antoine Comby	b3c1032f4f	wrap in function for correct behavior	2020-03-24 23:27:08 +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
Yohann D'ANELLO	432f14d9d1	Product's amounts can be negative, in case of discounts (treasurers are free to generate what invoice they want)	2020-03-24 22:01:02 +01:00
Yohann D'ANELLO	a33d373f6e	Comment code	2020-03-24 20:22:15 +01:00
Yohann D'ANELLO	a52741b87f	Add tabs (can be improved)	2020-03-24 01:12:22 +01:00
Yohann D'ANELLO	5682c5489e	Close remittances	2020-03-24 00:50:55 +01:00
Pierre-antoine Comby	33139bdbde	Dynamic search of buttons	2020-03-24 00:07:25 +01:00
Yohann D'ANELLO	414722df18	Link transactions and remittances	2020-03-23 23:42:37 +01:00
Yohann D'ANELLO	95888ea316	Add some tables for special transactions	2020-03-23 22:43:16 +01:00
Pierre-antoine Comby	7cd8a37aec	non dynamic search for button	2020-03-23 20:21:25 +01:00
Pierre-antoine Comby	1ce7dc0118	reorganize tabs of nav bar	2020-03-23 15:53:18 +01:00
Pierre-antoine Comby	4e17b50e35	Merge branch 'master' into manage_button	2020-03-23 15:40:01 +01:00
Pierre-antoine Comby	bbda99a3ac	Merge branch 'master' into manage_button	2020-03-23 15:31:39 +01:00
Pierre-antoine Comby	610a4f0b3f	show Note info always on left	2020-03-22 22:35:07 +01:00
Pierre-antoine Comby	c295e5cbc7	fix indentation	2020-03-22 22:22:37 +01:00
Pierre-antoine Comby	c200ae8c3c	ask for cas only if available.	2020-03-22 22:01:33 +01:00
Yohann D'ANELLO	5fd472d408	Create, view and update remittances	2020-03-22 18:27:22 +01:00
Yohann D'ANELLO	15bfdd9f96	Repair Invoice model	2020-03-22 15:24:54 +01:00
Yohann D'ANELLO	4f343fc99f	Billing -> Invoice	2020-03-22 01:22:27 +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	a772cea760	Add products on billings	2020-03-21 16:49:18 +01:00
Yohann D'ANELLO	02ac33d143	Render billings	2020-03-21 09:22:38 +01:00
Yohann D'ANELLO	8ecaef0daf	Add render button	2020-03-21 07:36:07 +01:00
Yohann D'ANELLO	b030f5797f	Create & update billings (products are not yet supported)	2020-03-21 00:52:26 +01:00
Yohann D'ANELLO	71346476df	Starting treasury app	2020-03-21 00:30:49 +01:00
Yohann D'ANELLO	7a4f929b36	Credit and debit buttons are hidden when there is no right to see special notes	2020-03-19 02:31:53 +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	6c002aacaa	JS from transfer page is now externalized	2020-03-17 18:47:16 +01:00
Yohann D'ANELLO	e8ad906f9c	Human-readable amounts	2020-03-17 18:31:26 +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	f1210d116c	Display balance and profile pic on transfer page	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	ad66380e1b	Update translations	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
Yohann D'ANELLO	5d15b8c613	Fix (de)validation of transactions	2020-03-17 17:48:55 +01:00
Yohann D'ANELLO	05fb50965b	Balance is refreshed after a (de)validation	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	c43e8c2dc2	Fix transfers	2020-03-17 17:42:54 +01:00
Yohann D'ANELLO	a1f8ef721a	Minor fixes on consumptions page	2020-03-13 09:26:39 +01:00
Yohann D'ANELLO	56a2d482c9	Transfers: switch between transfer and gift	2020-03-13 01:57:32 +01:00
Yohann D'ANELLO	bb0fc8c2cc	Consumptions with item selected before	2020-03-13 01:34:20 +01:00
Yohann D'ANELLO	e81450e092	Double consumptions switch (front only)	2020-03-13 00:11:33 +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
Yohann D'ANELLO	e0c650a039	Add true note name if we use an alias	2020-03-12 11:12:21 +01:00
Yohann D'ANELLO	b6c3178052	Dynamic page	2020-03-12 10:53:06 +01:00
Yohann D'ANELLO	a2f54d48a7	Improve a lot the interface	2020-03-12 01:10:52 +01:00
Yohann D'ANELLO	f748f533b2	Update note infos	2020-03-11 23:35:38 +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
Yohann D'ANELLO	7f432f5bc5	Fix categories in front (fields weren't well named)	2020-03-11 20:59:15 +01:00
Yohann D'ANELLO	d8a785d309	Replace contact email	2020-03-11 17:51:42 +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	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
Alexandre Iooss	f3b44f3170	Bootstrap for conso page	2020-03-10 08:11:43 +01:00
Alexandre Iooss	94ab2c81f7	Use TableView for conso page	2020-03-10 08:07:09 +01:00
Yohann D'ANELLO	83b1ad4751	Multi-connexions	2020-03-09 22:23:47 +01:00
Pierre-antoine Comby	f4fe0c9866	use django_tables2 for transactionTemplate	2020-03-09 20:59:04 +01:00
Pierre-antoine Comby	e1063fcaa2	translation in navbar and transfer tab	2020-03-09 18:35:11 +01:00
Yohann D'ANELLO	d0206fb790	Make erdnaxe be happy	2020-03-07 22:28:59 +01:00
Yohann D'ANELLO	8f1caddbe0	Add signup link, customize templates	2020-03-07 18:18:35 +01:00
Pierre-antoine Comby	deb19e45c1	center form	2020-03-06 20:16:44 +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	c4198a64af	add button for profile pic view	2020-03-03 14:45:50 +01:00
Pierre-antoine Comby	211859e940	add default profile pic	2020-03-03 14:24:07 +01:00
Pierre-antoine Comby	901454f338	rename template for consistency	2020-03-03 11:05:02 +01:00
Pierre-antoine Comby	d5f718fbba	start activity view and urls	2020-03-01 17:55:48 +01:00
Pierre-antoine Comby	b3d45ba64b	alias page inherit from profile template	2020-03-01 17:36:49 +01:00
Pierre-antoine Comby	b7e68722aa	front improvement on alias page	2020-03-01 16:20:13 +01:00
Pierre-antoine Comby	27391049f2	remove duplicated form	2020-02-28 16:12:35 +01:00
Pierre-antoine Comby	f77351b444	Add view for aliases	2020-02-28 13:37:31 +01:00
Pierre-antoine Comby	0ea0d77707	fix #27	2020-02-27 20:56:06 +01:00
Yohann D'ANELLO	ea9cda0d41	Update translations	2020-02-27 17:49:57 +01:00
Pierre-antoine Comby	a348178d13	Fix id name	2020-02-27 12:00:02 +01:00
Pierre-antoine Comby	707770a5b4	fix #28	2020-02-25 22:55:27 +01:00
Pierre-antoine Comby	eb6f142bf8	autofocus of signup form on first field	2020-02-25 22:26:43 +01:00
Pierre-antoine Comby	7230f9c535	transaction_type -> category	2020-02-23 18:56:03 +01:00
erdnaxe	ae90a957ce	Merge branch 'master' into 'turbolinks' ... # Conflicts: # apps/note/views.py	2020-02-22 11:09:45 +01:00
erdnaxe	9ef2bc8bc3	Merge branch 'fix_overflow' into 'master' ... Fix y-overflow on accordion showing during transition See merge request bde/nk20!16	2020-02-22 11:08:13 +01:00
Alexandre Iooss	a39bbea2d4	Add shadow and fix jquery hack	2020-02-22 10:17:24 +01:00
Alexandre Iooss	3597e79dc1	Dynamic tabs on conso view	2020-02-21 22:40:58 +01:00
Alexandre Iooss	24c994f2a5	Fix y-overflow on accordion showing during transition	2020-02-21 21:33:49 +01:00
Alexandre Iooss	82355135b0	Remove SmoothNavigation Middleware	2020-02-21 21:15:49 +01:00
Yohann D'ANELLO	3fd99ebac7	Ability to disable cache storage	2020-02-21 18:28:21 +01:00
Yohann D'ANELLO	c64347def7	Don't use slim version of jQuery (select2 requires AjaX)	2020-02-21 17:59:20 +01:00
Yohann D'ANELLO	886abd8188	Update django-light-admin, fix conflict between jQuery, select2 and turbolinks	2020-02-21 17:51:00 +01:00
Yohann D'ANELLO	0728ba4a5c	Reduce autoloaded libraries	2020-02-21 17:20:42 +01:00
Yohann D'ANELLO	52663d75fa	Move scripts location	2020-02-21 17:07:28 +01:00
Yohann D'ANELLO	d5bb1ee310	Don't use local static JS file	2020-02-21 15:43:01 +01:00
Yohann D'ANELLO	5977d88ed6	Test turbolinks	2020-02-21 15:24:29 +01:00
Alexandre Iooss	6c017b1993	Remove sidebar and drop shadows	2020-02-21 13:50:35 +01:00
Alexandre Iooss	b395d3a633	Overflow on collapsing tables and Bootstrap4 style	2020-02-21 12:29:11 +01:00
Alexandre Iooss	8d87b2b8f5	More style in profile page	2020-02-21 12:08:36 +01:00
Alexandre Iooss	6caad0b369	Do not forget responsible grid on second profile page column	2020-02-21 11:55:47 +01:00
Alexandre Iooss	45ce2eab9e	Two colomn profile page	2020-02-21 11:53:37 +01:00
Alexandre Iooss	43fd765a34	Title on profile update page	2020-02-21 11:17:14 +01:00
Alexandre Iooss	2e7bf4964b	Upgrade bootstrap and flex footer	2020-02-21 11:02:29 +01:00
Alexandre Iooss	d2ec7f6e0d	Do not justify everything	2020-02-21 10:52:07 +01:00
Yohann D'ANELLO	987b898a33	Auth token is hidden	2020-02-17 23:30:55 +01:00
Yohann D'ANELLO	b7383b35f7	Manage auth token	2020-02-17 21:32:08 +01:00
Yohann D'ANELLO	559445c8b4	Add some decoration	2020-02-17 19:44:56 +01:00