From c3ffedf5c27c38b39185a775e9a66f7ceadf1f49 Mon Sep 17 00:00:00 2001 From: mariusrklein <47218379+mariusrklein@users.noreply.github.com> Date: Sun, 19 Jan 2025 20:04:08 +0100 Subject: [PATCH] changed calculation of cativity total costs, addresses #105 --- jdav_web/members/models.py | 2 +- jdav_web/members/templates/admin/freizeit_finance_overview.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jdav_web/members/models.py b/jdav_web/members/models.py index 36f8a39..b09f1db 100644 --- a/jdav_web/members/models.py +++ b/jdav_web/members/models.py @@ -1212,7 +1212,7 @@ class Freizeit(CommonModel): if not self.statement: return 0 total_costs = self.statement.total_bills_theoretic - total_contributions = self.statement.total_staff + self.potential_ljp_contributions + total_contributions = self.statement.total_subsidies + self.potential_ljp_contributions return total_costs - total_contributions @property diff --git a/jdav_web/members/templates/admin/freizeit_finance_overview.html b/jdav_web/members/templates/admin/freizeit_finance_overview.html index efc7818..ae14716 100644 --- a/jdav_web/members/templates/admin/freizeit_finance_overview.html +++ b/jdav_web/members/templates/admin/freizeit_finance_overview.html @@ -145,7 +145,7 @@ you may obtain up to 25€ times {{ duration }} days for {{ participant_count }} {% trans "Contributions by the association" %}