ynerant/nk20
1
0
Fork 0
mirror of https://gitlab.crans.org/bde/nk20 synced 2024-11-27 10:53:02 +00:00
Code Issues Releases Wiki Activity
1,535 Commits 20 Branches 4 Tags 27 MiB
b597a6ac5b
Commit Graph

333 Commits

Author SHA1 Message Date
Yohann D'ANELLO
9c816a288d Stronger alias normalisation, ensure that normalized strings are encoded in ASCII. Closes #52 2020-08-10 18:36:47 +02:00
Alexandre Iooss
747a878cca Do not hover table when not clickable 2020-08-10 18:01:39 +02:00
Alexandre Iooss
beff848796 Use a fixed-width container by default for lisibility 2020-08-10 12:08:47 +02:00
Alexandre Iooss
40b826a375 Fix hanging indent in apps/note/tables.py 2020-08-09 19:42:09 +02:00
Alexandre Iooss
7b40ee1ca4 Reorder templates 2020-08-09 19:06:57 +02:00
Yohann D'ANELLO
29f84ea007 Remove test code 2020-08-09 15:42:07 +02:00
Yohann D'ANELLO
49bda926c6 Disable turbolinks for pages that require custom JS, like calendars or autocomplete fields 2020-08-09 15:31:38 +02:00
Yohann D'ANELLO
11fbbca2a8 Amount help text in transaction templates forms can be misleading: they type euros not cents 2020-08-09 14:52:57 +02:00
Yohann D'ANELLO
872456df20 🐛 Don't break the note 2020-08-09 12:31:06 +02:00
Yohann D'ANELLO
9751a5ad92 🐛 Fix pagination in transaction page 2020-08-07 12:55:07 +02:00
Yohann D'ANELLO
eb3d426947 💩 Don't reset a transaction before saving it... 2020-08-06 15:18:14 +02:00
Yohann D'ANELLO
0de69cbfaf 💚 Fix linters 2020-08-06 12:50:24 +02:00
Yohann D'ANELLO
d9cf812074 🐛 Prevent transactions to have the same source and destination 2020-08-06 12:46:44 +02:00
Yohann D'ANELLO
018ca84e2d Prevent superusers when they make a transaction with a non-member user 2020-08-05 20:40:30 +02:00
Yohann D'ANELLO
c205219d47 🐛 Fix transaction update concurency 2020-08-05 19:42:44 +02:00
Yohann D'ANELLO
af857d6fae 🐛 Prevent transactions where note balances go out integer bounds 2020-08-05 16:23:32 +02:00
Yohann D'ANELLO
655390b265 A longer transaction history is better 2020-08-03 18:50:51 +02:00
Yohann D'ANELLO
985a5ca876 ➕ Add "search transactions page" 2020-08-03 18:49:15 +02:00
Yohann D'ANELLO
5ea8d8f870 🎨 Update activity interface 2020-08-03 16:11:05 +02:00
Yohann D'ANELLO
66defee3ea 🐛 Display the invalidity reason of an invalid transaction even if we can't validate it 2020-08-03 11:41:06 +02:00
Yohann D'ANELLO
2f018f8c9d Always query distinct objects 2020-08-02 08:57:16 +02:00
Yohann D'ANELLO
efc2b6b0b0 Send mail to users when the note balance is negative 2020-08-01 21:44:16 +02:00
Yohann D'ANELLO
cc04fa5555 default=timezone.default is better than auto_now_add=True 2020-08-01 17:49:23 +02:00
Yohann D'ANELLO
377397b319 🐛 Fix WEI tables 2020-08-01 15:59:39 +02:00
Yohann D'ANELLO
b6453ce03d 💄 Improve Django Admin 2020-08-01 15:13:29 +02:00
Yohann D'ANELLO
d7b834d908 Translate rights 2020-07-31 22:29:23 +02:00
Yohann D'ANELLO
9008baad3a Better alias research, closes #51 2020-07-31 17:07:14 +02:00
Yohann D'ANELLO
ad2cc22964 Transactions are not invalidable if the user doesn't have the right to 2020-07-30 17:52:04 +02:00
Yohann D'ANELLO
ae629b55ad Add HTML titles 2020-07-30 17:30:21 +02:00
Yohann D'ANELLO
a5e50e5de6 Display true note name next to the alias, whenever the user has low permissions 2020-07-30 16:48:34 +02:00
Yohann D'ANELLO
e9cbc8e623 Fix linters 2020-07-30 15:53:23 +02:00
Yohann D'ANELLO
9d8c588b78 Buttons list didn't work as well 2020-07-30 15:49:59 +02:00
Yohann D'ANELLO
9361f3f2f0 Aliases should load really faster 2020-07-30 15:07:30 +02:00
Yohann D'ANELLO
20011db37e Order aliases by name 2020-07-29 19:03:11 +02:00
Yohann D'ANELLO
fa9159bb28 Alias pk != Note pk 2020-07-29 17:50:14 +02:00
Yohann D'ANELLO
b8a88eeda4 Only staff with good permission mask can visit Django Admin 2020-07-29 11:38:59 +02:00
Yohann D'ANELLO
2eb601bd66 💥 Improve performances 2020-07-25 17:25:57 +02:00
Yohann D'ANELLO
2c7995a79e A transaction can only be created between active notes 2020-06-21 22:47:05 +02:00
Yohann D'ANELLO
b46854e479 Rework on Docker image 2020-06-21 20:27:42 +02:00
Yohann D'ANELLO
a9ccf46010 Linters 2020-05-29 21:43:24 +02:00
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