Revert "missing comma"

This reverts commit 1ca4246cbd.

.gitignore

@@ -42,6 +42,7 @@ map.json
 backups/
 /static/
 /media/
+/tmp/
 
 # Virtualenv
 env/

apps/api/pagination.py

@@ -0,0 +1,5 @@
+from rest_framework.pagination import PageNumberPagination
+
+class CustomPagination(PageNumberPagination):
+    page_size_query_param = 'page_size'
+

apps/member/migrations/0009_auto_20220904_2325.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.26 on 2022-09-04 21:25
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('member', '0008_auto_20211005_1544'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='profile',
+            name='promotion',
+            field=models.PositiveSmallIntegerField(default=2022, help_text='Year of entry to the school (None if not ENS student)', null=True, verbose_name='promotion'),
+        ),
+    ]

apps/member/static/member/js/trust.js

@@ -1,7 +1,7 @@
 /**
  * On form submit, create a new friendship
  */
-function form_create_trust (e) {
+function create_trust (e) {
   // Do not submit HTML form
   e.preventDefault()
 
@@ -14,35 +14,25 @@ function form_create_trust (e) {
          addMsg(gettext("You can't add yourself as a friend"), "danger")
          return
       }
-      create_trust(formData.get('trusting'), trusted_alias.note)
-    }).fail(function (xhr, _textStatus, _error) {
-        errMsg(xhr.responseJSON)
-    })
-}
-
-/**
- * Create a trust between users
- * @param trusting:Integer trusting note id
- * @param trusted:Integer trusted note id
- */
-function create_trust(trusting, trusted) {
       $.post('/api/note/trust/', {
-      trusting: trusting,
-      trusted: trusted,
-      csrfmiddlewaretoken: CSRF_TOKEN
+        csrfmiddlewaretoken: formData.get('csrfmiddlewaretoken'),
+        trusting: formData.get('trusting'),
+        trusted: trusted_alias.note
       }).done(function () {
-  // Reload tables
+        // Reload table
         $('#trust_table').load(location.pathname + ' #trust_table')
-  $('#trusted_table').load(location.pathname + ' #trusted_table')
         addMsg(gettext('Friendship successfully added'), 'success')
       }).fail(function (xhr, _textStatus, _error) {
         errMsg(xhr.responseJSON)
       })
+    }).fail(function (xhr, _textStatus, _error) {
+        errMsg(xhr.responseJSON)
+    })
 }
 
 /**
- * On click of "delete", delete the trust
- * @param button_id:Integer Trust id to remove
+ * On click of "delete", delete the alias
+ * @param button_id:Integer Alias id to remove
  */
 function delete_button (button_id) {
   $.ajax({
@@ -52,7 +42,6 @@ function delete_button (button_id) {
   }).done(function () {
     addMsg(gettext('Friendship successfully deleted'), 'success')
     $('#trust_table').load(location.pathname + ' #trust_table')
-    $('#trusted_table').load(location.pathname + ' #trusted_table')
   }).fail(function (xhr, _textStatus, _error) {
     errMsg(xhr.responseJSON)
   })
@@ -60,5 +49,5 @@ function delete_button (button_id) {
 
 $(document).ready(function () {
   // Attach event
-  document.getElementById('form_trust').addEventListener('submit', form_create_trust)
+  document.getElementById('form_trust').addEventListener('submit', create_trust)
 })

apps/member/templates/member/profile_trust.html

@@ -7,7 +7,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
 {% block profile_content %}
 <div class="card bg-light mb-3">
     <h3 class="card-header text-center">
-        {% trans "Add friends" %}
+        {% trans "Note friendships" %}
     </h3>
     <div class="card-body">
         {% if can_create %}
@@ -24,7 +24,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
     {% render_table trusting %}
 </div>
 
-<div class="alert alert-warning card mb-3">
+<div class="alert alert-warning card">
     {% blocktrans trimmed %}
         Adding someone as a friend enables them to initiate transactions coming
         from your account (while keeping your balance positive). This is
@@ -33,13 +33,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
         friends without needing additional rights among them.
     {% endblocktrans %}
 </div>
-
-<div class="card bg-light mb-3">
-    <h3 class="card-header text-center">
-        {% trans "People having you as a friend" %}
-    </h3>
-    {% render_table trusted_by %}
-</div>
 {% endblock %}
 
 {% block extrajavascript %}

apps/member/views.py

@@ -8,6 +8,7 @@ from django.contrib.auth import logout
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.contrib.auth.models import User
 from django.contrib.auth.views import LoginView
+from django.contrib.contenttypes.models import ContentType
 from django.db import transaction
 from django.db.models import Q, F
 from django.shortcuts import redirect
@@ -20,7 +21,7 @@ from django_tables2.views import SingleTableView
 from rest_framework.authtoken.models import Token
 from note.models import Alias, NoteClub, NoteUser, Trust
 from note.models.transactions import Transaction, SpecialTransaction
-from note.tables import HistoryTable, AliasTable, TrustTable, TrustedTable
+from note.tables import HistoryTable, AliasTable, TrustTable
 from note_kfet.middlewares import _set_current_request
 from permission.backends import PermissionBackend
 from permission.models import Role
@@ -257,18 +258,17 @@ class ProfileTrustView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
         note = context['object'].note
         context["trusting"] = TrustTable(
             note.trusting.filter(PermissionBackend.filter_queryset(self.request, Trust, "view")).distinct().all())
-        context["trusted_by"] = TrustedTable(
-            note.trusted.filter(PermissionBackend.filter_queryset(self.request, Trust, "view")).distinct().all())
         context["can_create"] = PermissionBackend.check_perm(self.request, "note.add_trust", Trust(
             trusting=context["object"].note,
             trusted=context["object"].note
         ))
         context["widget"] = {
             "name": "trusted",
-            "resetable": True,
             "attrs": {
+                "model_pk": ContentType.objects.get_for_model(Alias).pk,
                 "class": "autocomplete form-control",
                 "id": "trusted",
+                "resetable": True,
                 "api_url": "/api/note/alias/?note__polymorphic_ctype__model=noteuser",
                 "name_field": "name",
                 "placeholder": ""

apps/note/tables.py

@@ -159,11 +159,11 @@ class TrustTable(tables.Table):
         template_name = 'django_tables2/bootstrap4.html'
 
     show_header = False
-    trusted = tables.Column(attrs={'td': {'class': 'text-center'}})
+    trusted = tables.Column(attrs={'td': {'class': 'text_center'}})
 
     delete_col = tables.TemplateColumn(
         template_code=DELETE_TEMPLATE,
-        extra_context={"delete_trans": _('Delete')},
+        extra_context={"delete_trans": _('delete')},
         attrs={
             'td': {
                 'class': lambda record: 'col-sm-1'
@@ -173,46 +173,6 @@ class TrustTable(tables.Table):
         verbose_name=_("Delete"),)
 
 
-class TrustedTable(tables.Table):
-    class Meta:
-        attrs = {
-            'class': 'table table condensed table-striped',
-            'id': 'trusted_table'
-        }
-        Model = Trust
-        fields = ("trusting",)
-        template_name = "django_tables2/bootstrap4.html"
-
-    show_header = False
-    trusting = tables.Column(attrs={
-        'td': {'class': 'text-center', 'width': '100%'}})
-
-    trust_back = tables.Column(
-        verbose_name=_("Trust back"),
-        accessor="pk",
-        attrs={
-            'td': {
-                'class': '',
-                'id': lambda record: "trust_back_" + str(record.pk),
-            }
-        },
-    )
-
-    def render_trust_back(self, record):
-        user_note = record.trusted
-        trusting_note = record.trusting
-        if Trust.objects.filter(trusted=trusting_note, trusting=user_note):
-            return ""
-        val = '<button id="'
-        val += str(record.pk)
-        val += '" class="btn btn-success btn-sm text-nowrap" \
-            onclick="create_trust(' + str(record.trusted.pk) + ',' + \
-            str(record.trusting.pk) + ')">'
-        val += str(_("Add back"))
-        val += '</button>'
-        return mark_safe(val)
-
-
 class AliasTable(tables.Table):
     class Meta:
         attrs = {

apps/permission/fixtures/initial.json

@@ -1967,7 +1967,7 @@
 				"note",
 				"transaction"
 			],
-			"query": "[\"AND\", [\"OR\", {\"source\": [\"club\", \"note\"]}, {\"destination\": [\"club\", \"note\"]}], [\"OR\", {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 5000]}, \"valid\": true}, {\"destination__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 5000]}, \"valid\": false}]]",
+			"query": "[\"AND\", [\"OR\", {\"source\": [\"club\", \"note\"]}, {\"destination\": [\"club\", \"note\"]}], [\"OR\", {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 5000]}, \"valid\": false}, {\"destination__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 5000]}, \"valid\": true}]]",
 			"type": "change",
 			"mask": 2,
 			"field": "valid",
@@ -2607,7 +2607,7 @@
 				"note",
 				"transaction"
 			],
-			"query": "[\"OR\", {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 5000]}, \"valid\": true}, {\"destination__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 5000]}, \"valid\": false}]",
+			"query": "[\"OR\", {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 5000]}, \"valid\": false}, {\"destination__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 5000]}, \"valid\": true}]",
 			"type": "change",
 			"mask": 2,
 			"field": "valid",
@@ -2623,7 +2623,7 @@
 				"note",
 				"transaction"
 			],
-			"query": "[\"OR\", {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 5000]}, \"valid\": true}, {\"destination__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 5000]}, \"valid\": false}]",
+			"query": "[\"OR\", {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 5000]}, \"valid\": false}, {\"destination__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 5000]}, \"valid\": true}]",
 			"type": "change",
 			"mask": 2,
 			"field": "invalidity_reason",
@@ -3079,22 +3079,6 @@
 			"description": "Transférer de l'argent depuis une note amie en restant positif"
 		}
 	},
-	{
-		"model": "permission.permission",
-		"pk": 197,
-		"fields": {
-			"model": [
-				"note",
-				"trust"
-			],
-			"query": "{\"trusted__noteuser__user\": [\"user\"]}",
-			"type": "view",
-			"mask": 1,
-			"field": "",
-			"permanent": true,
-			"description": "Voir ceux nous ayant pour ami, pour toujours"
-		}
-	},
 	{
 		"model": "permission.role",
 		"pk": 1,
@@ -3133,8 +3117,7 @@
                 190,
                 191,
                 195,
-                196,
-                197
+                196
 			]
 		}
 	},
@@ -3531,8 +3514,7 @@
                 193,
                 194,
                 195,
-                196,
-                197
+                196
 			]
 		}
 	},

