rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-26 22:52:26 +00:00
Code Issues Releases Wiki Activity
3827 commits 211 branches 14 tags 12 MiB
Commit graph

3827 commits

This branch
This branch
All branches
Author SHA1 Message Date
grisel-davy
ccce9d2de9 Move facture list to cotisation, add paginator 2020-10-18 15:22:48 +02:00
grisel-davy
a6d63521fd Rename profil view in apps and count machines in user profil view 2020-10-18 14:51:58 +02:00
grisel-davy
9a42485c0a Create profil template and corresponding view 2020-10-18 13:28:32 +02:00
grisel-davy
9005dc78b9 Fix test of subscription or connection to display message 2020-10-17 13:52:40 +02:00
chirac
9a2cae3b8f Merge branch 'fix_unarchived_vente' into 'dev' 
Don't know why, but it solves issue #281

See merge request re2o/re2o!563
 2020-10-17 01:27:46 +02:00
grisel-davy
3e3040550d Don't know why, but it solves issue #281 2020-10-17 01:06:24 +02:00
grizzly
b0fdeca744 Merge branch 'fix_memb_adh' into 'dev' 
Fix memb adh

See merge request re2o/re2o!562
 2020-10-17 00:40:18 +02:00
grisel-davy
89c805f61b Replace null by 0 in default value of duration_* 2020-10-17 00:34:56 +02:00
grisel-davy
bf298492f3 Merge branch 'fix_memb_adh' of https://gitlab.federez.net/federez/re2o into fix_memb_adh 2020-10-15 19:24:54 +02:00
grisel-davy
23698a1653 Fix the test for ventes in the set_active function. This function could be greatly improved if the duraction could not be null. 2020-10-15 19:21:16 +02:00
Gabriel Detraz
108154d6ce Fix query test for set_active function 2020-10-13 22:51:18 +02:00
grisel-davy
8c06bd4fca Fix creation of cotisation 2020-10-12 11:59:37 +02:00
grisel-davy
bb861eb089 split query into two filters 2020-10-08 23:24:37 +02:00
Gabriel Detraz
0a427cd30d Fix all_adherent and all_has_access function 2020-10-08 22:30:41 +02:00
histausse
a01c9e2303 Add the need_membership field to article 
This field is a boolean indicating if the article can be purshased by
nonmembers.
 2020-10-08 22:23:34 +02:00
histausse
640499a9e2 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
 2020-10-08 22:22:48 +02:00
Gabriel Detraz
4003856b47 Supprime l'avatar à la création (inutile/buggé) 2020-10-08 21:15:30 +02:00
Gabriel Detraz
53dd1920d7 Fix publication parser error 2020-10-06 21:57:47 +02:00
chirac
8c5cfc65ae Merge branch 'patch-1' into 'master' 
Update pip_requirements.txt; fix 1.6.0 version which crashes with 1.7.0

See merge request re2o/re2o!561
 2020-10-04 23:05:57 +02:00
chirac
d3a8667430 Update pip_requirements.txt; fix 1.6.0 version which crashes with 1.7.0 2020-10-04 23:05:19 +02:00
Gabriel Detraz
0df14f565f Fix; django_macaddress package 1.6.0, more recent versions crashes 2020-10-04 23:02:30 +02:00
Gabriel Detraz
d2ee39359f Fix : This is not a rw operation but a ro for db routers 2020-09-19 14:00:49 +02:00
jr-garnier
8d32fcb928 Merge branch 'new-line-apt_requirements' into 'dev' 
New line apt requirements radius

See merge request re2o/re2o!560
 2020-09-18 10:36:24 +02:00
Yoann Pietri
b3de6f34b0 Missing new line in apt requirements radius 2020-09-18 10:29:31 +02:00
Gabriel Detraz
7410028110 Fix, deleted the bad switchport serializer 2020-09-17 14:29:10 +02:00
Gabriel Detraz
83457c1dbd Fix, code mort qui provoque une erreur 500 2020-09-17 14:27:47 +02:00
klafyvel
2176ad973b Merge branch 'fix_multiop' into 'dev' 
Fix multiop

See merge request re2o/re2o!558
 2020-09-04 21:16:30 +02:00
Gabriel Detraz
7c9db55d79 Add preferences dormitory choice on displayed room states 2020-09-04 20:45:25 +02:00
Arthur Grisel-Davy
6235bcbe53 Fix multi operators options edition 2020-09-04 20:10:53 +02:00
klafyvel
01e01de4c2 Merge branch 'patch_api_room' into 'dev' 
Patch api room

See merge request re2o/re2o!556
 2020-09-02 21:33:45 +02:00
histausse
acca782cdb remove the second port serialiser 2020-09-02 19:56:46 +02:00
histausse
d124203273 Add dormitory to the building serialiser 2020-09-02 19:56:46 +02:00
histausse
a3909e090d Add building to the room serialiser 2020-09-02 19:56:46 +02:00
chirac
692da0dfae Merge branch 'fix_noncotisation_articles_in_forms' into 'dev' 
Fix availability of non cotisation articles in facture creation.

See merge request re2o/re2o!557
 2020-09-01 22:25:38 +02:00
Hugo Levy-Falk
0f6cf2a43b Fix availability of non cotisation articles in facture creation. 2020-09-01 21:13:05 +01:00
chirac
d5cfe2edd2 Merge branch 'fix_acl' into 'dev' 
Fix acl

See merge request re2o/re2o!555
 2020-08-29 12:49:51 +02:00
Hugo Levy-Falk
43d7cba264 Fix acl when viewing history of deleted object or all history. 2020-08-29 11:07:18 +02:00
Hugo Levy-Falk
2690a021d0 Fix can_view_app 2020-08-29 11:07:18 +02:00
Hugo Levy-Falk
b4ca715695 Fix history acl 2020-08-29 11:07:18 +02:00
Hugo Levy-Falk
73a4d2fa27 Fix can_view_all so it actually does its job. 2020-08-29 11:07:18 +02:00
klafyvel
e2a0db3408 Merge branch 'fix_279' into 'dev' 
The reset_passw function should not set as not yet active users that have...

See merge request re2o/re2o!554
 2020-08-28 22:15:47 +02:00
Gabriel Detraz
982200dc49 The reset_passw function should not set as not yet active users that have already been flaged active 2020-08-28 12:49:52 +02:00
klafyvel
d51599c59a Merge branch 'fix_about_crash_on_fresh_install' into 'dev' 
Fix of about page crash if no president or CGU file

See merge request re2o/re2o!553
 2020-08-15 13:31:12 +02:00
chapeau
3d1a554d18 Add exception name 2020-08-15 13:27:25 +02:00
chapeau
f5de596dff Fix of about page crash if no president or CGU file 2020-08-15 12:51:10 +02:00
Gabriel Detraz
7535050d4f Fix port edition crash with new convention for *_id 2020-08-08 23:56:32 +02:00
jr-garnier
ee8948dfb6 Merge branch 'fix_register' into 'dev' 
Replace full_clean with simple clean, fix interface registering on multi-database

See merge request re2o/re2o!551
 2020-08-08 18:17:12 +02:00
Gabriel Detraz
ac28691065 Replace full_clean with simple clean, fix interface registering on multi-database 2020-08-08 14:54:30 +02:00
jr-garnier
33e57839b8 Merge branch 'reply_to_on_comment' into 'dev' 
Reply to on comment

See merge request re2o/re2o!550
 2020-08-08 13:16:13 +02:00
Gabriel Detraz
7b89bf2e88 Add reply_to field on tickets comment 2020-08-07 19:51:55 +02:00