mirror of
https://gitlab.crans.org/bde/nk20
synced 2025-06-21 18:08:21 +02:00
Compare commits
1 Commits
summary_no
...
6e54ac207a
| Author | SHA1 | Date | |
|---|---|---|---|
| 6e54ac207a |
@ -138,9 +138,6 @@ class ImageForm(forms.Form):
|
|||||||
|
|
||||||
return cleaned_data
|
return cleaned_data
|
||||||
|
|
||||||
def is_valid(self):
|
|
||||||
return super().is_valid() or super().clean().get('image') is None
|
|
||||||
|
|
||||||
|
|
||||||
class ClubForm(forms.ModelForm):
|
class ClubForm(forms.ModelForm):
|
||||||
def clean(self):
|
def clean(self):
|
||||||
@ -154,7 +151,7 @@ class ClubForm(forms.ModelForm):
|
|||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = Club
|
model = Club
|
||||||
exclude = ("add_registration_form",)
|
fields = '__all__'
|
||||||
widgets = {
|
widgets = {
|
||||||
"membership_fee_paid": AmountInput(),
|
"membership_fee_paid": AmountInput(),
|
||||||
"membership_fee_unpaid": AmountInput(),
|
"membership_fee_unpaid": AmountInput(),
|
||||||
|
|||||||
@ -1,18 +0,0 @@
|
|||||||
# Generated by Django 2.2.28 on 2024-07-15 09:24
|
|
||||||
|
|
||||||
from django.db import migrations, models
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
('member', '0011_profile_vss_charter_read'),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.AddField(
|
|
||||||
model_name='club',
|
|
||||||
name='add_registration_form',
|
|
||||||
field=models.BooleanField(default=False, verbose_name='add to registration form'),
|
|
||||||
),
|
|
||||||
]
|
|
||||||
@ -1,18 +0,0 @@
|
|||||||
# Generated by Django 2.2.28 on 2024-08-07 12:09
|
|
||||||
|
|
||||||
from django.db import migrations, models
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
('member', '0012_club_add_registration_form'),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.AlterField(
|
|
||||||
model_name='profile',
|
|
||||||
name='promotion',
|
|
||||||
field=models.PositiveSmallIntegerField(default=2024, help_text='Year of entry to the school (None if not ENS student)', null=True, verbose_name='promotion'),
|
|
||||||
),
|
|
||||||
]
|
|
||||||
@ -259,11 +259,6 @@ class Club(models.Model):
|
|||||||
help_text=_('Maximal date of a membership, after which members must renew it.'),
|
help_text=_('Maximal date of a membership, after which members must renew it.'),
|
||||||
)
|
)
|
||||||
|
|
||||||
add_registration_form = models.BooleanField(
|
|
||||||
verbose_name=_("add to registration form"),
|
|
||||||
default=False,
|
|
||||||
)
|
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
verbose_name = _("club")
|
verbose_name = _("club")
|
||||||
verbose_name_plural = _("clubs")
|
verbose_name_plural = _("clubs")
|
||||||
|
|||||||
@ -14,9 +14,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
|
|||||||
<form method="post" enctype="multipart/form-data" id="formUpload">
|
<form method="post" enctype="multipart/form-data" id="formUpload">
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
{{ form |crispy }}
|
{{ form |crispy }}
|
||||||
{% if user.note.display_image != "pic/default.png" %}
|
|
||||||
<input type="submit" class="btn btn-primary" value="{% trans "Remove" %}">
|
|
||||||
{% endif %}
|
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
<!-- MODAL TO CROP THE IMAGE -->
|
<!-- MODAL TO CROP THE IMAGE -->
|
||||||
|
|||||||
@ -326,15 +326,12 @@ class PictureUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin, Det
|
|||||||
"""Save image to note"""
|
"""Save image to note"""
|
||||||
image = form.cleaned_data['image']
|
image = form.cleaned_data['image']
|
||||||
|
|
||||||
if image is None:
|
# Rename as a PNG or GIF
|
||||||
image = "pic/default.png"
|
extension = image.name.split(".")[-1]
|
||||||
|
if extension == "gif":
|
||||||
|
image.name = "{}_pic.gif".format(self.object.note.pk)
|
||||||
else:
|
else:
|
||||||
# Rename as a PNG or GIF
|
image.name = "{}_pic.png".format(self.object.note.pk)
|
||||||
extension = image.name.split(".")[-1]
|
|
||||||
if extension == "gif":
|
|
||||||
image.name = "{}_pic.gif".format(self.object.note.pk)
|
|
||||||
else:
|
|
||||||
image.name = "{}_pic.png".format(self.object.note.pk)
|
|
||||||
|
|
||||||
# Save
|
# Save
|
||||||
self.object.note.display_image = image
|
self.object.note.display_image = image
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
|
|
||||||
<p>
|
<p>
|
||||||
Par ailleurs, le BDE ne sert pas d'alcool aux adhérents dont le solde
|
Par ailleurs, le BDE ne sert pas d'alcool aux adhérents dont le solde
|
||||||
est inférieur à 0 €.
|
est inférieur à 0 € depuis plus de 24h.
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
|
|||||||
@ -1,65 +0,0 @@
|
|||||||
{% load pretty_money %}
|
|
||||||
{% load i18n %}
|
|
||||||
|
|
||||||
<!DOCTYPE html>
|
|
||||||
<html lang="fr">
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
|
||||||
<title>[Note Kfet] Récapitulatif de trésorerie</title>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<h1>
|
|
||||||
Récapitulatif de trésorerie au {{ summary.date|date:"d/m/Y" }} à {{ summary.date|date:"H:i:s" }} :
|
|
||||||
</h1>
|
|
||||||
|
|
||||||
<h2>
|
|
||||||
Tous les utilisateur⋅rices :
|
|
||||||
</h2>
|
|
||||||
<ul>
|
|
||||||
<li>Positifs : {{ summary.total_positive_user }} soit {{ summary.balance_positive_user / 100 }} €</li>
|
|
||||||
<li>Neutres : {{ summary.total_zero_user }}</li>
|
|
||||||
<li>Négatifs : {{ summary.total_negative_user }} soit {{ summary.balance_negative_user / 100 }} €</li>
|
|
||||||
</ul>
|
|
||||||
|
|
||||||
<h2>
|
|
||||||
Les {{ summary.total_positive_user_bde + summary.total_zero_user_bde + summary.total_negative_user_bde }} adhérent⋅es BDE :
|
|
||||||
</h2>
|
|
||||||
<ul>
|
|
||||||
<li>Positifs : {{ summary.total_positive_user_bde }} soit {{ summary.balance_positive_user_bde / 100 }} €</li>
|
|
||||||
<li>Neutres : {{ summary.total_zero_user_bde }}</li>
|
|
||||||
<li>Négatifs : {{ summary.total_negative_user_bde }} soit {{ summary.balance_negative_user_bde / 100 }} €</li>
|
|
||||||
</ul>
|
|
||||||
|
|
||||||
<h2>
|
|
||||||
Clubs :
|
|
||||||
</h2>
|
|
||||||
<ul>
|
|
||||||
<li>Positifs : {{ summary.total_positive_club }} soit {{ summary.balance_positive_club / 100 }} €</li>
|
|
||||||
<li>Neutres : {{ summary.total_zero_club }}</li>
|
|
||||||
<li>Négatifs : {{ summary.total_negative_club }} soit {{ summary.balance_negative_club / 100 }} €</li>
|
|
||||||
</ul>
|
|
||||||
|
|
||||||
<h2>
|
|
||||||
Clubs hors BDE / Kfet et club dont le nom fini par "- BDE" :
|
|
||||||
</h2>
|
|
||||||
<ul>
|
|
||||||
<li>Positifs : {{ summary.total_positive_club_nbde }} soit {{ summary.balance_positive_club_nbde / 100 }} €</li>
|
|
||||||
<li>Neutres : {{ summary.total_zero_club_nbde }}</li>
|
|
||||||
<li>Négatifs : {{ summary.total_negative_club_nbde }} soit {{ summary.balance_negative_club_nbde / 100 }} €</li>
|
|
||||||
</ul>
|
|
||||||
|
|
||||||
<h2>
|
|
||||||
Progression :
|
|
||||||
</h2>
|
|
||||||
<ul>
|
|
||||||
<li>Ceci correspond à une différence de {{ balance_difference_user / 100 }} € pour les utilisateur⋅rices</li>
|
|
||||||
<li>Ceci correspond à une différence de {{ balance_difference_club / 100 }} € pour les clubs</li>
|
|
||||||
</ul>
|
|
||||||
|
|
||||||
--
|
|
||||||
<p>
|
|
||||||
Le BDE<br>
|
|
||||||
{% trans "Mail generated by the Note Kfet on the" %} {% now "j F Y à H:i:s" %}
|
|
||||||
</p>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@ -1,33 +0,0 @@
|
|||||||
{% load pretty_money %}
|
|
||||||
{% load i18n %}
|
|
||||||
|
|
||||||
Récapitulatif de trésorerie au {{ summary.date|date:"d/m/Y" }} à {{ summary.date|date:"H:i:s" }} :
|
|
||||||
|
|
||||||
Tous les utilisateur⋅rices :
|
|
||||||
- Positifs : {{ summary.total_positive_user }} soit {{ summary.balance_positive_user / 100 }} €
|
|
||||||
- Neutres : {{ summary.total_zero_user }}
|
|
||||||
- Négatifs : {{ summary.total_negative_user }} soit {{ summary.balance_negative_user / 100 }} €
|
|
||||||
|
|
||||||
Les {{ summary.total_positive_user_bde + summary.total_zero_user_bde + summary.total_negative_user_bde }} adhérent⋅es BDE :
|
|
||||||
- Positifs : {{ summary.total_positive_user_bde }} soit {{ summary.balance_positive_user_bde / 100 }} €
|
|
||||||
- Neutres : {{ summary.total_zero_user_bde }}
|
|
||||||
- Négatifs : {{ summary.total_negative_user_bde }} soit {{ summary.balance_negative_user_bde /100 }} €
|
|
||||||
|
|
||||||
Clubs :
|
|
||||||
- Positifs : {{ summary.total_positive_club }} soit {{ summary.balance_positive_club / 100 }} €
|
|
||||||
- Neutres : {{ summary.total_zero_club }}
|
|
||||||
- Négatifs : {{ summary.total_negative_club }} soit {{ summary.balance_negative_club / 100 }} €
|
|
||||||
|
|
||||||
Clubs hors BDE / Kfet et club dont le nom fini par "- BDE" :
|
|
||||||
- Positifs : {{ summary.total_positive_club_nbde }} soit {{ summary.balance_positive_club_nbde / 100 }} €
|
|
||||||
- Neutres : {{ summary.total_zero_club_nbde }}
|
|
||||||
- Négatifs : {{ summary.total_negative_club_nbde }} soit {{ summary.balance_negative_club_nbde / 100 }} €
|
|
||||||
|
|
||||||
Progression :
|
|
||||||
- Ceci correspond à une différence de {{ balance_difference_user / 100 }} € pour les utilisateur⋅rices
|
|
||||||
- Ceci correspond à une différence de {{ balance_difference_club / 100 }} € pour les clubs
|
|
||||||
|
|
||||||
--
|
|
||||||
Le BDE
|
|
||||||
|
|
||||||
{% trans "Mail generated by the Note Kfet on the" %} {% now "j F Y à H:i:s" %}
|
|
||||||
@ -2591,12 +2591,12 @@
|
|||||||
"note",
|
"note",
|
||||||
"transaction"
|
"transaction"
|
||||||
],
|
],
|
||||||
"query": "[\"OR\", {\"source__balance__gte\": 0}, [\"AND\", [\"NOT\", {\"recurrenttransaction__template__category__name\": \"Alcool\"}], {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 2000]}}], {\"valid\": false}]",
|
"query": "[\"OR\", {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 2000]}}, {\"valid\": false}]",
|
||||||
"type": "add",
|
"type": "add",
|
||||||
"mask": 2,
|
"mask": 2,
|
||||||
"field": "",
|
"field": "",
|
||||||
"permanent": false,
|
"permanent": false,
|
||||||
"description": "Créer une transaction quelconque tant que la source reste positive s'il s'agit d'alcool, sinon au-dessus de -20€"
|
"description": "Créer une transaction quelconque tant que la source reste au-dessus de -20 €"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
@ -5,6 +5,7 @@ from django import forms
|
|||||||
from django.contrib.auth.forms import UserCreationForm
|
from django.contrib.auth.forms import UserCreationForm
|
||||||
from django.contrib.auth.models import User
|
from django.contrib.auth.models import User
|
||||||
from django.utils.translation import gettext_lazy as _
|
from django.utils.translation import gettext_lazy as _
|
||||||
|
# from member.models import Club
|
||||||
from note.models import NoteSpecial, Alias
|
from note.models import NoteSpecial, Alias
|
||||||
from note_kfet.inputs import AmountInput
|
from note_kfet.inputs import AmountInput
|
||||||
|
|
||||||
@ -114,3 +115,12 @@ class ValidationForm(forms.Form):
|
|||||||
required=False,
|
required=False,
|
||||||
initial=True,
|
initial=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# If the bda exists
|
||||||
|
# if Club.objects.filter(name__iexact="bda").exists():
|
||||||
|
# The user can join the bda club at the inscription
|
||||||
|
# join_bda = forms.BooleanField(
|
||||||
|
# label=_("Join BDA Club"),
|
||||||
|
# required=False,
|
||||||
|
# initial=True,
|
||||||
|
# )
|
||||||
|
|||||||
@ -1,7 +1,6 @@
|
|||||||
# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
|
# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
|
||||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
from django import forms
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.contrib.auth.mixins import LoginRequiredMixin
|
from django.contrib.auth.mixins import LoginRequiredMixin
|
||||||
from django.contrib.auth.models import User
|
from django.contrib.auth.models import User
|
||||||
@ -239,8 +238,9 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,
|
|||||||
fee += bde.membership_fee_paid if user.profile.paid else bde.membership_fee_unpaid
|
fee += bde.membership_fee_paid if user.profile.paid else bde.membership_fee_unpaid
|
||||||
kfet = Club.objects.get(name="Kfet")
|
kfet = Club.objects.get(name="Kfet")
|
||||||
fee += kfet.membership_fee_paid if user.profile.paid else kfet.membership_fee_unpaid
|
fee += kfet.membership_fee_paid if user.profile.paid else kfet.membership_fee_unpaid
|
||||||
for club in Club.objects.filter(add_registration_form=True):
|
if Club.objects.filter(name__iexact="BDA").exists():
|
||||||
fee += club.membership_fee_paid if user.profile.paid else club.membership_fee_unpaid
|
bda = Club.objects.get(name__iexact="BDA")
|
||||||
|
fee += bda.membership_fee_paid if user.profile.paid else bda.membership_fee_unpaid
|
||||||
ctx["total_fee"] = "{:.02f}".format(fee / 100, )
|
ctx["total_fee"] = "{:.02f}".format(fee / 100, )
|
||||||
|
|
||||||
# ctx["declare_soge_account"] = SogeCredit.objects.filter(user=user).exists()
|
# ctx["declare_soge_account"] = SogeCredit.objects.filter(user=user).exists()
|
||||||
@ -249,16 +249,6 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,
|
|||||||
|
|
||||||
def get_form(self, form_class=None):
|
def get_form(self, form_class=None):
|
||||||
form = super().get_form(form_class)
|
form = super().get_form(form_class)
|
||||||
|
|
||||||
# add clubs that are in registration form
|
|
||||||
for club in Club.objects.filter(add_registration_form=True).order_by("name"):
|
|
||||||
form_join_club = forms.BooleanField(
|
|
||||||
label=_("Join %(club)s Club") % {'club': club.name},
|
|
||||||
required=False,
|
|
||||||
initial=False,
|
|
||||||
)
|
|
||||||
form.fields.update({f"join_{club.id}": form_join_club})
|
|
||||||
|
|
||||||
user = self.get_object()
|
user = self.get_object()
|
||||||
form.fields["last_name"].initial = user.last_name
|
form.fields["last_name"].initial = user.last_name
|
||||||
form.fields["first_name"].initial = user.first_name
|
form.fields["first_name"].initial = user.first_name
|
||||||
@ -276,6 +266,11 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,
|
|||||||
form.add_error(None, _("An alias with a similar name already exists."))
|
form.add_error(None, _("An alias with a similar name already exists."))
|
||||||
return self.form_invalid(form)
|
return self.form_invalid(form)
|
||||||
|
|
||||||
|
# Check if BDA exist to propose membership at regisration
|
||||||
|
bda_exists = False
|
||||||
|
if Club.objects.filter(name__iexact="BDA").exists():
|
||||||
|
bda_exists = True
|
||||||
|
|
||||||
# Get form data
|
# Get form data
|
||||||
# soge = form.cleaned_data["soge"]
|
# soge = form.cleaned_data["soge"]
|
||||||
credit_type = form.cleaned_data["credit_type"]
|
credit_type = form.cleaned_data["credit_type"]
|
||||||
@ -285,9 +280,8 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,
|
|||||||
bank = form.cleaned_data["bank"]
|
bank = form.cleaned_data["bank"]
|
||||||
join_bde = form.cleaned_data["join_bde"]
|
join_bde = form.cleaned_data["join_bde"]
|
||||||
join_kfet = form.cleaned_data["join_kfet"]
|
join_kfet = form.cleaned_data["join_kfet"]
|
||||||
|
if bda_exists:
|
||||||
clubs_registration = Club.objects.filter(add_registration_form=True).order_by("name")
|
join_bda = form.cleaned_data["join_bda"]
|
||||||
join_clubs = [(club, form.cleaned_data[f"join_{club.id}"]) for club in clubs_registration]
|
|
||||||
|
|
||||||
# if soge:
|
# if soge:
|
||||||
# # If Société Générale pays the inscription, the user automatically joins the two clubs.
|
# # If Société Générale pays the inscription, the user automatically joins the two clubs.
|
||||||
@ -309,12 +303,11 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,
|
|||||||
kfet_fee = kfet.membership_fee_paid if user.profile.paid else kfet.membership_fee_unpaid
|
kfet_fee = kfet.membership_fee_paid if user.profile.paid else kfet.membership_fee_unpaid
|
||||||
# Add extra fee for the full membership
|
# Add extra fee for the full membership
|
||||||
fee += kfet_fee if join_kfet else 0
|
fee += kfet_fee if join_kfet else 0
|
||||||
clubs_fee = dict()
|
if bda_exists:
|
||||||
for club, join_club in join_clubs:
|
bda = Club.objects.get(name__iexact="BDA")
|
||||||
club_fee = club.membership_fee_paid if user.profile.paid else club.membership_fee_unpaid
|
bda_fee = bda.membership_fee_paid if user.profile.paid else bda.membership_fee_unpaid
|
||||||
# Add extra fee for the club membership
|
# Add extra fee for the bda membership
|
||||||
clubs_fee[club] = club_fee
|
fee += bda_fee if join_bda else 0
|
||||||
fee += club_fee if join_club else 0
|
|
||||||
|
|
||||||
# # If the bank pays, then we don't credit now. Treasurers will validate the transaction
|
# # If the bank pays, then we don't credit now. Treasurers will validate the transaction
|
||||||
# # and credit the note later.
|
# # and credit the note later.
|
||||||
@ -394,18 +387,17 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,
|
|||||||
membership.roles.add(Role.objects.get(name="Adhérent Kfet"))
|
membership.roles.add(Role.objects.get(name="Adhérent Kfet"))
|
||||||
membership.save()
|
membership.save()
|
||||||
|
|
||||||
for club, join_club in join_clubs:
|
if bda_exists and join_bda:
|
||||||
if join_club:
|
# Create membership for the user to the BDA starting today
|
||||||
# Create membership for the user to the BDA starting today
|
membership = Membership(
|
||||||
membership = Membership(
|
club=bda,
|
||||||
club=club,
|
user=user,
|
||||||
user=user,
|
fee=bda_fee,
|
||||||
fee=clubs_fee[club],
|
)
|
||||||
)
|
membership.save()
|
||||||
membership.save()
|
membership.refresh_from_db()
|
||||||
membership.refresh_from_db()
|
membership.roles.add(Role.objects.get(name="Membre de club"))
|
||||||
membership.roles.add(Role.objects.get(name="Membre de club"))
|
membership.save()
|
||||||
membership.save()
|
|
||||||
|
|
||||||
# if soge:
|
# if soge:
|
||||||
# soge_credit = SogeCredit.objects.get(user=user)
|
# soge_credit = SogeCredit.objects.get(user=user)
|
||||||
|
|||||||
Submodule apps/scripts updated: f76acb3248...f580f9b9e9
@ -5,13 +5,13 @@ from django.contrib import admin
|
|||||||
from note_kfet.admin import admin_site
|
from note_kfet.admin import admin_site
|
||||||
|
|
||||||
from .forms import ProductForm
|
from .forms import ProductForm
|
||||||
from .models import Invoice, NoteSummary, Product, RemittanceType, Remittance, SogeCredit
|
from .models import RemittanceType, Remittance, SogeCredit, Invoice, Product
|
||||||
|
|
||||||
|
|
||||||
@admin.register(RemittanceType, site=admin_site)
|
@admin.register(RemittanceType, site=admin_site)
|
||||||
class RemittanceTypeAdmin(admin.ModelAdmin):
|
class RemittanceTypeAdmin(admin.ModelAdmin):
|
||||||
"""
|
"""
|
||||||
Admin customisation for RemittanceType
|
Admin customisation for RemiitanceType
|
||||||
"""
|
"""
|
||||||
list_display = ('note', )
|
list_display = ('note', )
|
||||||
|
|
||||||
@ -55,19 +55,3 @@ class InvoiceAdmin(admin.ModelAdmin):
|
|||||||
"""
|
"""
|
||||||
list_display = ('object', 'id', 'bde', 'name', 'date', 'acquitted',)
|
list_display = ('object', 'id', 'bde', 'name', 'date', 'acquitted',)
|
||||||
inlines = (ProductInline,)
|
inlines = (ProductInline,)
|
||||||
|
|
||||||
|
|
||||||
@admin.register(NoteSummary, site=admin_site)
|
|
||||||
class NoteSummaryAdmin(admin.ModelAdmin):
|
|
||||||
"""
|
|
||||||
Admin customisation for NoteSummary
|
|
||||||
"""
|
|
||||||
list_display = (
|
|
||||||
'date', 'total_positive_user', 'balance_positive_user', 'total_positive_user_bde',
|
|
||||||
'balance_positive_user_bde', 'total_zero_user', 'total_zero_user_bde', 'total_negative_user',
|
|
||||||
'balance_negative_user', 'total_negative_user_bde', 'balance_negative_user_bde',
|
|
||||||
'total_vnegative_user', 'balance_vnegative_user', 'total_vnegative_user_bde',
|
|
||||||
'balance_vnegative_user_bde', 'total_positive_club', 'balance_positive_club',
|
|
||||||
'total_positive_club_nbde', 'balance_positive_club_nbde', 'total_zero_club', 'total_zero_club_nbde',
|
|
||||||
'total_negative_club', 'balance_negative_club', 'total_negative_club_nbde', 'balance_negative_club_nbde',
|
|
||||||
)
|
|
||||||
|
|||||||
@ -1,49 +0,0 @@
|
|||||||
# Generated by Django 2.2.28 on 2024-08-07 12:09
|
|
||||||
|
|
||||||
import datetime
|
|
||||||
from django.db import migrations, models
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
('treasury', '0008_auto_20240322_0045'),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.CreateModel(
|
|
||||||
name='NoteSummary',
|
|
||||||
fields=[
|
|
||||||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
|
||||||
('date', models.DateField(default=datetime.date.today, verbose_name='Date')),
|
|
||||||
('total_positive_user', models.PositiveIntegerField(verbose_name='Total positive user')),
|
|
||||||
('balance_positive_user', models.PositiveIntegerField(verbose_name='Balance positive user')),
|
|
||||||
('total_positive_user_bde', models.PositiveIntegerField(verbose_name='Total positive user BDE')),
|
|
||||||
('balance_positive_user_bde', models.PositiveIntegerField(verbose_name='Balance positive user BDE')),
|
|
||||||
('total_zero_user', models.PositiveIntegerField(verbose_name='Total zero user')),
|
|
||||||
('total_zero_user_bde', models.PositiveIntegerField(verbose_name='Total zero user BDE')),
|
|
||||||
('total_negative_user', models.PositiveIntegerField(verbose_name='Total negative user')),
|
|
||||||
('balance_negative_user', models.PositiveIntegerField(verbose_name='Balance negative user')),
|
|
||||||
('total_negative_user_bde', models.PositiveIntegerField(verbose_name='Total negative user BDE')),
|
|
||||||
('balance_negative_user_bde', models.PositiveIntegerField(verbose_name='Balance negative user BDE')),
|
|
||||||
('total_vnegative_user', models.PositiveIntegerField(verbose_name='Total very negative user')),
|
|
||||||
('balance_vnegative_user', models.PositiveIntegerField(verbose_name='Balance very negative user')),
|
|
||||||
('total_vnegative_user_bde', models.PositiveIntegerField(verbose_name='Total very negative user BDE')),
|
|
||||||
('balance_vnegative_user_bde', models.PositiveIntegerField(verbose_name='Balance very negative user BDE')),
|
|
||||||
('total_positive_club', models.PositiveIntegerField(verbose_name='Total positive club')),
|
|
||||||
('balance_positive_club', models.PositiveIntegerField(verbose_name='Balance positive club')),
|
|
||||||
('total_positive_club_nbde', models.PositiveIntegerField(verbose_name='Total positive club nbde')),
|
|
||||||
('balance_positive_club_nbde', models.PositiveIntegerField(verbose_name='Balance positive club nbde')),
|
|
||||||
('total_zero_club', models.PositiveIntegerField(verbose_name='Total zero club')),
|
|
||||||
('total_zero_club_nbde', models.PositiveIntegerField(verbose_name='Total zero club nbde')),
|
|
||||||
('total_negative_club', models.PositiveIntegerField(verbose_name='Total negative club')),
|
|
||||||
('balance_negative_club', models.PositiveIntegerField(verbose_name='Balance negative club')),
|
|
||||||
('total_negative_club_nbde', models.PositiveIntegerField(verbose_name='Total negative club nbde')),
|
|
||||||
('balance_negative_club_nbde', models.PositiveIntegerField(verbose_name='Balance negative club nbde')),
|
|
||||||
],
|
|
||||||
options={
|
|
||||||
'verbose_name': 'Summary',
|
|
||||||
'verbose_name_plural': 'Summaries',
|
|
||||||
},
|
|
||||||
),
|
|
||||||
]
|
|
||||||
@ -460,117 +460,3 @@ class SogeCredit(models.Model):
|
|||||||
self.credit_transaction._force_save = True
|
self.credit_transaction._force_save = True
|
||||||
self.credit_transaction.save()
|
self.credit_transaction.save()
|
||||||
super().delete(**kwargs)
|
super().delete(**kwargs)
|
||||||
|
|
||||||
|
|
||||||
class NoteSummary(models.Model):
|
|
||||||
"""
|
|
||||||
Summary of every notes
|
|
||||||
"""
|
|
||||||
|
|
||||||
date = models.DateField(
|
|
||||||
default=date.today,
|
|
||||||
verbose_name=_("Date"),
|
|
||||||
)
|
|
||||||
|
|
||||||
total_positive_user = models.PositiveIntegerField(
|
|
||||||
verbose_name=_("Total positive user"),
|
|
||||||
)
|
|
||||||
|
|
||||||
balance_positive_user = models.PositiveIntegerField(
|
|
||||||
verbose_name=_("Balance positive user"),
|
|
||||||
)
|
|
||||||
|
|
||||||
total_positive_user_bde = models.PositiveIntegerField(
|
|
||||||
verbose_name=_("Total positive user BDE"),
|
|
||||||
)
|
|
||||||
|
|
||||||
balance_positive_user_bde = models.PositiveIntegerField(
|
|
||||||
verbose_name=_("Balance positive user BDE"),
|
|
||||||
)
|
|
||||||
|
|
||||||
total_zero_user = models.PositiveIntegerField(
|
|
||||||
verbose_name=_("Total zero user"),
|
|
||||||
)
|
|
||||||
|
|
||||||
total_zero_user_bde = models.PositiveIntegerField(
|
|
||||||
verbose_name=_("Total zero user BDE"),
|
|
||||||
)
|
|
||||||
|
|
||||||
total_negative_user = models.PositiveIntegerField(
|
|
||||||
verbose_name=_("Total negative user"),
|
|
||||||
)
|
|
||||||
|
|
||||||
balance_negative_user = models.PositiveIntegerField(
|
|
||||||
verbose_name=_("Balance negative user"),
|
|
||||||
)
|
|
||||||
|
|
||||||
total_negative_user_bde = models.PositiveIntegerField(
|
|
||||||
verbose_name=_("Total negative user BDE"),
|
|
||||||
)
|
|
||||||
|
|
||||||
balance_negative_user_bde = models.PositiveIntegerField(
|
|
||||||
verbose_name=_("Balance negative user BDE"),
|
|
||||||
)
|
|
||||||
|
|
||||||
total_vnegative_user = models.PositiveIntegerField(
|
|
||||||
verbose_name=_("Total very negative user"),
|
|
||||||
)
|
|
||||||
|
|
||||||
balance_vnegative_user = models.PositiveIntegerField(
|
|
||||||
verbose_name=_("Balance very negative user"),
|
|
||||||
)
|
|
||||||
|
|
||||||
total_vnegative_user_bde = models.PositiveIntegerField(
|
|
||||||
verbose_name=_("Total very negative user BDE"),
|
|
||||||
)
|
|
||||||
|
|
||||||
balance_vnegative_user_bde = models.PositiveIntegerField(
|
|
||||||
verbose_name=_("Balance very negative user BDE"),
|
|
||||||
)
|
|
||||||
|
|
||||||
total_positive_club = models.PositiveIntegerField(
|
|
||||||
verbose_name=_("Total positive club"),
|
|
||||||
)
|
|
||||||
|
|
||||||
balance_positive_club = models.PositiveIntegerField(
|
|
||||||
verbose_name=_("Balance positive club"),
|
|
||||||
)
|
|
||||||
|
|
||||||
total_positive_club_nbde = models.PositiveIntegerField(
|
|
||||||
verbose_name=_("Total positive club nbde"),
|
|
||||||
)
|
|
||||||
|
|
||||||
balance_positive_club_nbde = models.PositiveIntegerField(
|
|
||||||
verbose_name=_("Balance positive club nbde"),
|
|
||||||
)
|
|
||||||
|
|
||||||
total_zero_club = models.PositiveIntegerField(
|
|
||||||
verbose_name=_("Total zero club"),
|
|
||||||
)
|
|
||||||
|
|
||||||
total_zero_club_nbde = models.PositiveIntegerField(
|
|
||||||
verbose_name=_("Total zero club nbde"),
|
|
||||||
)
|
|
||||||
|
|
||||||
total_negative_club = models.PositiveIntegerField(
|
|
||||||
verbose_name=_("Total negative club"),
|
|
||||||
)
|
|
||||||
|
|
||||||
balance_negative_club = models.PositiveIntegerField(
|
|
||||||
verbose_name=_("Balance negative club"),
|
|
||||||
)
|
|
||||||
|
|
||||||
total_negative_club_nbde = models.PositiveIntegerField(
|
|
||||||
verbose_name=_("Total negative club nbde"),
|
|
||||||
)
|
|
||||||
|
|
||||||
balance_negative_club_nbde = models.PositiveIntegerField(
|
|
||||||
verbose_name=_("Balance negative club nbde"),
|
|
||||||
)
|
|
||||||
|
|
||||||
class Meta:
|
|
||||||
verbose_name = _("Summary")
|
|
||||||
verbose_name_plural = _("Summaries")
|
|
||||||
|
|
||||||
def __str__(self):
|
|
||||||
return "Note summary of {date}".format(date=self.date)
|
|
||||||
|
|||||||
@ -114,7 +114,7 @@ msgstr "Lieu où l'activité est organisée, par exemple la Kfet."
|
|||||||
msgid "type"
|
msgid "type"
|
||||||
msgstr "type"
|
msgstr "type"
|
||||||
|
|
||||||
#: apps/activity/models.py:89 apps/logs/models.py:22 apps/member/models.py:318
|
#: apps/activity/models.py:89 apps/logs/models.py:22 apps/member/models.py:313
|
||||||
#: apps/note/models/notes.py:148 apps/treasury/models.py:293
|
#: apps/note/models/notes.py:148 apps/treasury/models.py:293
|
||||||
#: apps/wei/models.py:171 apps/wei/templates/wei/attribute_bus_1A.html:13
|
#: apps/wei/models.py:171 apps/wei/templates/wei/attribute_bus_1A.html:13
|
||||||
#: apps/wei/templates/wei/survey.html:15
|
#: apps/wei/templates/wei/survey.html:15
|
||||||
@ -247,7 +247,6 @@ msgid "The validation of the activity is pending."
|
|||||||
msgstr "La validation de cette activité est en attente."
|
msgstr "La validation de cette activité est en attente."
|
||||||
|
|
||||||
#: apps/activity/tables.py:43 apps/treasury/tables.py:107
|
#: apps/activity/tables.py:43 apps/treasury/tables.py:107
|
||||||
#: apps/member/templates/member/picture_update.html:18
|
|
||||||
msgid "Remove"
|
msgid "Remove"
|
||||||
msgstr "Supprimer"
|
msgstr "Supprimer"
|
||||||
|
|
||||||
@ -263,13 +262,13 @@ msgstr "supprimer"
|
|||||||
msgid "Type"
|
msgid "Type"
|
||||||
msgstr "Type"
|
msgstr "Type"
|
||||||
|
|
||||||
#: apps/activity/tables.py:84 apps/member/forms.py:196
|
#: apps/activity/tables.py:84 apps/member/forms.py:193
|
||||||
#: apps/registration/forms.py:92 apps/treasury/forms.py:131
|
#: apps/registration/forms.py:92 apps/treasury/forms.py:131
|
||||||
#: apps/wei/forms/registration.py:104
|
#: apps/wei/forms/registration.py:104
|
||||||
msgid "Last name"
|
msgid "Last name"
|
||||||
msgstr "Nom de famille"
|
msgstr "Nom de famille"
|
||||||
|
|
||||||
#: apps/activity/tables.py:86 apps/member/forms.py:201
|
#: apps/activity/tables.py:86 apps/member/forms.py:198
|
||||||
#: apps/note/templates/note/transaction_form.html:138
|
#: apps/note/templates/note/transaction_form.html:138
|
||||||
#: apps/registration/forms.py:97 apps/treasury/forms.py:133
|
#: apps/registration/forms.py:97 apps/treasury/forms.py:133
|
||||||
#: apps/wei/forms/registration.py:109
|
#: apps/wei/forms/registration.py:109
|
||||||
@ -508,11 +507,11 @@ msgstr "cotisation pour adhérer (normalien·ne élève)"
|
|||||||
msgid "membership fee (unpaid students)"
|
msgid "membership fee (unpaid students)"
|
||||||
msgstr "cotisation pour adhérer (normalien·ne étudiant·e)"
|
msgstr "cotisation pour adhérer (normalien·ne étudiant·e)"
|
||||||
|
|
||||||
#: apps/member/admin.py:65 apps/member/models.py:330
|
#: apps/member/admin.py:65 apps/member/models.py:325
|
||||||
msgid "roles"
|
msgid "roles"
|
||||||
msgstr "rôles"
|
msgstr "rôles"
|
||||||
|
|
||||||
#: apps/member/admin.py:66 apps/member/models.py:344
|
#: apps/member/admin.py:66 apps/member/models.py:339
|
||||||
msgid "fee"
|
msgid "fee"
|
||||||
msgstr "cotisation"
|
msgstr "cotisation"
|
||||||
|
|
||||||
@ -564,29 +563,29 @@ msgid "This image cannot be loaded."
|
|||||||
msgstr "Cette image ne peut pas être chargée."
|
msgstr "Cette image ne peut pas être chargée."
|
||||||
|
|
||||||
#: apps/member/forms.py:148 apps/member/views.py:102
|
#: apps/member/forms.py:148 apps/member/views.py:102
|
||||||
#: apps/registration/forms.py:34 apps/registration/views.py:276
|
#: apps/registration/forms.py:34 apps/registration/views.py:266
|
||||||
msgid "An alias with a similar name already exists."
|
msgid "An alias with a similar name already exists."
|
||||||
msgstr "Un alias avec un nom similaire existe déjà."
|
msgstr "Un alias avec un nom similaire existe déjà."
|
||||||
|
|
||||||
#: apps/member/forms.py:175
|
#: apps/member/forms.py:172
|
||||||
msgid "Inscription paid by Société Générale"
|
msgid "Inscription paid by Société Générale"
|
||||||
msgstr "Inscription payée par la Société générale"
|
msgstr "Inscription payée par la Société générale"
|
||||||
|
|
||||||
#: apps/member/forms.py:177
|
#: apps/member/forms.py:174
|
||||||
msgid "Check this case if the Société Générale paid the inscription."
|
msgid "Check this case if the Société Générale paid the inscription."
|
||||||
msgstr "Cochez cette case si la Société Générale a payé l'inscription."
|
msgstr "Cochez cette case si la Société Générale a payé l'inscription."
|
||||||
|
|
||||||
#: apps/member/forms.py:182 apps/registration/forms.py:79
|
#: apps/member/forms.py:179 apps/registration/forms.py:79
|
||||||
#: apps/wei/forms/registration.py:91
|
#: apps/wei/forms/registration.py:91
|
||||||
msgid "Credit type"
|
msgid "Credit type"
|
||||||
msgstr "Type de rechargement"
|
msgstr "Type de rechargement"
|
||||||
|
|
||||||
#: apps/member/forms.py:183 apps/registration/forms.py:80
|
#: apps/member/forms.py:180 apps/registration/forms.py:80
|
||||||
#: apps/wei/forms/registration.py:92
|
#: apps/wei/forms/registration.py:92
|
||||||
msgid "No credit"
|
msgid "No credit"
|
||||||
msgstr "Pas de rechargement"
|
msgstr "Pas de rechargement"
|
||||||
|
|
||||||
#: apps/member/forms.py:185
|
#: apps/member/forms.py:182
|
||||||
msgid "You can credit the note of the user."
|
msgid "You can credit the note of the user."
|
||||||
msgstr "Vous pouvez créditer la note de l'utilisateur·ice avant l'adhésion."
|
msgstr "Vous pouvez créditer la note de l'utilisateur·ice avant l'adhésion."
|
||||||
|
|
||||||
@ -595,17 +594,17 @@ msgstr "Vous pouvez créditer la note de l'utilisateur·ice avant l'adhésion."
|
|||||||
msgid "Credit amount"
|
msgid "Credit amount"
|
||||||
msgstr "Montant à créditer"
|
msgstr "Montant à créditer"
|
||||||
|
|
||||||
#: apps/member/forms.py:206 apps/note/templates/note/transaction_form.html:144
|
#: apps/member/forms.py:203 apps/note/templates/note/transaction_form.html:144
|
||||||
#: apps/registration/forms.py:102 apps/treasury/forms.py:135
|
#: apps/registration/forms.py:102 apps/treasury/forms.py:135
|
||||||
#: apps/wei/forms/registration.py:114
|
#: apps/wei/forms/registration.py:114
|
||||||
msgid "Bank"
|
msgid "Bank"
|
||||||
msgstr "Banque"
|
msgstr "Banque"
|
||||||
|
|
||||||
#: apps/member/forms.py:233
|
#: apps/member/forms.py:230
|
||||||
msgid "User"
|
msgid "User"
|
||||||
msgstr "Utilisateur·ice"
|
msgstr "Utilisateur·ice"
|
||||||
|
|
||||||
#: apps/member/forms.py:247
|
#: apps/member/forms.py:244
|
||||||
msgid "Roles"
|
msgid "Roles"
|
||||||
msgstr "Rôles"
|
msgstr "Rôles"
|
||||||
|
|
||||||
@ -853,50 +852,46 @@ msgstr ""
|
|||||||
"Date maximale d'une fin d'adhésion, après laquelle les adhérent·e·s doivent la "
|
"Date maximale d'une fin d'adhésion, après laquelle les adhérent·e·s doivent la "
|
||||||
"renouveler."
|
"renouveler."
|
||||||
|
|
||||||
#: apps/member/models.py:263
|
#: apps/member/models.py:263 apps/member/models.py:319
|
||||||
msgid "add to registration form"
|
|
||||||
msgstr "ajouter au formulaire d'inscription"
|
|
||||||
|
|
||||||
#: apps/member/models.py:268 apps/member/models.py:324
|
|
||||||
#: apps/note/models/notes.py:176
|
#: apps/note/models/notes.py:176
|
||||||
msgid "club"
|
msgid "club"
|
||||||
msgstr "club"
|
msgstr "club"
|
||||||
|
|
||||||
#: apps/member/models.py:269
|
#: apps/member/models.py:264
|
||||||
msgid "clubs"
|
msgid "clubs"
|
||||||
msgstr "clubs"
|
msgstr "clubs"
|
||||||
|
|
||||||
#: apps/member/models.py:335
|
#: apps/member/models.py:330
|
||||||
msgid "membership starts on"
|
msgid "membership starts on"
|
||||||
msgstr "l'adhésion commence le"
|
msgstr "l'adhésion commence le"
|
||||||
|
|
||||||
#: apps/member/models.py:339
|
#: apps/member/models.py:334
|
||||||
msgid "membership ends on"
|
msgid "membership ends on"
|
||||||
msgstr "l'adhésion finit le"
|
msgstr "l'adhésion finit le"
|
||||||
|
|
||||||
#: apps/member/models.py:348 apps/note/models/transactions.py:385
|
#: apps/member/models.py:343 apps/note/models/transactions.py:385
|
||||||
msgid "membership"
|
msgid "membership"
|
||||||
msgstr "adhésion"
|
msgstr "adhésion"
|
||||||
|
|
||||||
#: apps/member/models.py:349
|
#: apps/member/models.py:344
|
||||||
msgid "memberships"
|
msgid "memberships"
|
||||||
msgstr "adhésions"
|
msgstr "adhésions"
|
||||||
|
|
||||||
#: apps/member/models.py:353
|
#: apps/member/models.py:348
|
||||||
#, python-brace-format
|
#, python-brace-format
|
||||||
msgid "Membership of {user} for the club {club}"
|
msgid "Membership of {user} for the club {club}"
|
||||||
msgstr "Adhésion de {user} pour le club {club}"
|
msgstr "Adhésion de {user} pour le club {club}"
|
||||||
|
|
||||||
#: apps/member/models.py:372
|
#: apps/member/models.py:367
|
||||||
#, python-brace-format
|
#, python-brace-format
|
||||||
msgid "The role {role} does not apply to the club {club}."
|
msgid "The role {role} does not apply to the club {club}."
|
||||||
msgstr "Le rôle {role} ne s'applique pas au club {club}."
|
msgstr "Le rôle {role} ne s'applique pas au club {club}."
|
||||||
|
|
||||||
#: apps/member/models.py:381 apps/member/views.py:712
|
#: apps/member/models.py:376 apps/member/views.py:712
|
||||||
msgid "User is already a member of the club"
|
msgid "User is already a member of the club"
|
||||||
msgstr "L'utilisateur·ice est déjà membre du club"
|
msgstr "L'utilisateur·ice est déjà membre du club"
|
||||||
|
|
||||||
#: apps/member/models.py:393 apps/member/views.py:721
|
#: apps/member/models.py:388 apps/member/views.py:721
|
||||||
msgid "User is not a member of the parent club"
|
msgid "User is not a member of the parent club"
|
||||||
msgstr "L'utilisateur·ice n'est pas membre du club parent"
|
msgstr "L'utilisateur·ice n'est pas membre du club parent"
|
||||||
|
|
||||||
@ -1158,11 +1153,11 @@ msgstr "Introspection :"
|
|||||||
msgid "Show my applications"
|
msgid "Show my applications"
|
||||||
msgstr "Voir mes applications"
|
msgstr "Voir mes applications"
|
||||||
|
|
||||||
#: apps/member/templates/member/picture_update.html:38
|
#: apps/member/templates/member/picture_update.html:35
|
||||||
msgid "Nevermind"
|
msgid "Nevermind"
|
||||||
msgstr "Annuler"
|
msgstr "Annuler"
|
||||||
|
|
||||||
#: apps/member/templates/member/picture_update.html:39
|
#: apps/member/templates/member/picture_update.html:36
|
||||||
msgid "Crop and upload"
|
msgid "Crop and upload"
|
||||||
msgstr "Recadrer et envoyer"
|
msgstr "Recadrer et envoyer"
|
||||||
|
|
||||||
@ -1701,8 +1696,6 @@ msgstr "Historique des transactions récentes"
|
|||||||
#: apps/note/templates/note/mails/negative_balance.txt:25
|
#: apps/note/templates/note/mails/negative_balance.txt:25
|
||||||
#: apps/note/templates/note/mails/negative_notes_report.html:46
|
#: apps/note/templates/note/mails/negative_notes_report.html:46
|
||||||
#: apps/note/templates/note/mails/negative_notes_report.txt:13
|
#: apps/note/templates/note/mails/negative_notes_report.txt:13
|
||||||
#: apps/note/templates/note/mails/summary_notes_report.html:62
|
|
||||||
#: apps/note/templates/note/mails/summary_ntoes_report.txt:33
|
|
||||||
#: apps/note/templates/note/mails/weekly_report.html:51
|
#: apps/note/templates/note/mails/weekly_report.html:51
|
||||||
#: apps/note/templates/note/mails/weekly_report.txt:32
|
#: apps/note/templates/note/mails/weekly_report.txt:32
|
||||||
#: apps/registration/templates/registration/mails/email_validation_email.html:40
|
#: apps/registration/templates/registration/mails/email_validation_email.html:40
|
||||||
@ -2190,23 +2183,18 @@ msgstr "Utilisateur·ice·s en attente d'inscription"
|
|||||||
msgid "Registration detail"
|
msgid "Registration detail"
|
||||||
msgstr "Détails de l'inscription"
|
msgstr "Détails de l'inscription"
|
||||||
|
|
||||||
#: apps/registration/views.py:256
|
#: apps/registration/views.py:293
|
||||||
#, python-format
|
|
||||||
msgid "Join %(club)s Club"
|
|
||||||
msgstr "Adhérer au club %(club)s"
|
|
||||||
|
|
||||||
#: apps/registration/views.py:299
|
|
||||||
msgid "You must join the BDE."
|
msgid "You must join the BDE."
|
||||||
msgstr "Vous devez adhérer au BDE."
|
msgstr "Vous devez adhérer au BDE."
|
||||||
|
|
||||||
#: apps/registration/views.py:330
|
#: apps/registration/views.py:323
|
||||||
msgid ""
|
msgid ""
|
||||||
"The entered amount is not enough for the memberships, should be at least {}"
|
"The entered amount is not enough for the memberships, should be at least {}"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Le montant crédité est trop faible pour adhérer, il doit être au minimum de "
|
"Le montant crédité est trop faible pour adhérer, il doit être au minimum de "
|
||||||
"{}"
|
"{}"
|
||||||
|
|
||||||
#: apps/registration/views.py:425
|
#: apps/registration/views.py:417
|
||||||
msgid "Invalidate pre-registration"
|
msgid "Invalidate pre-registration"
|
||||||
msgstr "Invalider l'inscription"
|
msgstr "Invalider l'inscription"
|
||||||
|
|
||||||
@ -2264,7 +2252,6 @@ msgid "Address"
|
|||||||
msgstr "Adresse"
|
msgstr "Adresse"
|
||||||
|
|
||||||
#: apps/treasury/models.py:69 apps/treasury/models.py:202
|
#: apps/treasury/models.py:69 apps/treasury/models.py:202
|
||||||
#: apps/treasury/models.py:472
|
|
||||||
msgid "Date"
|
msgid "Date"
|
||||||
msgstr "Date"
|
msgstr "Date"
|
||||||
|
|
||||||
@ -2383,102 +2370,6 @@ msgstr ""
|
|||||||
"Cet·te utilisateur·ice n'a pas assez d'argent pour payer les adhésions avec sa "
|
"Cet·te utilisateur·ice n'a pas assez d'argent pour payer les adhésions avec sa "
|
||||||
"note. Merci de lui demander de recharger sa note avant d'invalider ce crédit."
|
"note. Merci de lui demander de recharger sa note avant d'invalider ce crédit."
|
||||||
|
|
||||||
#: apps/treasury/models.py:476
|
|
||||||
msgid "Total positive user"
|
|
||||||
msgstr "Nombre d'utilisateur⋅rices en positif"
|
|
||||||
|
|
||||||
#: apps/treasury/models.py:480
|
|
||||||
msgid "Balance positive user"
|
|
||||||
msgstr "Solde des utilisateur⋅rices en positif"
|
|
||||||
|
|
||||||
#: apps/treasury/models.py:484
|
|
||||||
msgid "Total positive user BDE"
|
|
||||||
msgstr "Nombre d'adhérent⋅es au BDE en positif"
|
|
||||||
|
|
||||||
#: apps/treasury/models.py:488
|
|
||||||
msgid "Balance positive user BDE"
|
|
||||||
msgstr "Solde des adhérent⋅es au BDE en positif"
|
|
||||||
|
|
||||||
#: apps/treasury/models.py:492
|
|
||||||
msgid "Total zero user"
|
|
||||||
msgstr "Nombre d'utilisateur⋅rices à zéro"
|
|
||||||
|
|
||||||
#: apps/treasury/models.py:496
|
|
||||||
msgid "Total zero user BDE"
|
|
||||||
msgstr "Nombre d'adhérent⋅es au BDE à zéro"
|
|
||||||
|
|
||||||
#: apps/treasury/models.py:500
|
|
||||||
msgid "Total negative user"
|
|
||||||
msgstr "Nombre d'utilisateur⋅rices en négatif"
|
|
||||||
|
|
||||||
#: apps/treasury/models.py:504
|
|
||||||
msgid "Balance negative user"
|
|
||||||
msgstr "Solde des utilisateur⋅rices en négatif"
|
|
||||||
|
|
||||||
#: apps/treasury/models.py:508
|
|
||||||
msgid "Total negative user BDE"
|
|
||||||
msgstr "Nombre d'adhérent⋅es au BDE en négatif"
|
|
||||||
|
|
||||||
#: apps/treasury/models.py:512
|
|
||||||
msgid "Balance negative user BDE"
|
|
||||||
msgstr "Solde des adhérent⋅es au BDE en négatif"
|
|
||||||
|
|
||||||
#: apps/treasury/models.py:516
|
|
||||||
msgid "Total very negative user"
|
|
||||||
msgstr "Nombre d'utilisateur⋅rices en négatif sévère"
|
|
||||||
|
|
||||||
#: apps/treasury/models.py:520
|
|
||||||
msgid "Balance very negative user"
|
|
||||||
msgstr "Solde des utilisateur⋅rices en négatif sévère"
|
|
||||||
|
|
||||||
#: apps/treasury/models.py:524
|
|
||||||
msgid "Total very negative user BDE"
|
|
||||||
msgstr "Nombre d'adhérent⋅es au BDE en négatif sévère"
|
|
||||||
|
|
||||||
#: apps/treasury/models.py:528
|
|
||||||
msgid "Balance very negative user BDE"
|
|
||||||
msgstr "Solde des adhérent⋅es au BDE en négatif sévère"
|
|
||||||
|
|
||||||
#: apps/treasury/models.py:532
|
|
||||||
msgid "Total positive club"
|
|
||||||
msgstr "Nombre de clubs en positif"
|
|
||||||
|
|
||||||
#: apps/treasury/models.py:536
|
|
||||||
msgid "Balance positive club"
|
|
||||||
msgstr "Solde des clubs en positif"
|
|
||||||
|
|
||||||
#: apps/treasury/models.py:540
|
|
||||||
msgid "Total positive club nbde"
|
|
||||||
msgstr "Nombre de clubs non-BDE en positif"
|
|
||||||
|
|
||||||
#: apps/treasury/models.py:544
|
|
||||||
msgid "Balance positive club nbde"
|
|
||||||
msgstr "Solde des clubs non-BDE en positif"
|
|
||||||
|
|
||||||
#: apps/treasury/models.py:548
|
|
||||||
msgid "Total zero club"
|
|
||||||
msgstr "Nombre de clubs à zéro"
|
|
||||||
|
|
||||||
#: apps/treasury/models.py:552
|
|
||||||
msgid "Total zero club nbde"
|
|
||||||
msgstr "Nombre de clubs non-BDE à zéro"
|
|
||||||
|
|
||||||
#: apps/treasury/models.py:556
|
|
||||||
msgid "Total negative club"
|
|
||||||
msgstr "Nombre de clubs en négatif"
|
|
||||||
|
|
||||||
#: apps/treasury/models.py:560
|
|
||||||
msgid "Balance negative club"
|
|
||||||
msgstr "Solde des clubs en négatif"
|
|
||||||
|
|
||||||
#: apps/treasury/models.py:564
|
|
||||||
msgid "Total negative club nbde"
|
|
||||||
msgstr "Nombre de clubs non-BDE en négatif"
|
|
||||||
|
|
||||||
#: apps/treasury/models.py:568
|
|
||||||
msgid "Balance negative club nbde"
|
|
||||||
msgstr "Solde des clubs non-BDE en négatif"
|
|
||||||
|
|
||||||
#: apps/treasury/tables.py:20
|
#: apps/treasury/tables.py:20
|
||||||
msgid "Invoice #{:d}"
|
msgid "Invoice #{:d}"
|
||||||
msgstr "Facture n°{:d}"
|
msgstr "Facture n°{:d}"
|
||||||
@ -3729,6 +3620,9 @@ msgstr ""
|
|||||||
"d'adhésion. Vous devez également valider votre adresse email en suivant le "
|
"d'adhésion. Vous devez également valider votre adresse email en suivant le "
|
||||||
"lien que vous avez reçu."
|
"lien que vous avez reçu."
|
||||||
|
|
||||||
|
#~ msgid "Join BDA Club"
|
||||||
|
#~ msgstr "Adhérer au club BDA"
|
||||||
|
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
#~| msgid "People having you as a friend"
|
#~| msgid "People having you as a friend"
|
||||||
#~ msgid "You already have that person as a friend"
|
#~ msgid "You already have that person as a friend"
|
||||||
|
|||||||
@ -19,8 +19,6 @@ MAILTO=notekfet2020@lists.crans.org
|
|||||||
00 5 * * 2 root cd /var/www/note_kfet && env/bin/python manage.py send_mail_to_negative_balances --spam --negative-amount 1 -v 0
|
00 5 * * 2 root cd /var/www/note_kfet && env/bin/python manage.py send_mail_to_negative_balances --spam --negative-amount 1 -v 0
|
||||||
# Envoyer le rapport mensuel aux trésoriers et respos info
|
# Envoyer le rapport mensuel aux trésoriers et respos info
|
||||||
00 8 * * 5 root cd /var/www/note_kfet && env/bin/python manage.py send_mail_to_negative_balances --report --add-years 1 -v 0
|
00 8 * * 5 root cd /var/www/note_kfet && env/bin/python manage.py send_mail_to_negative_balances --report --add-years 1 -v 0
|
||||||
# Envoyer le recap de tresorerie
|
|
||||||
00 8 * * 5 root cd /var/www/note_kfet && env/bin/python manage.py send_summary_notes_report --negative-amount 2000
|
|
||||||
# Envoyer les rapports aux gens
|
# Envoyer les rapports aux gens
|
||||||
55 6 * * * root cd /var/www/note_kfet && env/bin/python manage.py send_reports -v 0
|
55 6 * * * root cd /var/www/note_kfet && env/bin/python manage.py send_reports -v 0
|
||||||
# Mettre à jour les boutons mis en avant
|
# Mettre à jour les boutons mis en avant
|
||||||
|
|||||||
Reference in New Issue
Block a user