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

3044 commits

Author SHA1 Message Date
grisel-davy
5673b199c5 split query into two filters 2021-01-24 16:36:16 +01:00
Gabriel Detraz
996839ef70 Fix all_adherent and all_has_access function 2021-01-24 16:36:16 +01:00
histausse
98639f54f0 Add the need_membership field to article
This field is a boolean indicating if the article can be purshased by
nonmembers.
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
Gabriel Detraz
90df51edfc Fix publication parser error 2021-01-24 16:36:16 +01:00
Gabriel Detraz
e6bd154116 Fix : This is not a rw operation but a ro for db routers 2021-01-24 16:36:16 +01:00
939c0e28aa Missing new line in apt requirements radius 2021-01-24 16:36:16 +01:00
Gabriel Detraz
3e59e96520 Fix, deleted the bad switchport serializer 2021-01-24 16:36:16 +01:00
Gabriel Detraz
f8a5d3ad16 Fix, code mort qui provoque une erreur 500 2021-01-24 16:36:16 +01:00
Gabriel Detraz
2d4c94243b Add preferences dormitory choice on displayed room states 2021-01-24 16:36:16 +01:00
Arthur Grisel-Davy
9eca19e176 Fix multi operators options edition 2021-01-24 16:36:16 +01:00
histausse
98a0e3b388 remove the second port serialiser 2021-01-24 16:36:16 +01:00
histausse
6b022f625e Add dormitory to the building serialiser 2021-01-24 16:36:16 +01:00
histausse
f010436997 Add building to the room serialiser 2021-01-24 16:36:16 +01:00
Hugo Levy-Falk
4c692a42e0 Fix availability of non cotisation articles in facture creation. 2021-01-24 16:36:16 +01:00
Hugo Levy-Falk
0051099267 Fix acl when viewing history of deleted object or all history. 2021-01-24 16:36:16 +01:00
Hugo Levy-Falk
652982941a Fix can_view_app 2021-01-24 16:36:16 +01:00
Hugo Levy-Falk
f4c5101b35 Fix history acl 2021-01-24 16:36:16 +01:00
Hugo Levy-Falk
360458541a Fix can_view_all so it actually does its job. 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
3a386b90ae Add exception name 2021-01-24 16:36:16 +01:00
546656e9f9 Fix of about page crash if no president or CGU file 2021-01-24 16:36:16 +01:00
Gabriel Detraz
0df3542ec1 Fix port edition crash with new convention for *_id 2021-01-24 16:36:16 +01:00
Gabriel Detraz
8182505fd2 Replace full_clean with simple clean, fix interface registering on multi-database 2021-01-24 16:36:16 +01:00
Gabriel Detraz
0f4067478f Add reply_to field on tickets comment 2021-01-24 16:36:16 +01:00
chirac
c5dca80703 Update comments models.py 2021-01-24 16:36:16 +01:00
Gabriel Detraz
383aaf3132 Don't use disabled ip for administration purpose 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
fbc718bf3c Update, need pil for radius 2021-01-24 16:36:16 +01:00
Jean-Marie Mineau
dda0775a22 add an 'active' field to ipv6 to signal the DNS to ignore them. 2021-01-24 16:36:16 +01:00
Gabriel Detraz
7e2e900a01 Fix, can't serialize this var 2021-01-24 16:36:16 +01:00
0c3123719e Fix sql command when using mysql on remote machine 2021-01-24 16:36:16 +01:00
4329261342 rebase 2021-01-24 16:36:16 +01:00
chapeau
5091c626b6 Update models.py 2021-01-24 16:36:16 +01:00
4ca261d83d Refactoring 2021-01-24 16:36:16 +01:00
e0a0375e5d Translation 2021-01-24 16:36:16 +01:00
c3fae17599 Add exception handling 2021-01-24 16:36:16 +01:00
be1c051e98 Optimisation of domains update 2021-01-24 16:36:16 +01:00
7a6075b741 Update domains when ip_type or machine_type are updated 2021-01-24 16:36:16 +01:00
klafyvel
02c8321d7d Update apt_requirements.txt 2021-01-24 16:36:16 +01:00
e3b7ffd8d2 Suppression of ldap settings in default settings 2021-01-24 16:36:16 +01:00
7fac0e1a9a Add default values for local settings 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
Laouen Fernet
d4da12dda9 Fix some translations in topologie/ 2021-01-24 16:36:16 +01:00
Laouen Fernet
6abe2ea960 Fix some translations in tickets/ 2021-01-24 16:36:16 +01:00
Laouen Fernet
98784da411 Fix some translations in preferences/ 2021-01-24 16:36:16 +01:00
Laouen Fernet
a4f50f62d2 Fix some translations in logs/ 2021-01-24 16:36:16 +01:00
Laouen Fernet
792e424430 Fix some translations in cotisations/ 2021-01-24 16:36:16 +01:00