Merge branch 'master' into 'devalidation_reason'

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

locale/fr/LC_MESSAGES/django.po

@@ -421,98 +421,217 @@ msgstr "alias utilisé"
 msgid "quantity"
 msgstr "quantité"
 
-#: apps/note/models/transactions.py:130
+#: apps/note/models/transactions.py:115
 msgid "reason"
 msgstr "raison"
 
-#: apps/note/models/transactions.py:135
+#: apps/note/models/transactions.py:119
 msgid "valid"
 msgstr "valide"
 
-#: apps/note/models/transactions.py:140 apps/note/tables.py:95
-msgid "invalidity reason"
-msgstr "Motif d'invalidité"
-
-#: apps/note/models/transactions.py:147
+#: apps/note/models/transactions.py:124
 msgid "transaction"
 msgstr "transaction"
 
-#: apps/note/models/transactions.py:148
+#: apps/note/models/transactions.py:125
 msgid "transactions"
 msgstr "transactions"
 
-#: apps/note/models/transactions.py:202 templates/base.html:83
+#: apps/note/models/transactions.py:168 templates/base.html:98
 #: templates/note/transaction_form.html:19
 #: templates/note/transaction_form.html:145
 msgid "Transfer"
 msgstr "Virement"
 
-#: apps/note/models/transactions.py:222
+#: apps/note/models/transactions.py:188
 msgid "Template"
 msgstr "Bouton"
 
-#: apps/note/models/transactions.py:237
+#: apps/note/models/transactions.py:203
 msgid "first_name"
-msgstr "Prénom"
+msgstr "prénom"
 
-#: apps/note/models/transactions.py:242
+#: apps/note/models/transactions.py:208
 msgid "bank"
-msgstr "Banque"
+msgstr "banque"
 
-#: apps/note/models/transactions.py:248 templates/note/transaction_form.html:24
+#: apps/note/models/transactions.py:214 templates/note/transaction_form.html:24
 msgid "Credit"
 msgstr "Crédit"
 
-#: apps/note/models/transactions.py:248 templates/note/transaction_form.html:28
+#: apps/note/models/transactions.py:214 templates/note/transaction_form.html:28
 msgid "Debit"
-msgstr "Retrait"
+msgstr "Débit"
 
-#: apps/note/models/transactions.py:264 apps/note/models/transactions.py:269
+#: apps/note/models/transactions.py:230 apps/note/models/transactions.py:235
 msgid "membership transaction"
 msgstr "transaction d'adhésion"
 
-#: apps/note/models/transactions.py:265
+#: apps/note/models/transactions.py:231
 msgid "membership transactions"
 msgstr "transactions d'adhésion"
 
-#: apps/note/tables.py:57
-msgid "Click to invalidate"
-msgstr "Cliquez pour dévalider"
-
-#: apps/note/tables.py:57
-msgid "Click to validate"
-msgstr "Cliquez pour valider"
-
-#: apps/note/tables.py:93
-msgid "No reason specified"
-msgstr "Pas de motif spécifié"
-
-#: apps/note/views.py:42
+#: apps/note/views.py:39
 msgid "Transfer money"
-msgstr "Transferts d'argent"
+msgstr "Transférer de l'argent"
 
-#: apps/note/views.py:158 templates/base.html:79
+#: apps/note/views.py:145 templates/base.html:79
 msgid "Consumptions"
 msgstr "Consommations"
 
-#: apps/permission/models.py:70 apps/permission/models.py:263
+#: apps/permission/models.py:69 apps/permission/models.py:262
 #, python-brace-format
 msgid "Can {type} {model}.{field} in {query}"
 msgstr ""
 
-#: apps/permission/models.py:72 apps/permission/models.py:265
+#: apps/permission/models.py:71 apps/permission/models.py:264
 #, python-brace-format
 msgid "Can {type} {model} in {query}"
 msgstr ""
 
-#: apps/permission/models.py:85
+#: apps/permission/models.py:84
 msgid "rank"
-msgstr "rang"
+msgstr "Rang"
 
-#: apps/permission/models.py:148
+#: apps/permission/models.py:147
 msgid "Specifying field applies only to view and change permission types."
 msgstr ""
 
