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

753 commits

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
3e3040550d Don't know why, but it solves issue #281 2020-10-17 01:06:24 +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
bb861eb089 split query into two filters 2020-10-08 23:24:37 +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
Hugo Levy-Falk
2690a021d0 Fix can_view_app 2020-08-29 11:07:18 +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
Gabriel Detraz
69813bf38e Fix acl on check pseudo change by user 2020-08-07 19:05:37 +02:00
Gabriel Detraz
b022c98a1c Translation of user app views + remove trailing spaces 2020-06-01 18:21:22 +02:00
Gabriel Detraz
c709a7e8b2 Final translation of users app 2020-06-01 18:21:22 +02:00
Gabriel Detraz
e1f8254115 Translation of docstrings in user admin and forms 2020-06-01 18:21:21 +02:00
Gabriel Detraz
ee0fe7b24e Refactor serviceuser admin 2020-05-28 22:27:37 +02:00
Gabriel Detraz
eb5becb0db Fix user adherent/club creation form 2020-05-28 22:08:44 +02:00
chiahetcho
1ba03335e4 Correct django settings 2020-05-18 16:52:53 +02:00
Leila
a6e324bc60 Add migration file 2020-05-18 16:49:17 +02:00
Leila
c4fcf68077 Update image in filesystem when user changes image 2020-05-17 18:01:22 +02:00
Leila
d94f7b44a3 Add thumbnail to user model 2020-05-17 12:51:05 +02:00
Gabriel Detraz
e82b170698 Rename rezo_rez_uid legacy and add some help text entries 2020-05-03 15:59:59 +02:00
4190f4f39e Start implementing detailed history for event class 2020-04-25 12:31:18 +02:00
e537143efc Add missing translations 2020-04-25 01:43:25 +02:00
6371f11536 Add missing translations 2020-04-23 19:28:15 +00:00
4731e7da02 Add missing translations for detailed history 2020-04-23 18:13:37 +00:00
c4e034a5a6 Improve handling of detailed history button 2020-04-23 18:43:34 +02:00
Hugo Levy-Falk
6d3c86f99c Rebase dev 2020-04-23 17:01:07 +02:00
Gabriel Detraz
60a55ea1e0 Fix permission check 2020-04-23 12:59:38 +02:00
Gabriel Detraz
24c000e743 Add self pseudo setting 2020-04-23 12:07:15 +02:00
91cee11297 Add missing translations in logs 2020-04-22 23:25:19 +02:00
3fdcdd99b2 Fix CGU line formatting 2020-04-22 19:34:55 +00:00
5107a34a6e Add missing translations 2020-04-21 19:48:59 +00:00
91a4c35d3b Improve comments for User clean methods 2020-04-21 21:38:31 +02:00
Gabriel Detraz
e47b555343 Check email in user clean (factorise code) 2020-04-21 19:27:12 +02:00
24abff4106 Fix some email checks being bypassed for legacy users 2020-04-21 19:22:14 +02:00
b119bfeb65 Prevent user email from being null 2020-04-21 19:22:14 +02:00
eb4dd7ebe3 Make email check more pythonic 2020-04-21 19:22:14 +02:00
51b3c52181 Leave user email blank / null for compatilibity 2020-04-21 19:22:14 +02:00
ba05a682f4 Handle empty emails 2020-04-21 19:22:13 +02:00
99cd24cec0 Add required for email field when necessary 2020-04-21 19:21:43 +02:00
42c15c1f5d Leave user email blank / null for compatilibity 2020-04-21 19:21:43 +02:00
f875e317ef Handle empty emails 2020-04-21 19:21:43 +02:00
Hugo Levy-Falk
5df604e792 Fix dead code. 2020-04-21 18:17:47 +02:00
Hugo Levy-Falk
0dd0c614a4 Merge branch 'fix-98-new-edit-listright' of https://gitlab.federez.net/re2o/re2o into fix-98-new-edit-listright 2020-04-21 18:09:40 +02:00
Hugo Levy-Falk
90dc125355 Production version of VueJS 2020-04-21 18:08:18 +02:00
Hugo Levy-Falk
da0b820006 Fix #98 2020-04-21 18:03:03 +02:00
Hugo Levy-Falk
a3b352b29d Fix #98 2020-04-21 17:37:17 +02:00
chapeau
72984c12e3 Fix of copy/paste errors 2020-04-21 17:19:16 +02:00