fixup! Enable export of non-attributable transfers

pycroft/lib/finance/retransfer.py

@@ -3,15 +3,15 @@
 
 from sepaxml import SepaTransfer
 from sqlalchemy import select
-from sqlalchemy.orm import joinedload
+from sqlalchemy.orm import joinedload, Session
 
 from pycroft import config
 from pycroft.helpers.utc import ensure_tz
 from pycroft.model import session
 from pycroft.model.finance import BankAccountActivity
 
 
-def get_activities_to_return() -> Sequence[BankAccountActivity]:
+def get_activities_to_return(session: Session) -> Sequence[BankAccountActivity]:
     statement = (
         select(BankAccountActivity)
         .options(joinedload(BankAccountActivity.bank_account))
@@ -20,7 +20,7 @@ def get_activities_to_return() -> Sequence[BankAccountActivity]:
         .filter(BankAccountActivity.imported_at < ensure_tz(datetime.utcnow() - timedelta(days=14)))
     )
 
-    return session.session.scalars(statement).all()
+    return session.scalars(statement).all()
 
 
 def generate_activities_return_sepaxml(activities: list[BankAccountActivity]) -> bytes:

web/blueprints/finance/__init__.py

@@ -563,10 +563,12 @@ class ActivityEntry(t.TypedDict):
 @bp.route("/bank-account-activities/return/")
 @access.require("finance_change")
 def bank_account_activities_return() -> ResponseReturnValue:
+    s = session.session
+
     field_list: BooleanFieldList = []
     activities: dict[str, ActivityEntry] = {}
 
-    for activity in get_activities_to_return():
+    for activity in get_activities_to_return(s):
         activities[str(activity.id)] = {
             "bank_account": activity.bank_account.name,
             "name": activity.other_name,
@@ -589,8 +591,10 @@ def bank_account_activities_return() -> ResponseReturnValue:
 @bp.route("/bank-account-activities/return/do/", methods=["GET", "POST"])
 @access.require("finance_change")
 def bank_account_activities_return_do() -> ResponseReturnValue:
+    s = session.session
+
     field_list: BooleanFieldList = []
-    activities_to_return: Sequence[BankAccountActivity] = get_activities_to_return()
+    activities_to_return: Sequence[BankAccountActivity] = get_activities_to_return(s)
 
     for activity in activities_to_return:
         field_list.append((str(activity.id), BooleanField(str(activity.id), default=True)))

web/templates/finance/bank_account_activities_return.html

@@ -1,8 +1,3 @@
-{#
-SPDX-FileCopyrightText: 2024 Gregor Düster <git@gdstr.eu>
-
-SPDX-License-Identifier: Apache-2.0
-#}
 {% extends "layout.html" %}
 
 {% set page_title = "Unzuordenbare Überweisungen zurücküberweisen" %}