apps/treasury/migrations/0005_auto_20230129_2348.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.28 on 2023-01-29 22:48
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('treasury', '0004_auto_20211005_1544'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='invoice',
+            name='bde',
+            field=models.CharField(choices=[('TotalistSpies', 'Tota[list]Spies'), ('Saperlistpopette', 'Saper[list]popette'), ('Finalist', 'Fina[list]'), ('Listorique', '[List]orique'), ('Satellist', 'Satel[list]'), ('Monopolist', 'Monopo[list]'), ('Kataclist', 'Katac[list]')], default='TotalistSpies', max_length=32, verbose_name='BDE'),
+        ),
+    ]

apps/treasury/models.py

@@ -28,8 +28,9 @@ class Invoice(models.Model):
 
     bde = models.CharField(
         max_length=32,
-        default='Saperlistpopette',
+        default='TotalistSpies',
         choices=(
+	    ('TotalistSpies', 'Tota[list]Spies'),
             ('Saperlistpopette', 'Saper[list]popette'),
             ('Finalist', 'Fina[list]'),
             ('Listorique', '[List]orique'),
@@ -95,7 +96,7 @@ class Invoice(models.Model):
         products = self.products.all()
 
         self.place = "Gif-sur-Yvette"
-        self.my_name = "BDE ENS Cachan"
+        self.my_name = "BDE ENS Paris Saclay"
         self.my_address_street = "4 avenue des Sciences"
         self.my_city = "91190 Gif-sur-Yvette"
         self.bank_code = 30003
@@ -310,8 +311,8 @@ class SogeCredit(models.Model):
         amount = sum(transaction.total for transaction in self.transactions.all())
         if 'wei' in settings.INSTALLED_APPS:
             from wei.models import WEIMembership
-            if not WEIMembership.objects.filter(club__weiclub__year=datetime.date.today().year, user=self.user)\
-                    .exists():
+            if not WEIMembership.objects\
+                    .filter(club__weiclub__year=self.credit_transaction.created_at.year, user=self.user).exists():
                 # 80 € for people that don't go to WEI
                 amount += 8000
         return amount
@@ -324,10 +325,10 @@ class SogeCredit(models.Model):
         if self.valid or not self.pk:
             return
 
-#         bde = Club.objects.get(name="BDE")
-#         kfet = Club.objects.get(name="Kfet")
-#         bde_qs = Membership.objects.filter(user=self.user, club=bde, date_start__gte=bde.membership_start)
-#         kfet_qs = Membership.objects.filter(user=self.user, club=kfet, date_start__gte=kfet.membership_start)
+        bde = Club.objects.get(name="BDE")
+        kfet = Club.objects.get(name="Kfet")
+        bde_qs = Membership.objects.filter(user=self.user, club=bde, date_start__gte=bde.membership_start)
+        kfet_qs = Membership.objects.filter(user=self.user, club=kfet, date_start__gte=kfet.membership_start)
 
 ## Soge do not pay BDE and kfet memberships this year (2022-2023)
 #        if bde_qs.exists():

apps/wei/migrations/0004_auto_20220904_2325.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.26 on 2022-09-04 21:25
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wei', '0003_bus_size'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='weiclub',
+            name='year',
+            field=models.PositiveIntegerField(default=2022, unique=True, verbose_name='year'),
+        ),
+    ]

apps/wei/migrations/0005_auto_20230128_1850.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.28 on 2023-01-28 17:50
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wei', '0004_auto_20220904_2325'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='weiclub',
+            name='year',
+            field=models.PositiveIntegerField(default=2023, unique=True, verbose_name='year'),
+        ),
+    ]

locale/de/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-07 09:10+0200\n"
+"POT-Creation-Date: 2022-04-10 22:34+0200\n"
 "PO-Revision-Date: 2020-11-16 20:02+0000\n"
 "Last-Translator: Yohann D'ANELLO <ynerant@crans.org>\n"
 "Language-Team: German <http://translate.ynerant.fr/projects/nk20/nk20/de/>\n"
@@ -391,7 +391,7 @@ msgid "validate"
 msgstr ""
 
 #: apps/activity/templates/activity/includes/activity_info.html:71
-#: apps/logs/models.py:64 apps/note/tables.py:260
+#: apps/logs/models.py:64 apps/note/tables.py:220
 msgid "edit"
 msgstr "bearbeiten"
 
@@ -467,9 +467,9 @@ msgstr "neue Daten"
 msgid "create"
 msgstr "schaffen"
 
-#: apps/logs/models.py:65 apps/note/tables.py:230 apps/note/tables.py:277
-#: apps/permission/models.py:127 apps/treasury/tables.py:38
-#: apps/wei/tables.py:74
+#: apps/logs/models.py:65 apps/note/tables.py:166 apps/note/tables.py:190
+#: apps/note/tables.py:237 apps/permission/models.py:127
+#: apps/treasury/tables.py:38 apps/wei/tables.py:74
 msgid "delete"
 msgstr "entfernen"
 
