mirror of
https://gitlab2.federez.net/re2o/re2o
synced 2024-09-12 01:03:09 +00:00
Merge branch 'remove-contributor-levy-arcas' into 'dev'
Remove contributor levy arcas See merge request federez/re2o!445
This commit is contained in:
commit
4dfc752313
4 changed files with 6 additions and 5 deletions
|
@ -297,7 +297,8 @@ class Facture(BaseInvoice):
|
||||||
if self.is_subscription() \
|
if self.is_subscription() \
|
||||||
and not self.__original_control \
|
and not self.__original_control \
|
||||||
and self.control \
|
and self.control \
|
||||||
and CotisationsOption.get_cached_value('send_voucher_mail'):
|
and CotisationsOption.get_cached_value('send_voucher_mail') \
|
||||||
|
and self.user.is_adherent():
|
||||||
send_mail_voucher(self)
|
send_mail_voucher(self)
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
Bonjour {{name}} !
|
Bonjour {{name}} !
|
||||||
|
|
||||||
Nous vous informons que votre cotisation auprès de {{asso_name}} a été acceptée. Vous voilà donc membre de l'association.
|
Nous vous informons que votre cotisation auprès de {{asso_name}} a été acceptée. Vous voilà donc membre de l'association jusqu'au {{ date_end|date:"d/m/Y" }}.
|
||||||
|
|
||||||
Vous trouverez en pièce jointe un reçu.
|
Vous trouverez en pièce jointe un reçu.
|
||||||
|
|
||||||
|
@ -11,7 +11,7 @@ L'équipe de {{asso_name}}.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
Your subscription to {{asso_name}} has just been accepted. You are now a full member of {{asso_name}}.
|
Your subscription to {{asso_name}} has just been accepted. You are now a full member of {{asso_name}} until {{ date_end|date:"d/m/Y" }}.
|
||||||
|
|
||||||
You will find with this email a subscription voucher.
|
You will find with this email a subscription voucher.
|
||||||
|
|
||||||
|
|
|
@ -117,7 +117,8 @@ def send_mail_voucher(invoice):
|
||||||
invoice.user.surname
|
invoice.user.surname
|
||||||
),
|
),
|
||||||
'asso_email': AssoOption.get_cached_value('contact'),
|
'asso_email': AssoOption.get_cached_value('contact'),
|
||||||
'asso_name': AssoOption.get_cached_value('name')
|
'asso_name': AssoOption.get_cached_value('name'),
|
||||||
|
'date_end': invoice.get_subscription().latest('date_end').date_end,
|
||||||
}
|
}
|
||||||
|
|
||||||
mail = EmailMessage(
|
mail = EmailMessage(
|
||||||
|
|
|
@ -14,7 +14,6 @@ CONTRIBUTORS = [
|
||||||
'Matthieu "Lebanni" Michelet',
|
'Matthieu "Lebanni" Michelet',
|
||||||
'Arthur "Grizzly" Grisel-Davy',
|
'Arthur "Grizzly" Grisel-Davy',
|
||||||
'Simon "Rezatoune" Brélivet',
|
'Simon "Rezatoune" Brélivet',
|
||||||
'Sellem Lev-Arcady',
|
|
||||||
'David "5-1" Sinquin',
|
'David "5-1" Sinquin',
|
||||||
'Pierre "Redstorm" Cadart',
|
'Pierre "Redstorm" Cadart',
|
||||||
'Éloi "Goslig" Alain',
|
'Éloi "Goslig" Alain',
|
||||||
|
|
Loading…
Reference in a new issue