finance: don't include subsidies in theoretic total

Subsidies paid for night and travel costs are expected to be listed
in the bills of the associated statement. Hence, they should not be
counted a second time in the theoretic total. This affects LJP
and SJR applications.
pull/103/head
Christian Merten 11 months ago
parent e2bff68471
commit afdbb56d81
Signed by: christian.merten
GPG Key ID: D953D69721B948B3

@ -366,7 +366,13 @@ class Statement(CommonModel):
@property
def total_theoretic(self):
return self.total_bills_theoretic + self.total_staff
"""
The theoretic total used in SJR and LJP applications. This is the sum of all
bills (ignoring whether they are paid by the association or not) plus the
total allowance. This does not include the subsidies for night and travel costs,
since they are expected to be included in the bills.
"""
return self.total_bills_theoretic + self.total_allowance
def total_pretty(self):
return "{}".format(self.total)

@ -146,8 +146,6 @@
\textbf{Beschreibung} & \textbf{Betrag} \\
\midrule
Aufwandsentschädigung & {{ memberlist.statement.total_allowance }}\\
Fahrtkosten & {{ memberlist.statement.total_transportation }}\\
Übernachtungskosten & {{ memberlist.statement.total_nights }}\\
{% for bill in memberlist.statement.grouped_bills %}
{{ bill.short_description|esc_all }} & {{ bill.amount }}\\
{% endfor %}

Loading…
Cancel
Save