@@ -548,7 +548,7 @@ msgstr "Maximal Größe: 2MB"
 msgid "This image cannot be loaded."
 msgstr "Dieses Bild kann nicht geladen werden."
 
-#: apps/member/forms.py:141 apps/member/views.py:102
+#: apps/member/forms.py:141 apps/member/views.py:103
 #: apps/registration/forms.py:33 apps/registration/views.py:262
 msgid "An alias with a similar name already exists."
 msgstr "Ein ähnliches Alias ist schon benutzt."
@@ -930,7 +930,7 @@ msgid "Account #"
 msgstr "Konto #"
 
 #: apps/member/templates/member/base.html:48
-#: apps/member/templates/member/base.html:62 apps/member/views.py:59
+#: apps/member/templates/member/base.html:62 apps/member/views.py:60
 #: apps/registration/templates/registration/future_profile_detail.html:48
 #: apps/wei/templates/wei/weimembership_form.html:117
 msgid "Update Profile"
@@ -1172,8 +1172,8 @@ msgstr "Click hier um eine Bestätigunglinke zu schicken."
 msgid "View my memberships"
 msgstr "Meine Mitgliedschaften schauen"
 
-#: apps/member/templates/member/profile_trust.html:10
-msgid "Add friends"
+#: apps/member/templates/member/profile_trust.html:10 apps/member/views.py:254
+msgid "Note friendships"
 msgstr ""
 
 #: apps/member/templates/member/profile_trust.html:28
@@ -1185,10 +1185,6 @@ msgid ""
 "without needing additional rights among them."
 msgstr ""
 
-#: apps/member/templates/member/profile_trust.html:39
-msgid "People having you as a friend"
-msgstr ""
-
 #: apps/member/templates/member/profile_update.html:18
 msgid "Save Changes"
 msgstr "Speichern"
@@ -1197,22 +1193,18 @@ msgstr "Speichern"
 msgid "Registrations"
 msgstr "Anmeldung"
 
-#: apps/member/views.py:72 apps/registration/forms.py:23
+#: apps/member/views.py:73 apps/registration/forms.py:23
 msgid "This address must be valid."
 msgstr "Diese Adresse muss gültig sein."
 
-#: apps/member/views.py:139
+#: apps/member/views.py:140
 msgid "Profile detail"
 msgstr "Profile detail"
 
-#: apps/member/views.py:205
+#: apps/member/views.py:206
 msgid "Search user"
 msgstr "User finden"
 
-#: apps/member/views.py:253
-msgid "Note friendships"
-msgstr ""
-
 #: apps/member/views.py:308
 msgid "Update note picture"
 msgstr "Notebild ändern"
@@ -1594,8 +1586,8 @@ msgstr "Klicken Sie zum gültigmachen"
 msgid "No reason specified"
 msgstr "Kein Grund gegeben"
 
-#: apps/note/tables.py:166 apps/note/tables.py:173 apps/note/tables.py:234
-#: apps/note/tables.py:279 apps/treasury/tables.py:39
+#: apps/note/tables.py:173 apps/note/tables.py:194 apps/note/tables.py:239
+#: apps/treasury/tables.py:39
 #: apps/treasury/templates/treasury/invoice_confirm_delete.html:30
 #: apps/treasury/templates/treasury/sogecredit_detail.html:65
 #: apps/wei/tables.py:75 apps/wei/tables.py:118
@@ -1606,17 +1598,7 @@ msgstr "Kein Grund gegeben"
 msgid "Delete"
 msgstr "Löschen"
 
-#: apps/note/tables.py:191
-msgid "Trust back"
-msgstr ""
-
-#: apps/note/tables.py:211
-#, fuzzy
-#| msgid "Add bus"
-msgid "Add back"
-msgstr "Neue Bus"
-
-#: apps/note/tables.py:262 apps/note/templates/note/conso_form.html:132
+#: apps/note/tables.py:222 apps/note/templates/note/conso_form.html:132
 #: apps/wei/tables.py:49 apps/wei/tables.py:50
 #: apps/wei/templates/wei/base.html:89
 #: apps/wei/templates/wei/bus_detail.html:20
@@ -1626,7 +1608,7 @@ msgstr "Neue Bus"
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: apps/note/tables.py:266 apps/note/tables.py:293
+#: apps/note/tables.py:226 apps/note/tables.py:253
 msgid "Hide/Show"
 msgstr ""
 
@@ -2339,7 +2321,7 @@ msgstr "spezielle Transaktion Proxies"
 msgid "credit transaction"
 msgstr "Kredit Transaktion"
 
-#: apps/treasury/models.py:431
+#: apps/treasury/models.py:430
 msgid ""
 "This user doesn't have enough money to pay the memberships with its note. "
 "Please ask her/him to credit the note before invalidating this credit."
@@ -2347,16 +2329,16 @@ msgstr ""
 "Dieser Benutzer hat nicht genug Geld, um die Mitgliedschaften mit seiner "
 "Note zu bezahlen."
 
-#: apps/treasury/models.py:452
+#: apps/treasury/models.py:451
 #: apps/treasury/templates/treasury/sogecredit_detail.html:10
 msgid "Credit from the Société générale"
 msgstr "Kredit von der Société générale"
 
-#: apps/treasury/models.py:453
+#: apps/treasury/models.py:452
 msgid "Credits from the Société générale"
 msgstr "Krediten von der Société générale"
 
-#: apps/treasury/models.py:456
+#: apps/treasury/models.py:455
 #, python-brace-format
 msgid "Soge credit for {user}"
 msgstr "Kredit von der Société générale für {user}"
@@ -2658,7 +2640,7 @@ msgstr "Wählen Sie die Rollen aus, an denen Sie interessiert sind."
 msgid "This team doesn't belong to the given bus."
 msgstr "Dieses Team gehört nicht zum angegebenen Bus."
 
-#: apps/wei/forms/surveys/wei2021.py:35 apps/wei/forms/surveys/wei2022.py:38
+#: apps/wei/forms/surveys/wei2021.py:35 apps/wei/forms/surveys/wei2022.py:35
 msgid "Choose a word:"
 msgstr "Wählen Sie ein Wort:"
 

locale/de/LC_MESSAGES/djangojs.po

@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-07 09:07+0200\n"
+"POT-Creation-Date: 2020-11-15 23:21+0100\n"
 "PO-Revision-Date: 2020-11-16 20:21+0000\n"
 "Last-Translator: Yohann D'ANELLO <ynerant@crans.org>\n"
-"Language-Team: German <http://translate.ynerant.fr/projects/nk20/nk20-js/de/"
-">\n"
+"Language-Team: German <http://translate.ynerant.fr/projects/nk20/nk20-js/de/>"
+"\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,22 +27,6 @@ msgstr "Alias erfolgreich hinzugefügt"
 msgid "Alias successfully deleted"
 msgstr "Alias erfolgreich gelöscht"
 
-#: apps/member/static/member/js/trust.js:14
-msgid "You can't add yourself as a friend"
-msgstr ""
-
-#: apps/member/static/member/js/trust.js:37
-#, fuzzy
-#| msgid "Alias successfully added"
-msgid "Friendship successfully added"
-msgstr "Alias erfolgreich hinzugefügt"
-
-#: apps/member/static/member/js/trust.js:53
-#, fuzzy
-#| msgid "Alias successfully deleted"
-msgid "Friendship successfully deleted"
-msgstr "Alias erfolgreich gelöscht"
-
 #: apps/note/static/note/js/consos.js:225
 #, javascript-format
 msgid ""
@@ -62,32 +46,32 @@ msgstr ""
 "ist negativ."
 
 #: apps/note/static/note/js/consos.js:232
-#: apps/note/static/note/js/transfer.js:309
-#: apps/note/static/note/js/transfer.js:412
+#: apps/note/static/note/js/transfer.js:298
+#: apps/note/static/note/js/transfer.js:401
 #, javascript-format
 msgid "Warning, the emitter note %s is no more a BDE member."
 msgstr "Warnung, der Emittent Hinweis %s ist kein BDE-Mitglied mehr."
 
