Merge branch 'master' into 'devalidation_reason'

# Conflicts:
#   locale/de/LC_MESSAGES/django.po
#   locale/fr/LC_MESSAGES/django.po

apps/note/fixtures/initial.json

@@ -70,7 +70,7 @@
       "balance": 0,
       "last_negative": null,
       "is_active": true,
-      "display_image": "",
+      "display_image": "pic/default.png",
       "created_at": "2020-02-20T20:09:38.615Z"
     }
   },
@@ -85,23 +85,8 @@
       "balance": 0,
       "last_negative": null,
       "is_active": true,
-      "display_image": "",
-      "created_at": "2020-02-20T20:16:14.753Z"
-    }
-  },
-  {
-    "model": "note.note",
-    "pk": 7,
-    "fields": {
-      "polymorphic_ctype": [
-        "note",
-        "noteuser"
-      ],
-      "balance": 0,
-      "last_negative": null,
-      "is_active": true,
       "display_image": "pic/default.png",
-      "created_at": "2020-03-22T13:01:35.680Z"
+      "created_at": "2020-02-20T20:16:14.753Z"
     }
   },
   {
@@ -256,4 +241,4 @@
       "name": "Alcool"
     }
   }
-]
+]

apps/note/models/__init__.py

@@ -3,12 +3,12 @@
 
 from .notes import Alias, Note, NoteClub, NoteSpecial, NoteUser
 from .transactions import MembershipTransaction, Transaction, \
-    TemplateCategory, TransactionTemplate, RecurrentTransaction
+    TemplateCategory, TransactionTemplate, RecurrentTransaction, SpecialTransaction
 
 __all__ = [
     # Notes
     'Alias', 'Note', 'NoteClub', 'NoteSpecial', 'NoteUser',
     # Transactions
     'MembershipTransaction', 'Transaction', 'TemplateCategory', 'TransactionTemplate',
-    'RecurrentTransaction',
+    'RecurrentTransaction', 'SpecialTransaction',
 ]

apps/note/templatetags/pretty_money.py

@@ -18,5 +18,10 @@ def pretty_money(value):
         )
 
 
+def cents_to_euros(value):
+    return "{:.02f}".format(value / 100) if value else ""
+
+
 register = template.Library()
 register.filter('pretty_money', pretty_money)
+register.filter('cents_to_euros', cents_to_euros)