ynerant/nk20
1
0
Fork 0
mirror of https://gitlab.crans.org/bde/nk20 synced 2024-12-29 10:52:20 +00:00
Code Issues Releases Wiki Activity
1,080 Commits 21 Branches 4 Tags 27 MiB
7c291b115a
Commit Graph

682 Commits

Author SHA1 Message Date
Yohann D'ANELLO
73878d03ab Delete registrations 2020-04-21 01:06:54 +02:00
Yohann D'ANELLO
1c7d4fbbec 2A+ can select a bus (and fix random bugs) 2020-04-21 00:07:00 +02:00
Yohann D'ANELLO
47b9b53591 Protect all from update if the WEI is ended (or not started), remove useless fixture 2020-04-20 04:53:26 +02:00
Yohann D'ANELLO
16af9ac0ea Improve survey, comment code 2020-04-20 01:26:53 +02:00
Yohann D'ANELLO
473d3c3546 Integrate survey results into validation form 2020-04-19 22:16:57 +02:00
Yohann D'ANELLO
69ac5cd291 Revert changes on some comments 2020-04-19 20:45:59 +02:00
Yohann D'ANELLO
8113c5cd61 WEI Survey (work in progress) 2020-04-19 20:35:49 +02:00
Pierre-antoine Comby
6d27193ac4 update import script 2020-04-18 16:07:45 +02:00
Pierre-antoine Comby
038ddc2ab8 remittance need preciser check (bug during import) 2020-04-18 15:59:59 +02:00
Pierre-antoine Comby
cc97948c24 clean specialTransaction 2020-04-18 15:59:06 +02:00
Pierre-antoine Comby
53748cd534 frenglish -> english 2020-04-18 15:57:11 +02:00
Yohann D'ANELLO
b62fa4cc6d Register users themselves 2020-04-18 03:55:30 +02:00
Yohann D'ANELLO
0c9409fd4b Improve WEI UI 2020-04-18 03:27:12 +02:00
Yohann D'ANELLO
d7da876a23 Add a link to register 1A 2020-04-17 21:48:50 +02:00
Yohann D'ANELLO
96ad5385b0 Distinguish new and old members 2020-04-17 00:48:54 +02:00
Yohann D'ANELLO
080510bcf2 Add WEI form on signup form 2020-04-16 23:31:36 +02:00
Yohann D'ANELLO
db67598b25 Validate WEI memberships 2020-04-14 04:46:52 +02:00
Yohann D'ANELLO
36b26e0baa Validation form (only front) 2020-04-14 03:41:26 +02:00
Yohann D'ANELLO
0bf958dbd6 Edit and view teams 2020-04-13 21:16:52 +02:00
Yohann D'ANELLO
840376a4f5 Add teams 2020-04-13 06:01:27 +02:00
Yohann D'ANELLO
822853be66 Add a bus 2020-04-13 05:02:16 +02:00
Yohann D'ANELLO
6242e316ae Update pre-registrations 2020-04-12 04:39:57 +02:00
Yohann D'ANELLO
bdb0f677e5 List pre-registrations (TODO: filter) 2020-04-12 04:29:44 +02:00
Yohann D'ANELLO
6b8e9d45fd Pre-register 2A+ 2020-04-12 03:31:08 +02:00
Yohann D'ANELLO
ea8e25a7b3 Create WEI 2020-04-12 02:43:22 +02:00
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
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
a220ca7549 We need the french latex package 2020-03-21 17:54:08 +01:00
Yohann D'ANELLO
2d0ba4750c Fix CI 2020-03-21 17:29:39 +01:00
Yohann D'ANELLO
086bb967d5 Update translations 2020-03-21 17:02:28 +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
1c12494a67 Register the BDE in billings 2020-03-21 00:41:55 +01:00
Yohann D'ANELLO
71346476df Starting treasury app 2020-03-21 00:30:49 +01:00
Yohann D'ANELLO
e2d2d2cc99 Anonymous users have no right 2020-03-20 18:23:20 +01:00
Yohann D'ANELLO
d494a3e7fa Quality assurance 2020-03-20 18:13:34 +01:00
Yohann D'ANELLO
93bd8489df Amounts are in cents... 2020-03-20 18:02:12 +01:00
Yohann D'ANELLO
24ea4c0a52 Comment code 2020-03-20 15:58:14 +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
f80cb635d3 Optimize permissions, full support add perms, more fixtures 2020-03-20 00:06:28 +01:00
Yohann D'ANELLO
c653e0986e Remove UserPermission model 2020-03-19 20:39:19 +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
022997f923 Add unique tags on permission masks 2020-03-19 16:27:25 +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
112d4b6c5a Merge branch 'consos' into rights 
# Conflicts:
#	apps/logs/signals.py
#	note_kfet/settings/base.py
 2020-03-17 21:11:14 +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