-#: apps/note/static/note/js/consos.js:254
+#: apps/note/static/note/js/consos.js:253
 msgid "The transaction couldn't be validated because of insufficient balance."
 msgstr ""
 "Die Transaktion konnte aufgrund eines unzureichenden Saldos nicht validiert "
 "werden."
 
-#: apps/note/static/note/js/transfer.js:249
+#: apps/note/static/note/js/transfer.js:238
 msgid "This field is required and must contain a decimal positive number."
 msgstr ""
 "Dieses Feld ist erforderlich und muss eine positive Dezimalzahl enthalten."
 
-#: apps/note/static/note/js/transfer.js:256
+#: apps/note/static/note/js/transfer.js:245
 msgid "The amount must stay under 21,474,836.47 €."
 msgstr "Der Betrag muss unter 21.474.836,47 € bleiben."
 
-#: apps/note/static/note/js/transfer.js:262
+#: apps/note/static/note/js/transfer.js:251
 msgid "This field is required."
 msgstr "Dies ist ein Pflichtfeld."
 
-#: apps/note/static/note/js/transfer.js:288
+#: apps/note/static/note/js/transfer.js:277
 #, javascript-format
 msgid ""
 "Warning: the transaction of %s from %s to %s was not made because it is the "
@@ -96,12 +80,12 @@ msgstr ""
 "Warnung: Die Transaktion von %s von %s nach %s wurde nicht durchgeführt, da "
 "es sich um die gleiche Quell- und Zielnotiz handelt."
 
-#: apps/note/static/note/js/transfer.js:312
+#: apps/note/static/note/js/transfer.js:301
 #, javascript-format
 msgid "Warning, the destination note %s is no more a BDE member."
 msgstr "Warnung, der Bestimmungsvermerk %s ist kein BDE-Mitglied mehr."
 
-#: apps/note/static/note/js/transfer.js:318
+#: apps/note/static/note/js/transfer.js:307
 #, javascript-format
 msgid ""
 "Warning, the transaction of %s from the note %s to the note %s succeed, but "
@@ -110,7 +94,7 @@ msgstr ""
 "Warnung, die Transaktion von %s von der Note %s zur Note %s gelingt, aber "
 "die Emitternote %s ist sehr negativ."
 
-#: apps/note/static/note/js/transfer.js:323
+#: apps/note/static/note/js/transfer.js:312
 #, javascript-format
 msgid ""
 "Warning, the transaction of %s from the note %s to the note %s succeed, but "
@@ -119,32 +103,31 @@ msgstr ""
 "Warnung, die Transaktion von %s von der Note %s zur Note %s gelingt, aber "
 "die Emitternote %s ist negativ."
 
-#: apps/note/static/note/js/transfer.js:329
+#: apps/note/static/note/js/transfer.js:318
 #, javascript-format
 msgid "Transfer of %s from %s to %s succeed!"
 msgstr "Übertragung von %s von %s auf %s gelingt!"
 
-#: apps/note/static/note/js/transfer.js:336
-#: apps/note/static/note/js/transfer.js:357
-#: apps/note/static/note/js/transfer.js:364
+#: apps/note/static/note/js/transfer.js:325
+#: apps/note/static/note/js/transfer.js:346
+#: apps/note/static/note/js/transfer.js:353
 #, javascript-format
 msgid "Transfer of %s from %s to %s failed: %s"
 msgstr "Übertragung von %s von %s auf %s fehlgeschlagen: %s"
 
-#: apps/note/static/note/js/transfer.js:358
+#: apps/note/static/note/js/transfer.js:347
 msgid "insufficient funds"
 msgstr "unzureichende Geldmittel"
 
-#: apps/note/static/note/js/transfer.js:411
+#: apps/note/static/note/js/transfer.js:400
 msgid "Credit/debit succeed!"
 msgstr "Kredit/Debit erfolgreich!"
 
-#: apps/note/static/note/js/transfer.js:418
+#: apps/note/static/note/js/transfer.js:407
 #, javascript-format
 msgid "Credit/debit failed: %s"
 msgstr "Kredit/Debit fehlgeschlagen: %s"
 
-#: note_kfet/static/js/base.js:370
+#: note_kfet/static/js/base.js:366
 msgid "An error occured while (in)validating this transaction:"
-msgstr ""
-"Bei der (Un-)Validierung dieser Transaktion ist ein Fehler aufgetreten:"
+msgstr "Bei der (Un-)Validierung dieser Transaktion ist ein Fehler aufgetreten:"

locale/es/LC_MESSAGES/django.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-07 09:10+0200\n"
-"PO-Revision-Date: 2022-10-07 13:24+0200\n"
+"POT-Creation-Date: 2022-04-10 22:34+0200\n"
+"PO-Revision-Date: 2022-04-11 23:12+0200\n"
 "Last-Translator: elkmaennchen <elkmaennchen@crans.org>\n"
 "Language-Team: \n"
 "Language: es\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.0.1\n"
+"X-Generator: Poedit 3.0\n"
 
 #: apps/activity/apps.py:10 apps/activity/models.py:151
 #: apps/activity/models.py:167
@@ -386,7 +386,7 @@ msgid "validate"
 msgstr "validar"
 
 #: apps/activity/templates/activity/includes/activity_info.html:71
-#: apps/logs/models.py:64 apps/note/tables.py:260
+#: apps/logs/models.py:64 apps/note/tables.py:220
 msgid "edit"
 msgstr "modificar"
 
@@ -464,9 +464,9 @@ msgstr "nuevos datos"
 msgid "create"
 msgstr "crear"
 
-#: apps/logs/models.py:65 apps/note/tables.py:230 apps/note/tables.py:277
-#: apps/permission/models.py:127 apps/treasury/tables.py:38
-#: apps/wei/tables.py:74
+#: apps/logs/models.py:65 apps/note/tables.py:166 apps/note/tables.py:190
+#: apps/note/tables.py:237 apps/permission/models.py:127
+#: apps/treasury/tables.py:38 apps/wei/tables.py:74
 msgid "delete"
 msgstr "suprimir"
 
@@ -545,7 +545,7 @@ msgstr "Tamaño máximo : 2Mo"
 msgid "This image cannot be loaded."
 msgstr "Esta imagen no puede ser cargada."
 
-#: apps/member/forms.py:141 apps/member/views.py:102
+#: apps/member/forms.py:141 apps/member/views.py:103
 #: apps/registration/forms.py:33 apps/registration/views.py:262
 msgid "An alias with a similar name already exists."
 msgstr "Un alias similar ya existe."
@@ -921,7 +921,7 @@ msgid "Account #"
 msgstr "Cuenta n°"
 
 #: apps/member/templates/member/base.html:48
-#: apps/member/templates/member/base.html:62 apps/member/views.py:59
+#: apps/member/templates/member/base.html:62 apps/member/views.py:60
 #: apps/registration/templates/registration/future_profile_detail.html:48
 #: apps/wei/templates/wei/weimembership_form.html:117
 msgid "Update Profile"
@@ -1155,9 +1155,9 @@ msgstr "Hacer clic aquí para reenviar un enlace de validación."
 msgid "View my memberships"
 msgstr "Ver mis afiliaciones"
 
-#: apps/member/templates/member/profile_trust.html:10
-msgid "Add friends"
-msgstr "Añadir amig@s"
+#: apps/member/templates/member/profile_trust.html:10 apps/member/views.py:254
+msgid "Note friendships"
+msgstr "Amistades de note"
 
 #: apps/member/templates/member/profile_trust.html:28
 msgid ""
@@ -1172,10 +1172,6 @@ msgstr ""
 "simplificar el reembolso entre amig@s por Note Kfet. Pues una persona puede "
 "crear todas la transacciones sin tener derechos particulares."
 
