From e82ac6cd809102b8c5705a3fe623296e510cf87e Mon Sep 17 00:00:00 2001
From: Fredrik Jonsson <frjo@xdeb.org>
Date: Wed, 19 Aug 2026 13:54:08 +0200
Subject: [PATCH 1/2] Flatten invoice urls to not include project id. Same as
 reports.

---
 hypha/apply/projects/models/payment.py        | 11 +--
 .../application_projects/invoice_detail.html  | 10 +-
 .../modals/invoice_tag.html                   |  2 +-
 .../partials/invoice_detail_actions.html      |  8 +-
 .../partials/invoice_status_table.html        |  6 +-
 hypha/apply/projects/tests/test_views.py      | 76 ++++-----------
 hypha/apply/projects/urls.py                  | 96 +++++++++----------
 hypha/apply/projects/views/payment.py         | 22 ++---
 .../apply/projects/views/project_partials.py  | 18 ++--
 9 files changed, 90 insertions(+), 159 deletions(-)

diff --git a/hypha/apply/projects/models/payment.py b/hypha/apply/projects/models/payment.py
index c809df3880..391a73b578 100644
--- a/hypha/apply/projects/models/payment.py
+++ b/hypha/apply/projects/models/payment.py
@@ -301,10 +301,7 @@ def value(self):
         return self.paid_value
 
     def get_absolute_url(self):
-        return reverse(
-            "apply:projects:invoice-detail",
-            kwargs={"pk": self.project.pk, "invoice_pk": self.pk},
-        )
+        return reverse("apply:projects:invoice-detail", kwargs={"pk": self.pk})
 
     @property
     def filename(self):
@@ -337,11 +334,7 @@ def filename(self):
     def get_absolute_url(self):
         return reverse(
             "apply:projects:invoice-supporting-document",
-            kwargs={
-                "pk": self.invoice.project.pk,
-                "invoice_pk": self.invoice.pk,
-                "file_pk": self.pk,
-            },
+            kwargs={"pk": self.invoice.pk, "file_pk": self.pk},
         )
 
 
diff --git a/hypha/apply/projects/templates/application_projects/invoice_detail.html b/hypha/apply/projects/templates/application_projects/invoice_detail.html
index daed3300d2..50e8ae9b2d 100644
--- a/hypha/apply/projects/templates/application_projects/invoice_detail.html
+++ b/hypha/apply/projects/templates/application_projects/invoice_detail.html
@@ -51,7 +51,7 @@
                     </p>
                     <p
                         class="lg:col-span-2"
-                        hx-get="{% url 'apply:projects:partial-invoice-tags' pk=object.project.pk invoice_pk=object.pk %}"
+                        hx-get="{% url 'apply:projects:partial-invoice-tags' pk=object.pk %}"
                         hx-trigger="load, invoicesUpdated from:body"
                     ></p>
                 </div>
@@ -59,7 +59,7 @@
 
             <!-- status -->
             <section
-                hx-get="{% url 'apply:projects:partial-invoice-status' pk=object.project.pk invoice_pk=object.pk %}"
+                hx-get="{% url 'apply:projects:partial-invoice-status' pk=object.pk %}"
                 hx-trigger="load, invoicesUpdated from:body"
                 class="card card-border"
             >
@@ -75,7 +75,7 @@
                     <h2 class="card-title">{% trans "Invoice" %}</h2>
                     <p class="max-w-md">
                         <c-card-attachment
-                            href="{% url 'apply:projects:invoice-document' pk=object.project.pk invoice_pk=object.pk %}"
+                            href="{% url 'apply:projects:invoice-document' pk=object.pk %}"
                             :filename="object.filename"
                             :exists="invoice_file_exists"
                             title="{% trans 'Download invoice' %}"
@@ -84,7 +84,7 @@ <h2 class="card-title">{% trans "Invoice" %}</h2>
                     {% if invoice_file_exists %}
                         <div class="overflow-x-auto mt-4">
                             <embed
-                                src="{% url 'apply:projects:invoice-document' pk=object.project.pk invoice_pk=object.pk %}"
+                                src="{% url 'apply:projects:invoice-document' pk=object.pk %}"
                                 width="800px"
                                 height="800px"
                             />
@@ -112,7 +112,7 @@ <h2 class="card-title">{% trans "Supporting Documents" %}</h2>
         <aside class="layout-sidebar">
             <div
                 class="sticky top-8 card card-border bg-base-200 shadow-xs sidebar__inner--actions"
-                hx-get="{% url 'apply:projects:partial-invoice-detail-actions' pk=object.project.pk invoice_pk=object.pk %}"
+                hx-get="{% url 'apply:projects:partial-invoice-detail-actions' pk=object.pk %}"
                 hx-trigger="invoicesUpdated from:body"
                 data-testid="sidebar-primary-actions"
             >
diff --git a/hypha/apply/projects/templates/application_projects/modals/invoice_tag.html b/hypha/apply/projects/templates/application_projects/modals/invoice_tag.html
index c897b08465..96d86b80d3 100644
--- a/hypha/apply/projects/templates/application_projects/modals/invoice_tag.html
+++ b/hypha/apply/projects/templates/application_projects/modals/invoice_tag.html
@@ -3,7 +3,7 @@
 
 <div class="p-4">
     <form
-        hx-post="{% url 'apply:projects:invoice-tags' pk=object.project.pk invoice_pk=object.pk %}"
+        hx-post="{% url 'apply:projects:invoice-tags' pk=object.pk %}"
         hx-swap="innerHTML"
     >
         {% csrf_token %}
diff --git a/hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html b/hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html
index 14c167bbec..d5051f8960 100644
--- a/hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html
+++ b/hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html
@@ -9,7 +9,7 @@ <h2 class="card-title">{% trans "Actions to take" %}</h2>
         {% if user_can_change_status %}
             <button
                 class="btn btn-primary btn-block"
-                hx-get="{% url 'apply:projects:invoice-update' pk=object.project.pk invoice_pk=object.pk %}"
+                hx-get="{% url 'apply:projects:invoice-update' pk=object.pk %}"
                 hx-target="#htmx-modal"
             >
                 {% trans "Update Status" %}