+#: apps/treasury/apps.py:11 templates/base.html:102
+msgid "Treasury"
+msgstr "Trésorerie"
+
+#: apps/treasury/forms.py:56 apps/treasury/forms.py:95
+#: templates/django_filters/rest_framework/form.html:5
+#: templates/member/club_form.html:10 templates/treasury/invoice_form.html:47
+msgid "Submit"
+msgstr "Envoyer"
+
+#: apps/treasury/forms.py:58
+msgid "Close"
+msgstr "Fermer"
+
+#: apps/treasury/forms.py:65
+msgid "Remittance is already closed."
+msgstr "La remise est déjà fermée."
+
+#: apps/treasury/forms.py:70
+msgid "You can't change the type of the remittance."
+msgstr "Vous ne pouvez pas changer le type de la remise."
+
+#: apps/treasury/forms.py:84
+msgid "Last name"
+msgstr "Nom de famille"
+
+#: apps/treasury/forms.py:86 templates/note/transaction_form.html:92
+msgid "First name"
+msgstr "Prénom"
+
+#: apps/treasury/forms.py:88 templates/note/transaction_form.html:98
+msgid "Bank"
+msgstr "Banque"
+
+#: apps/treasury/forms.py:90 apps/treasury/tables.py:40
+#: templates/note/transaction_form.html:128
+#: templates/treasury/remittance_form.html:18
+msgid "Amount"
+msgstr "Montant"
+
+#: apps/treasury/models.py:18
+msgid "Invoice identifier"
+msgstr "Numéro de facture"
+
+#: apps/treasury/models.py:32
+msgid "BDE"
+msgstr "BDE"
+
+#: apps/treasury/models.py:37
+msgid "Object"
+msgstr "Objet"
+
+#: apps/treasury/models.py:41
+msgid "Description"
+msgstr "Description"
+
+#: apps/treasury/models.py:46 templates/note/transaction_form.html:86
+msgid "Name"
+msgstr "Nom"
+
+#: apps/treasury/models.py:50
+msgid "Address"
+msgstr "Adresse"
+
+#: apps/treasury/models.py:55
+msgid "Place"
+msgstr "Lieu"
+
+#: apps/treasury/models.py:59
+msgid "Acquitted"
+msgstr "Acquittée"
+
+#: apps/treasury/models.py:75
+msgid "Designation"
+msgstr "Désignation"
+
+#: apps/treasury/models.py:79
+msgid "Quantity"
+msgstr "Quantité"
+
+#: apps/treasury/models.py:83
+msgid "Unit price"
+msgstr "Prix unitaire"
+
+#: apps/treasury/models.py:120
+msgid "Date"
+msgstr "Date"
+
+#: apps/treasury/models.py:126
+msgid "Type"
+msgstr "Type"
+
+#: apps/treasury/models.py:131
+msgid "Comment"
+msgstr "Commentaire"
+
+#: apps/treasury/models.py:136
+msgid "Closed"
+msgstr "Fermée"
+
+#: apps/treasury/models.py:159
+msgid "Remittance #{:d}: {}"
+msgstr "Remise n°{:d} : {}"
+
+#: apps/treasury/models.py:178 apps/treasury/tables.py:64
+#: apps/treasury/tables.py:72 templates/treasury/invoice_list.html:13
+#: templates/treasury/remittance_list.html:13
+msgid "Remittance"
+msgstr "Remise"
+
+#: apps/treasury/tables.py:16
+msgid "Invoice #{:d}"
+msgstr "Facture n°{:d}"
+
+#: apps/treasury/tables.py:19 templates/treasury/invoice_list.html:10
+#: templates/treasury/remittance_list.html:10
+msgid "Invoice"
+msgstr "Facture"
+
+#: apps/treasury/tables.py:38
+msgid "Transaction count"
+msgstr "Nombre de transactions"
+
+#: apps/treasury/tables.py:43 apps/treasury/tables.py:45
+msgid "View"
+msgstr "Voir"
+
+#: apps/treasury/tables.py:66
+msgid "Add"
+msgstr "Ajouter"
+
+#: apps/treasury/tables.py:74
+msgid "Remove"
+msgstr "supprimer"
+
 #: note_kfet/settings/__init__.py:63
 msgid ""
 "The Central Authentication Service grants you access to most of our websites "
@@ -601,11 +720,6 @@ msgstr ""
 msgid "Field filters"
 msgstr ""
 
-#: templates/django_filters/rest_framework/form.html:5
-#: templates/member/club_form.html:10
-msgid "Submit"
-msgstr "Envoyer"
-
 #: templates/member/club_detail.html:10
 msgid "Membership starts on"
 msgstr "L'adhésion commence le"
