8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-05 09:26:27 +00:00
Commit graph

440 commits

Author SHA1 Message Date
chapeau
0b58365c87 First draft of moving api functions into each apps 2021-01-24 16:33:31 +01:00
69286beabf Fix calls to invoice.save 2021-01-24 16:33:31 +01:00
6900c153d1 Move both send_mail utils to same file 2021-01-24 16:33:31 +01:00
cd097cd428 Also catch ConnectionError when sending mails 2021-01-24 16:33:31 +01:00
fa95625205 Add translation for email error message 2021-01-24 16:33:31 +01:00
cb9ae34418 Make emails throw timeout errors, and gracefully handle them 2021-01-24 16:33:31 +01:00
449e1f8721 Add translations for advanced search email filter 2021-01-24 16:33:31 +01:00
ca3b3af1c2 Fix wrong template used for invoices sent by email 2021-01-24 16:33:31 +01:00
51c81886b5 Add translations for statistics 2021-01-24 16:33:31 +01:00
2ed3b2ac31 Fix translations 2021-01-24 16:33:31 +01:00
8f75078152 Fix cheque cotisations being saved twice 2020-02-15 12:30:37 +00:00
Gabriel Detraz
8118c9edf2 Fix float display 2019-12-27 18:01:16 +01:00
Gabriel Detraz
f91f284ed1 Fix js calculation of price - NaN bug 2019-12-27 17:00:41 +01:00
e7a363866a Add start date tot create cotis 2019-12-20 07:43:35 +00:00
Hugo Levy-Falk
05501c90d9 Fix Overlapping invoices. 2019-12-15 15:24:54 +00:00
Laouen Fernet
c8ed48145c Add migrations for improved translations 2019-11-24 23:27:57 +01:00
Laouen Fernet
d24dd8225e Edit translations in cotisations 2019-11-24 23:27:56 +01:00
Laouen Fernet
2454de2032 Mark strings for translation in cotisations 2019-11-24 23:27:55 +01:00
Hugo Levy-Falk
09da1b4d43 Fix klafy horrors 2019-11-17 11:58:23 +00:00
Hugo Levy-Falk
c4a104b3b6 I like my black.
Just ran black on the whoe repository. Fix #210.
2019-11-04 22:47:24 +01:00
Hugo Levy-Falk
034b50bc58 Fix #189 2019-11-04 00:25:29 +01:00
Hugo Levy-Falk
e0a65e4d04 Setup tests for Vente model. 2019-11-03 21:46:18 +01:00
Hugo Levy-Falk
c76f32cf26 Fix #222 2019-11-03 19:55:37 +01:00
Hugo Levy-Falk
6171f42b66 Get the right mandate when creating voucher. 2019-10-01 19:30:35 +02:00
Hugo Levy-Falk
6dd4e776c1 Make use of mandates everywhere. 2019-10-01 19:30:34 +02:00
Hugo Levy-Falk
a9194b405a Hello Lara :D
Just ran `find /var/www/re2o \( -type d -name .git -prune \) -o -type f -print0 | xargs -0 sed -i 's/Goulven/Lara/g'`.
2019-10-01 13:37:56 +02:00
Hugo Levy-Falk
0cb9388cde Fix #191 2019-09-30 15:20:20 +02:00
klafyvel
657ef77bfe Remove contributor levy arcas 2019-09-24 00:44:16 +02:00
Hugo Levy-Falk
8df5a05d89 Do not display unnecessary warnings. 2019-09-19 22:55:16 +02:00
Gabriel Detraz
55b2ff076a NEVER user _ for var; conflicts with _( from trad + remove return True 2019-09-17 02:09:19 +02:00
Hugo Levy-Falk
9b3bc1d053 ACL for applications. 2019-09-08 15:17:17 +02:00
Hugo Levy-Falk
225731b25c helpful acl messages for cotisations. 2019-09-08 15:17:17 +02:00
Hugo Levy-Falk
8f5b302cbf Translation for GTU check. 2019-09-05 22:03:45 +02:00
Hugo Levy-Falk
32aa2780ed Context is deprecated for rendering in Django1.11 2019-09-04 22:01:02 +02:00
chirac
a51c5f4b57 Fix Article (s) 2019-07-14 19:55:53 +02:00
Gabriel Detraz
e60196db9b Fix : Evite le plantage si le montant vaut exactement le minimum 2019-07-13 11:46:40 +02:00
Alexandre Iooss
56ec7a2df5 Update translation files 2019-02-12 09:12:45 +01:00
Hugo LEVY-FALK
31ba9a271f Fix get_subscription of invoice. 2019-01-21 20:52:28 +01:00
Hugo LEVY-FALK
bc758a6bcb Retire le lien vers les templates dans la sidebar de cotisations 2019-01-21 09:12:06 +01:00
Hugo LEVY-FALK
4fef4a6057 Déplace les templates dans préférences. 2019-01-21 00:54:02 +01:00
Hugo LEVY-FALK
f4b6f10d1e attribut name unique 2019-01-21 00:08:53 +01:00
Hugo LEVY-FALK
ddc2c6e380 Suppression des anciens templates lors de la mise à jour 2019-01-20 19:32:29 +01:00
Hugo LEVY-FALK
985a2f4a52 Choix de l'envoi du reçu par mail 2019-01-20 19:08:11 +01:00
detraz
d323ed5937 Start date set au moment de la validation de la facture 2019-01-20 16:44:22 +01:00
Hugo LEVY-FALK
b83bfc0da9 Fix #123 Subscription voucher 2019-01-20 16:44:22 +01:00
Hugo LEVY-FALK
48d8d7921d subscripbtion voucher 2019-01-20 16:41:11 +01:00
Hugo LEVY-FALK
0a8335c375 Enable template selection for invoices. 2019-01-20 16:41:11 +01:00
Hugo LEVY-FALK
6fdf8a0406 Add Document templates to re2o 2019-01-20 16:41:11 +01:00
Laouen Fernet
2012f20352 add translations for cotisations/ 2019-01-12 16:56:14 +01:00
Hugo LEVY-FALK
4721d8763c Fix invoice edit page, discount title is only displayed when needed. 2019-01-11 14:10:34 +01:00
Gabriel Detraz
4ac403ec29 Hotfix boostrapform 2019-01-02 15:19:23 +01:00
Hugo LEVY-FALK
37dbfd2fbf Add Cost Estimates 2019-01-01 18:09:58 +01:00
Hugo LEVY-FALK
b85384b226 Do not fail on empty discount 2019-01-01 18:09:58 +01:00
Hugo LEVY-FALK
f612e4192f Add remark to custom invoices 2019-01-01 18:09:58 +01:00
Hugo LEVY-FALK
fd57a9b925 Display payment method on invoices 2019-01-01 18:09:58 +01:00
Hugo LEVY-FALK
e7a7e81a2c Add discount for custom invoices. 2019-01-01 18:09:58 +01:00
Hugo LEVY-FALK
70a5996f5d Fix available articles 2018-12-28 23:30:39 +01:00
Alexandre Iooss
29fb5dc848 Remove generated locales from git tree
Now compiled locale files (.mo) are generated on the server side.
This cleans up the git tree and make translation contributions much
easier to merge.

Please note that you will need to generate those files after each pull,
so remember to execute install_re2o.sh.
2018-12-10 13:14:56 +01:00
Gabriel Detraz
6c6330dd4d Séparation entre utils et base (dossier re2o) 2018-11-15 18:59:06 +01:00
Gabriel Detraz
e829ea609e Python legacy 2018-11-05 14:21:55 +01:00
Maxime Bombar
baa2369436 Non member can't buy connexion : They need to pay membership 2018-11-01 23:40:11 +01:00
Gabriel Detraz
42d718ae8c Fix display facture + room + machine_name 2018-10-15 19:57:56 +02:00
detraz
634527dc95 Fix name of user after invoice comnpay + acl delete invoice 2018-10-14 16:48:11 +02:00
Hugo LEVY-FALK
5431e20629 Hotfix : recupération de l'user lors d'une cotisation en post_save de Vente 2018-10-11 15:13:49 +02:00
Maxime Bombar
5c8e90fde8 [cotisations] Replace Float by Decimal everywhere 2018-10-03 22:01:30 +02:00
Alexandre Iooss
0f7f14c1ea Fix Font Awesome icons
Some icons had their id changed in the Debian version (4.7.0) so their
id need to be updated.

Also the width of an icon in a button was reduced to make it more
compact.
2018-09-27 22:23:45 +02:00
Alexandre Iooss
992dc97024 Fix initial migration
Initial migration was failing due to change_facture_pdf not being
initialised at the right time.
2018-09-19 10:06:09 +02:00
detraz
f2c132016f Les factures sont validées en post_paiement + bug fix paiement relation 2018-09-08 21:17:08 +02:00
detraz
5b347f3db4 Fix, utilise la bonne fonction d'envoie de mails 2018-09-08 21:17:08 +02:00
detraz
32be355fd8 Corrections de front buttons et labels cotisations 2018-09-02 18:07:43 +02:00
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
Hugo LEVY-FALK
9b080450ab Fix le choix des articles pour les custom invoices 2018-09-01 19:37:34 +02:00
Hugo LEVY-FALK
f68a1ae2a9 Corrige les classes css du bouton historique des cotisations 2018-09-01 19:25:45 +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
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
Gabriel Detraz
0ffdde5a6a Cree une fonction pour set active les utilisateurs cotisant 2018-08-31 13:29:01 +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
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
Gabriel Detraz
3eda283f64 Correction du problème de vente d'articles + simplification views et forms 2018-08-26 17:24:33 +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
Gabriel Detraz
9d46031ae1 Hotfix : users.end_conn + python2 header 2018-08-24 17:00:02 +02:00
Laouen Fernet
a06082c6d4 Translation of cotisations/ (front) 2018-08-18 13:20:22 +02:00
Gabriel Detraz
9c065b57e3 Fix #153, pas de solde par solde 2018-08-16 19:37:45 +02:00
Hugo LEVY-FALK
6cc22c376d Adapte les migrations de custom_invoice à la branche dev 2018-08-16 00:22:39 +02:00
Hugo LEVY-FALK
63c80d69a3 Fix de render_tex 2018-08-16 00:22:07 +02:00
Hugo LEVY-FALK
19bd78bc8d Fix des traductions et de détails de front. 2018-08-16 00:08:29 +02:00
Hugo LEVY-FALK
1284d9ffec Migration des permissions 2018-08-16 00:08:29 +02:00
Hugo LEVY-FALK
bad89ea7c2 Réfléchir avant de pusher le klafyvel doit se rappeler. fix les traductions 2018-08-16 00:08:29 +02:00
Hugo LEVY-FALK
37dbf3d82a i18n pour cotisations 2018-08-16 00:08:29 +02:00
Hugo LEVY-FALK
e38ae33c6e Utilise le filter tick pour afficher les booléens de custom invoice 2018-08-16 00:06:36 +02:00
Hugo LEVY-FALK
5236b659b6 Fix l'historique 2018-08-16 00:06:35 +02:00
Hugo LEVY-FALK
d6091d117c Custom invoices. 2018-08-16 00:06:35 +02:00
Hugo LEVY-FALK
4ab0dad146 Documentation propre de render_tex et create_pdf 2018-08-15 23:56:49 +02:00
Delphine SALVY
9dd54a99a5 Fix 141 : envoi des factures par mail 2018-08-15 23:56:49 +02:00
Delphine SALVY
904c7b279b POC de l'envoi de facture par mail. 2018-08-15 23:56:49 +02:00