@@ -37,7 +37,7 @@ <h4 class="modal__project-header-bar">{% trans "Update Invoice status" %}</h4>
             {% endif %}
             class="btn btn-secondary btn-outline btn-block"
             href={% if user_can_edit_request %}
-                 "{% url "apply:projects:invoice-edit" pk=object.project.pk invoice_pk=object.pk %}"
+                 "{% url "apply:projects:invoice-edit" pk=object.pk %}"
             {% else %}
                  "#"
             {% endif %}
@@ -51,7 +51,7 @@ <h4 class="modal__project-header-bar">{% trans "Update Invoice status" %}</h4>
     {% if user.is_apply_staff or user.is_finance %}
         <button
             class="btn btn-secondary btn-outline btn-block"
-            hx-get="{% url 'apply:projects:invoice-tags' pk=object.project.pk invoice_pk=object.pk %}"
+            hx-get="{% url 'apply:projects:invoice-tags' pk=object.pk %}"
             hx-target="#htmx-modal"
         >
             {% heroicon_micro "tag" aria_hidden=true class="opacity-80 size-4" %}
@@ -64,7 +64,7 @@ <h4 class="modal__project-header-bar">{% trans "Update Invoice status" %}</h4>
     {% if user_can_delete_request %}
         <a
             class="btn btn-error btn-outline btn-block"
-            hx-get="{% url 'apply:projects:invoice-delete' pk=object.project.pk invoice_pk=object.pk %}"
+            hx-get="{% url 'apply:projects:invoice-delete' pk=object.pk %}"
             hx-target="#htmx-modal"
         >
             {% heroicon_micro "trash" aria_hidden=true class="opacity-80 size-4" %}
diff --git a/hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html b/hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html
index 178dd7e5fc..4c812d02f9 100644
--- a/hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html
+++ b/hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html
@@ -23,7 +23,7 @@
                 {% if user_can_edit_request %}
                     <a
                         class="btn btn-sm btn-soft btn-secondary btn-square"
-                        href="{% url 'apply:projects:invoice-edit' pk=invoice.project.pk invoice_pk=invoice.pk %}"
+                        href="{% url 'apply:projects:invoice-edit' pk=invoice.pk %}"
                     >
                         {% heroicon_micro "pencil-square" aria_hidden=true %}
                         <span class="sr-only">{% trans "Edit" %}</span>
@@ -34,7 +34,7 @@
                 {% if not user.is_applicant and not user_can_delete_request %}
                     <a
                         class="btn btn-sm btn-outline btn-error btn-square"
-                        href="{% url 'apply:projects:invoice-delete' pk=invoice.project.pk invoice_pk=invoice.pk %}"
+                        href="{% url 'apply:projects:invoice-delete' pk=invoice.pk %}"
                     >
                         {% heroicon_micro "trash" aria_hidden=true %}
                         <span class="sr-only">{% trans "Delete" %}</span>
@@ -42,7 +42,7 @@
                 {% endif %}
                 {% can_change_status invoice user as can_change_invoice_status %}
                 {% if can_change_invoice_status %}
-                    <button class="btn btn-sm btn-primary" hx-get="{% url 'apply:projects:invoice-update' pk=invoice.project.pk invoice_pk=invoice.pk %}" hx-target="#htmx-modal">
+                    <button class="btn btn-sm btn-primary" hx-get="{% url 'apply:projects:invoice-update' pk=invoice.pk %}" hx-target="#htmx-modal">
                         {% trans "Update Status" %}
                     </button>
                 {% endif %}
diff --git a/hypha/apply/projects/tests/test_views.py b/hypha/apply/projects/tests/test_views.py
index cc743fed55..84598c13e7 100644
--- a/hypha/apply/projects/tests/test_views.py
+++ b/hypha/apply/projects/tests/test_views.py
@@ -846,22 +846,13 @@ class TestStaffDetailInvoiceStatus(BaseViewTestCase):
     user_factory = StaffFactory
 
     def get_kwargs(self, instance):
-        return {
-            "pk": instance.project.pk,
-            "invoice_pk": instance.pk,
-        }
+        return {"pk": instance.pk}
 
     def test_can(self):
         invoice = InvoiceFactory()
-        response = self.get_page(invoice, url_kwargs={"pk": invoice.project.pk})
+        response = self.get_page(invoice)
         self.assertEqual(response.status_code, 200)
 
-    def test_wrong_project_cant(self):
-        other_project = ProjectFactory()
-        invoice = InvoiceFactory()
-        response = self.get_page(invoice, url_kwargs={"pk": other_project.pk})
-        self.assertEqual(response.status_code, 404)
-
 
 class TestFinanceDetailInvoiceStatus(BaseViewTestCase):
     base_view_name = "invoice-detail"
@@ -869,22 +860,13 @@ class TestFinanceDetailInvoiceStatus(BaseViewTestCase):
     user_factory = FinanceFactory
 
     def get_kwargs(self, instance):
-        return {
-            "pk": instance.project.pk,
-            "invoice_pk": instance.pk,
-        }
+        return {"pk": instance.pk}
 
     def test_can(self):
         invoice = InvoiceFactory()
-        response = self.get_page(invoice, url_kwargs={"pk": invoice.project.pk})
+        response = self.get_page(invoice)
         self.assertEqual(response.status_code, 200)
 
-    def test_wrong_project_cant(self):
-        other_project = ProjectFactory()
-        invoice = InvoiceFactory()
-        response = self.get_page(invoice, url_kwargs={"pk": other_project.pk})
-        self.assertEqual(response.status_code, 404)
-
 
 class TestApplicantDetailInvoiceStatus(BaseViewTestCase):
     base_view_name = "invoice-detail"
@@ -892,10 +874,7 @@ class TestApplicantDetailInvoiceStatus(BaseViewTestCase):
     user_factory = ApplicantFactory
 
     def get_kwargs(self, instance):
-        return {
-            "pk": instance.project.pk,
-            "invoice_pk": instance.pk,
-        }
+        return {"pk": instance.pk}
 
     def test_can(self):
         invoice = InvoiceFactory(project__user=self.user)
