From cdf91cc69d3a3a5535e3cfd538bd262010bd2047 Mon Sep 17 00:00:00 2001 From: mariusrklein <47218379+mariusrklein@users.noreply.github.com> Date: Sun, 6 Apr 2025 14:23:05 +0200 Subject: [PATCH] feat(finance/excursion): added ljp payout functionality and tax --- jdav_web/finance/models.py | 1 - .../admin/freizeit_finance_overview.html | 25 +++++-------------- 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/jdav_web/finance/models.py b/jdav_web/finance/models.py index 11477d4..e37f79e 100644 --- a/jdav_web/finance/models.py +++ b/jdav_web/finance/models.py @@ -267,7 +267,6 @@ class Statement(CommonModel): if self.ljp_to: ref = _("LJP-Contribution %(excu)s") % {'excu': self.excursion.name} Transaction(statement=self, member=self.ljp_to, amount=self.paid_ljp_contributions, confirmed=False, reference=ref).save() - return True diff --git a/jdav_web/members/templates/admin/freizeit_finance_overview.html b/jdav_web/members/templates/admin/freizeit_finance_overview.html index 43229f1..00a759f 100644 --- a/jdav_web/members/templates/admin/freizeit_finance_overview.html +++ b/jdav_web/members/templates/admin/freizeit_finance_overview.html @@ -136,29 +136,16 @@ cost plan!
{% endif %} - -{% if memberlist.statement.ljp_to %}-{% 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 %} -
+{% if memberlist.statement.ljp_to %}- {% blocktrans %}The LJP contributions are configured to be paid to:{% endblocktrans %} -
| - | {% trans "IBAN valid" %} | - -
|---|---|
| {{ memberlist.statement.ljp_to.name }} | -{{ memberlist.statement.ljp_to.iban_valid|render_bool }} | -