@@ -652,15 +766,15 @@ msgstr "Ajouter un alias"
 
 #: templates/member/profile_detail.html:15
 msgid "first name"
-msgstr ""
+msgstr "prénom"
 
 #: templates/member/profile_detail.html:18
 msgid "username"
-msgstr ""
+msgstr "pseudo"
 
 #: templates/member/profile_detail.html:21
 msgid "password"
-msgstr ""
+msgstr "mot de passe"
 
 #: templates/member/profile_detail.html:24
 msgid "Change password"
@@ -693,7 +807,7 @@ msgstr "Sélection des émetteurs"
 
 #: templates/note/conso_form.html:45
 msgid "Select consumptions"
-msgstr "Consommations"
+msgstr "Sélection des consommations"
 
 #: templates/note/conso_form.html:51
 msgid "Consume!"
@@ -709,11 +823,11 @@ msgstr "Éditer"
 
 #: templates/note/conso_form.html:126
 msgid "Single consumptions"
-msgstr "Consos simples"
+msgstr "Consommations simples"
 
 #: templates/note/conso_form.html:130
 msgid "Double consumptions"
-msgstr "Consos doubles"
+msgstr "Consommations doubles"
 
 #: templates/note/conso_form.html:141 templates/note/transaction_form.html:152
 msgid "Recent transactions history"
@@ -725,7 +839,7 @@ msgstr "Don"
 
 #: templates/note/transaction_form.html:68
 msgid "External payment"
-msgstr "Paiement extérieur"
+msgstr "Paiement externe"
 
 #: templates/note/transaction_form.html:76
 msgid "Transfer type"
@@ -759,7 +873,7 @@ msgstr "Raison"
 
 #: templates/note/transaction_form.html:183
 msgid "Credit note"
-msgstr "Note à créditer"
+msgstr "Note à recharger"
 
 #: templates/note/transaction_form.html:190
 msgid "Debit note"
@@ -870,3 +984,72 @@ msgstr ""
 #: templates/registration/password_reset_form.html:11
 msgid "Reset my password"
 msgstr ""
+
+#: templates/treasury/invoice_form.html:6
+msgid "Invoices list"
+msgstr "Liste des factures"
+
+#: templates/treasury/invoice_form.html:42
+msgid "Add product"
+msgstr "Ajouter produit"
+
+#: templates/treasury/invoice_form.html:43
+msgid "Remove product"
+msgstr "Retirer produit"
+
+#: templates/treasury/invoice_list.html:21
+msgid "New invoice"
+msgstr "Nouvelle facture"
+
+#: templates/treasury/remittance_form.html:7
+msgid "Remittance #"
+msgstr "Remise n°"
+
+#: templates/treasury/remittance_form.html:9
+#: templates/treasury/specialtransactionproxy_form.html:7
+msgid "Remittances list"
+msgstr "Liste des remises"
+
+#: templates/treasury/remittance_form.html:12
+msgid "Count"
+msgstr "Nombre"
+
+#: templates/treasury/remittance_form.html:29
+msgid "Linked transactions"
+msgstr "Transactions liées"
+
+#: templates/treasury/remittance_form.html:34
+msgid "There is no transaction linked with this remittance."
+msgstr "Il n'y a pas de transaction liée à cette remise."
+
+#: templates/treasury/remittance_list.html:19
+msgid "Opened remittances"
+msgstr "Remises ouvertes"
+
+#: templates/treasury/remittance_list.html:24
+msgid "There is no opened remittance."
+msgstr "Il n'y a pas de remise ouverte."
+
+#: templates/treasury/remittance_list.html:28
+msgid "New remittance"
+msgstr "Nouvelle remise"
+
+#: templates/treasury/remittance_list.html:32
+msgid "Transfers without remittances"
+msgstr "Transactions sans remise associée"
+
+#: templates/treasury/remittance_list.html:37
+msgid "There is no transaction without any linked remittance."
+msgstr "Il n'y a pas de transactions sans remise associée."
+
+#: templates/treasury/remittance_list.html:43
+msgid "Transfers with opened remittances"
+msgstr "Transactions associées à une remise ouverte"
+
+#: templates/treasury/remittance_list.html:48
+msgid "There is no transaction with an opened linked remittance."
+msgstr "Il n'y a pas de transaction associée à une remise ouverte."
+
+#: templates/treasury/remittance_list.html:54
+msgid "Closed remittances"
+msgstr "Remises fermées"