-#: apps/member/templates/member/profile_trust.html:39
-msgid "People having you as a friend"
-msgstr "Personas que tienen usted como amig@"
-
 #: apps/member/templates/member/profile_update.html:18
 msgid "Save Changes"
 msgstr "Guardar cambios"
@@ -1184,22 +1180,18 @@ msgstr "Guardar cambios"
 msgid "Registrations"
 msgstr "Registraciones"
 
-#: apps/member/views.py:72 apps/registration/forms.py:23
+#: apps/member/views.py:73 apps/registration/forms.py:23
 msgid "This address must be valid."
 msgstr "Este correo tiene que ser valido."
 
-#: apps/member/views.py:139
+#: apps/member/views.py:140
 msgid "Profile detail"
 msgstr "Detalles del usuario"
 
-#: apps/member/views.py:205
+#: apps/member/views.py:206
 msgid "Search user"
 msgstr "Buscar un usuario"
 
-#: apps/member/views.py:253
-msgid "Note friendships"
-msgstr "Amistades de note"
-
 #: apps/member/views.py:308
 msgid "Update note picture"
 msgstr "Modificar la imagen de la note"
@@ -1581,8 +1573,8 @@ msgstr "Hacer clic para validar"
 msgid "No reason specified"
 msgstr "Ningún motivo dado"
 
-#: apps/note/tables.py:166 apps/note/tables.py:173 apps/note/tables.py:234
-#: apps/note/tables.py:279 apps/treasury/tables.py:39
+#: apps/note/tables.py:173 apps/note/tables.py:194 apps/note/tables.py:239
+#: apps/treasury/tables.py:39
 #: apps/treasury/templates/treasury/invoice_confirm_delete.html:30
 #: apps/treasury/templates/treasury/sogecredit_detail.html:65
 #: apps/wei/tables.py:75 apps/wei/tables.py:118
@@ -1593,15 +1585,7 @@ msgstr "Ningún motivo dado"
 msgid "Delete"
 msgstr "Suprimir"
 
-#: apps/note/tables.py:191
-msgid "Trust back"
-msgstr "Añadir como amig@"
-
-#: apps/note/tables.py:211
-msgid "Add back"
-msgstr "Añadir en retorno"
-
-#: apps/note/tables.py:262 apps/note/templates/note/conso_form.html:132
+#: apps/note/tables.py:222 apps/note/templates/note/conso_form.html:132
 #: apps/wei/tables.py:49 apps/wei/tables.py:50
 #: apps/wei/templates/wei/base.html:89
 #: apps/wei/templates/wei/bus_detail.html:20
@@ -1611,7 +1595,7 @@ msgstr "Añadir en retorno"
 msgid "Edit"
 msgstr "Editar"
 
-#: apps/note/tables.py:266 apps/note/tables.py:293
+#: apps/note/tables.py:226 apps/note/tables.py:253
 msgid "Hide/Show"
 msgstr "Ocultar/Mostrar"
 
@@ -2317,7 +2301,7 @@ msgstr "proxys de transacciones especiales"
 msgid "credit transaction"
 msgstr "transacción de crédito"
 
-#: apps/treasury/models.py:431
+#: apps/treasury/models.py:430
 msgid ""
 "This user doesn't have enough money to pay the memberships with its note. "
 "Please ask her/him to credit the note before invalidating this credit."
@@ -2326,16 +2310,16 @@ msgstr ""
 "afiliaciones. Por favor pídelo acreditar su note antes de invalidar este "
 "crédito."
 
-#: apps/treasury/models.py:452
+#: apps/treasury/models.py:451
 #: apps/treasury/templates/treasury/sogecredit_detail.html:10
 msgid "Credit from the Société générale"
 msgstr "Crédito de la Société Générale"
 
-#: apps/treasury/models.py:453
+#: apps/treasury/models.py:452
 msgid "Credits from the Société générale"
 msgstr "Créditos de la Société Générale"
 
-#: apps/treasury/models.py:456
+#: apps/treasury/models.py:455
 #, python-brace-format
 msgid "Soge credit for {user}"
 msgstr "Crédito de la Société Générale para {user}"
@@ -2628,7 +2612,7 @@ msgstr "Elegir los papeles que le interesa."
 msgid "This team doesn't belong to the given bus."
 msgstr "Este equipo no pertenece al bus dado."
 
-#: apps/wei/forms/surveys/wei2021.py:35 apps/wei/forms/surveys/wei2022.py:38
+#: apps/wei/forms/surveys/wei2021.py:35 apps/wei/forms/surveys/wei2022.py:35
 msgid "Choose a word:"
 msgstr "Elegir una palabra :"
 

locale/es/LC_MESSAGES/djangojs.po

@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-07 09:07+0200\n"
-"PO-Revision-Date: 2022-10-07 13:20+0200\n"
-"Last-Translator: elkmaennchen <elkmaennchen@crans.org>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2020-11-15 23:21+0100\n"
+"PO-Revision-Date: 2020-11-21 12:23+0100\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.0.1\n"
+"Last-Translator: elkmaennchen <elkmaennchen@crans.org>\n"
+"Language-Team: \n"
+"X-Generator: Poedit 2.3\n"
 
 #: apps/member/static/member/js/alias.js:17
 msgid "Alias successfully added"
@@ -26,18 +26,6 @@ msgstr "Alias añadido con éxito"
 msgid "Alias successfully deleted"
 msgstr "Alias suprimido con éxito"
 
-#: apps/member/static/member/js/trust.js:14
-msgid "You can't add yourself as a friend"
-msgstr "No puede añadir asimismo como amig@"
-
-#: apps/member/static/member/js/trust.js:37
-msgid "Friendship successfully added"
-msgstr "Amig@ añadido con éxito"
-
-#: apps/member/static/member/js/trust.js:53
-msgid "Friendship successfully deleted"
-msgstr "Amig@ suprimido con éxito"
-
 #: apps/note/static/note/js/consos.js:225
 #, javascript-format
 msgid ""
@@ -56,29 +44,30 @@ msgstr ""
 "Cuidado, la transacción de %s fue un éxito, pero la note %s está negativa."
 
 #: apps/note/static/note/js/consos.js:232
-#: apps/note/static/note/js/transfer.js:309
-#: apps/note/static/note/js/transfer.js:412
+#: apps/note/static/note/js/transfer.js:298
+#: apps/note/static/note/js/transfer.js:401
 #, javascript-format
 msgid "Warning, the emitter note %s is no more a BDE member."
 msgstr "Cuidado, la note remitente %s no está más miembro del BDE."
 
-#: apps/note/static/note/js/consos.js:254
+#: apps/note/static/note/js/consos.js:253
 msgid "The transaction couldn't be validated because of insufficient balance."
-msgstr "La transacción no pudo ser validada por culpa de saldo demasiado bajo."
+msgstr ""
+"La transacción no pudo ser validada por culpa de saldo demasiado bajo."
 
-#: apps/note/static/note/js/transfer.js:249
+#: apps/note/static/note/js/transfer.js:238
 msgid "This field is required and must contain a decimal positive number."
 msgstr "Este campo obligatorio requiere un número decimal positivo."
 
-#: apps/note/static/note/js/transfer.js:256
+#: apps/note/static/note/js/transfer.js:245
 msgid "The amount must stay under 21,474,836.47 €."
 msgstr "El monto no puede superar los 21 474 836,47 €."
 
-#: apps/note/static/note/js/transfer.js:262
+#: apps/note/static/note/js/transfer.js:251
 msgid "This field is required."
 msgstr "Este campo es obligatorio."
 
-#: apps/note/static/note/js/transfer.js:288
+#: apps/note/static/note/js/transfer.js:277
 #, javascript-format
 msgid ""
 "Warning: the transaction of %s from %s to %s was not made because it is the "
