Merge branch 'master' into 'tranfer_front'

# Conflicts:
#   apps/activity/views.py
#   apps/permission/backends.py
#   locale/de/LC_MESSAGES/django.po
#   locale/fr/LC_MESSAGES/django.po
#   static/js/base.js
#   templates/base.html
#   templates/member/user_list.html

apps/note/models/transactions.py

@@ -8,6 +8,7 @@ from django.utils.translation import gettext_lazy as _
 from polymorphic.models import PolymorphicModel
 
 from .notes import Note, NoteClub, NoteSpecial
+from ..templatetags.pretty_money import pretty_money
 
 """
 Defines transactions
@@ -198,6 +199,14 @@ class Transaction(PolymorphicModel):
         self.source.save()
         self.destination.save()
 
+    def delete(self, **kwargs):
+        """
+        Whenever we want to delete a transaction (caution with this), we ensure the transaction is invalid first.
+        """
+        self.valid = False
+        self.save(**kwargs)
+        super().delete(**kwargs)
+
     @property
     def total(self):
         return self.amount * self.quantity
@@ -206,6 +215,10 @@ class Transaction(PolymorphicModel):
     def type(self):
         return _('Transfer')
 
+    def __str__(self):
+        return self.__class__.__name__ + " from " + str(self.source) + " to " + str(self.destination) + " of "\
+            + pretty_money(self.quantity * self.amount) + ("" if self.valid else " invalid")
+
 
 class RecurrentTransaction(Transaction):
     """

apps/note/signals.py

@@ -10,14 +10,14 @@ def save_user_note(instance, raw, **_kwargs):
         # When provisionning data, do not try to autocreate
         return
 
-    if (instance.is_superuser or instance.profile.registration_valid) and instance.is_active:
+    if instance.is_superuser or instance.profile.registration_valid:
         # Create note only when the registration is validated
         from note.models import NoteUser
         NoteUser.objects.get_or_create(user=instance)
         instance.note.save()
 
 
-def save_club_note(instance, created, raw, **_kwargs):
+def save_club_note(instance, raw, **_kwargs):
     """
     Hook to create and save a note when a club is updated
     """
@@ -25,7 +25,6 @@ def save_club_note(instance, created, raw, **_kwargs):
         # When provisionning data, do not try to autocreate
         return
 
-    if created:
-        from .models import NoteClub
-        NoteClub.objects.create(club=instance)
+    from .models import NoteClub
+    NoteClub.objects.get_or_create(club=instance)
     instance.note.save()

apps/note/views.py

@@ -31,7 +31,7 @@ class TransactionCreateView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTabl
     table_class = HistoryTable
 
     def get_queryset(self, **kwargs):
-        return super().get_queryset(**kwargs).order_by("-id").all()[:20]
+        return super().get_queryset(**kwargs).order_by("-created_at", "-id").all()[:20]
 
     def get_context_data(self, **kwargs):
         """
@@ -121,7 +121,7 @@ class ConsoView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView):
     table_class = HistoryTable
 
     def get_queryset(self, **kwargs):
-        return super().get_queryset(**kwargs).order_by("-id").all()[:20]
+        return super().get_queryset(**kwargs).order_by("-created_at", "-id").all()[:20]
 
     def get_context_data(self, **kwargs):
         """