From edd21e6ac3806cc9d8f7d9ebdcb2b592660c8c33 Mon Sep 17 00:00:00 2001 From: mariusrklein <47218379+mariusrklein@users.noreply.github.com> Date: Mon, 30 Dec 2024 14:15:10 +0100 Subject: [PATCH] added iban-valid info to statement submit forms --- .../finance/locale/de/LC_MESSAGES/django.po | 27 +- .../templates/admin/submit_statement.html | 30 ++ .../members/locale/de/LC_MESSAGES/django.po | 368 +++++++++--------- .../admin/freizeit_finance_overview.html | 11 +- 4 files changed, 252 insertions(+), 184 deletions(-) diff --git a/jdav_web/finance/locale/de/LC_MESSAGES/django.po b/jdav_web/finance/locale/de/LC_MESSAGES/django.po index 5da218d..50524d1 100644 --- a/jdav_web/finance/locale/de/LC_MESSAGES/django.po +++ b/jdav_web/finance/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-12-28 01:22+0100\n" +"POT-Creation-Date: 2024-12-29 13:12+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -151,6 +151,7 @@ msgid "Short description" msgstr "Kurzbeschreibung" #: finance/models.py:54 finance/models.py:421 +#: finance/templates/admin/submit_statement.html:30 msgid "Explanation" msgstr "Erklärung" @@ -245,10 +246,11 @@ msgstr "Bezahlte Abrechnungen" #: finance/templates/admin/confirmed_statement.html:38 #: finance/templates/admin/overview_submitted_statement.html:31 #: finance/templates/admin/overview_submitted_statement.html:98 +#: finance/templates/admin/submit_statement.html:31 msgid "Amount" msgstr "Betrag" -#: finance/models.py:424 +#: finance/models.py:424 finance/templates/admin/submit_statement.html:32 msgid "Paid by" msgstr "Bezahlt von" @@ -461,13 +463,13 @@ msgid "Reject" msgstr "Ablehnen" #: finance/templates/admin/overview_submitted_statement.html:178 -#: finance/templates/admin/submit_statement.html:35 +#: finance/templates/admin/submit_statement.html:65 #: finance/templates/admin/unconfirm_statement.html:39 msgid "Cancel" msgstr "Abbruch" #: finance/templates/admin/submit_statement.html:21 -#: finance/templates/admin/submit_statement.html:34 +#: finance/templates/admin/submit_statement.html:64 msgid "Submit" msgstr "Einreichen" @@ -475,7 +477,22 @@ msgstr "Einreichen" msgid "Submit to the finance department" msgstr "Beim Finanzreferat einreichen" -#: finance/templates/admin/submit_statement.html:28 +#: finance/templates/admin/submit_statement.html:27 +msgid "" +"Please check if all expenses are documented correctly and if all payers have " +"a valid account code." +msgstr "Bitte überprüfe, ob alle Ausgaben korrekt erfasst sind und ob alle " +"auslegenden Personen eine gültige IBAN haben." + +#: finance/templates/admin/submit_statement.html:33 +msgid "IBAN valid" +msgstr "IBAN gültig" + +#: finance/templates/admin/submit_statement.html:51 +msgid "Change here" +msgstr "Hier ändern" + +#: finance/templates/admin/submit_statement.html:58 msgid "" "Do you want to submit the statement for further processing by the finance " "department? If you proceed, no further changes to the statement are possible." diff --git a/jdav_web/finance/templates/admin/submit_statement.html b/jdav_web/finance/templates/admin/submit_statement.html index 838c410..7f58deb 100644 --- a/jdav_web/finance/templates/admin/submit_statement.html +++ b/jdav_web/finance/templates/admin/submit_statement.html @@ -24,6 +24,36 @@ {% block content %}

{% translate "Submit to the finance department" %}

+

{% translate "Please check if all expenses are documented correctly and if all payers have a valid account code." %}

+ + + + + + + {% for bill in statement.bill_set.all %} + + + + + + + + {% endfor %} +
+ {% trans "Explanation" %}{% trans "Amount" %}{% trans "Paid by" %}{% trans "IBAN valid" %}
+ {{bill.short_description}} + + {{bill.explanation}} + + {{ bill.amount }}€ + + {{ bill.paid_by.name }} + + + {% if not bill.paid_by.iban_valid %} {% trans "Change here" %} {% endif %} +
+

{% trans "Do you want to submit the statement for further processing by the finance department? If you proceed, no further changes to the statement are possible." %}