@@ -87,12 +76,12 @@ msgstr ""
 "Cuidado : la transacción de %s de %s a %s no fue echa porque la fuente y el "
 "destino son iguales."
 
-#: apps/note/static/note/js/transfer.js:312
+#: apps/note/static/note/js/transfer.js:301
 #, javascript-format
 msgid "Warning, the destination note %s is no more a BDE member."
 msgstr "Cuidado, la note destino %s no está más miembro del BDE."
 
-#: apps/note/static/note/js/transfer.js:318
+#: apps/note/static/note/js/transfer.js:307
 #, javascript-format
 msgid ""
 "Warning, the transaction of %s from the note %s to the note %s succeed, but "
@@ -101,7 +90,7 @@ msgstr ""
 "Cuidado, la transacción de %s de la note %s a la note %s fue un éxito, pero "
 "la note fuente %s está muy negativa."
 
-#: apps/note/static/note/js/transfer.js:323
+#: apps/note/static/note/js/transfer.js:312
 #, javascript-format
 msgid ""
 "Warning, the transaction of %s from the note %s to the note %s succeed, but "
@@ -110,31 +99,31 @@ msgstr ""
 "Cuidado, la transacción de %s de la note %s a la note %s fue un éxito, pero "
 "la note fuente %s está negativa."
 
-#: apps/note/static/note/js/transfer.js:329
+#: apps/note/static/note/js/transfer.js:318
 #, javascript-format
 msgid "Transfer of %s from %s to %s succeed!"
 msgstr "¡ La transacción de %s de %s a %s fue un éxito !"
 
-#: apps/note/static/note/js/transfer.js:336
-#: apps/note/static/note/js/transfer.js:357
-#: apps/note/static/note/js/transfer.js:364
+#: apps/note/static/note/js/transfer.js:325
+#: apps/note/static/note/js/transfer.js:346
+#: apps/note/static/note/js/transfer.js:353
 #, javascript-format
 msgid "Transfer of %s from %s to %s failed: %s"
 msgstr "La transacción de %s de %s a %s fue un fracaso : %s"
 
-#: apps/note/static/note/js/transfer.js:358
+#: apps/note/static/note/js/transfer.js:347
 msgid "insufficient funds"
 msgstr "fundos insuficientes"
 
-#: apps/note/static/note/js/transfer.js:411
+#: apps/note/static/note/js/transfer.js:400
 msgid "Credit/debit succeed!"
 msgstr "¡ Crédito/débito tubo éxito !"
 
-#: apps/note/static/note/js/transfer.js:418
+#: apps/note/static/note/js/transfer.js:407
 #, javascript-format
 msgid "Credit/debit failed: %s"
 msgstr "Crédito/débito falló : %s"
 
-#: note_kfet/static/js/base.js:370
+#: note_kfet/static/js/base.js:366
 msgid "An error occured while (in)validating this transaction:"
 msgstr "Un error ocurrió durante la (in)validación de esta transacción :"

locale/fr/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-07 09:10+0200\n"
+"POT-Creation-Date: 2022-04-10 22:34+0200\n"
 "PO-Revision-Date: 2022-04-11 22:05+0200\n"
 "Last-Translator: elkmaennchen <elkmaennchen@crans.org>\n"
 "Language-Team: French <http://translate.ynerant.fr/projects/nk20/nk20/fr/>\n"
@@ -388,7 +388,7 @@ msgid "validate"
 msgstr "valider"
 
 #: apps/activity/templates/activity/includes/activity_info.html:71
-#: apps/logs/models.py:64 apps/note/tables.py:260
+#: apps/logs/models.py:64 apps/note/tables.py:220
 msgid "edit"
 msgstr "modifier"
 
@@ -466,9 +466,9 @@ msgstr "nouvelles données"
 msgid "create"
 msgstr "créer"
 
-#: apps/logs/models.py:65 apps/note/tables.py:230 apps/note/tables.py:277
-#: apps/permission/models.py:127 apps/treasury/tables.py:38
-#: apps/wei/tables.py:74
+#: apps/logs/models.py:65 apps/note/tables.py:166 apps/note/tables.py:190
+#: apps/note/tables.py:237 apps/permission/models.py:127
+#: apps/treasury/tables.py:38 apps/wei/tables.py:74
 msgid "delete"
 msgstr "supprimer"
 
@@ -547,7 +547,7 @@ msgstr "Taille maximale : 2 Mo"
 msgid "This image cannot be loaded."
 msgstr "Cette image ne peut pas être chargée."
 
-#: apps/member/forms.py:141 apps/member/views.py:102
+#: apps/member/forms.py:141 apps/member/views.py:103
 #: apps/registration/forms.py:33 apps/registration/views.py:262
 msgid "An alias with a similar name already exists."
 msgstr "Un alias avec un nom similaire existe déjà."
@@ -924,7 +924,7 @@ msgid "Account #"
 msgstr "Compte n°"
 
 #: apps/member/templates/member/base.html:48
-#: apps/member/templates/member/base.html:62 apps/member/views.py:59
+#: apps/member/templates/member/base.html:62 apps/member/views.py:60
 #: apps/registration/templates/registration/future_profile_detail.html:48
 #: apps/wei/templates/wei/weimembership_form.html:117
 msgid "Update Profile"
@@ -1158,9 +1158,9 @@ msgstr "Cliquez ici pour renvoyer un lien de validation."
 msgid "View my memberships"
 msgstr "Voir mes adhésions"
 
-#: apps/member/templates/member/profile_trust.html:10
-msgid "Add friends"
-msgstr "Ajouter des amis"
+#: apps/member/templates/member/profile_trust.html:10 apps/member/views.py:254
+msgid "Note friendships"
+msgstr "Amitiés note"
 
 #: apps/member/templates/member/profile_trust.html:28
 msgid ""
@@ -1175,10 +1175,6 @@ msgstr ""
 "ami⋅es via note. En effet, une personne peut effectuer tous les transferts "
 "sans posséder de droits supplémentaires."
 
-#: apps/member/templates/member/profile_trust.html:39
-msgid "People having you as a friend"
-msgstr "Personnes vous ayant ajouté"
-
 #: apps/member/templates/member/profile_update.html:18
 msgid "Save Changes"
 msgstr "Sauvegarder les changements"
@@ -1187,22 +1183,18 @@ msgstr "Sauvegarder les changements"
 msgid "Registrations"
 msgstr "Inscriptions"
 
-#: apps/member/views.py:72 apps/registration/forms.py:23
+#: apps/member/views.py:73 apps/registration/forms.py:23
 msgid "This address must be valid."
 msgstr "Cette adresse doit être valide."
 
-#: apps/member/views.py:139
+#: apps/member/views.py:140
 msgid "Profile detail"
 msgstr "Détails de l'utilisateur"
 
-#: apps/member/views.py:205
+#: apps/member/views.py:206
 msgid "Search user"
 msgstr "Chercher un utilisateur"
 
-#: apps/member/views.py:253
-msgid "Note friendships"
-msgstr "Amitiés note"
-
 #: apps/member/views.py:308
 msgid "Update note picture"
 msgstr "Modifier la photo de la note"
@@ -1587,8 +1579,8 @@ msgstr "Cliquez pour valider"
 msgid "No reason specified"
 msgstr "Pas de motif spécifié"
 
-#: apps/note/tables.py:166 apps/note/tables.py:173 apps/note/tables.py:234
-#: apps/note/tables.py:279 apps/treasury/tables.py:39
+#: apps/note/tables.py:173 apps/note/tables.py:194 apps/note/tables.py:239
+#: apps/treasury/tables.py:39
 #: apps/treasury/templates/treasury/invoice_confirm_delete.html:30
 #: apps/treasury/templates/treasury/sogecredit_detail.html:65
 #: apps/wei/tables.py:75 apps/wei/tables.py:118