@@ -914,10 +893,7 @@ class TestApplicantEditInvoiceView(BaseViewTestCase):
     user_factory = ApplicantFactory
 
     def get_kwargs(self, instance):
-        return {
-            "pk": instance.project.pk,
-            "invoice_pk": instance.pk,
-        }
+        return {"pk": instance.pk}
 
     def test_editing_invoice_remove_supporting_document(self):
         invoice = InvoiceFactory(project__user=self.user)
@@ -982,10 +958,7 @@ class TestStaffEditInvoiceView(BaseViewTestCase):
     user_factory = StaffFactory
 
     def get_kwargs(self, instance):
-        return {
-            "pk": instance.project.pk,
-            "invoice_pk": instance.pk,
-        }
+        return {"pk": instance.pk}
 
     def test_editing_invoice_remove_supporting_document(self):
         invoice = InvoiceFactory()
@@ -1052,10 +1025,7 @@ class TestStaffChangeInvoiceStatus(BaseViewTestCase):
     user_factory = StaffFactory
 
     def get_kwargs(self, instance):
-        return {
-            "pk": instance.project.pk,
-            "invoice_pk": instance.pk,
-        }
+        return {"pk": instance.pk}
 
     def test_can(self):
         invoice = InvoiceFactory()
@@ -1140,7 +1110,7 @@ def test_can_view_updated_invoice_status(self):
         response = self.client.get(
             reverse(
                 "apply:projects:partial-invoice-status",
-                kwargs={"pk": project.pk, "invoice_pk": invoice.pk},
+                kwargs={"pk": invoice.pk},
             ),
             secure=True,
             follow=True,
@@ -1162,7 +1132,7 @@ def test_can_view_updated_invoice_status(self):
         response = self.client.get(
             reverse(
                 "apply:projects:partial-invoice-status",
-                kwargs={"pk": project.pk, "invoice_pk": invoice.pk},
+                kwargs={"pk": invoice.pk},
             ),
             secure=True,
             follow=True,
@@ -1178,7 +1148,7 @@ class TestApplicantChangeInvoiceStatus(BaseViewTestCase):
     user_factory = ApplicantFactory
 
     def get_kwargs(self, instance):
-        return {"pk": instance.project.pk, "invoice_pk": instance.pk}
+        return {"pk": instance.pk}
 
     def test_can(self):
         invoice = InvoiceFactory(project__user=self.user)
@@ -1213,19 +1183,13 @@ class TestStaffInvoiceDocumentPrivateMedia(BaseViewTestCase):
     user_factory = StaffFactory
 
     def get_kwargs(self, instance):
-        return {"pk": instance.project.pk, "invoice_pk": instance.pk}
+        return {"pk": instance.pk}
 
     def test_can_access(self):
         invoice = InvoiceFactory()
-        response = self.get_page(invoice, url_kwargs={"pk": invoice.project.pk})
+        response = self.get_page(invoice)
         self.assertContains(response, invoice.document.read())
 
-    def test_cant_access_if_project_wrong(self):
-        other_project = ProjectFactory()
-        invoice = InvoiceFactory()
-        response = self.get_page(invoice, url_kwargs={"pk": other_project.pk})
-        self.assertEqual(response.status_code, 404)
-
 
 class TestApplicantInvoiceDocumentPrivateMedia(BaseViewTestCase):
     base_view_name = "invoice-document"
@@ -1233,7 +1197,7 @@ class TestApplicantInvoiceDocumentPrivateMedia(BaseViewTestCase):
     user_factory = ApplicantFactory
 
     def get_kwargs(self, instance):
-        return {"pk": instance.project.pk, "invoice_pk": instance.pk}
+        return {"pk": instance.pk}
 
     def test_can_access_own(self):
         invoice = InvoiceFactory(project__user=self.user)
@@ -1252,11 +1216,7 @@ class TestStaffInvoiceSupportingDocumentPrivateMedia(BaseViewTestCase):
     user_factory = StaffFactory
 
     def get_kwargs(self, instance):
-        return {
-            "pk": instance.invoice.project.pk,
-            "invoice_pk": instance.invoice.pk,
-            "file_pk": instance.pk,
-        }
+        return {"pk": instance.invoice.pk, "file_pk": instance.pk}
 
     def test_can_access(self):
         supporting_document = SupportingDocumentFactory()
@@ -1270,11 +1230,7 @@ class TestApplicantSupportingDocumentPrivateMedia(BaseViewTestCase):
     user_factory = ApplicantFactory
 
     def get_kwargs(self, instance):
-        return {
-            "pk": instance.invoice.project.pk,
-            "invoice_pk": instance.invoice.pk,
-            "file_pk": instance.pk,
-        }
+        return {"pk": instance.invoice.pk, "file_pk": instance.pk}
 
     def test_can_access_own(self):
         supporting_document = SupportingDocumentFactory(
diff --git a/hypha/apply/projects/urls.py b/hypha/apply/projects/urls.py
index 2e4fe46629..4ccffcdff9 100644
--- a/hypha/apply/projects/urls.py
+++ b/hypha/apply/projects/urls.py
@@ -74,6 +74,51 @@
         invoice_export_download,
         name="invoice-export-download",
     ),
+    path(
+        "invoices/<int:pk>/",
+        include(
+            [
+                path("", InvoiceView.as_view(), name="invoice-detail"),
+                path("edit/", EditInvoiceView.as_view(), name="invoice-edit"),
+                path(
+                    "update/",
+                    ChangeInvoiceStatusView.as_view(),
+                    name="invoice-update",
+                ),
+                path(
+                    "delete/",
+                    DeleteInvoiceView.as_view(),
+                    name="invoice-delete",
+                ),
+                path(
+                    "partial/status/",
+                    partial_get_invoice_status,
+                    name="partial-invoice-status",
+                ),
+                path(
+                    "actions/",
+                    partial_get_invoice_detail_actions,
+                    name="partial-invoice-detail-actions",
+                ),
+                path("tags/", TagInvoiceView.as_view(), name="invoice-tags"),
+                path(
+                    "partial/tags/",
+                    partial_get_invoice_tags,
+                    name="partial-invoice-tags",
+                ),
+                path(
+                    "documents/invoice/",
+                    InvoicePrivateMedia.as_view(),
+                    name="invoice-document",
+                ),
+                path(
+                    "documents/supporting/<int:file_pk>/",
+                    InvoicePrivateMedia.as_view(),
+                    name="invoice-supporting-document",
+                ),
+            ]
+        ),
+    ),
     path(
         "all/bulk_invoice_status_update/",
         BatchUpdateInvoiceStatusView.as_view(),
@@ -247,57 +292,6 @@
                     {"rejected": True},
                     name="partial-rejected-invoices-status",
                 ),
-                path(
-                    "invoices/<int:invoice_pk>/",
-                    include(
-                        [
-                            path("", InvoiceView.as_view(), name="invoice-detail"),
-                            path(
-                                "edit/", EditInvoiceView.as_view(), name="invoice-edit"
-                            ),
-                            path(
-                                "update/",
-                                ChangeInvoiceStatusView.as_view(),
-                                name="invoice-update",
-                            ),
-                            path(
-                                "delete/",
-                                DeleteInvoiceView.as_view(),
-                                name="invoice-delete",
-                            ),
-                            path(
-                                "partial/status/",
-                                partial_get_invoice_status,
-                                name="partial-invoice-status",
-                            ),
-                            path(
-                                "actions/",
-                                partial_get_invoice_detail_actions,
-                                name="partial-invoice-detail-actions",
-                            ),
-                            path(
-                                "tags/",
-                                TagInvoiceView.as_view(),
-                                name="invoice-tags",
-                            ),
-                            path(
-                                "partial/tags/",
-                                partial_get_invoice_tags,
-                                name="partial-invoice-tags",
-                            ),
-                            path(
-                                "documents/invoice/",
-                                InvoicePrivateMedia.as_view(),
-                                name="invoice-document",
-                            ),
-                            path(
-                                "documents/supporting/<int:file_pk>/",
-                                InvoicePrivateMedia.as_view(),
-                                name="invoice-supporting-document",
-                            ),
-                        ]
-                    ),
-                ),
             ]
         ),
     ),
