detraz
|
f5eb4616f5
|
Rename note en note_kfet
|
2018-09-01 21:22:08 +02:00 |
|
Pierre-Antoine Comby
|
6b1597c0c6
|
Module de paiement par note
|
2018-09-01 21:22:08 +02:00 |
|
chirac
|
1e72a6b6eb
|
Merge branch 'fix_var_names_in_custom_invoices' into 'dev'
Fix le choix des articles pour les custom invoices
See merge request federez/re2o!284
|
2018-09-01 19:41:38 +02:00 |
|
Hugo LEVY-FALK
|
9b080450ab
|
Fix le choix des articles pour les custom invoices
|
2018-09-01 19:37:34 +02:00 |
|
chirac
|
ed7c758a30
|
Merge branch 'fix_history_button_invoice' into 'dev'
Fix history button invoice
See merge request federez/re2o!282
|
2018-09-01 19:35:24 +02:00 |
|
Hugo LEVY-FALK
|
f68a1ae2a9
|
Corrige les classes css du bouton historique des cotisations
|
2018-09-01 19:25:45 +02:00 |
|
chirac
|
3b0186eb41
|
Merge branch 'feature_redirect_to_target_user_homepage_after_comnpay' into 'dev'
Redirige vers l'utilisateur cible après un paiement par comnpay.
See merge request federez/re2o!283
|
2018-09-01 19:25:12 +02:00 |
|
Hugo LEVY-FALK
|
5d65e87229
|
Redirige vers l'utilisateur cible après un paiement par comnpay.
|
2018-09-01 12:10:47 +02:00 |
|
klafyvel
|
c917f0b7ab
|
Merge branch 'fix_send_mail' into 'dev'
Fix l'envoie de mail, en postsave maintenant (plus propre)
See merge request federez/re2o!281
|
2018-09-01 11:58:50 +02:00 |
|
detraz
|
d609bb6493
|
Post save custom dans la fonction save, pour __original_valid
|
2018-09-01 02:16:50 +02:00 |
|
Gabriel Detraz
|
2dd410fedf
|
Fix l'envoie de mail, en postsave maintenant (plus propre)
|
2018-09-01 01:15:37 +02:00 |
|
detraz
|
cd8a23da31
|
Fix import de users.User
|
2018-09-01 00:55:18 +02:00 |
|
klafyvel
|
5af66b400b
|
Merge branch 'user_adh_pas_encore' into 'dev'
User adh pas encore
See merge request federez/re2o!279
|
2018-08-31 23:27:32 +02:00 |
|
Hugo LEVY-FALK
|
ded8f89ba8
|
Fix couleurs du texte pour l'état 'actif'
|
2018-08-31 22:25:38 +02:00 |
|
chirac
|
ea78da87e0
|
Que en anglais docstring models.py
|
2018-08-31 13:37:08 +02:00 |
|
Gabriel Detraz
|
48773668d1
|
No harcoded var
|
2018-08-31 13:35:33 +02:00 |
|
Gabriel Detraz
|
0ffdde5a6a
|
Cree une fonction pour set active les utilisateurs cotisant
|
2018-08-31 13:29:01 +02:00 |
|
grisel-davy
|
5ab8bb4f0e
|
Empeche la syncronisation ldap pour les users_not_yet_member
|
2018-08-31 12:06:32 +02:00 |
|
grisel-davy
|
fa3aca906f
|
Les nouveau users ne sont pas adhérents et n'ont pas de home
|
2018-08-31 12:06:32 +02:00 |
|
chirac
|
3e679757af
|
Merge branch 'web_register_mac' into 'dev'
Web register mac
See merge request federez/re2o!278
|
2018-08-29 11:54:09 +02:00 |
|
Laouen Fernet
|
1de72714d0
|
translation for commit f355175b + typos
|
2018-08-29 11:27:10 +02:00 |
|
Gabriel Detraz
|
5d30e95aa4
|
Ebauche, interface de capture de mac et d'enregistrement de chambre
|
2018-08-29 11:27:10 +02:00 |
|
chirac
|
be1c0cef22
|
Merge branch 'typos' into 'dev'
Typos in README
See merge request federez/re2o!275
|
2018-08-29 11:25:19 +02:00 |
|
Vincent Le Gallic
|
c73485f7ab
|
Typos in README
|
2018-08-29 10:32:48 +02:00 |
|
chirac
|
61bd9de8d1
|
Merge branch 'hotfix_ipv4_field' into 'dev'
Fix l'erreur sur l'utilisation du massive bootstrap form pour l'ipv4
See merge request federez/re2o!276
|
2018-08-28 12:50:51 +02:00 |
|
Hugo LEVY-FALK
|
e546a2228a
|
Fix l'erreur sur l'utilisation du massive bootstrap form pour l'ipv4
|
2018-08-28 12:31:43 +02:00 |
|
chirac
|
9fbf17004a
|
Merge branch 'solde-users' into 'dev'
Solde users
See merge request federez/re2o!273
|
2018-08-27 19:08:52 +02:00 |
|
chirac
|
3331999434
|
Update forms.py, user_source=None
|
2018-08-27 19:04:27 +02:00 |
|
grisel-davy
|
db198c46ad
|
Déconfusion entre la personne qui fait l'action et le compte concerné.
|
2018-08-27 19:00:10 +02:00 |
|
grisel-davy
|
25a710395f
|
envoyer le bon user pour les verifications
|
2018-08-27 18:30:10 +02:00 |
|
grisel-davy
|
39b9c1b3a9
|
Fix #155 confusion entre request.user et user
|
2018-08-27 18:30:09 +02:00 |
|
klafyvel
|
175e2170eb
|
Merge branch 'fix_vente' into 'dev'
Correction du problème de vente d'articles + simplification views et forms
See merge request federez/re2o!271
|
2018-08-26 17:32:29 +02:00 |
|
Gabriel Detraz
|
3eda283f64
|
Correction du problème de vente d'articles + simplification views et forms
|
2018-08-26 17:24:33 +02:00 |
|
chirac
|
48be064b94
|
Merge branch 'hotfix_baseinvoice_import_date' into 'dev'
Donne la bonne date lors de l'import des factures dans BaseInvoice.
See merge request federez/re2o!268
|
2018-08-25 13:01:50 +02:00 |
|
Hugo LEVY-FALK
|
74a2e265fa
|
Donne la bonne date lors de l'import des factures dans BaseInvoice.
|
2018-08-25 11:10:18 +02:00 |
|
chirac
|
5208a9ca82
|
Merge branch 'hotfix_front' into 'dev'
Hotfix : users.end_conn + python2 header
See merge request federez/re2o!266
|
2018-08-24 17:07:34 +02:00 |
|
Gabriel Detraz
|
9d46031ae1
|
Hotfix : users.end_conn + python2 header
|
2018-08-24 17:00:02 +02:00 |
|
chirac
|
04d6be56bc
|
Merge branch 'fix_log_summary' into 'dev'
Fais la distinction entre un baseinvoice avec et sans objet facture.
See merge request federez/re2o!265
|
2018-08-23 23:14:46 +02:00 |
|
Hugo LEVY-FALK
|
dfc765f5e5
|
Fais la distinction entre un baseinvoice avec et sans objet facture.
|
2018-08-23 23:11:01 +02:00 |
|
chirac
|
b137ddc5a4
|
Merge branch 'hotfix-general-message' into 'dev'
Fix regression introduced in commit c3b3146f39
See merge request federez/re2o!264
|
2018-08-23 19:41:43 +02:00 |
|
Maxime Bombar
|
8e7a1c5094
|
Fix regression introduced in commit c3b3146f39
|
2018-08-23 19:33:13 +02:00 |
|
chirac
|
5a959062ba
|
Merge branch 'beta-test' into 'dev'
Beta test
See merge request federez/re2o!262
|
2018-08-23 19:32:17 +02:00 |
|
Laouen Fernet
|
d574194ed7
|
fix bug with shell field for self registration
|
2018-08-23 15:38:36 +02:00 |
|
Laouen Fernet
|
aa2d6365e7
|
translation
|
2018-08-23 15:12:16 +02:00 |
|
Gabriel Detraz
|
547e6d0915
|
Prolongation de connexion avant expiration
|
2018-08-23 02:54:40 +02:00 |
|
Gabriel Detraz
|
7f021621ad
|
Marquage trad + fix si autoregister disabled
|
2018-08-23 02:18:44 +02:00 |
|
Gabriel Detraz
|
c7f00a1197
|
More clear welcome page
|
2018-08-23 02:03:50 +02:00 |
|
grisel-davy
|
dd79b86601
|
Clarification mineur du AdherentForm
|
2018-08-23 02:03:50 +02:00 |
|
grisel-davy
|
615c20830f
|
jout d'un message sur la page des services
|
2018-08-23 02:02:15 +02:00 |
|
chirac
|
2747fa463f
|
Merge branch 'mailing' into 'dev'
get_mail au lieux de user.mail pour génerer la ml
See merge request federez/re2o!261
|
2018-08-21 11:52:22 +02:00 |
|