Yohann D'ANELLO
|
69b7f31eed
|
Add lorem ipsum, update WEI
|
2020-04-12 02:30:48 +02:00 |
Yohann D'ANELLO
|
7ad32c2afd
|
View detail of a WEI
|
2020-04-12 00:06:20 +02:00 |
Yohann D'ANELLO
|
31d2224b8f
|
List wei
|
2020-04-11 23:02:12 +02:00 |
Yohann D'ANELLO
|
a186ccbb26
|
Update WEI models
|
2020-04-11 17:42:08 +02:00 |
Yohann D'ANELLO
|
154ea64b9f
|
Launching WEI app, add models
|
2020-04-11 03:37:06 +02:00 |
Yohann D'ANELLO
|
a609d7c995
|
Fix credit/debit tabs
|
2020-04-10 23:41:13 +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 |
Pierre-antoine Comby
|
161d2ceed7
|
Merge branch 'explicit>implicit' into 'master'
Explicit>implicit
See merge request bde/nk20!75
|
2020-04-09 22:41:04 +02:00 |
Pierre-antoine Comby
|
99d3ba9c1a
|
Merge branch 'master' into 'explicit>implicit'
# Conflicts:
# apps/activity/views.py
|
2020-04-09 22:31:54 +02:00 |
Pierre-antoine Comby
|
68808ddece
|
Merge branch 'master' into 'fix_distinct'
# Conflicts:
# apps/activity/views.py
|
2020-04-09 22:30:19 +02:00 |
Yohann D'ANELLO
|
fc511689b0
|
Update mail translation
|
2020-04-09 22:03:26 +02:00 |
Yohann D'ANELLO
|
e067b19d41
|
Paginate memberships and transactions
|
2020-04-06 19:51:39 +02:00 |
Pierre-antoine Comby
|
7e0aac0125
|
add docstring for entry
|
2020-04-06 12:32:44 +02:00 |
Pierre-antoine Comby
|
61b32f9aec
|
explicit context is better than implicit ctx
|
2020-04-06 12:13:12 +02:00 |
Pierre-antoine Comby
|
9fbfac7bdb
|
distinct on field not supported by sqlite
|
2020-04-06 11:44:02 +02:00 |
Yohann D'ANELLO
|
6fedbe2a2a
|
Some model translations were missing
|
2020-04-06 10:58:16 +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
|
6498a20b87
|
A user is active iff the email and the account are validated
|
2020-04-06 03:58:48 +02:00 |
Yohann D'ANELLO
|
2c3127c746
|
Société générale can pay BDE membership renewal (only once)
|
2020-04-05 22:35:56 +02:00 |
Yohann D'ANELLO
|
c513759515
|
Credit note for membership renewals
|
2020-04-05 21:56:56 +02:00 |
Yohann D'ANELLO
|
515edc4459
|
Credit note for new memberships
|
2020-04-05 18:37:04 +02:00 |
Yohann D'ANELLO
|
5b61db8821
|
We adhere other users, not ourself...
|
2020-04-05 16:18:56 +02:00 |
Yohann D'ANELLO
|
e8133805f5
|
Users must be member of the BDE club
|
2020-04-05 16:07:31 +02:00 |
Yohann D'ANELLO
|
f2baeedc01
|
Add basic roles for BDE and Kfet
|
2020-04-05 16:05:49 +02:00 |
Yohann D'ANELLO
|
ff820ef086
|
Update translations
|
2020-04-05 15:42:09 +02:00 |
Yohann D'ANELLO
|
f286f99ced
|
Handle payments from the Société Générale, closes #15
|
2020-04-05 15:31:39 +02:00 |
Yohann D'ANELLO
|
3516b1fa04
|
Add links to resend mail confirmations
|
2020-04-05 09:48:23 +02:00 |
Yohann D'ANELLO
|
fbc25240e6
|
Validate registrations, closes #14, #18, #19
|
2020-04-05 09:09:21 +02:00 |
Yohann D'ANELLO
|
b1cd46bf7d
|
Invalidate registrations, fix profile creation
|
2020-04-05 08:01:51 +02:00 |
Yohann D'ANELLO
|
f10497bac3
|
List pending users
|
2020-04-05 06:40:03 +02:00 |
Yohann D'ANELLO
|
49807d33d9
|
Use a separate app for registration
|
2020-04-05 05:17:28 +02:00 |
Yohann D'ANELLO
|
0f77b9df9a
|
Unvalidate e-mail when the user changes it, but the user still active
|
2020-04-05 04:37:29 +02:00 |
Yohann D'ANELLO
|
26281af673
|
Send an e-mail verification to a new registered user
|
2020-04-05 04:26:42 +02:00 |
Yohann D'ANELLO
|
0cdc8ae004
|
RolePermissions were missing in the API
|
2020-04-02 16:06:58 +02:00 |
Yohann D'ANELLO
|
17ea2246ca
|
Remove useless field in activities
|
2020-04-02 15:43:41 +02:00 |
Yohann D'ANELLO
|
be42801709
|
The memoization doesn't work when objects don't have a primary key.
|
2020-04-02 14:50:28 +02:00 |
Yohann D'ANELLO
|
8ad464ae0c
|
Fix CI
|
2020-04-02 00:42:00 +02:00 |
Yohann D'ANELLO
|
5c9c0bbc2a
|
Optimize permissions, use memoization
|
2020-04-02 00:30:22 +02:00 |
Yohann D'ANELLO
|
3f5faa0b05
|
Add tab for user list
|
2020-04-01 20:56:24 +02:00 |
Yohann D'ANELLO
|
5eb08fd822
|
Dynamic user research
|
2020-04-01 20:14:16 +02:00 |
Yohann D'ANELLO
|
2853fe252b
|
Renew memberships
|
2020-04-01 18:47:56 +02:00 |
Yohann D'ANELLO
|
356c8588e7
|
Users that are not member of the club Kfet can't have a negative balance
|
2020-04-01 17:00:06 +02:00 |
Yohann D'ANELLO
|
92ab5ee3af
|
Fix memberships with clubs without memberships (we always need treasurers...)
|
2020-04-01 04:34:42 +02:00 |
Yohann D'ANELLO
|
535c493bc7
|
Fix some issues
|
2020-04-01 04:20:47 +02:00 |
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
|
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
|
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
|
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
|
81cfaf12fa
|
People can join activities
|
2020-03-28 13:38:31 +01:00 |
Yohann D'ANELLO
|
a805e41367
|
Fix CI
|
2020-03-28 02:09:10 +01:00 |
Yohann D'ANELLO
|
08ed694438
|
Update translations
|
2020-03-28 02:08:29 +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
|
34949f0859
|
Fix activity in Guest model
|
2020-03-27 19:16:38 +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
|
e27b456aea
|
Merge branch 'parent-club' into 'master'
Resolve "Club Parent"
Closes #42
See merge request bde/nk20!65
|
2020-03-27 13:29:43 +01:00 |
Pierre-antoine Comby
|
a3a8fd601c
|
revert to ReadProtectedViewset
|
2020-03-27 13:26:47 +01:00 |
Yohann D'ANELLO
|
45b14ed1bd
|
Create activities
|
2020-03-27 01:31:54 +01:00 |
Yohann D'ANELLO
|
213e5a8369
|
Fix CI
|
2020-03-27 00:40:35 +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
|
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 |
Benjamin Graillot
|
59cd166b79
|
[member] tabs --> spaces
|
2020-03-25 18:05:46 +01:00 |
Pierre-antoine Comby
|
33e3657120
|
add aliases view to clubs
|
2020-03-25 18:00:40 +01:00 |
Benjamin Graillot
|
c86ddf17ad
|
[member] Check membership of parent club
|
2020-03-25 17:54:28 +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
|
826573f553
|
whitespaces compliance
|
2020-03-25 16:58:15 +01:00 |
Pierre-antoine Comby
|
2d18cb983f
|
fee in cents for fixture and initial picture
|
2020-03-25 16:12:57 +01:00 |
Pierre-antoine Comby
|
ff17f1e877
|
Club view should as good as profile ones
|
2020-03-25 16:11:44 +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
|
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 |
Yohann D'ANELLO
|
9a7f1bba21
|
Fix CI (no idea of why this error happened)
|
2020-03-25 00:39:40 +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 |
Yohann D'ANELLO
|
075cb1b592
|
Transaction can't be attached to a closed remittance
|
2020-03-25 00:25:24 +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 |
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 |
Pierre-antoine Comby
|
8ab142c122
|
no need to be static after all
|
2020-03-24 20:25:08 +01:00 |
Yohann D'ANELLO
|
a33d373f6e
|
Comment code
|
2020-03-24 20:22:15 +01:00 |
Pierre-antoine Comby
|
d4b8d35206
|
check permission with PermissionBackend.
taking connection permission mask into account.
|
2020-03-24 20:19:24 +01:00 |
Yohann D'ANELLO
|
093e585b79
|
We don't need to create proxies for special transactions that don't require a remittance
|
2020-03-24 17:14:29 +01:00 |
Yohann D'ANELLO
|
4cf1047faa
|
Manage remittance types
|
2020-03-24 17:06:50 +01:00 |
Yohann D'ANELLO
|
d25d342d28
|
Update translations
|
2020-03-24 01:04:01 +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 |
Yohann D'ANELLO
|
d6e00f7bba
|
Fix SpecialTransaction proxies
|
2020-03-23 22:13:16 +01:00 |
Yohann D'ANELLO
|
cf45b08c5b
|
Automatically link SpecialTransactions and their proxies
|
2020-03-23 21:30:57 +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 |
Benjamin Graillot
|
a4cb19e5b1
|
[member] Added parent_club field to Club
|
2020-03-23 09:07:39 +01:00 |
Pierre-antoine Comby
|
c3bea59f2f
|
update script projects
|
2020-03-22 22:09:45 +01:00 |
Yohann D'ANELLO
|
b9fac82d89
|
Fixtures are more natural
|
2020-03-22 22:09:41 +01:00 |
Yohann D'ANELLO
|
5fd472d408
|
Create, view and update remittances
|
2020-03-22 18:27:22 +01:00 |
Yohann D'ANELLO
|
3551568de5
|
Add remittance model
|
2020-03-22 17:29:31 +01:00 |
Yohann D'ANELLO
|
5ac10b58d5
|
API Support (useless, but...)
|
2020-03-22 16:04:09 +01:00 |
Yohann D'ANELLO
|
d641b4cc1c
|
Can't change which BDE has editted the invoice
|
2020-03-22 15:33:48 +01:00 |
Yohann D'ANELLO
|
15bfdd9f96
|
Repair Invoice model
|
2020-03-22 15:24:54 +01:00 |
Yohann D'ANELLO
|
f6027e9edd
|
Fix CI
|
2020-03-22 14:57:51 +01:00 |
Pierre-antoine Comby
|
28e7707bc5
|
add submodule
|
2020-03-22 14:57:49 +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
|
4f343fc99f
|
Billing -> Invoice
|
2020-03-22 01:22:27 +01:00 |