diff --git a/hypha/apply/projects/views/payment.py b/hypha/apply/projects/views/payment.py
index fe71d1d8ec..48f330e9b2 100644
--- a/hypha/apply/projects/views/payment.py
+++ b/hypha/apply/projects/views/payment.py
@@ -93,8 +93,7 @@ class InvoiceAccessMixin(UserPassesTestMixin):
     model = Invoice
 
     def get_object(self):
-        project = get_object_or_404(Project, pk=self.kwargs["pk"])
-        return get_object_or_404(project.invoices.all(), pk=self.kwargs["invoice_pk"])
+        return get_object_or_404(Invoice, pk=self.kwargs["pk"])
 
     def test_func(self):
         if self.request.user.is_apply_staff:
@@ -130,7 +129,7 @@ class ChangeInvoiceStatusView(InvoiceAccessMixin, View):
     template = "application_projects/modals/invoice_status_update.html"
 
     def dispatch(self, request, *args, **kwargs):
-        self.object: Invoice = get_object_or_404(Invoice, id=kwargs.get("invoice_pk"))
+        self.object: Invoice = self.get_object()
         return super().dispatch(request, *args, **kwargs)
 
     def get_context_data(self, **kwargs):
@@ -233,10 +232,6 @@ class DeleteInvoiceView(DeleteView):
     model = Invoice
     template_name = "application_projects/modals/invoice_confirm_delete.html"
 
-    def get_object(self):
-        project = get_object_or_404(Project, pk=self.kwargs["pk"])
-        return get_object_or_404(project.invoices.all(), pk=self.kwargs["invoice_pk"])
-
     def dispatch(self, request, *args, **kwargs):
         self.object = self.get_object()
         if not self.object.can_user_delete(request.user):
@@ -381,11 +376,7 @@ def post(self, request, *args, **kwargs):
         self.object = self.get_object()
         form = self.get_form()
         if "delete" in form.data:
-            return redirect(
-                "apply:projects:invoice-delete",
-                pk=self.object.project.pk,
-                invoice_pk=self.object.id,
-            )
+            return redirect("apply:projects:invoice-delete", pk=self.object.pk)
         if form.is_valid():
             return self.form_valid(form)
         else:
@@ -472,9 +463,8 @@ class InvoicePrivateMedia(UserPassesTestMixin, PrivateMediaView):
     raise_exception = True
 
     def dispatch(self, *args, **kwargs):
-        invoice_pk = self.kwargs["invoice_pk"]
-        self.project = get_object_or_404(Project, pk=self.kwargs["pk"])
-        self.invoice = get_object_or_404(self.project.invoices.all(), pk=invoice_pk)
+        self.invoice = get_object_or_404(Invoice, pk=self.kwargs["pk"])
+        self.project = self.invoice.project
 
         return super().dispatch(*args, **kwargs)
 
@@ -699,7 +689,7 @@ class TagInvoiceView(InvoiceAccessMixin, View):
     template_name = "application_projects/modals/invoice_tag.html"
 
     def dispatch(self, request, *args, **kwargs):
-        self.object = get_object_or_404(Invoice, id=kwargs.get("invoice_pk"))
+        self.object = self.get_object()
         return super().dispatch(request, *args, **kwargs)
 
     def get(self, *args, **kwargs):
