8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-16 00:13:12 +00:00
Commit graph

749 commits

Author SHA1 Message Date
grisel-davy
af3da1eafb Move facture list to cotisation, add paginator 2021-01-24 16:37:09 +01:00
grisel-davy
e2d9591dc8 Rename profil view in apps and count machines in user profil view 2021-01-24 16:37:09 +01:00
grisel-davy
eaf3673587 Don't know why, but it solves issue #281 2021-01-24 16:37:09 +01:00
grisel-davy
7ac894c168 Replace null by 0 in default value of duration_* 2021-01-24 16:37:09 +01:00
grisel-davy
baadaa18f9 Fix the test for ventes in the set_active function. This function could be greatly improved if the duraction could not be null. 2021-01-24 16:36:51 +01:00
Gabriel Detraz
8190101c0a Fix query test for set_active function 2021-01-24 16:36:17 +01:00
grisel-davy
5673b199c5 split query into two filters 2021-01-24 16:36:16 +01:00
histausse
b317eceec3 Split the membership duration from the connection duration
changes:

Article:
remove COTISATION_TYPE, duration(_days), type_cotisation
add duration(_days)_connection, duration(_days)_membership

Vente:
remove COTISATION_TYPE, duration(_days), type_cotisation
add duration(_days)_connection, duration(_days)_membership
add method `test_membership_or_connection()` to replace
`bool(type_cotisation)`

Cotisation:
remove COTISATION_TYPE, date_start, date_end, type_cotisation
add date_start_con, date_end_con, date_start_memb, date_end_memb

create_cotis(date_start=False) -> create_cotis(date_start_con=False, date_start_memb=False)

+ migration
+ changes to use the new models in the remaining of the code
2021-01-24 16:36:16 +01:00
Gabriel Detraz
8338790eae Supprime l'avatar à la création (inutile/buggé) 2021-01-24 16:36:16 +01:00
Hugo Levy-Falk
652982941a Fix can_view_app 2021-01-24 16:36:16 +01:00
Gabriel Detraz
d5831c5f1f The reset_passw function should not set as not yet active users that have already been flaged active 2021-01-24 16:36:16 +01:00
Gabriel Detraz
2d6d1a6024 Fix acl on check pseudo change by user 2021-01-24 16:36:16 +01:00
Gabriel Detraz
7824083a55 Translation of user app views + remove trailing spaces 2021-01-24 16:36:16 +01:00
Gabriel Detraz
564851feda Final translation of users app 2021-01-24 16:36:16 +01:00
Gabriel Detraz
55bf1a9077 Translation of docstrings in user admin and forms 2021-01-24 16:36:16 +01:00
Gabriel Detraz
32aa0572f1 Refactor serviceuser admin 2021-01-24 16:36:16 +01:00
Gabriel Detraz
93e6c96493 Fix user adherent/club creation form 2021-01-24 16:36:16 +01:00
chiahetcho
593ec4b6cb Correct django settings 2021-01-24 16:36:16 +01:00
Leila
9829976cdb Add migration file 2021-01-24 16:36:16 +01:00
Leila
ba54cb845c Update image in filesystem when user changes image 2021-01-24 16:36:16 +01:00
Leila
b2607ab232 Add thumbnail to user model 2021-01-24 16:36:16 +01:00
Gabriel Detraz
abbcf4a1de Rename rezo_rez_uid legacy and add some help text entries 2021-01-24 16:36:16 +01:00
c43c532822 Start implementing detailed history for event class 2021-01-24 16:34:46 +01:00
e2660d0bee Add missing translations 2021-01-24 16:34:24 +01:00
ec6d73869d Add missing translations 2021-01-24 16:34:24 +01:00
ead2609564 Add missing translations for detailed history 2021-01-24 16:33:32 +01:00
ac53084695 Improve handling of detailed history button 2021-01-24 16:33:32 +01:00
Hugo Levy-Falk
7ddbc02835 Rebase dev 2021-01-24 16:33:32 +01:00
Gabriel Detraz
69c924014f Fix permission check 2021-01-24 16:33:32 +01:00
Gabriel Detraz
bcb9e097ac Add self pseudo setting 2021-01-24 16:33:32 +01:00
c891e52118 Add missing translations in logs 2021-01-24 16:33:32 +01:00
6088f5c91b Fix CGU line formatting 2021-01-24 16:33:32 +01:00
a1d35a2c9b Add missing translations 2021-01-24 16:33:32 +01:00
5eb89e85ba Improve comments for User clean methods 2021-01-24 16:33:32 +01:00
Gabriel Detraz
dc67ed5298 Check email in user clean (factorise code) 2021-01-24 16:33:32 +01:00
6235909a9a Fix some email checks being bypassed for legacy users 2021-01-24 16:33:32 +01:00
1755f6e624 Prevent user email from being null 2021-01-24 16:33:32 +01:00
4a7c5c1bdb Make email check more pythonic 2021-01-24 16:33:32 +01:00
259e9eff51 Leave user email blank / null for compatilibity 2021-01-24 16:33:32 +01:00
8befbb8ad8 Handle empty emails 2021-01-24 16:33:32 +01:00
77a1b39dbf Add required for email field when necessary 2021-01-24 16:33:32 +01:00
b968f23b65 Leave user email blank / null for compatilibity 2021-01-24 16:33:32 +01:00
9e1cd17a1b Handle empty emails 2021-01-24 16:33:32 +01:00
Hugo Levy-Falk
c2b5a26d8f Fix dead code. 2021-01-24 16:33:31 +01:00
Hugo Levy-Falk
8730c2ecfe Production version of VueJS 2021-01-24 16:33:31 +01:00
Hugo Levy-Falk
a370ae066e Fix #98 2021-01-24 16:33:31 +01:00
chapeau
cf7e293a1c Fix of copy/paste errors 2021-01-24 16:33:31 +01:00
chapeau
0b58365c87 First draft of moving api functions into each apps 2021-01-24 16:33:31 +01:00
Gabriel Detraz
334537e475 Remove old api 2021-01-24 16:33:31 +01:00
Gabriel Detraz
0d7ca44edd Add help_text for password 2021-01-24 16:33:31 +01:00