@@ -1599,15 +1591,7 @@ msgstr "Pas de motif spécifié"
 msgid "Delete"
 msgstr "Supprimer"
 
-#: apps/note/tables.py:191
-msgid "Trust back"
-msgstr "Ajouter en ami"
-
-#: apps/note/tables.py:211
-msgid "Add back"
-msgstr "Ajouter"
-
-#: apps/note/tables.py:262 apps/note/templates/note/conso_form.html:132
+#: apps/note/tables.py:222 apps/note/templates/note/conso_form.html:132
 #: apps/wei/tables.py:49 apps/wei/tables.py:50
 #: apps/wei/templates/wei/base.html:89
 #: apps/wei/templates/wei/bus_detail.html:20
@@ -1617,7 +1601,7 @@ msgstr "Ajouter"
 msgid "Edit"
 msgstr "Éditer"
 
-#: apps/note/tables.py:266 apps/note/tables.py:293
+#: apps/note/tables.py:226 apps/note/tables.py:253
 msgid "Hide/Show"
 msgstr "Afficher/Masquer"
 
@@ -2325,7 +2309,7 @@ msgstr "proxys de transactions spéciales"
 msgid "credit transaction"
 msgstr "transaction de crédit"
 
-#: apps/treasury/models.py:431
+#: apps/treasury/models.py:430
 msgid ""
 "This user doesn't have enough money to pay the memberships with its note. "
 "Please ask her/him to credit the note before invalidating this credit."
@@ -2333,16 +2317,16 @@ msgstr ""
 "Cet utilisateur 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."
 
-#: apps/treasury/models.py:452
+#: apps/treasury/models.py:451
 #: apps/treasury/templates/treasury/sogecredit_detail.html:10
 msgid "Credit from the Société générale"
 msgstr "Crédit de la Société générale"
 
-#: apps/treasury/models.py:453
+#: apps/treasury/models.py:452
 msgid "Credits from the Société générale"
 msgstr "Crédits de la Société générale"
 
-#: apps/treasury/models.py:456
+#: apps/treasury/models.py:455
 #, python-brace-format
 msgid "Soge credit for {user}"
 msgstr "Crédit de la société générale pour l'utilisateur {user}"
@@ -2640,7 +2624,7 @@ msgstr "Sélectionnez les rôles qui vous intéressent."
 msgid "This team doesn't belong to the given bus."
 msgstr "Cette équipe n'appartient pas à ce bus."
 
-#: apps/wei/forms/surveys/wei2021.py:35 apps/wei/forms/surveys/wei2022.py:38
+#: apps/wei/forms/surveys/wei2021.py:35 apps/wei/forms/surveys/wei2022.py:35
 msgid "Choose a word:"
 msgstr "Choisissez un mot :"
 

locale/fr/LC_MESSAGES/djangojs.po

@@ -3,11 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-07 09:07+0200\n"
+"POT-Creation-Date: 2020-11-15 23:21+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,18 +26,6 @@ msgstr "Alias ajouté avec succès"
 msgid "Alias successfully deleted"
 msgstr "Alias supprimé avec succès"
 
-#: apps/member/static/member/js/trust.js:14
-msgid "You can't add yourself as a friend"
-msgstr ""
-
-#: apps/member/static/member/js/trust.js:37
-msgid "Friendship successfully added"
-msgstr "Amitié ajoutée avec succès"
-
-#: apps/member/static/member/js/trust.js:53
-msgid "Friendship successfully deleted"
-msgstr "Amitié supprimée avec succès"
-
 #: apps/note/static/note/js/consos.js:225
 #, javascript-format
 msgid ""
@@ -56,31 +45,31 @@ msgstr ""
 "la note émettrice %s est en négatif."
 
 #: apps/note/static/note/js/consos.js:232
-#: apps/note/static/note/js/transfer.js:309
-#: apps/note/static/note/js/transfer.js:412
+#: apps/note/static/note/js/transfer.js:298
+#: apps/note/static/note/js/transfer.js:401
 #, javascript-format
 msgid "Warning, the emitter note %s is no more a BDE member."
 msgstr "Attention, la note émettrice %s n'est plus adhérente."
 
-#: apps/note/static/note/js/consos.js:254
+#: apps/note/static/note/js/consos.js:253
 msgid "The transaction couldn't be validated because of insufficient balance."
 msgstr ""
 "La transaction n'a pas pu être validée pour cause de solde insuffisant."
 
-#: apps/note/static/note/js/transfer.js:249
+#: apps/note/static/note/js/transfer.js:238
 msgid "This field is required and must contain a decimal positive number."
 msgstr ""
 "Ce champ est requis et doit comporter un nombre décimal strictement positif."
 
-#: apps/note/static/note/js/transfer.js:256
+#: apps/note/static/note/js/transfer.js:245
 msgid "The amount must stay under 21,474,836.47 €."
 msgstr "Le montant ne doit pas excéder 21 474 836.47 €."
 
-#: apps/note/static/note/js/transfer.js:262
+#: apps/note/static/note/js/transfer.js:251
 msgid "This field is required."
 msgstr "Ce champ est requis."
 
-#: apps/note/static/note/js/transfer.js:288
+#: apps/note/static/note/js/transfer.js:277
 #, javascript-format
 msgid ""
 "Warning: the transaction of %s from %s to %s was not made because it is the "
@@ -89,12 +78,12 @@ msgstr ""
 "Attention : la transaction de %s de la note %s vers la note %s n'a pas été "
 "faite car il s'agit de la même note au départ et à l'arrivée."
 
-#: apps/note/static/note/js/transfer.js:312
+#: apps/note/static/note/js/transfer.js:301
 #, javascript-format
 msgid "Warning, the destination note %s is no more a BDE member."
 msgstr "Attention, la note de destination %s n'est plus adhérente."
 
-#: apps/note/static/note/js/transfer.js:318
+#: apps/note/static/note/js/transfer.js:307
 #, javascript-format
 msgid ""
 "Warning, the transaction of %s from the note %s to the note %s succeed, but "
@@ -103,7 +92,7 @@ msgstr ""
 "Attention, La transaction de %s depuis la note %s vers la note %s a été "
 "réalisée avec succès, mais la note émettrice %s est en négatif sévère."
 
-#: apps/note/static/note/js/transfer.js:323
+#: apps/note/static/note/js/transfer.js:312
 #, javascript-format
 msgid ""
 "Warning, the transaction of %s from the note %s to the note %s succeed, but "
@@ -112,33 +101,33 @@ msgstr ""
 "Attention, La transaction de %s depuis la note %s vers la note %s a été "
 "réalisée avec succès, mais la note émettrice %s est en négatif."
 
-#: apps/note/static/note/js/transfer.js:329
+#: apps/note/static/note/js/transfer.js:318
 #, javascript-format
 msgid "Transfer of %s from %s to %s succeed!"
 msgstr ""
 "Le transfert de %s de la note %s vers la note %s a été fait avec succès !"
 
-#: apps/note/static/note/js/transfer.js:336
-#: apps/note/static/note/js/transfer.js:357
-#: apps/note/static/note/js/transfer.js:364
+#: apps/note/static/note/js/transfer.js:325
+#: apps/note/static/note/js/transfer.js:346
+#: apps/note/static/note/js/transfer.js:353
 #, javascript-format
 msgid "Transfer of %s from %s to %s failed: %s"
 msgstr "Le transfert de %s de la note %s vers la note %s a échoué : %s"
 
-#: apps/note/static/note/js/transfer.js:358
+#: apps/note/static/note/js/transfer.js:347
 msgid "insufficient funds"
 msgstr "solde insuffisant"
 
-#: apps/note/static/note/js/transfer.js:411
+#: apps/note/static/note/js/transfer.js:400
 msgid "Credit/debit succeed!"
 msgstr "Le crédit/retrait a bien été effectué !"
 
