1
0
mirror of https://gitlab.crans.org/bde/nk20 synced 2024-12-28 18:32:20 +00:00
Commit Graph

47 Commits

Author SHA1 Message Date
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
b81f186866 Add PDF member lists 2020-04-23 18:28:16 +02:00
Yohann D'ANELLO
640f0f9a31 Don't delete Sogé credits if the user don't have enough money on its note, stay positive :) 2020-04-22 03:57:19 +02:00
Yohann D'ANELLO
b23814aef0 Handle credits from the Société générale 2020-04-22 03:26:45 +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
038ddc2ab8 remittance need preciser check (bug during import) 2020-04-18 15:59:59 +02:00
Pierre-antoine Comby
53748cd534 frenglish -> english 2020-04-18 15:57:11 +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
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
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
61b32f9aec explicit context is better than implicit ctx 2020-04-06 12:13:12 +02:00
Yohann D'ANELLO
6fedbe2a2a Some model translations were missing 2020-04-06 10:58:16 +02:00
Yohann D'ANELLO
b1cd46bf7d Invalidate registrations, fix profile creation 2020-04-05 08:01:51 +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
f81e2b5b5b Use custom inputs for date picker and amounts 2020-03-27 13:50:02 +01:00
Yohann D'ANELLO
075cb1b592 Transaction can't be attached to a closed remittance 2020-03-25 00:25:24 +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
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
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
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
4f343fc99f Billing -> Invoice 2020-03-22 01:22:27 +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