diff --git a/jdav_web/members/locale/de/LC_MESSAGES/django.po b/jdav_web/members/locale/de/LC_MESSAGES/django.po index 6f46c53..73e948e 100644 --- a/jdav_web/members/locale/de/LC_MESSAGES/django.po +++ b/jdav_web/members/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-12-28 22:56+0100\n" +"POT-Creation-Date: 2024-12-29 13:12+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: members/admin.py:129 members/models.py:430 +#: members/admin.py:129 members/models.py:435 msgid "Registration complete" msgstr "Anmeldung vollständig" @@ -130,7 +130,7 @@ msgstr "" msgid "activity" msgstr "Aktivität" -#: members/admin.py:405 members/models.py:56 members/models.py:1584 +#: members/admin.py:405 members/models.py:57 members/models.py:1589 msgid "Name" msgstr "Name" @@ -180,8 +180,8 @@ msgstr "Ausgewählte Registrierung zurück auf die Warteliste setzen." msgid "Successfully demoted %(name)s to waiter." msgstr "%(name)s zurück auf die Warteliste gesetzt." -#: members/admin.py:579 members/models.py:437 members/models.py:840 -#: members/models.py:1329 +#: members/admin.py:579 members/models.py:442 members/models.py:845 +#: members/models.py:1334 msgid "Group" msgstr "Gruppe" @@ -230,7 +230,7 @@ msgstr "Wähle Gruppe für Einladung aus" msgid "Successfully invited %(name)s to %(group)s." msgstr "Erfolgreich %(name)s zu Gruppe %(group)s eingeladen." -#: members/admin.py:748 members/models.py:72 +#: members/admin.py:748 members/models.py:73 msgid "name" msgstr "Name" @@ -249,7 +249,7 @@ msgstr "Schwierigkeit" msgid "Tour type" msgstr "Art der Tour" -#: members/admin.py:784 members/models.py:1060 +#: members/admin.py:784 members/models.py:1065 msgid "Means of transportation" msgstr "Verkehrsmittel" @@ -384,244 +384,244 @@ msgstr "Kostenübersicht" msgid "member administration" msgstr "Teilnehmer*innenverwaltung" -#: members/models.py:42 +#: members/models.py:43 msgid "Monday" msgstr "Montag" -#: members/models.py:43 +#: members/models.py:44 msgid "Tuesday" msgstr "Dienstag" -#: members/models.py:44 +#: members/models.py:45 msgid "Wednesday" msgstr "Mittwoch" -#: members/models.py:45 +#: members/models.py:46 msgid "Thursday" msgstr "Donnerstag" -#: members/models.py:46 +#: members/models.py:47 msgid "Friday" msgstr "Freitag" -#: members/models.py:47 +#: members/models.py:48 msgid "Saturday" msgstr "Samstag" -#: members/models.py:48 +#: members/models.py:49 msgid "Sunday" msgstr "Sonntag" -#: members/models.py:57 members/models.py:1046 +#: members/models.py:58 members/models.py:1051 msgid "Description" msgstr "Beschreibung" -#: members/models.py:63 members/models.py:1038 +#: members/models.py:64 members/models.py:1043 #: members/templates/members/change_member.html:18 msgid "Activity" msgstr "Aktivität" -#: members/models.py:64 +#: members/models.py:65 msgid "Activities" msgstr "Aktivitäten" -#: members/models.py:73 +#: members/models.py:74 msgid "description" msgstr "Beschreibung" -#: members/models.py:74 +#: members/models.py:75 msgid "show on website" msgstr "Auf der Webseite anzeigen" -#: members/models.py:75 +#: members/models.py:76 msgid "lowest year" msgstr "Ab Jahrgang" -#: members/models.py:76 +#: members/models.py:77 msgid "highest year" msgstr "Bis Jahrgang" -#: members/models.py:77 +#: members/models.py:78 msgid "youth leaders" msgstr "Jugendleiter" -#: members/models.py:79 +#: members/models.py:80 msgid "week day" msgstr "Wochentag" -#: members/models.py:80 members/models.py:1411 +#: members/models.py:81 members/models.py:1416 msgid "Starting time" msgstr "Zeitpunkt" -#: members/models.py:81 +#: members/models.py:82 msgid "Ending time" msgstr "Endzeitpunkt" -#: members/models.py:83 +#: members/models.py:84 msgid "Contact email" msgstr "Kontakt Email" -#: members/models.py:93 members/models.py:294 +#: members/models.py:94 members/models.py:295 msgid "group" msgstr "Gruppe" -#: members/models.py:94 +#: members/models.py:95 msgid "groups" msgstr "Gruppen" -#: members/models.py:128 +#: members/models.py:129 msgid "prename" msgstr "Vorname" -#: members/models.py:129 +#: members/models.py:130 msgid "last name" msgstr "Nachname" -#: members/models.py:132 +#: members/models.py:133 msgid "Email confirmed" msgstr "Emailadresse bestätigt" -#: members/models.py:150 members/models.py:221 members/models.py:268 +#: members/models.py:151 members/models.py:222 members/models.py:269 msgid "phone number" msgstr "Telefonnummer (mobil)" -#: members/models.py:181 +#: members/models.py:182 msgid "Email confirmation needed" msgstr "Email Bestätigung erforderlich" -#: members/models.py:231 +#: members/models.py:232 msgid "birth date" msgstr "Geburtsdatum" -#: members/models.py:236 +#: members/models.py:237 msgid "Gender" msgstr "Gender" -#: members/models.py:237 +#: members/models.py:238 msgid "comments" msgstr "Kommentare" -#: members/models.py:265 +#: members/models.py:266 msgid "Alternative email confirmed" msgstr "Alternative E-Mail Adresse bestätigt" -#: members/models.py:269 +#: members/models.py:270 msgid "street and house number" msgstr "Straße und Hausnummer" -#: members/models.py:270 +#: members/models.py:271 msgid "Postcode" msgstr "PLZ" -#: members/models.py:272 +#: members/models.py:273 msgid "town" msgstr "Stadt" -#: members/models.py:273 +#: members/models.py:274 msgid "Address extra" msgstr "Adress-Zusatz" -#: members/models.py:274 +#: members/models.py:275 msgid "Country" msgstr "Land" -#: members/models.py:276 +#: members/models.py:277 msgid "Good conduct certificate presented on" msgstr "Führungszeugnis vorgelegt am" -#: members/models.py:277 +#: members/models.py:278 msgid "Joined on" msgstr "Eintritt" -#: members/models.py:278 +#: members/models.py:279 msgid "Left on" msgstr "Austritt" -#: members/models.py:279 +#: members/models.py:280 msgid "Has key" msgstr "Hat Jugendraumschlüssel" -#: members/models.py:280 +#: members/models.py:281 msgid "Has a free ticket for the climbing gym" msgstr "Hat Freikarte für Kletterhalle" -#: members/models.py:281 +#: members/models.py:282 msgid "DAV badge number" msgstr "DAV Mitgliedsnummer" -#: members/models.py:282 +#: members/models.py:283 msgid "Knows how to swim" msgstr "Kann schwimmen" -#: members/models.py:283 +#: members/models.py:284 msgid "Climbing badge" msgstr "Kletterschein" -#: members/models.py:284 +#: members/models.py:285 msgid "Alpine experience" msgstr "Alpine Erfahrung" -#: members/models.py:285 +#: members/models.py:286 msgid "Allergies" msgstr "Allergieen" -#: members/models.py:286 +#: members/models.py:287 msgid "Medication" msgstr "Medikamente" -#: members/models.py:287 +#: members/models.py:288 msgid "Tetanus vaccination" msgstr "Tetanusimpfung" -#: members/models.py:288 +#: members/models.py:289 msgid "Photos may be taken" msgstr "Fotoerlaubnis" -#: members/models.py:289 +#: members/models.py:290 msgid "Legal guardians" msgstr "Erziehungsberechtigte" -#: members/models.py:291 +#: members/models.py:292 msgid "May cancel a group appointment independently" msgstr "Darf sich allein von der Gruppenstunde abmelden" -#: members/models.py:298 +#: members/models.py:299 msgid "receives newsletter" msgstr "Erhält den Newsletter" -#: members/models.py:302 +#: members/models.py:303 msgid "created" msgstr "erstellt" -#: members/models.py:303 +#: members/models.py:304 msgid "Active" msgstr "Aktiv" -#: members/models.py:304 +#: members/models.py:305 msgid "registration form" msgstr "Anmeldeformular" -#: members/models.py:313 +#: members/models.py:314 msgid "image" msgstr "Bild" -#: members/models.py:322 +#: members/models.py:323 msgid "Echoed" msgstr "Rückgemeldet" -#: members/models.py:323 +#: members/models.py:324 msgid "Confirmed" msgstr "Bestätigt" -#: members/models.py:325 +#: members/models.py:326 msgid "Login data" msgstr "Zugangsdaten" -#: members/models.py:327 +#: members/models.py:328 msgid "waitinglist application date" msgstr "Wartelistenbewerbungsdatum" -#: members/models.py:329 +#: members/models.py:330 msgid "" "If the person registered from the waitinglist, this is their application " "date." @@ -629,351 +629,351 @@ msgstr "" "Falls sich die Person über die Warteliste angemeldet hat ist dies ihr " "Bewerbungsdatum." -#: members/models.py:358 +#: members/models.py:363 msgid "Good conduct certificate valid" msgstr "Führungszeugnis gültig" -#: members/models.py:440 +#: members/models.py:445 msgid "member" msgstr "Teilnehmer*in" -#: members/models.py:441 +#: members/models.py:446 msgid "members" msgstr "Teilnehmer*innen" -#: members/models.py:519 +#: members/models.py:524 msgid "Upload registration form" msgstr "Anmeldeformular hochladen" -#: members/models.py:530 +#: members/models.py:535 #, python-format msgid "New unconfirmed registration for group %(group)s" msgstr "Neue unbestätigte Registrierung für Gruppe %(group)s" -#: members/models.py:756 +#: members/models.py:761 msgid "Set login data for Kompass" msgstr "Zugangsdaten für Kompass wählen" -#: members/models.py:791 members/models.py:994 members/models.py:1005 -#: members/models.py:1360 members/models.py:1367 +#: members/models.py:796 members/models.py:999 members/models.py:1010 +#: members/models.py:1365 members/models.py:1372 msgid "Member" msgstr "Teilnehmer*in" -#: members/models.py:798 +#: members/models.py:803 msgid "Emergency contact" msgstr "Notfallkontakt" -#: members/models.py:799 +#: members/models.py:804 msgid "Emergency contacts" msgstr "Notfallkontakte" -#: members/models.py:819 +#: members/models.py:824 msgid "Unconfirmed registration" msgstr "Unbestätigte Registrierung" -#: members/models.py:820 +#: members/models.py:825 msgid "Unconfirmed registrations" msgstr "Unbestätigte Registrierungen" -#: members/models.py:839 members/models.py:884 +#: members/models.py:844 members/models.py:889 msgid "Waiter" msgstr "Wartende Person" -#: members/models.py:841 +#: members/models.py:846 msgid "Invitation date" msgstr "Einladungsdatum" -#: members/models.py:842 members/templates/members/reject_success.html:6 +#: members/models.py:847 members/templates/members/reject_success.html:6 #: members/templates/members/reject_success.html:11 msgid "Invitation rejected" msgstr "Einladung abgelehnt" -#: members/models.py:846 +#: members/models.py:851 msgid "Invitation to group" msgstr "Gruppeneinladung" -#: members/models.py:847 +#: members/models.py:852 msgid "Invitations to groups" msgstr "Gruppeneinladungen" -#: members/models.py:854 +#: members/models.py:859 msgid "Rejected" msgstr "Abgelehnt" -#: members/models.py:856 +#: members/models.py:861 msgid "Expired" msgstr "Abgelaufen" -#: members/models.py:858 +#: members/models.py:863 msgid "Undecided" msgstr "Ausstehend" -#: members/models.py:859 +#: members/models.py:864 msgid "Status" msgstr "Status" -#: members/models.py:870 +#: members/models.py:875 msgid "Do you want to tell us something else?" msgstr "Möchtest du uns noch etwas mitteilen?" -#: members/models.py:871 +#: members/models.py:876 msgid "application date" msgstr "Bewerbungsdatum" -#: members/models.py:873 +#: members/models.py:878 msgid "Last wait confirmation" msgstr "Letzte Wartebestätigung" -#: members/models.py:877 +#: members/models.py:882 msgid "Last reminder" msgstr "Letzte Erinnerung" -#: members/models.py:878 +#: members/models.py:883 msgid "Missed reminders" msgstr "Verpasste Erinnerungen" -#: members/models.py:885 +#: members/models.py:890 msgid "Waiters" msgstr "Warteliste" -#: members/models.py:900 +#: members/models.py:905 msgid "Latest group invitation" msgstr "Letzte Gruppeneinladung" -#: members/models.py:917 +#: members/models.py:922 msgid "Waiting status confirmed" msgstr "Wartelistenplatz bestätigt" -#: members/models.py:924 +#: members/models.py:929 msgid "Waiting confirmation needed" msgstr "Wartelistenplatzbestätigung erforderlich" -#: members/models.py:977 +#: members/models.py:982 msgid "Invitation to trial group meeting" msgstr "Einladung zu Schnupperstunde" -#: members/models.py:985 +#: members/models.py:990 msgid "Unregistered from waiting list" msgstr "Von der Warteliste abgemeldet" -#: members/models.py:999 +#: members/models.py:1004 msgid "Comment" msgstr "Kommentar" -#: members/models.py:1006 members/models.py:1368 +#: members/models.py:1011 members/models.py:1373 msgid "Members" msgstr "Teilnehmer*innen" -#: members/models.py:1040 +#: members/models.py:1045 msgid "Place" msgstr "Stützpunkt / Ort" -#: members/models.py:1041 +#: members/models.py:1046 msgid "Destination (optional)" msgstr "ggf. Ziel" -#: members/models.py:1043 +#: members/models.py:1048 msgid "e.g. a peak" msgstr "z.B. ein Gipfel" -#: members/models.py:1044 +#: members/models.py:1049 msgid "Begin" msgstr "Anfang" -#: members/models.py:1045 +#: members/models.py:1050 msgid "End (optional)" msgstr "Ende" -#: members/models.py:1048 +#: members/models.py:1053 msgid "Groups" msgstr "Gruppen" -#: members/models.py:1061 +#: members/models.py:1066 msgid "Kilometers traveled" msgstr "Fahrstrecke in Kilometer" -#: members/models.py:1064 +#: members/models.py:1069 msgid "Categories" msgstr "Kategorien" -#: members/models.py:1065 +#: members/models.py:1070 msgid "easy" msgstr "leicht" -#: members/models.py:1065 +#: members/models.py:1070 msgid "medium" msgstr "mittel" -#: members/models.py:1065 +#: members/models.py:1070 msgid "hard" msgstr "schwer" -#: members/models.py:1075 members/models.py:1391 +#: members/models.py:1080 members/models.py:1396 #: members/templates/admin/freizeit_finance_overview.html:26 msgid "Excursion" msgstr "Ausfahrt" -#: members/models.py:1076 +#: members/models.py:1081 msgid "Excursions" msgstr "Ausfahrten" -#: members/models.py:1306 members/models.py:1382 members/models.py:1598 +#: members/models.py:1311 members/models.py:1387 members/models.py:1603 msgid "Title" msgstr "Titel" -#: members/models.py:1307 members/models.py:1325 members/models.py:1599 +#: members/models.py:1312 members/models.py:1330 members/models.py:1604 msgid "Date" msgstr "Datum" -#: members/models.py:1326 +#: members/models.py:1331 msgid "Location" msgstr "Ort" -#: members/models.py:1327 +#: members/models.py:1332 msgid "Topic" msgstr "Thema" -#: members/models.py:1351 +#: members/models.py:1356 msgid "Jugendleiter" msgstr "Jugendleiter" -#: members/models.py:1354 +#: members/models.py:1359 msgid "Klettertreff" msgstr "Klettertreff" -#: members/models.py:1355 +#: members/models.py:1360 msgid "Klettertreffs" msgstr "Klettertreffs" -#: members/models.py:1373 +#: members/models.py:1378 msgid "Password" msgstr "Passwort" -#: members/models.py:1376 +#: members/models.py:1381 msgid "registration password" msgstr "Registrierungspassort" -#: members/models.py:1377 +#: members/models.py:1382 msgid "registration passwords" msgstr "Registrierungspasswörter" -#: members/models.py:1384 +#: members/models.py:1389 msgid "Alpinistic goals" msgstr "Alpintechnische Ziele" -#: members/models.py:1385 +#: members/models.py:1390 msgid "Pedagogic goals" msgstr "Pädagogische Ziele" -#: members/models.py:1386 +#: members/models.py:1391 msgid "Content and methods" msgstr "Inhalte und Methoden" -#: members/models.py:1387 +#: members/models.py:1392 msgid "Evaluation" msgstr "Wertung" -#: members/models.py:1388 +#: members/models.py:1393 msgid "Experiences and possible improvements" msgstr "Erfahrungen und Verbesserungsvorschläge" -#: members/models.py:1397 members/models.py:1418 +#: members/models.py:1402 members/models.py:1423 msgid "LJP Proposal" msgstr "Seminarbericht" -#: members/models.py:1398 +#: members/models.py:1403 msgid "LJP Proposals" msgstr "Seminarberichte" -#: members/models.py:1412 +#: members/models.py:1417 msgid "Duration in hours" msgstr "Dauer in Stunden" -#: members/models.py:1415 +#: members/models.py:1420 msgid "Activity and method" msgstr "Art der Aktion inkl. Methode" -#: members/models.py:1423 +#: members/models.py:1428 msgid "Intervention" msgstr "Aktion" -#: members/models.py:1424 +#: members/models.py:1429 msgid "Interventions" msgstr "Aktionen" -#: members/models.py:1526 members/models.py:1556 +#: members/models.py:1531 members/models.py:1561 msgid "May list members" msgstr "Darf folgende Teilnehmer*innen listen" -#: members/models.py:1528 members/models.py:1558 +#: members/models.py:1533 members/models.py:1563 msgid "May view members" msgstr "Darf folgende Teilnehmer*innen anzeigen" -#: members/models.py:1530 members/models.py:1560 +#: members/models.py:1535 members/models.py:1565 msgid "May change members" msgstr "Darf folgende Teilnehmer*innen ändern" -#: members/models.py:1532 members/models.py:1562 +#: members/models.py:1537 members/models.py:1567 msgid "May delete members" msgstr "Darf folgende Teilnehmer*innen löschen" -#: members/models.py:1536 members/models.py:1566 +#: members/models.py:1541 members/models.py:1571 msgid "May list members of groups" msgstr "Darf Teilnehmer*innen folgender Gruppen listen" -#: members/models.py:1538 members/models.py:1568 +#: members/models.py:1543 members/models.py:1573 msgid "May view members of groups" msgstr "Darf Teilnehmer*innen folgender Gruppen anzeigen" -#: members/models.py:1540 members/models.py:1570 +#: members/models.py:1545 members/models.py:1575 msgid "May change members of groups" msgstr "Darf Teilnehmer*innen folgender Gruppen ändern" -#: members/models.py:1542 members/models.py:1572 +#: members/models.py:1547 members/models.py:1577 msgid "May delete members of groups" msgstr "Darf Teilnehmer*innen folgender Gruppen löschen" -#: members/models.py:1545 members/models.py:1546 members/models.py:1549 +#: members/models.py:1550 members/models.py:1551 members/models.py:1554 msgid "Permissions" msgstr "Berechtigungen" -#: members/models.py:1575 members/models.py:1576 members/models.py:1579 +#: members/models.py:1580 members/models.py:1581 members/models.py:1584 msgid "Group permissions" msgstr "Gruppenberechtigungen" -#: members/models.py:1585 +#: members/models.py:1590 msgid "Permission needed" msgstr "Freigabe erforderlich" -#: members/models.py:1588 +#: members/models.py:1593 msgid "Training category" msgstr "Fortbildungstyp" -#: members/models.py:1589 +#: members/models.py:1594 msgid "Training categories" msgstr "Fortbildungstypen" -#: members/models.py:1600 +#: members/models.py:1605 msgid "Category" msgstr "Kategorien" -#: members/models.py:1601 +#: members/models.py:1606 msgid "Comments" msgstr "Kommentar" -#: members/models.py:1602 +#: members/models.py:1607 msgid "Participated" msgstr "Teilgenommmen" -#: members/models.py:1603 +#: members/models.py:1608 msgid "Passed" msgstr "Bestanden" -#: members/models.py:1606 +#: members/models.py:1611 msgid "Training" msgstr "Fortbildung" -#: members/models.py:1607 +#: members/models.py:1612 msgid "Trainings" msgstr "Fortbildungen" @@ -1003,7 +1003,7 @@ msgid "Demote" msgstr "Zurück auf die Warteliste setzen" #: members/templates/admin/demote_to_waiter.html:46 -#: members/templates/admin/freizeit_finance_overview.html:154 +#: members/templates/admin/freizeit_finance_overview.html:163 #: members/templates/admin/generate_seminar_report.html:60 #: members/templates/admin/invite_as_user.html:37 #: members/templates/admin/invite_for_group.html:64 @@ -1024,7 +1024,7 @@ msgstr "" "kein garantierter Kostenplan.\n" #: members/templates/admin/freizeit_finance_overview.html:34 -#: members/templates/admin/freizeit_finance_overview.html:100 +#: members/templates/admin/freizeit_finance_overview.html:109 msgid "Expenses" msgstr "Ausgaben" @@ -1040,19 +1040,31 @@ msgstr "Erklärung" msgid "Amount" msgstr "Betrag" -#: members/templates/admin/freizeit_finance_overview.html:58 +#: members/templates/admin/freizeit_finance_overview.html:41 +msgid "Paid by" +msgstr "Bezahlt von" + +#: members/templates/admin/freizeit_finance_overview.html:42 +msgid "IBAN valid" +msgstr "IBAN gültig" + +#: members/templates/admin/freizeit_finance_overview.html:60 +msgid "Change here" +msgstr "Hier ändern" + +#: members/templates/admin/freizeit_finance_overview.html:67 #, python-format msgid "The total expected expenses are %(total_bills_theoretic)s €." msgstr "" "Insgesamt belaufen sich die geschätzten Ausgaben auf " "%(total_bills_theoretic)s €." -#: members/templates/admin/freizeit_finance_overview.html:60 -#: members/templates/admin/freizeit_finance_overview.html:108 +#: members/templates/admin/freizeit_finance_overview.html:69 +#: members/templates/admin/freizeit_finance_overview.html:117 msgid "Contributions by the association" msgstr "Sektionszuschüsse" -#: members/templates/admin/freizeit_finance_overview.html:63 +#: members/templates/admin/freizeit_finance_overview.html:72 #, python-format msgid "" "According to the contribution guidelines,\n" @@ -1061,7 +1073,7 @@ msgstr "" "Gemäß den Zuschussrichtlinien erhalten %(staff_count)s Jugendleiter*innen " "Zuschüsse. Jeweils sind das" -#: members/templates/admin/freizeit_finance_overview.html:69 +#: members/templates/admin/freizeit_finance_overview.html:78 #, python-format msgid "" "%(nights)s nights for %(price_per_night)s€ per night making a total of " @@ -1070,7 +1082,7 @@ msgstr "" "%(nights)s Nächte zum Preis von %(price_per_night)s€ pro Nacht. Das ergibt " "eine Gesamtsumme von %(nights_per_yl)s€." -#: members/templates/admin/freizeit_finance_overview.html:72 +#: members/templates/admin/freizeit_finance_overview.html:81 #, python-format msgid "" "%(duration)s days for %(allowance_per_day)s€ per day making a total of " @@ -1079,7 +1091,7 @@ msgstr "" "%(duration)s Tage für %(allowance_per_day)s€ pro Tag. Das ergibt eine " "Gesamtsumme von %(allowance_per_yl)s€." -#: members/templates/admin/freizeit_finance_overview.html:75 +#: members/templates/admin/freizeit_finance_overview.html:84 #, python-format msgid "" "%(kilometers_traveled)s km by %(means_of_transport)s (%(euro_per_km)s € / " @@ -1088,7 +1100,7 @@ msgstr "" "%(kilometers_traveled)s km mit %(means_of_transport)s (%(euro_per_km)s€ / " "km). Das ergibt eine Gesamtsumme von %(transportation_per_yl)s€." -#: members/templates/admin/freizeit_finance_overview.html:80 +#: members/templates/admin/freizeit_finance_overview.html:89 #, python-format msgid "" "In total these are contributions of %(total_per_yl)s€ times %(staff_count)s, " @@ -1097,11 +1109,11 @@ msgstr "" "Insgesamt sind das Kosten von %(total_per_yl)s€ mal %(staff_count)s, " "insgesamt also %(total_staff)s€." -#: members/templates/admin/freizeit_finance_overview.html:83 +#: members/templates/admin/freizeit_finance_overview.html:92 msgid "LJP contributions" msgstr "LJP Zuschüsse" -#: members/templates/admin/freizeit_finance_overview.html:86 +#: members/templates/admin/freizeit_finance_overview.html:95 #, python-format msgid "" "By submitting a seminar report, you may apply for LJP contributions. In this " @@ -1116,23 +1128,23 @@ msgstr "" "Gesamtausgaben erhalten. Das resultiert in einem Gesamtzuschuss von " "%(ljp_contributions)s€." -#: members/templates/admin/freizeit_finance_overview.html:91 +#: members/templates/admin/freizeit_finance_overview.html:100 msgid "Summary" msgstr "Zusammenfassung" -#: members/templates/admin/freizeit_finance_overview.html:94 +#: members/templates/admin/freizeit_finance_overview.html:103 msgid "This is the estimated cost and contribution summary:" msgstr "Das ist die geschätzte Kosten- und Zuschussübersicht." -#: members/templates/admin/freizeit_finance_overview.html:116 +#: members/templates/admin/freizeit_finance_overview.html:125 msgid "Potential LJP contributions" msgstr "Mögliche LJP Zuschüsse" -#: members/templates/admin/freizeit_finance_overview.html:124 +#: members/templates/admin/freizeit_finance_overview.html:133 msgid "Remaining costs" msgstr "Verbleibende Kosten" -#: members/templates/admin/freizeit_finance_overview.html:133 +#: members/templates/admin/freizeit_finance_overview.html:142 msgid "" "Positive remaining costs indicate that the estimated costs exceed the " "estimated contributions, while negative\n" @@ -1143,7 +1155,7 @@ msgstr "" "geschätzten Zuschüsse übersteigen, während negative Kosten\n" " bedeuten, dass die geschätzten Zuschüsse die geschätzten Kosten übersteigen." -#: members/templates/admin/freizeit_finance_overview.html:137 +#: members/templates/admin/freizeit_finance_overview.html:146 msgid "" "Note that this cost calculation expects you to apply for LJP contributions. " "On the\n" @@ -1153,11 +1165,11 @@ msgstr "" "beantragst. Auf der Hauptseite dieser Ausfahrt kannst du dir eine Vorlage " "und alle Formblätter für einen solchen Antrag erstellen lassen." -#: members/templates/admin/freizeit_finance_overview.html:142 +#: members/templates/admin/freizeit_finance_overview.html:151 msgid "Submit statement" msgstr "Abrechnung einreichen" -#: members/templates/admin/freizeit_finance_overview.html:144 +#: members/templates/admin/freizeit_finance_overview.html:153 msgid "" "Did you already complete this excursion? If yes, please check if all listed " "expenses are correct\n" @@ -1170,15 +1182,15 @@ msgstr "" "Finanzreferat ein. Wenn du fortschreitest sind keine weiteren Änderungen an " "der Abrechnung mehr möglich." -#: members/templates/admin/freizeit_finance_overview.html:153 +#: members/templates/admin/freizeit_finance_overview.html:162 msgid "Submit" msgstr "Einreichen" -#: members/templates/admin/freizeit_finance_overview.html:158 +#: members/templates/admin/freizeit_finance_overview.html:167 msgid "Statement submitted" msgstr "Abrechnung eingereicht" -#: members/templates/admin/freizeit_finance_overview.html:160 +#: members/templates/admin/freizeit_finance_overview.html:169 msgid "" "The statement for this excursion was already submitted. The finance " "department is currently processing your\n" @@ -1188,7 +1200,7 @@ msgstr "" "Finanzreferat bearbeitet deine Abrechnung zur Zeit und kommt " "schnellstmöglich auf dich zurück." -#: members/templates/admin/freizeit_finance_overview.html:163 +#: members/templates/admin/freizeit_finance_overview.html:172 #: members/templates/admin/invite_for_group_text.html:63 msgid "Back" msgstr "Zurück" diff --git a/jdav_web/members/templates/admin/freizeit_finance_overview.html b/jdav_web/members/templates/admin/freizeit_finance_overview.html index ffba21f..b087ae0 100644 --- a/jdav_web/members/templates/admin/freizeit_finance_overview.html +++ b/jdav_web/members/templates/admin/freizeit_finance_overview.html @@ -38,6 +38,8 @@ cost plan! {% trans "Explanation" %} {% trans "Amount" %} + {% trans "Paid by" %} + {% trans "IBAN valid" %} {% for bill in memberlist.statement.bill_set.all %} @@ -50,6 +52,13 @@ cost plan! {{ bill.amount }}€ + + {{ bill.paid_by.name }} + + + + {% if not bill.paid_by.iban_valid %} {% trans "Change here" %} {% endif %} + {% endfor %} @@ -142,7 +151,7 @@ excursions main page, you can generate a template for a seminar report.{% endblo

{% trans "Submit statement" %}

{% blocktrans %}Did you already complete this excursion? If yes, please check if all listed expenses are correct -and then submit the statement for processing by the finance department. If you proceed, +and people who want their money back have valid bank account numbers. Then submit the statement for processing by the finance department. If you proceed, no further changes to the statement are possible.{% endblocktrans %}