diff --git a/hypha/apply/projects/views/project_partials.py b/hypha/apply/projects/views/project_partials.py
index ddaf138f68..ffe41d71ea 100644
--- a/hypha/apply/projects/views/project_partials.py
+++ b/hypha/apply/projects/views/project_partials.py
@@ -106,19 +106,18 @@ def partial_get_invoice_status_table(
 
 
 @login_required
-def partial_get_invoice_status(request: HttpRequest, pk: int, invoice_pk: int):
+def partial_get_invoice_status(request: HttpRequest, pk: int):
     """
     Partial to get the invoice status for invoice detail view
 
     Args:
         request: request used to retrieve partial
-        pk: ID of the associated project
-        invoice_pk: ID of the invoice to retrieve the status of
+        pk: ID of the invoice to retrieve the status of
 
     Returns:
         HttpResponse containing the status line of requested invoice
     """
-    invoice = get_object_or_404(Invoice, pk=invoice_pk)
+    invoice = get_object_or_404(Invoice, pk=pk)
     user = request.user
     invoice_activities = Activity.actions.filter(
         related_content_type__model="invoice", related_object_id=invoice.id
@@ -137,19 +136,18 @@ def partial_get_invoice_status(request: HttpRequest, pk: int, invoice_pk: int):
 
 
 @login_required
-def partial_get_invoice_detail_actions(request: HttpRequest, pk: int, invoice_pk: int):
+def partial_get_invoice_detail_actions(request: HttpRequest, pk: int):
     """
     Partial to get the actions for the invoice detail view
 
     Args:
         request: request used to retrieve partial
-        pk: ID of the associated project
-        invoice_pk: ID of the invoice to retrieve the status of
+        pk: ID of the invoice to retrieve the actions for
 
     Returns:
         HttpResponse containing the status line of requested invoice
     """
-    invoice = get_object_or_404(Invoice, pk=invoice_pk)
+    invoice = get_object_or_404(Invoice, pk=pk)
     user = request.user
 
     return render(
@@ -160,8 +158,8 @@ def partial_get_invoice_detail_actions(request: HttpRequest, pk: int, invoice_pk
 
 
 @login_required
-def partial_get_invoice_tags(request: HttpRequest, pk: int, invoice_pk: int):
-    invoice = get_object_or_404(Invoice, pk=invoice_pk)
+def partial_get_invoice_tags(request: HttpRequest, pk: int):
+    invoice = get_object_or_404(Invoice, pk=pk)
     return render(
         request,
         "application_projects/partials/invoice_tags.html",

From 1a21944a4a5ce5c54b19f552d76fb51129c84120 Mon Sep 17 00:00:00 2001
From: Fredrik Jonsson <frjo@xdeb.org>
Date: Wed, 19 Aug 2026 14:03:18 +0200
Subject: [PATCH 2/2] Rename payment.py to invoice.py.

---
 hypha/apply/activity/adapters/emails.py                       | 2 +-
 hypha/apply/activity/adapters/slack.py                        | 2 +-
 hypha/apply/activity/adapters/utils.py                        | 2 +-
 hypha/apply/activity/tests/test_adapter_utils.py              | 2 +-
 hypha/apply/dashboard/tests/test_views.py                     | 2 +-
 hypha/apply/dashboard/views.py                                | 2 +-
 hypha/apply/projects/constants.py                             | 2 +-
 hypha/apply/projects/filters.py                               | 2 +-
 hypha/apply/projects/forms/__init__.py                        | 2 +-
 hypha/apply/projects/forms/{payment.py => invoice.py}         | 2 +-
 .../projects/migrations/0014_add_payment_related_models.py    | 2 +-
 hypha/apply/projects/migrations/0037_add_project_invoicing.py | 4 ++--
 .../migrations/0103_alter_contract_options_and_more.py        | 4 ++--
 hypha/apply/projects/models/__init__.py                       | 2 +-
 hypha/apply/projects/models/{payment.py => invoice.py}        | 0
 hypha/apply/projects/service_utils.py                         | 2 +-
 hypha/apply/projects/tables.py                                | 2 +-
 hypha/apply/projects/tasks.py                                 | 4 ++--
 hypha/apply/projects/templatetags/invoice_tools.py            | 4 ++--
 hypha/apply/projects/tests/factories.py                       | 2 +-
 hypha/apply/projects/tests/test_forms.py                      | 4 ++--
 hypha/apply/projects/tests/test_models.py                     | 2 +-
 hypha/apply/projects/tests/test_more_templatetags.py          | 2 +-
 hypha/apply/projects/tests/test_templatetags.py               | 2 +-
 hypha/apply/projects/tests/test_utils.py                      | 2 +-
 hypha/apply/projects/tests/test_views.py                      | 2 +-
 hypha/apply/projects/utils.py                                 | 2 +-
 hypha/apply/projects/views/__init__.py                        | 2 +-
 hypha/apply/projects/views/{payment.py => invoice.py}         | 2 +-
 hypha/apply/projects/views/project_partials.py                | 2 +-
 30 files changed, 34 insertions(+), 34 deletions(-)
 rename hypha/apply/projects/forms/{payment.py => invoice.py} (99%)
 rename hypha/apply/projects/models/{payment.py => invoice.py} (100%)
 rename hypha/apply/projects/views/{payment.py => invoice.py} (99%)

diff --git a/hypha/apply/activity/adapters/emails.py b/hypha/apply/activity/adapters/emails.py
index 8f033d1401..e94ed8eda7 100644
--- a/hypha/apply/activity/adapters/emails.py
+++ b/hypha/apply/activity/adapters/emails.py
@@ -13,7 +13,7 @@
     CoApplicantProjectPermission,
     CoApplicantRole,
 )
-from hypha.apply.projects.models.payment import (
+from hypha.apply.projects.models.invoice import (
     APPROVED_BY_FINANCE,
     CHANGES_REQUESTED_BY_FINANCE,
     CHANGES_REQUESTED_BY_STAFF,
diff --git a/hypha/apply/activity/adapters/slack.py b/hypha/apply/activity/adapters/slack.py
index bef0014dc0..fda4fc896a 100644
--- a/hypha/apply/activity/adapters/slack.py
+++ b/hypha/apply/activity/adapters/slack.py
@@ -8,7 +8,7 @@
 from hypha.apply.activity.adapters.base import AdapterBase
 from hypha.apply.activity.adapters.utils import link_to, reviewers_message
 from hypha.apply.activity.options import MESSAGES
-from hypha.apply.projects.models.payment import (
+from hypha.apply.projects.models.invoice import (
     APPROVED_BY_STAFF,
     CHANGES_REQUESTED_BY_FINANCE,
     PAID,
diff --git a/hypha/apply/activity/adapters/utils.py b/hypha/apply/activity/adapters/utils.py
index 8c0ad9a549..30578707c6 100644
--- a/hypha/apply/activity/adapters/utils.py
+++ b/hypha/apply/activity/adapters/utils.py
@@ -5,7 +5,7 @@
 
 from hypha.apply.activity.options import MESSAGES
 from hypha.apply.projects.models import ProjectSettings
-from hypha.apply.projects.models.payment import (
+from hypha.apply.projects.models.invoice import (
     APPROVED_BY_FINANCE,
     CHANGES_REQUESTED_BY_STAFF,
     DECLINED,
diff --git a/hypha/apply/activity/tests/test_adapter_utils.py b/hypha/apply/activity/tests/test_adapter_utils.py
index 30f7dc8f3a..db37330a13 100644
--- a/hypha/apply/activity/tests/test_adapter_utils.py
+++ b/hypha/apply/activity/tests/test_adapter_utils.py
@@ -3,7 +3,7 @@
 from django.test import SimpleTestCase, TestCase
 
 from hypha.apply.activity.options import MESSAGES
-from hypha.apply.projects.models.payment import (
+from hypha.apply.projects.models.invoice import (
     APPROVED_BY_FINANCE,
     APPROVED_BY_STAFF,
     CHANGES_REQUESTED_BY_STAFF,
diff --git a/hypha/apply/dashboard/tests/test_views.py b/hypha/apply/dashboard/tests/test_views.py
index a96b3b252c..f2a9b2b94d 100644
--- a/hypha/apply/dashboard/tests/test_views.py
+++ b/hypha/apply/dashboard/tests/test_views.py
@@ -6,7 +6,7 @@
     ApplicationSubmissionFactory,
     InvitedToProposalFactory,
 )
-from hypha.apply.projects.models.payment import (
+from hypha.apply.projects.models.invoice import (
     APPROVED_BY_STAFF,
     CHANGES_REQUESTED_BY_STAFF,
     DECLINED,
diff --git a/hypha/apply/dashboard/views.py b/hypha/apply/dashboard/views.py
index e8505088f4..3e71979b31 100644
--- a/hypha/apply/dashboard/views.py
+++ b/hypha/apply/dashboard/views.py
@@ -18,7 +18,7 @@
 )
 from hypha.apply.projects.filters import ProjectListFilter
 from hypha.apply.projects.models import Invoice, Project, ProjectSettings
-from hypha.apply.projects.models.payment import DECLINED, PAID
+from hypha.apply.projects.models.invoice import DECLINED, PAID
 from hypha.apply.projects.tables import (
     InvoiceDashboardTable,
     PAFForReviewDashboardTable,
diff --git a/hypha/apply/projects/constants.py b/hypha/apply/projects/constants.py
index ce689ae75b..88a08e5f68 100644
--- a/hypha/apply/projects/constants.py
+++ b/hypha/apply/projects/constants.py
@@ -1,7 +1,7 @@
 from django.conf import settings
 from django.utils.translation import gettext_lazy as _
 
-from .models.payment import (
+from .models.invoice import (
     APPROVED_BY_FINANCE,
     APPROVED_BY_STAFF,
     CHANGES_REQUESTED_BY_FINANCE,
diff --git a/hypha/apply/projects/filters.py b/hypha/apply/projects/filters.py
index efda59cf2b..0b13cebbbd 100644
--- a/hypha/apply/projects/filters.py
+++ b/hypha/apply/projects/filters.py
@@ -10,7 +10,7 @@
     get_used_funds,
 )
 
-from .models.payment import INVOICE_STATUS_CHOICES, Invoice
+from .models.invoice import INVOICE_STATUS_CHOICES, Invoice
 from .models.project import (
     CLOSING,
     INVOICING_AND_REPORTING,
diff --git a/hypha/apply/projects/forms/__init__.py b/hypha/apply/projects/forms/__init__.py
index f874f17084..a8dd172dfa 100644
--- a/hypha/apply/projects/forms/__init__.py
+++ b/hypha/apply/projects/forms/__init__.py
@@ -1,4 +1,4 @@
-from .payment import (
+from .invoice import (
     BatchUpdateInvoiceStatusForm,
     ChangeInvoiceStatusForm,
     CreateInvoiceForm,
diff --git a/hypha/apply/projects/forms/payment.py b/hypha/apply/projects/forms/invoice.py
similarity index 99%
rename from hypha/apply/projects/forms/payment.py
rename to hypha/apply/projects/forms/invoice.py
index 7fffef4637..872c12e62e 100644
--- a/hypha/apply/projects/forms/payment.py
+++ b/hypha/apply/projects/forms/invoice.py
@@ -11,7 +11,7 @@
 from hypha.apply.funds.widgets import MultiCheckboxesWidget
 from hypha.apply.stream_forms.fields import MultiFileField, SingleFileField
 
-from ..models.payment import (
+from ..models.invoice import (
     APPROVED_BY_FINANCE,
     APPROVED_BY_STAFF,
     CHANGES_REQUESTED_BY_FINANCE,
diff --git a/hypha/apply/projects/migrations/0014_add_payment_related_models.py b/hypha/apply/projects/migrations/0014_add_payment_related_models.py
index 30b4e21f45..c75c8e139c 100644
--- a/hypha/apply/projects/migrations/0014_add_payment_related_models.py
+++ b/hypha/apply/projects/migrations/0014_add_payment_related_models.py
@@ -74,7 +74,7 @@ class Migration(migrations.Migration):
                     "invoice",
                     models.FileField(
                         storage=django.core.files.storage.FileSystemStorage(),
-                        upload_to=hypha.apply.projects.models.payment.invoice_path,
+                        upload_to=hypha.apply.projects.models.invoice.invoice_path,
                     ),
                 ),
                 (
diff --git a/hypha/apply/projects/migrations/0037_add_project_invoicing.py b/hypha/apply/projects/migrations/0037_add_project_invoicing.py
index e56c5fe793..f2ab875390 100644
--- a/hypha/apply/projects/migrations/0037_add_project_invoicing.py
+++ b/hypha/apply/projects/migrations/0037_add_project_invoicing.py
@@ -6,7 +6,7 @@
 import django.core.validators
 from django.db import migrations, models
 import django.db.models.deletion
-import hypha.apply.projects.models.payment
+import hypha.apply.projects.models.invoice
 
 
 class Migration(migrations.Migration):
@@ -56,7 +56,7 @@ class Migration(migrations.Migration):
                     "document",
                     models.FileField(
                         storage=django.core.files.storage.FileSystemStorage(),
-                        upload_to=hypha.apply.projects.models.payment.invoice_path,
+                        upload_to=hypha.apply.projects.models.invoice.invoice_path,
                     ),
                 ),
                 ("requested_at", models.DateTimeField(auto_now_add=True)),
diff --git a/hypha/apply/projects/migrations/0103_alter_contract_options_and_more.py b/hypha/apply/projects/migrations/0103_alter_contract_options_and_more.py
index f6b34c6750..294698e793 100644
--- a/hypha/apply/projects/migrations/0103_alter_contract_options_and_more.py
+++ b/hypha/apply/projects/migrations/0103_alter_contract_options_and_more.py
@@ -3,7 +3,7 @@
 import datetime
 import django.core.files.storage
 import django.core.validators
-import hypha.apply.projects.models.payment
+import hypha.apply.projects.models.invoice
 import hypha.apply.projects.models.project
 from decimal import Decimal
 from django.db import migrations, models
@@ -235,7 +235,7 @@ class Migration(migrations.Migration):
             name="document",
             field=models.FileField(
                 storage=django.core.files.storage.FileSystemStorage(),
-                upload_to=hypha.apply.projects.models.payment.invoice_path,
+                upload_to=hypha.apply.projects.models.invoice.invoice_path,
                 verbose_name="document",
             ),
         ),
diff --git a/hypha/apply/projects/models/__init__.py b/hypha/apply/projects/models/__init__.py
index 1b258a2d9d..f998756da5 100644
--- a/hypha/apply/projects/models/__init__.py
+++ b/hypha/apply/projects/models/__init__.py
@@ -1,4 +1,4 @@
-from .payment import Invoice, InvoiceExportManager, InvoiceTag, SupportingDocument
+from .invoice import Invoice, InvoiceExportManager, InvoiceTag, SupportingDocument
 from .project import (
     Contract,
     ContractDocumentCategory,
diff --git a/hypha/apply/projects/models/payment.py b/hypha/apply/projects/models/invoice.py
similarity index 100%
rename from hypha/apply/projects/models/payment.py
rename to hypha/apply/projects/models/invoice.py
diff --git a/hypha/apply/projects/service_utils.py b/hypha/apply/projects/service_utils.py
index 29bcddaa6c..e6ca9e89af 100644
--- a/hypha/apply/projects/service_utils.py
+++ b/hypha/apply/projects/service_utils.py
@@ -15,7 +15,7 @@
     FINANCE_GROUP_NAME,
 )
 
-from .models.payment import (
+from .models.invoice import (
     APPROVED_BY_FINANCE,
     APPROVED_BY_STAFF,
     CHANGES_REQUESTED_BY_FINANCE,
diff --git a/hypha/apply/projects/tables.py b/hypha/apply/projects/tables.py
index a4aabefc28..eaad7ba631 100644
--- a/hypha/apply/projects/tables.py
+++ b/hypha/apply/projects/tables.py
@@ -13,7 +13,7 @@
 from hypha.apply.funds.tables import LabeledCheckboxColumn
 from hypha.core.tables import RelativeTimeColumn
 
-from .forms.payment import get_invoice_possible_transition_for_user
+from .forms.invoice import get_invoice_possible_transition_for_user
 from .models import Invoice, PAFApprovals, Project
 from .utils import get_project_title
 
diff --git a/hypha/apply/projects/tasks.py b/hypha/apply/projects/tasks.py
index 78762693ff..e33b723963 100644
--- a/hypha/apply/projects/tasks.py
+++ b/hypha/apply/projects/tasks.py
@@ -3,7 +3,7 @@
 from celery import shared_task
 from django.conf import settings
 
-from hypha.apply.projects.models.payment import InvoiceExportManager
+from hypha.apply.projects.models.invoice import InvoiceExportManager
 from hypha.apply.projects.utils import export_invoices_to_csv
 from hypha.apply.todo.options import (
     DOWNLOAD_INVOICES_EXPORT,
@@ -21,7 +21,7 @@ def generate_invoice_csv(qs_ids: List[int], request_user_id: int) -> None:
     adds a download task to the user's `My Tasks` when completed.
     """
     try:
-        from hypha.apply.projects.models.payment import Invoice
+        from hypha.apply.projects.models.invoice import Invoice
 
         qs = (
             Invoice.objects.filter(id__in=qs_ids)
diff --git a/hypha/apply/projects/templatetags/invoice_tools.py b/hypha/apply/projects/templatetags/invoice_tools.py
index fa23a38f02..75660fa7c4 100644
--- a/hypha/apply/projects/templatetags/invoice_tools.py
+++ b/hypha/apply/projects/templatetags/invoice_tools.py
@@ -9,7 +9,7 @@
 from hypha.apply.projects.constants import (
     INVOICE_STATUS_CLASSNAME_MAP,
 )
-from hypha.apply.projects.models.payment import PAID
+from hypha.apply.projects.models.invoice import PAID
 from hypha.apply.projects.models.project import (
     CLOSING,
     COMPLETE,
@@ -70,7 +70,7 @@ def project_can_have_invoices(project):
 
 @register.simple_tag
 def get_invoice_form(invoice, user):
-    from hypha.apply.projects.views.payment import ChangeInvoiceStatusForm
+    from hypha.apply.projects.views.invoice import ChangeInvoiceStatusForm
 
     form = ChangeInvoiceStatusForm(instance=invoice, user=user)
     if form:
diff --git a/hypha/apply/projects/tests/factories.py b/hypha/apply/projects/tests/factories.py
index 6d1cd3d8f6..5745ff529f 100644
--- a/hypha/apply/projects/tests/factories.py
+++ b/hypha/apply/projects/tests/factories.py
@@ -13,7 +13,7 @@
 from hypha.apply.users.tests.factories import GroupFactory, StaffFactory, UserFactory
 from hypha.home.factories import ApplySiteFactory
 
-from ..models.payment import Invoice, SupportingDocument
+from ..models.invoice import Invoice, SupportingDocument
 from ..models.project import (
     COMPLETE,
     INVOICING_AND_REPORTING,
diff --git a/hypha/apply/projects/tests/test_forms.py b/hypha/apply/projects/tests/test_forms.py
index c79ec88d20..b7deddf50c 100644
--- a/hypha/apply/projects/tests/test_forms.py
+++ b/hypha/apply/projects/tests/test_forms.py
@@ -13,7 +13,7 @@
 from hypha.home.factories import ApplySiteFactory
 
 from ..files import get_files
-from ..forms.payment import (
+from ..forms.invoice import (
     ChangeInvoiceStatusForm,
     CreateInvoiceForm,
     EditInvoiceForm,
@@ -26,7 +26,7 @@
     StaffUploadContractForm,
     UploadContractForm,
 )
-from ..models.payment import (
+from ..models.invoice import (
     APPROVED_BY_FINANCE,
     APPROVED_BY_STAFF,
     CHANGES_REQUESTED_BY_FINANCE,
diff --git a/hypha/apply/projects/tests/test_models.py b/hypha/apply/projects/tests/test_models.py
index 1e568c8c1d..670ae713e6 100644
--- a/hypha/apply/projects/tests/test_models.py
+++ b/hypha/apply/projects/tests/test_models.py
@@ -9,7 +9,7 @@
     StaffFactory,
 )
 
-from ..models.payment import (
+from ..models.invoice import (
     APPROVED_BY_FINANCE,
     APPROVED_BY_STAFF,
     CHANGES_REQUESTED_BY_FINANCE,
diff --git a/hypha/apply/projects/tests/test_more_templatetags.py b/hypha/apply/projects/tests/test_more_templatetags.py
index 8d922d02c9..7c4bfc9f18 100644
--- a/hypha/apply/projects/tests/test_more_templatetags.py
+++ b/hypha/apply/projects/tests/test_more_templatetags.py
@@ -11,7 +11,7 @@
     StaffFactory,
 )
 
-from ..models.payment import (
+from ..models.invoice import (
     DECLINED,
     PAID,
     SUBMITTED,
diff --git a/hypha/apply/projects/tests/test_templatetags.py b/hypha/apply/projects/tests/test_templatetags.py
index 3ab0819c43..e33773acc7 100644
--- a/hypha/apply/projects/tests/test_templatetags.py
+++ b/hypha/apply/projects/tests/test_templatetags.py
@@ -7,7 +7,7 @@
     StaffFactory,
 )
 
-from ..models.payment import (
+from ..models.invoice import (
     CHANGES_REQUESTED_BY_STAFF,
     DECLINED,
     PAID,
diff --git a/hypha/apply/projects/tests/test_utils.py b/hypha/apply/projects/tests/test_utils.py
index 1338dd769b..c6058dcc06 100644
--- a/hypha/apply/projects/tests/test_utils.py
+++ b/hypha/apply/projects/tests/test_utils.py
@@ -13,7 +13,7 @@
     INT_STAFF_PENDING,
     INT_VENDOR_PENDING,
 )
-from ..models.payment import (
+from ..models.invoice import (
     APPROVED_BY_FINANCE,
     APPROVED_BY_STAFF,
     CHANGES_REQUESTED_BY_FINANCE,
diff --git a/hypha/apply/projects/tests/test_views.py b/hypha/apply/projects/tests/test_views.py
index 84598c13e7..0aad0db014 100644
--- a/hypha/apply/projects/tests/test_views.py
+++ b/hypha/apply/projects/tests/test_views.py
@@ -26,7 +26,7 @@
 from hypha.home.factories import ApplySiteFactory
 
 from ..forms import SetPendingForm
-from ..models.payment import CHANGES_REQUESTED_BY_STAFF, DECLINED, SUBMITTED
+from ..models.invoice import CHANGES_REQUESTED_BY_STAFF, DECLINED, SUBMITTED
 from ..models.project import (
     APPROVE,
     CONTRACTING,
diff --git a/hypha/apply/projects/utils.py b/hypha/apply/projects/utils.py
index 23f77146f1..8520ababeb 100644
--- a/hypha/apply/projects/utils.py
+++ b/hypha/apply/projects/utils.py
@@ -16,7 +16,7 @@
     INT_VENDOR_PENDING,
 )
 from .models import Project
-from .models.payment import (
+from .models.invoice import (
     APPROVED_BY_FINANCE,
     APPROVED_BY_STAFF,
     CHANGES_REQUESTED_BY_FINANCE,
diff --git a/hypha/apply/projects/views/__init__.py b/hypha/apply/projects/views/__init__.py
index 2f355e9137..27ba9e9cde 100644
--- a/hypha/apply/projects/views/__init__.py
+++ b/hypha/apply/projects/views/__init__.py
@@ -1,4 +1,4 @@
-from .payment import (
+from .invoice import (
     BatchUpdateInvoiceStatusView,
     ChangeInvoiceStatusView,
     CreateInvoiceView,
diff --git a/hypha/apply/projects/views/payment.py b/hypha/apply/projects/views/invoice.py
similarity index 99%
rename from hypha/apply/projects/views/payment.py
rename to hypha/apply/projects/views/invoice.py
index 48f330e9b2..21fbbb0265 100644
--- a/hypha/apply/projects/views/payment.py
+++ b/hypha/apply/projects/views/invoice.py
@@ -68,7 +68,7 @@
     EditInvoiceForm,
     InvoiceTagsForm,
 )
-from ..models.payment import (
+from ..models.invoice import (
     APPROVED_BY_FINANCE,
     APPROVED_BY_STAFF,
     CHANGES_REQUESTED_BY_FINANCE,
diff --git a/hypha/apply/projects/views/project_partials.py b/hypha/apply/projects/views/project_partials.py
index ffe41d71ea..c0f0fdfd3a 100644
--- a/hypha/apply/projects/views/project_partials.py
+++ b/hypha/apply/projects/views/project_partials.py
@@ -8,7 +8,7 @@
 
 from hypha.apply.activity.models import Activity
 
-from ..models.payment import Invoice
+from ..models.invoice import Invoice
 from ..models.project import ContractDocumentCategory, DocumentCategory, Project