a1f37f0eea Validation/devalidation of a transaction on profile page 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
Yohann D'ANELLO
0c00a934bd Translate some docs 2020-03-11 17:54:54 +01:00
Yohann D'ANELLO
695ef446ec Add logs in tox settings 2020-03-11 17:20:16 +01:00
Yohann D'ANELLO
2bd59544ec Remove two whitespaces for tox 2020-03-11 17:10:16 +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
6c2cdf0667 Remove warning when no user is detected while a modification is made 2020-03-11 16:10:26 +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
b17ff59984 Added indexes for Membership 2020-03-11 13:51:26 +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
06c97d75a0 Logs are decreasing ordered 2020-03-11 12:41:44 +01:00
Yohann D'ANELLO
f082f8523a Update translations 2020-03-11 12:05:29 +01:00
Yohann D'ANELLO
b89028b3dc Add models in the API 2020-03-11 11:37:47 +01:00
Yohann D'ANELLO
2c440062ce Changelogs are read-only protected 2020-03-11 11:33:14 +01:00
Yohann D'ANELLO
1379759803 Changelogs are read-only protected 2020-03-11 11:25:40 +01:00
Yohann D'ANELLO
417cd5da04 Improve REST API with filters 2020-03-11 11:15:03 +01:00
Yohann D'ANELLO
bc97eb1eb4 Add logs to the API (this right should only be given to superusers) 2020-03-11 10:08:28 +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
Yohann D'ANELLO
be877276f8 Fix JSON serialization 2020-03-11 00:41:37 +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
Pierre-antoine Comby
77551162d5 Merge branch 'page_conso' into 'master' 
Base conso page

See merge request bde/nk20!53
 2020-03-10 09:32:44 +01:00
Pierre-antoine Comby
a54c0769bf Merge branch 'add_script_submodule' into 'master' 
initiate submodule for scripts

See merge request bde/nk20!51
 2020-03-10 09:32:33 +01:00
Alexandre Iooss
94ab2c81f7
Use TableView for conso page 2020-03-10 08:07:09 +01:00
Yohann D'ANELLO
185f6ce4e3 Alias have to be exact 2020-03-10 01:07:37 +01:00
Yohann D'ANELLO
db69091d9f When an update is made from the shell, the username of the user connected to the shell is queried 2020-03-10 01:04:00 +01:00
Yohann D'ANELLO
20e2d41563 Use a middleware rather than inspect the stack to get current user and IP 2020-03-10 00:01:40 +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
205fd5c17a initiate submodule for scripts 2020-03-09 19:03:36 +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
Pierre-antoine Comby
0de2c18bec profile is first created via signal. 2020-03-09 18:08:37 +01:00
Benjamin Graillot
79b9131049 [note] Fix template for TemplateTransaction in Conso form 2020-03-09 11:51:20 +01:00
Maxime Bombar
b7fc598837 OTL 2020-03-08 23:17:55 +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
663ee072d4 always save to png 2020-03-07 17:58:41 +01:00
Yohann D'ANELLO
09137dd9d7 Fix anonymous users issue 2020-03-07 16:45:45 +01:00
Yohann D'ANELLO
30ce17b644 Update a lot of things 2020-03-07 13:12:17 +01:00
Yohann D'ANELLO
a014a97e14 Merge remote-tracking branch 'origin/rights' into rights 2020-03-07 11:21:08 +01:00
Benjamin Graillot
9d61e217e9 [permission] Only split permission up to 3 2020-03-07 11:21:19 +01:00
Yohann D'ANELLO
7e29f1d482 Merge remote-tracking branch 'origin/rights' into rights 2020-03-07 10:48:42 +01:00
Benjamin Graillot
5df1f42f43 [permission] Syntax error 2020-03-07 10:48:38 +01:00
Yohann D'ANELLO
0884270474 Merge branch 'master' into rights 
# Conflicts:
#	note_kfet/settings/base.py
 2020-03-07 10:42:51 +01:00
ynerant
6f7374710b Merge branch 'master' into 'logging' 
# Conflicts:
#   locale/de/LC_MESSAGES/django.po
#   locale/fr/LC_MESSAGES/django.po
 2020-03-07 10:32:17 +01:00
Benjamin Graillot
8a9ad0a6e5 [permission] Handle add rights 2020-03-07 09:30:22 +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
2e8505e9b4 ménage dans les imports 2020-03-04 16:34:52 +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
14ccc8da75 Add ImageForm 2020-03-03 14:26:31 +01:00
Pierre-antoine Comby
f992c117f4 rename second_form to profile_form 2020-03-03 14:25:16 +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
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
27391049f2 remove duplicated form 2020-02-28 16:12:35 +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
c77bc0c032 add deleteView for aliases 2020-02-28 13:52:15 +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
Pierre-antoine Comby
0ea0d77707 fix #27 2020-02-27 20:56:06 +01:00
Yohann D'ANELLO
3764bc44ff Fix money creation, closes #25 2020-02-27 17:22:59 +01:00
Yohann D'ANELLO
b23237f669 Uncomment required line 2020-02-27 16:26:07 +01:00
Yohann D'ANELLO
9cd050e2f0 Logging is finally processed at post saved, but old instance is querried 2020-02-27 16:25:18 +01:00
Yohann D'ANELLO
bcee5f8f2f Don't log when there is no modification, or only when a user is connected 2020-02-27 15:53:06 +01:00
Yohann D'ANELLO
125f437345 Profiles are saved after the user 2020-02-27 15:41:15 +01:00
Yohann D'ANELLO
3c52c1d002 Users have now automatically an attached profile to a user (fix an old bug) 2020-02-27 15:36:12 +01:00