-#: apps/note/static/note/js/transfer.js:418
+#: apps/note/static/note/js/transfer.js:407
 #, javascript-format
 msgid "Credit/debit failed: %s"
 msgstr "Le crédit/retrait a échoué : %s"
 
-#: note_kfet/static/js/base.js:370
+#: note_kfet/static/js/base.js:366
 msgid "An error occured while (in)validating this transaction:"
 msgstr ""
 "Une erreur est survenue lors de la validation/dévalidation de cette "

note_kfet/settings/base.py

@@ -252,7 +252,7 @@ REST_FRAMEWORK = {
         'rest_framework.authentication.TokenAuthentication',
         'oauth2_provider.contrib.rest_framework.OAuth2Authentication',
     ],
-    'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.PageNumberPagination',
+    'DEFAULT_PAGINATION_CLASS': 'apps.api.pagination.CustomPagination',
     'PAGE_SIZE': 20,
 }
 

note_kfet/static/css/custom.css

@@ -65,7 +65,10 @@ mark {
 
 /* Last BDE colors */
 .bg-primary {
-    background-color: rgb(102, 83, 105) !important;
+/*    background-color: rgb(18, 67, 4) !important; */
+/* MODE VIEUXCON=ON */
+/*    background-color: rgb(166, 0, 2) !important; */
+    background-color: rgb(0, 0, 0) !important;
 }
 
 html {
@@ -80,15 +83,15 @@ body {
 .btn-outline-primary:hover,
 .btn-outline-primary:not(:disabled):not(.disabled).active,
 .btn-outline-primary:not(:disabled):not(.disabled):active {
-    color: #fff;
-    background-color: rgb(102, 83, 105);
-    border-color: rgb(102, 83, 105);
+   color:  rgb(241, 229, 52);
+    background-color: rgb(228, 35, 132);
+    border-color: rgb(228, 35, 132);
 }
 
 .btn-outline-primary {
-    color: rgb(102, 83, 105);
-    background-color: rgba(248, 249, 250, 0.9);
-    border-color: rgb(102, 83, 105);
+    color: #fff;
+    background-color: #000;
+    border-color: #464647;
 }
 
 .turbolinks-progress-bar {
@@ -98,36 +101,63 @@ body {
 .btn-primary:hover,
 .btn-primary:not(:disabled):not(.disabled).active,
 .btn-primary:not(:disabled):not(.disabled):active {
-    color: #fff;
-    background-color: rgb(102, 83, 105);
-    border-color: rgb(102, 83, 105);
+    color:  rgb(241, 229, 52);
+    background-color: rgb(228, 35, 132);
+    border-color: rgb(228, 35, 132);
 }
 
 .btn-primary {
-    color: rgba(248, 249, 250, 0.9); 
-    background-color: rgb(102, 83, 105);
-    border-color: rgb(102, 83, 105);
+    color:  #fff; 
+    background-color: #000;
+    border-color: #adb5bd;
 }
 
 .border-primary {
-    border-color: rgb(115, 15, 115) !important; 
+    border-color: rgb(228, 35, 132) !important; 
 }
 
+.btn-secondary {
+    color:  #fff;
+    background-color: #000;
+    border-color: #adb5bd;
+}
+
+.btn-secondary:hover,
+.btn-secondary:not(:disabled):not(.disabled).active,
+.btn-secondary:not(:disabled):not(.disabled):active {
+    color:  rgb(241, 229, 52);
+    background-color: rgb(228, 35, 132);
+    border-color: rgb(228, 35, 132);
+}
+
+
+.btn-outline-dark {
+    color: #343a40;
+    border-color: #343a40;
+}
+
+.btn-outline-dark:hover,
+.btn-outline-dark:not(:disabled):not(.disabled).active,
+.btn-outline-dark:not(:disabled):not(.disabled):active {
+    color:  rgb(241, 229, 52);
+    background-color: rgb(228, 35, 132);
+    border-color: rgb(228, 35, 132);
+}
+
+
 a {
-    color: rgb(102, 83, 105);
+    color: rgb(228, 35, 132);
 }
 
 a:hover {
-    color: rgb(200, 30, 200);
+    color: rgb(228, 35, 132);
 }
 
 .form-control:focus {
-    box-shadow: 0 0 0 0.25rem rgba(200, 30, 200, 0.25);
-    border-color: rgb(200, 30, 200);
+    box-shadow: 0 0 0 0.25rem rgb(228 35 132 / 50%);
+    border-color: rgb(228, 35, 132);
 }
 
 .btn-outline-primary.focus {
-  box-shadow: 0 0 0 0.25rem rgba(200, 30, 200, 0.5);
+  box-shadow: 0 0 0 0.25rem rgb(228 35 132 / 10%);
 }
-
-

note_kfet/static/js/autocomplete_model.js

@@ -1,5 +1,3 @@
-const keycodes = [32, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 106, 107, 109, 110, 111, 186, 187, 188, 189, 190, 191, 219, 220, 221, 222]
-
 $(document).ready(function () {
   $('.autocomplete').keyup(function (e) {
     const target = $('#' + e.target.id)
@@ -12,6 +10,7 @@ $(document).ready(function () {
     const input = target.val()
     target.addClass('is-invalid')
     target.removeClass('is-valid')
+    $('#' + prefix + '_reset').removeClass('d-none')
 
     $.getJSON(api_url + (api_url.includes('?') ? '&' : '?') + 'format=json&search=^' + input + api_url_suffix, function (objects) {
       let html = '<ul class="list-group list-group-flush" id="' + prefix + '_list">'
@@ -42,14 +41,11 @@ $(document).ready(function () {
 
           if (typeof autocompleted !== 'undefined') { autocompleted(obj, prefix) }
         })
+
+        if (input === obj[name_field]) { $('#' + prefix + '_pk').val(obj.id) }
       })
 
-      if (objects.results.length >= 2) {
-        $('#' + prefix + '_pk').val(objects.results[0].id)
-      }
-      if (objects.results.length === 1 &&
-          (keycodes.includes(e.originalEvent.keyCode) ||
-            input === objects.results[0][name_field])) {
+      if (objects.results.length === 1 && e.originalEvent.keyCode >= 32) {
         $('#' + prefix + '_' + objects.results[0].id).trigger('click')
       }
     })
@@ -59,6 +55,7 @@ $(document).ready(function () {
     const name = $(this).attr('id').replace('_reset', '')
     $('#' + name + '_pk').val('')
     $('#' + name).val('')
-    $('#' + name).tooltip('hide')
+    $('#' + name + '_list').html('')
+    $(this).addClass('d-none')
   })
 })

note_kfet/templates/autocomplete_model.html

@@ -12,6 +12,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
     {% endfor %}
     aria-describedby="{{widget.attrs.id}}_tooltip">
     {% if widget.resetable %}
-        <a id="{{ widget.attrs.id }}_reset" class="btn btn-light autocomplete-reset">{% trans "Reset" %}</a>
+        <a id="{{ widget.attrs.id }}_reset" class="btn btn-light autocomplete-reset{% if not widget.value %} d-none{% endif %}">{% trans "Reset" %}</a>
     {% endif %}
 

requirements.txt

@@ -17,3 +17,6 @@ django-tables2~=2.3.1
 python-memcached~=1.59
 phonenumbers~=8.9.10
 Pillow>=5.4.1
+oauthlib<3.2.1
+lxml<4.9.2
+zipp>=2.0.0,<2.0.1

tox.ini

@@ -16,7 +16,7 @@ skipsdist = True
 sitepackages = True
 deps =
     -r{toxinidir}/requirements.txt
-    coverage
+    coverage<6.5.0
 commands =
     coverage run --omit='apps/scripts*,*_example.py,note_kfet/wsgi.py' --source=apps,note_kfet ./manage.py test apps/
     coverage report -m