Commit Graph

400 Commits

Author SHA1 Message Date
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