fix merge inconsistencies

jdav_web/finance/admin.py

@@ -137,16 +137,6 @@ class TransactionOnSubmittedStatementInline(admin.TabularInline):
     }
     readonly_fields = ['text_length_warning']
     extra = 0
-    
-    def text_length_warning(self, obj):
-        """Display reference length, warn if exceeds 140 characters."""
-        len_reference = len(obj.reference)
-        len_string = f"{len_reference}/140"
-        if len_reference > 140:
-            return mark_safe(f'<span style="color: red;">{len_string}</span>')
-        
-        return len_string
-    text_length_warning.short_description = "Länge"
 
     def text_length_warning(self, obj):
         """Display reference length, warn if exceeds 140 characters."""

jdav_web/finance/templates/finance/statement_summary.tex

@@ -63,6 +63,7 @@ Zuschüsse und Aufwandsentschädigung werden wie folgt abgerufen:
     {% if statement.subsidy_to %}
     \item Der Zuschuss zu Übernachtung und Anreise für alle Jugendleiter*innen in Höhe von {{ statement.total_subsidies }} € wird überwiesen an:
             {{ statement.subsidy_to.name }}
+
     {% else %}
     \item Zuschüsse zu Übernachtung und Anreise werden nicht in Anspruch genommen.
     {% endif %}

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: 2025-04-15 22:08+0200\n"
+"POT-Creation-Date: 2025-04-15 22:18+0200\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"
@@ -1415,14 +1415,12 @@ msgstr "LJP Zuschüsse"
 #: members/templates/admin/freizeit_finance_overview.html
 #, python-format
 msgid ""
-"By submitting the given seminar report, you will receive LJP contributions. "
-"You have\n"
-"    documented interventions worth of %(total_seminar_days)s seminar days "
-"for %(participant_count)s participants.\n"
-"    This results in a total contribution of %(ljp_contributions)s€. To "
-"receive them, you need to \n"
-"    submit the LJP-Proposal within 3 weeks after your excursion and have it "
-"approved by the finance office. "
+"By submitting the given seminar report, you will receive LJP contributions.\n"
+"You have documented interventions worth of %(total_seminar_days)s seminar "
+"days for %(participant_count)s participants.\n"
+"This results in a total contribution of %(ljp_contributions)s€.\n"
+"To receive them, you need to submit the LJP-Proposal within 3 weeks after "
+"your excursion and have it approved by the finance office."
 msgstr ""
 "Wenn du den erstellten LJP-Antrag einreichst, erhältst du LJP-Zuschüsse. Du "
 "hast Lehreinheiten für insgesamt %(total_seminar_days)s Seminartage und für "
@@ -1431,6 +1429,10 @@ msgstr ""
 "Um den zu erhalten, musst du den LJP-Antrag innerhalb von 3 Wochen nach der "
 "Ausfahrt beim Jugendreferat einreichen und formal genehmigt bekommen."
 
+#: members/templates/admin/freizeit_finance_overview.html
+msgid "The LJP contributions are configured to be paid to:"
+msgstr "Die LJP-Zuschüsse werden ausgezahlt an:"
+
 #: members/templates/admin/freizeit_finance_overview.html
 #, python-format
 msgid ""

jdav_web/members/templates/admin/freizeit_finance_overview.html

@@ -125,7 +125,6 @@ cost plan!
 {% endif %}
 
 {% if total_org_fee %}
-
 <h3>{% trans "Org fee" %}</h3>
 <p>
 {% blocktrans %}Warning: {{ old_participant_count }} participant(s) of the excursion are 27 or older. For each of them, an organisation fee of 10,00 € per day has to be paid to the account. With a duration of {{ duration }} days, a total of {{ total_org_fee_theoretical }} € is charged against the other transactions.{% endblocktrans %}
@@ -138,16 +137,29 @@ cost plan!
 </p>
 {% endif %}
 
-<h3>{% trans "LJP contributions" %}</h3>
 
 {% if memberlist.statement.ljp_to %}
+<h3>{% trans "LJP contributions" %}</h3>
 
 <p>
-    {% blocktrans %}By submitting the given seminar report, you will receive LJP contributions. You have
-    documented interventions worth of {{ total_seminar_days }} seminar days for {{ participant_count }} participants.
-    This results in a total contribution of {{ ljp_contributions }}€. To receive them, you need to 
-    submit the LJP-Proposal within 3 weeks after your excursion and have it approved by the finance office. {% endblocktrans %}
-    </p>
+{% blocktrans %}By submitting the given seminar report, you will receive LJP contributions.
+You have documented interventions worth of {{ total_seminar_days }} seminar days for {{ participant_count }} participants.
+This results in a total contribution of {{ ljp_contributions }}€.
+To receive them, you need to submit the LJP-Proposal within 3 weeks after your excursion and have it approved by the finance office.{% endblocktrans %}
+</p>
+
+<p>
+    {% blocktrans %}The LJP contributions are configured to be paid to:{% endblocktrans %}
+    <table>
+        <th>
+            <td>{% trans "IBAN valid" %}</td>
+        </th>
+        <tr>
+            <td>{{ memberlist.statement.ljp_to.name }}</td>
+            <td>{{ memberlist.statement.ljp_to.iban_valid|render_bool }}</td>
+        </tr>
+    </table>
+</p>
 
 {% else %}
 <p>