From 206e8d142f01a7e9ea4e03c0ca1f76ed21d3264f Mon Sep 17 00:00:00 2001
From: Jesse Bickel <jbickel@opentechstrategies.com>
Date: Fri, 12 Jun 2026 12:22:13 -0500
Subject: [PATCH 01/18] Disbursements: add requested and approved amounts

A broad range is allowed so as to support current and future monies.
Several fiat currencies use 0 or 3 decimal places. Several digital
currencies support 6-18 digits following the decimal place. Displaying
the amounts in a sensible way will be a UI concern.

Thanks to GLM-5.2 (LLM) for helpful hints.
---
 ...oved_contract_amount_requested_and_more.py | 40 +++++++++++++++++++
 hypha/apply/projects/models/project.py        | 11 +++++
 2 files changed, 51 insertions(+)
 create mode 100644 hypha/apply/projects/migrations/0111_contract_amount_approved_contract_amount_requested_and_more.py

diff --git a/hypha/apply/projects/migrations/0111_contract_amount_approved_contract_amount_requested_and_more.py b/hypha/apply/projects/migrations/0111_contract_amount_approved_contract_amount_requested_and_more.py
new file mode 100644
index 0000000000..047dc30dc1
--- /dev/null
+++ b/hypha/apply/projects/migrations/0111_contract_amount_approved_contract_amount_requested_and_more.py
@@ -0,0 +1,40 @@
+# Generated by Django 5.2.18 on 2026-11-04 16:44
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("application_projects", "0110_alter_pafreviewersrole_options_and_more"),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="contract",
+            name="amount_approved",
+            field=models.DecimalField(decimal_places=19, max_digits=38, null=True),
+        ),
+        migrations.AddField(
+            model_name="contract",
+            name="amount_requested",
+            field=models.DecimalField(decimal_places=19, max_digits=38, null=True),
+        ),
+        migrations.AddField(
+            model_name="contract",
+            name="currency",
+            field=models.CharField(blank=True, default=None, max_length=3, null=True),
+        ),
+        migrations.AddConstraint(
+            model_name="contract",
+            constraint=models.CheckConstraint(
+                condition=models.Q(
+                    ("currency__isnull", True),
+                    ("currency__regex", "^[A-Z]{3}$"),
+                    _connector="OR",
+                ),
+                name="contract_currency_code_format",
+            ),
+        ),
+    ]
diff --git a/hypha/apply/projects/models/project.py b/hypha/apply/projects/models/project.py
index 2ae28b842b..fb3103a6e3 100644
--- a/hypha/apply/projects/models/project.py
+++ b/hypha/apply/projects/models/project.py
@@ -752,12 +752,23 @@ class Contract(models.Model):
     created_at = models.DateTimeField(auto_now_add=True)
     approved_at = models.DateTimeField(null=True)
     updated_at = models.DateTimeField(null=True)
+    # Purposefully avoid currency libraries: support unofficial currencies.
+    currency = models.CharField(max_length=3, null=True, blank=True, default=None)
+    # Purposefully large decimal fields: support many currencies and inflation.
+    amount_requested = models.DecimalField(max_digits=38, decimal_places=19, null=True)
+    amount_approved = models.DecimalField(max_digits=38, decimal_places=19, null=True)
 
     objects = ContractQuerySet.as_manager()
 
     class Meta:
         verbose_name = _("contract")
         verbose_name_plural = _("contracts")
+        constraints = [
+            models.CheckConstraint(
+                condition=Q(currency__isnull=True) | Q(currency__regex=r"^[A-Z]{3}$"),
+                name="contract_currency_code_format",
+            ),
+        ]
 
     def save(self, *args, **kwargs):
         self.updated_at = timezone.now()

From 6b45cc0cf4af85c18320d5b8dbd75906c7a494db Mon Sep 17 00:00:00 2001
From: Jesse Bickel <jbickel@opentechstrategies.com>
Date: Fri, 26 Jun 2026 14:12:40 -0500
Subject: [PATCH 02/18] Disbursements: show currency, amount fields in UI

Offer an hint at currency codes with a datalist with top ten codes.

Actually load original when editing and save updates to the contract.

There is wide decimal precision available on input, but exactly two
decimal places are shown in the UI unless more are used.

LLM assistance by unsloth/Qwen3.6-35B-A3B-GGUF:UD-Q4_K_XL
Further LLM assistance by GLM-5.2
---
 docs/user-guides/LEDGER_NOTES.md         |   8 ++
 hypha/apply/projects/forms/project.py    | 130 ++++++++++++++++++++++-
 hypha/apply/projects/models/project.py   |   2 +
 hypha/apply/projects/tests/test_forms.py | 100 +++++++++++++++++
 hypha/apply/projects/views/project.py    | 107 ++++++++++---------
 5 files changed, 292 insertions(+), 55 deletions(-)
 create mode 100644 docs/user-guides/LEDGER_NOTES.md

diff --git a/docs/user-guides/LEDGER_NOTES.md b/docs/user-guides/LEDGER_NOTES.md
new file mode 100644
index 0000000000..448aad10e8
--- /dev/null
+++ b/docs/user-guides/LEDGER_NOTES.md
@@ -0,0 +1,8 @@
+# ARDC Ledger Functionality
+
+## Requested and approved amounts
+
+Negative amounts are allowed in case the grantee needs to repay.
+Wide currency amounts are allowed in cases of strange or inflated currencies.
+The currency code is left optional and relatively unconstrained in case of new
+or unofficial currencies.
diff --git a/hypha/apply/projects/forms/project.py b/hypha/apply/projects/forms/project.py
index 0f18edfa90..5b1d290c97 100644
--- a/hypha/apply/projects/forms/project.py
+++ b/hypha/apply/projects/forms/project.py
@@ -1,9 +1,14 @@
 from datetime import date
+from decimal import Decimal, InvalidOperation
 
 from django import forms
 from django.conf import settings
 from django.contrib.auth import get_user_model
+from django.core.validators import RegexValidator
 from django.db.models import Count, Q
+from django.forms import NumberInput
+from django.utils.formats import number_format
+from django.utils.html import mark_safe
 from django.utils.text import slugify
 from django.utils.translation import gettext_lazy as _
 from django_file_form.forms import FileFormMixin
@@ -21,6 +26,7 @@
 from ..models.project import (
     CLOSING,
     COMPLETE,
+    CURRENCY_CODE_REGEX,
     DRAFT,
     INVOICING_AND_REPORTING,
     PAF_STATUS_CHOICES,
@@ -36,6 +42,19 @@
 
 User = get_user_model()
 
+TOP_CURRENCY_CODES = [
+    "USD",
+    "EUR",
+    "CNY",
+    "INR",
+    "JPY",
+    "RUB",
+    "IDR",
+    "BRL",
+    "MXN",
+    "NGN",
+]
+
 
 def filter_request_choices(choices):
     return [(k, v) for k, v in PROJECT_STATUS_CHOICES if k in choices]
@@ -52,6 +71,74 @@ def get_latest_project_paf_approval_via_roles(project, roles):
     return paf_approvals.first()
 
 
+class CurrencyDatalistWidget(forms.TextInput):
+    """Renders an <input> with a <datalist> for auto-suggestions + free typing."""
+
+    def __init__(self, choices=None, attrs=None):
+        super().__init__(attrs)
+        self.choices = choices or []
+
+    def render(self, name, value, attrs=None, renderer=None):
+        # Base input HTML
+        if self.choices:
+            attrs = dict(attrs or {})
+            attrs["list"] = f"{name}_datalist"
+        input_html = super().render(name, value, attrs, renderer)
+        if not self.choices:
+            return input_html
+
+        # Datalist options
+        options_html = "".join(f'<option value="{c}">' for c in self.choices)
+        datalist_html = f'<datalist id="{name}_datalist">{options_html}</datalist>'
+
+        return mark_safe(f"{input_html}{datalist_html}")
+
+
+class CurrencyCodeField(forms.CharField):
+    def __init__(self, *args, **kwargs):
+        kwargs["max_length"] = 3
+        kwargs["required"] = False
+        kwargs["empty_value"] = None
+        super().__init__(*args, **kwargs)
+
+        self.widget = CurrencyDatalistWidget(choices=TOP_CURRENCY_CODES)
+
+        self.validators.append(
+            RegexValidator(
+                regex=CURRENCY_CODE_REGEX,
+                message="Currency must be exactly 3 uppercase letters.",
+                code="invalid",
+            )
+        )
+
+
+class TrimmedDecimalInput(NumberInput):
+    """
+    Renders Decimal values with a minimum of 2 decimal places,
+    but preserves all fractional digits if >2 are present.
+    """
+
+    localize = True
+
+    def format_value(self, value):
+        if value is None:
+            return ""
+        try:
+            s = format(Decimal(str(value)), "f")
+        except (InvalidOperation, ValueError):
+            return ""
+        if "." in s:
+            int_part, frac_part = s.split(".")
+            # 1. Remove trailing zeros
+            frac_part = frac_part.rstrip("0")
+            # 2. Pad to minimum 2 decimal places
+            if len(frac_part) < 2:
+                frac_part = frac_part.ljust(2, "0")
+            formatted = f"{int_part}.{frac_part}"
+            return number_format(formatted)
+        return number_format(f"{s}.00")
+
+
 class ApproveContractForm(forms.Form):
     id = forms.IntegerField(widget=forms.HiddenInput())
 
@@ -396,21 +483,54 @@ class UploadContractForm(FileFormMixin, forms.ModelForm):
     signed_and_approved = forms.BooleanField(
         label=_("Signed and approved"), required=False
     )
+    currency = CurrencyCodeField(required=False)
+    amount_requested = forms.DecimalField(
+        localize=True, required=False, widget=TrimmedDecimalInput()
+    )
+    amount_approved = forms.DecimalField(
+        localize=True, required=False, widget=TrimmedDecimalInput()
+    )
 
     class Meta:
-        fields = ["file", "signed_and_approved"]
+        fields = [
+            "file",
+            "signed_and_approved",
+            "currency",
+            "amount_requested",
+            "amount_approved",
+        ]
         model = Contract
 
-    def save(self, commit=True):
-        self.instance.file = self.cleaned_data.get("file")
-        return super().save(commit=True)
+    def __init__(self, *args, user=None, **kwargs):
+        super().__init__(*args, **kwargs)
+        # Applicants cannot self-approve; never render or accept this field.
+        # NOTE: `is_applicant` is a global group flag (see users/models.py);
+        # the project-relative ownership check lives in can_upload_contract.
+        if user is None or user.is_applicant:
+            self.fields.pop("signed_and_approved")
 
 
 class StaffUploadContractForm(FileFormMixin, forms.ModelForm):
     file = SingleFileField(label=_("Contract"), required=True)
+    signed_by_applicant = forms.BooleanField(
+        label=_("Signed by Applicant"), initial=True
+    )
+    currency = CurrencyCodeField(required=False)
+    amount_requested = forms.DecimalField(
+        localize=True, required=False, widget=TrimmedDecimalInput()
+    )
+    amount_approved = forms.DecimalField(
+        localize=True, required=False, widget=TrimmedDecimalInput()
+    )
 
     class Meta:
-        fields = ["file", "signed_by_applicant"]
+        fields = [
+            "file",
+            "signed_by_applicant",
+            "currency",
+            "amount_requested",
+            "amount_approved",
+        ]
         model = Contract
 
 
diff --git a/hypha/apply/projects/models/project.py b/hypha/apply/projects/models/project.py
index fb3103a6e3..dc659e61e2 100644
--- a/hypha/apply/projects/models/project.py
+++ b/hypha/apply/projects/models/project.py
@@ -99,6 +99,8 @@ def contract_document_path(instance, filename):
     (COMPLETE, _("Complete")),
 ]
 
+CURRENCY_CODE_REGEX = r"^[A-Z]{3}$"
+
 
 class ProjectQuerySet(models.QuerySet):
     def active(self):
diff --git a/hypha/apply/projects/tests/test_forms.py b/hypha/apply/projects/tests/test_forms.py
index b7deddf50c..74be2d3817 100644
--- a/hypha/apply/projects/tests/test_forms.py
+++ b/hypha/apply/projects/tests/test_forms.py
@@ -1,5 +1,6 @@
 import datetime
 import json
+from decimal import Decimal
 from io import BytesIO
 
 from django.core.files.uploadedfile import SimpleUploadedFile
@@ -428,3 +429,102 @@ def test_applicant_can_upload_signed(self):
         )
         self.assertTrue(form.is_valid(), form.errors)
         self.assertIsNone(form.cleaned_data.get("signed_by_applicant"))
+
+    def test_can_set_amounts_to_wide_precision_with_no_currency(self):
+        form = UploadContractForm(
+            data={
+                "amount_approved": "43.0000000000043",
+                "amount_requested": "17.0000000000000000017",
+            },
+            files={"file": self.mock_file},
+        )
+        self.assertTrue(form.is_valid(), form.errors)
+        self.assertEqual(
+            form.cleaned_data.get("amount_approved"), Decimal("43.0000000000043")
+        )
+        self.assertEqual(
+            form.cleaned_data.get("amount_requested"), Decimal("17.0000000000000000017")
+        )
+
+    def test_can_set_amounts_to_smaller_than_two_decimal_places_and_see_exactly_two_decimals(
+        self,
+    ):
+        form = UploadContractForm(
+            data={"amount_approved": "23", "amount_requested": "31.3"},
+            files={"file": self.mock_file},
+        )
+        self.assertTrue(form.is_valid(), form.errors)
+
+        # Render fields to HTML: triggers widget.render() which calls format_value()
+        html_approved = str(form["amount_approved"])
+        html_requested = str(form["amount_requested"])
+
+        self.assertIn('value="23.00"', html_approved)
+        self.assertIn('value="31.30"', html_requested)
+
+    def test_can_set_amounts_to_larger_than_two_decimal_places_and_see_that_precision(
+        self,
+    ):
+        form = UploadContractForm(
+            data={"amount_approved": "23.2323", "amount_requested": "31.313131"},
+            files={"file": self.mock_file},
+        )
+        self.assertTrue(form.is_valid(), form.errors)
+
+        # Render fields to HTML: triggers widget.render() which calls format_value()
+        html_approved = str(form["amount_approved"])
+        html_requested = str(form["amount_requested"])
+
+        self.assertIn('value="23.2323"', html_approved)
+        self.assertIn('value="31.313131"', html_requested)
+
+    def test_can_set_currency_to_USD_with_no_amounts(self):
+        form = UploadContractForm(
+            data={"currency": "USD"}, files={"file": self.mock_file}
+        )
+        self.assertTrue(form.is_valid(), form.errors)
+        self.assertEqual(form.cleaned_data.get("currency"), "USD")
+
+    def test_cannot_set_currency_to_two_digits(self):
+        form = UploadContractForm(
+            data={"currency": "NA"}, files={"file": self.mock_file}
+        )
+        self.assertFalse(form.is_valid())
+        self.assertIn("currency", form.errors.keys())
+
+    def test_zero_amount_with_full_scale_renders_as_zero_not_scientific_notation(self):
+        # NUMERIC(38,19) returns Decimal("0.0000000000000000000"), whose
+        # str() is "0E-19" -- the widget must not emit "0E-19.00".
+        form = UploadContractForm(
+            data={
+                "amount_approved": "0.0000000000000000000",
+                "amount_requested": "0.0000000000000000000",
+            },
+            files={"file": self.mock_file},
+        )
+        self.assertTrue(form.is_valid(), form.errors)
+        self.assertEqual(form.cleaned_data["amount_approved"], Decimal("0"))
+        self.assertEqual(form.cleaned_data["amount_requested"], Decimal("0"))
+
+        html_approved = str(form["amount_approved"])
+        html_requested = str(form["amount_requested"])
+        self.assertIn('value="0.00"', html_approved)
+        self.assertIn('value="0.00"', html_requested)
+        self.assertNotIn("E", html_approved)
+        self.assertNotIn("E", html_requested)
+
+    def test_blank_amount_renders_empty_not_dot_zero(self):
+        # Blank amount on a bound (error) re-render must show empty, NOT ".00".
+        # Otherwise a resubmit silently stores 0 -> NUMERIC(38,19) -> 0E-19.
+        form = UploadContractForm(
+            data={"amount_approved": "", "amount_requested": ""},
+            files={"file": self.mock_file},
+        )
+        # file is required but amount blank is valid -> form may be invalid only
+        # due to file; in any case the bound field must not emit ".00".
+        html_approved = str(form["amount_approved"])
+        html_requested = str(form["amount_requested"])
+        self.assertIn('value=""', html_approved)
+        self.assertIn('value=""', html_requested)
+        self.assertNotIn('value=".00"', html_approved)
+        self.assertNotIn('value=".00"', html_requested)
diff --git a/hypha/apply/projects/views/project.py b/hypha/apply/projects/views/project.py
index 704b405ffd..77daa279a9 100644
--- a/hypha/apply/projects/views/project.py
+++ b/hypha/apply/projects/views/project.py
@@ -11,7 +11,12 @@
 from django.core.exceptions import ObjectDoesNotExist, PermissionDenied
 from django.db import transaction
 from django.db.models import Q
-from django.http import FileResponse, Http404, HttpResponse, HttpResponseRedirect
+from django.http import (
+    FileResponse,
+    Http404,
+    HttpResponse,
+    HttpResponseRedirect,
+)
 from django.shortcuts import get_object_or_404, render
 from django.template.loader import get_template
 from django.urls import reverse
@@ -617,7 +622,7 @@ def get_context_data(self, **kwargs):
 
 
 @method_decorator(staff_required, name="dispatch")
-class ApproveContractView(ProjectByIdMixin, View):
+class ApproveContractView(ProjectByIdMixin, UpdateView):
     form_class = ApproveContractForm
     model = Contract
     template_name = "application_projects/modals/approve_contract.html"
@@ -724,80 +729,81 @@ def dispatch(self, request, *args, **kwargs):
         )
         return super().dispatch(request, *args, **kwargs)
 
-    def get(self, *args, **kwargs):
-        form = self.get_form()
+    def get(self, request, *args, **kwargs):
+        # Get the existing contract if it exists
+        existing_contract = self.project.contracts.order_by("created_at").first()
+
+        # Pass instance explicitly. This is the KEY to making edits work with FileFormMixin.
+        form = self.form_class(instance=existing_contract, user=request.user)
+
         return render(
-            self.request,
+            request,
             self.template_name,
             context={
                 "form": form,
-                "user": self.request.user,
-                "value": _("Upload") if self.request.user.is_applicant else _("Submit"),
+                "user": request.user,
+                "value": _("Upload") if request.user.is_applicant else _("Submit"),
                 "object": self.project,
             },
         )
 
-    def get_form_kwargs(self):
-        kwargs = super().get_form_kwargs()
-        kwargs.pop("instance")
-        kwargs.pop("user")
-        return kwargs
+    def post(self, request, *args, **kwargs):
+        old_stage = self.project.status
 
-    def get_form(self, *args, **kwargs):
-        form = self.form_class(*args, **kwargs)
-        if self.request.user.is_applicant:
-            form.fields.pop("signed_and_approved")
-        return form
+        # 1. Determine the contract instance
+        existing_contract = self.project.contracts.order_by("created_at").first()
 
-    def post(self, *args, **kwargs):
-        form = self.get_form(self.request.POST)
+        # 2. Instantiate form with POST data AND the instance
+        # This allows ModelForm to:
+        # a) Validate against the existing DB state
+        # b) Populate initial data for FileFormMixin
+        # c) Set form.instance to the existing object for editing
+        form = self.form_class(
+            request.POST, instance=existing_contract, user=request.user
+        )
 
         if form.is_valid():
-            if self.project.contracts.exists():
-                form.instance = self.project.contracts.order_by("created_at").first()
-
+            # 3. Assign common fields
             form.instance.project = self.project
 
-            if self.request.user.is_applicant:
+            # 4. Handle user-specific logic
+            if request.user.is_applicant:
                 form.instance.signed_by_applicant = True
                 form.instance.uploaded_by_applicant_at = timezone.now()
-                messages.success(self.request, _("Countersigned contract uploaded"))
-            elif self.request.user.is_contracting or self.request.user.is_apply_staff:
+                messages.success(request, _("Countersigned contract uploaded"))
+            else:
                 form.instance.uploaded_by_contractor_at = timezone.now()
-                messages.success(self.request, _("Signed contract uploaded"))
-
-            form.save()
+                messages.success(request, _("Signed contract uploaded"))
 
-            contract_signed_and_approved = form.cleaned_data.get("signed_and_approved")
-            if contract_signed_and_approved:
-                form.instance.approver = self.request.user
+            # 5. Handle approval logic
+            if form.cleaned_data.get("signed_and_approved"):
+                form.instance.approver = request.user
                 form.instance.approved_at = timezone.now()
-                form.instance.signed_and_approved = contract_signed_and_approved
+                form.instance.signed_and_approved = True
                 form.instance.signed_by_applicant = True
-                form.instance.save(
-                    update_fields=[
-                        "approver",
-                        "approved_at",
-                        "signed_and_approved",
-                        "signed_by_applicant",
-                    ]
-                )
 
+            # 6. Save ONCE.
+            # Django ModelForm.save() automatically maps cleaned_data to instance
+            # and saves if commit=True (default).
+            form.save()
+
+            # 7. Handle Project status transition
+            if form.cleaned_data.get("signed_and_approved"):
                 self.project.status = INVOICING_AND_REPORTING
                 self.project.save(update_fields=["status"])
-                old_stage = CONTRACTING
 
                 if settings.PROJECTS_START_AFTER_CONTRACTING:
                     self.project.proposed_start = datetime.date.today()
-                    self.project.save()
+                    self.project.save(update_fields=["proposed_start"])
 
                 messenger(
                     MESSAGES.PROJECT_TRANSITION,
-                    request=self.request,
-                    user=self.request.user,
+                    request=request,
+                    user=request.user,
                     source=self.project,
                     related=old_stage,
                 )
+
                 # remove Project waiting contract task for contracting/staff group
                 if settings.STAFF_UPLOAD_CONTRACT:
                     remove_tasks_for_user(
@@ -818,11 +824,11 @@ def post(self, *args, **kwargs):
                     related_obj=self.project,
                 )
             else:
-                if self.request.user != self.project.user:
+                if request.user != self.project.user:
                     messenger(
                         MESSAGES.UPLOAD_CONTRACT,
-                        request=self.request,
-                        user=self.request.user,
+                        request=request,
+                        user=request.user,
                         source=self.project,
                         related=form.instance,
                     )
@@ -849,13 +855,14 @@ def post(self, *args, **kwargs):
                     )
             return HttpResponseClientRefresh()
 
+        # If invalid, re-render with errors
         return render(
-            self.request,
+            request,
             self.template_name,
             context={
                 "form": form,
-                "user": self.request.user,
-                "value": _("Upload") if self.request.user.is_applicant else _("Submit"),
+                "user": request.user,
+                "value": _("Upload") if request.user.is_applicant else _("Submit"),
                 "object": self.project,
             },
         )

From 47b08e4f0e5ed5023c5c186c54a84697ebc45eb2 Mon Sep 17 00:00:00 2001
From: "GLM-5.2 prompted by Jesse Bickel" <jbickel+llm@opentechstrategies.com>
Date: Thu, 20 Aug 2026 16:07:22 -0500
Subject: [PATCH 03/18] Disbursements: add model tied to Contract

Introduce a Disbursement model (one transaction against a Contract)
recorded by staff with no approval workflow. Negative amounts are
allowed so repayments net out via Sum(). The canonical audit trail is
written to Wagtail's ModelLogEntry via wagtail.log_actions.log on every
save, mirroring ApplicationRevision.save; activity/messenger notices
are a separate, best-effort concern for the views MR.

This is model-only: CRUD views, the All Projects columns, and the
audit report come on a follow-on branch.

GLM-5.2
---
 hypha/apply/projects/forms/project.py         |   2 +-
 .../projects/migrations/0112_disbursement.py  |  68 ++++++++++
 hypha/apply/projects/models/__init__.py       |   2 +
 hypha/apply/projects/models/disbursement.py   |  70 ++++++++++
 hypha/apply/projects/tests/test_models.py     | 124 +++++++++++++++++-
 5 files changed, 264 insertions(+), 2 deletions(-)
 create mode 100644 hypha/apply/projects/migrations/0112_disbursement.py
 create mode 100644 hypha/apply/projects/models/disbursement.py

diff --git a/hypha/apply/projects/forms/project.py b/hypha/apply/projects/forms/project.py
index 5b1d290c97..8d4ce331ba 100644
--- a/hypha/apply/projects/forms/project.py
+++ b/hypha/apply/projects/forms/project.py
@@ -513,7 +513,7 @@ def __init__(self, *args, user=None, **kwargs):
 class StaffUploadContractForm(FileFormMixin, forms.ModelForm):
     file = SingleFileField(label=_("Contract"), required=True)
     signed_by_applicant = forms.BooleanField(
-        label=_("Signed by Applicant"), initial=True
+        label=_("Signed by Applicant"), initial=True, required=False
     )
     currency = CurrencyCodeField(required=False)
     amount_requested = forms.DecimalField(
diff --git a/hypha/apply/projects/migrations/0112_disbursement.py b/hypha/apply/projects/migrations/0112_disbursement.py
new file mode 100644
index 0000000000..c466ab1e7f
--- /dev/null
+++ b/hypha/apply/projects/migrations/0112_disbursement.py
@@ -0,0 +1,68 @@
+# Generated by Django 5.2.18 on 2026-11-04 16:55
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        (
+            "application_projects",
+            "0111_contract_amount_approved_contract_amount_requested_and_more",
+        ),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="Disbursement",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("amount", models.DecimalField(decimal_places=19, max_digits=38)),
+                ("date", models.DateField()),
+                ("notes", models.TextField(blank=True)),
+                ("created_at", models.DateTimeField(auto_now_add=True)),
+                ("updated_at", models.DateTimeField(auto_now=True)),
+                (
+                    "contract",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="disbursements",
+                        to="application_projects.contract",
+                    ),
+                ),
+                (
+                    "created_by",
+                    models.ForeignKey(
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        related_name="disbursements_created",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+                (
+                    "updated_by",
+                    models.ForeignKey(
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        related_name="disbursements_updated",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "disbursement",
+                "verbose_name_plural": "disbursements",
+                "ordering": ["-date", "-created_at"],
+            },
+        ),
+    ]
diff --git a/hypha/apply/projects/models/__init__.py b/hypha/apply/projects/models/__init__.py
index f998756da5..b3b556bcf0 100644
--- a/hypha/apply/projects/models/__init__.py
+++ b/hypha/apply/projects/models/__init__.py
@@ -1,3 +1,4 @@
+from .disbursement import Disbursement
 from .invoice import Invoice, InvoiceExportManager, InvoiceTag, SupportingDocument
 from .project import (
     Contract,
@@ -31,4 +32,5 @@
     "InvoiceExportManager",
     "InvoiceTag",
     "SupportingDocument",
+    "Disbursement",
 ]
diff --git a/hypha/apply/projects/models/disbursement.py b/hypha/apply/projects/models/disbursement.py
new file mode 100644
index 0000000000..cb056d195a
--- /dev/null
+++ b/hypha/apply/projects/models/disbursement.py
@@ -0,0 +1,70 @@
+from django.conf import settings
+from django.db import models
+from django.utils.translation import gettext_lazy as _
+from wagtail.log_actions import LogContext, log
+
+
+class Disbursement(models.Model):
+    """A single transaction (money sent to, or repaid by, the grantee)
+    recorded against a specific Contract.
+
+    Disbursements are recorded by staff without an approval workflow. The
+    canonical audit trail is written to Wagtail's ``ModelLogEntry`` via
+    ``wagtail.log_actions.log`` (see ``save`` below); activity/messenger
+    notices are a separate, best-effort concern handled in the views, not a
+    source of truth.
+
+    Negative amounts are permitted so that repayments net out correctly when
+    summing disbursements for a contract or project.
+    """
+
+    contract = models.ForeignKey(
+        "Contract",
+        on_delete=models.CASCADE,
+        related_name="disbursements",
+    )
+    # Purposefully large decimal field: support many currencies and inflation.
+    # No MinValueValidator: negatives are allowed for repayments.
+    amount = models.DecimalField(max_digits=38, decimal_places=19)
+    date = models.DateField()
+    notes = models.TextField(blank=True)
+    created_by = models.ForeignKey(
+        settings.AUTH_USER_MODEL,
+        null=True,
+        on_delete=models.SET_NULL,
+        related_name="disbursements_created",
+    )
+    updated_by = models.ForeignKey(
+        settings.AUTH_USER_MODEL,
+        null=True,
+        on_delete=models.SET_NULL,
+        related_name="disbursements_updated",
+    )
+    created_at = models.DateTimeField(auto_now_add=True)
+    updated_at = models.DateTimeField(auto_now=True)
+
+    wagtail_reference_index_ignore = True
+
+    class Meta:
+        verbose_name = _("disbursement")
+        verbose_name_plural = _("disbursements")
+        ordering = ["-date", "-created_at"]
+
+    def save(self, *args, **kwargs):
+        """Audit log all creates and edits to Wagtail's ModelLogEntry.
+
+        Mirrors the pattern in
+        hypha/apply/funds/models/application_revisions.py: every save emits a
+        wagtail.create/wagtail.edit entry, so the canonical audit trail is
+        populated regardless of how the save is triggered. Deletion is logged
+        by the DeleteView (which has the request user), not here.
+        """
+        is_adding = self._state.adding
+        super().save(*args, **kwargs)
+        with LogContext(user=self.updated_by or self.created_by):
+            log(self, "wagtail.create" if is_adding else "wagtail.edit")
+
+    def __str__(self):
+        return _("Disbursement of {amount} on {date} for {contract}").format(
+            amount=self.amount, date=self.date, contract=self.contract
+        )
diff --git a/hypha/apply/projects/tests/test_models.py b/hypha/apply/projects/tests/test_models.py
index 670ae713e6..60db0b4cf7 100644
--- a/hypha/apply/projects/tests/test_models.py
+++ b/hypha/apply/projects/tests/test_models.py
@@ -1,6 +1,9 @@
+import datetime
 from decimal import Decimal
 
+from django.contrib.contenttypes.models import ContentType
 from django.test import TestCase
+from wagtail.models import ModelLogEntry
 
 from hypha.apply.funds.tests.factories import ApplicationSubmissionFactory
 from hypha.apply.users.tests.factories import (
@@ -9,6 +12,7 @@
     StaffFactory,
 )
 
+from ..models.disbursement import Disbursement
 from ..models.invoice import (
     APPROVED_BY_FINANCE,
     APPROVED_BY_STAFF,
@@ -24,7 +28,7 @@
     invoice_status_user_choices,
 )
 from ..models.project import Project
-from .factories import InvoiceFactory
+from .factories import ContractFactory, InvoiceFactory
 
 
 class TestProjectModel(TestCase):
@@ -223,3 +227,121 @@ def test_get_totals(self):
     def test_get_totals_no_value(self):
         self.assertEqual(Invoice.objects.paid_value(), 0)
         self.assertEqual(Invoice.objects.unpaid_value(), 0)
+
+
+class TestDisbursementModel(TestCase):
+    """Test values use prime numbers (prime left and right of the decimal
+    point) that are unique to this test, and dates several hundred years in
+    the future, so a correct assertion is traceable to this test and not a
+    coincidence. The system under test (Disbursement) is constructed directly
+    via its initializer; factories are used only for its dependencies
+    (Contract, Staff), which the test harness owns.
+    """
+
+    def test_str_includes_amount_and_date(self):
+        contract = ContractFactory()
+        disbursement = Disbursement(
+            contract=contract,
+            amount=Decimal("53.17"),
+            date=datetime.date(2525, 7, 19),
+        )
+        disbursement.save()
+        rendered = str(disbursement)
+        self.assertIn("53.17", rendered)
+        self.assertIn("2525-07-19", rendered)
+
+    def test_negative_amount_allowed_for_repayment(self):
+        disbursement = Disbursement(
+            contract=ContractFactory(),
+            amount=Decimal("-61.13"),
+            date=datetime.date(2527, 11, 23),
+        )
+        disbursement.save()
+        disbursement.refresh_from_db()
+        self.assertEqual(disbursement.amount, Decimal("-61.13"))
+
+    def test_create_emits_wagtail_create_log_entry(self):
+        staff = StaffFactory()
+        contract = ContractFactory()
+        disbursement = Disbursement(
+            contract=contract,
+            amount=Decimal("67.19"),
+            date=datetime.date(2529, 3, 17),
+            updated_by=staff,
+        )
+        disbursement.save()
+        entries = ModelLogEntry.objects.filter(
+            content_type=ContentType.objects.get_for_model(Disbursement),
+            object_id=disbursement.pk,
+        )
+        self.assertTrue(entries.exists())
+        self.assertEqual(entries.first().action, "wagtail.create")
+        self.assertEqual(entries.first().user, staff)
+
+    def test_edit_emits_wagtail_edit_log_entry(self):
+        staff = StaffFactory()
+        disbursement = Disbursement(
+            contract=ContractFactory(),
+            amount=Decimal("71.23"),
+            date=datetime.date(2537, 1, 7),
+            updated_by=staff,
+        )
+        disbursement.save()
+        disbursement.amount = Decimal("73.29")
+        disbursement.updated_by = staff
+        disbursement.save()
+        entries = ModelLogEntry.objects.filter(
+            content_type=ContentType.objects.get_for_model(Disbursement),
+            object_id=disbursement.pk,
+        )
+        # create then edit each emit an entry; assert both are present and the
+        # edit is the most recent (ModelLogEntry defaults to newest-first).
+        self.assertEqual(entries.count(), 2)
+        self.assertEqual(
+            set(entries.values_list("action", flat=True)),
+            {"wagtail.create", "wagtail.edit"},
+        )
+        self.assertEqual(entries.first().action, "wagtail.edit")
+
+    def test_contract_disbursements_related_name(self):
+        contract = ContractFactory()
+        Disbursement(
+            contract=contract, amount=Decimal("79.31"), date=datetime.date(2539, 4, 3)
+        ).save()
+        Disbursement(
+            contract=contract,
+            amount=Decimal("-83.37"),
+            date=datetime.date(2539, 4, 3),
+        ).save()
+        # Sum() over the related manager nets negatives (repayments) correctly.
+        total = sum(d.amount for d in contract.disbursements.all())
+        self.assertEqual(total, Decimal("-4.06"))
+
+    def test_updated_by_changes_on_edit_while_created_by_does_not(self):
+        creator = StaffFactory()
+        editor = StaffFactory()
+        disbursement = Disbursement(
+            contract=ContractFactory(),
+            amount=Decimal("89.41"),
+            date=datetime.date(2531, 5, 13),
+            created_by=creator,
+            updated_by=creator,
+        )
+        disbursement.save()
+        disbursement.amount = Decimal("97.11")
+        disbursement.updated_by = editor
+        disbursement.save()
+        disbursement.refresh_from_db()
+        self.assertEqual(disbursement.created_by, creator)
+        self.assertEqual(disbursement.updated_by, editor)
+
+    def test_notes_field_persisted(self):
+        disbursement = Disbursement(
+            contract=ContractFactory(),
+            amount=Decimal("101.03"),
+            date=datetime.date(2533, 9, 29),
+            notes="Wire transfer for the reporting period.",
+        )
+        disbursement.save()
+        disbursement.refresh_from_db()
+        self.assertEqual(disbursement.notes, "Wire transfer for the reporting period.")

From 41cc515eeba49bd137a568fd8cb253bbbaee8123 Mon Sep 17 00:00:00 2001
From: "GLM-5.2 prompted by Jesse Bickel" <jbickel+llm@opentechstrategies.com>
Date: Fri, 21 Aug 2026 19:44:33 -0500
Subject: [PATCH 04/18] Disbursements: UI to create/update/delete

Stack create/update/delete views (staff/finance), a DisbursementForm,
and URL routes on the Disbursement model. Entry is a modal on the
project page; on save the user returns to the project page.
Activity/messenger notices are emitted for create/update/delete with
the amount included (not the note), wired through the activity
adapters like invoices.

GLM-5.2
---
 .../apply/activity/adapters/activity_feed.py  |  10 +
 hypha/apply/activity/adapters/base.py         |   3 +
 hypha/apply/activity/adapters/slack.py        |   9 +
 .../migrations/0097_alter_event_type.py       |  97 +++++
 hypha/apply/activity/options.py               |   3 +
 hypha/apply/projects/forms/__init__.py        |   2 +
 hypha/apply/projects/forms/disbursement.py    |  42 +++
 .../modals/disbursement_confirm_delete.html   |   7 +
 .../modals/disbursement_form.html             |  21 ++
 hypha/apply/projects/tests/factories.py       |  13 +
 hypha/apply/projects/tests/test_views.py      | 334 ++++++++++++++++++
 hypha/apply/projects/urls.py                  |  25 ++
 hypha/apply/projects/views/__init__.py        |   8 +
 hypha/apply/projects/views/disbursement.py    | 140 ++++++++
 .../django/forms/widgets/number_signed.html   |  27 ++
 15 files changed, 741 insertions(+)
 create mode 100644 hypha/apply/activity/migrations/0097_alter_event_type.py
 create mode 100644 hypha/apply/projects/forms/disbursement.py
 create mode 100644 hypha/apply/projects/templates/application_projects/modals/disbursement_confirm_delete.html
 create mode 100644 hypha/apply/projects/templates/application_projects/modals/disbursement_form.html
 create mode 100644 hypha/apply/projects/views/disbursement.py
 create mode 100644 hypha/templates/django/forms/widgets/number_signed.html

diff --git a/hypha/apply/activity/adapters/activity_feed.py b/hypha/apply/activity/adapters/activity_feed.py
index 94ff2d60e5..ce5703bbd3 100644
--- a/hypha/apply/activity/adapters/activity_feed.py
+++ b/hypha/apply/activity/adapters/activity_feed.py
@@ -71,6 +71,13 @@ class ActivityAdapter(AdapterBase):
         MESSAGES.APPROVE_CONTRACT: _("Approved contract"),
         MESSAGES.UPDATE_INVOICE_STATUS: "handle_update_invoice_status",
         MESSAGES.CREATE_INVOICE: _("Invoice added"),
+        MESSAGES.CREATE_DISBURSEMENT: _("Disbursement of {disbursement.amount} added"),
+        MESSAGES.UPDATE_DISBURSEMENT: _(
+            "Disbursement of {disbursement.amount} updated"
+        ),
+        MESSAGES.DELETE_DISBURSEMENT: _(
+            "Disbursement of {disbursement.amount} deleted"
+        ),
         MESSAGES.SUBMIT_REPORT: _("Submitted a report"),
         MESSAGES.DELETE_REPORT: _("deleted a report"),
         MESSAGES.SKIPPED_REPORT: "handle_skipped_report",
@@ -126,6 +133,9 @@ def extra_kwargs(self, message_type, source, sources, **kwargs):
             MESSAGES.DELETE_INVOICE,
             MESSAGES.CREATE_INVOICE,
             MESSAGES.DELETE_REPORT,
+            MESSAGES.CREATE_DISBURSEMENT,
+            MESSAGES.UPDATE_DISBURSEMENT,
+            MESSAGES.DELETE_DISBURSEMENT,
         ]:
             return {"visibility": APPLICANT}
 
diff --git a/hypha/apply/activity/adapters/base.py b/hypha/apply/activity/adapters/base.py
index 3957b43209..164a063f90 100644
--- a/hypha/apply/activity/adapters/base.py
+++ b/hypha/apply/activity/adapters/base.py
@@ -36,6 +36,9 @@
     MESSAGES.APPROVE_INVOICE: "invoice",
     MESSAGES.DELETE_INVOICE: "invoice",
     MESSAGES.UPDATE_INVOICE: "invoice",
+    MESSAGES.CREATE_DISBURSEMENT: "disbursement",
+    MESSAGES.UPDATE_DISBURSEMENT: "disbursement",
+    MESSAGES.DELETE_DISBURSEMENT: "disbursement",
     MESSAGES.SUBMIT_REPORT: "report",
     MESSAGES.DELETE_REPORT: "report",
     MESSAGES.SKIPPED_REPORT: "report",
diff --git a/hypha/apply/activity/adapters/slack.py b/hypha/apply/activity/adapters/slack.py
index d06f65938a..703e4d0964 100644
--- a/hypha/apply/activity/adapters/slack.py
+++ b/hypha/apply/activity/adapters/slack.py
@@ -114,6 +114,15 @@ class SlackAdapter(AdapterBase):
         MESSAGES.CREATE_INVOICE: _(
             "{user} has created invoice for <{link}|{source.title}>"
         ),
+        MESSAGES.CREATE_DISBURSEMENT: _(
+            "{user} has created a disbursement of {disbursement.amount} for <{link}|{source.title}>"
+        ),
+        MESSAGES.UPDATE_DISBURSEMENT: _(
+            "{user} has updated a disbursement of {disbursement.amount} for <{link}|{source.title}>"
+        ),
+        MESSAGES.DELETE_DISBURSEMENT: _(
+            "{user} has deleted a disbursement of {disbursement.amount} for <{link}|{source.title}>"
+        ),
         MESSAGES.UPDATE_INVOICE_STATUS: _(
             "{user} has changed the status of <{link_related}|invoice> on <{link}|{source.title}> to {invoice.status_display}"
         ),
diff --git a/hypha/apply/activity/migrations/0097_alter_event_type.py b/hypha/apply/activity/migrations/0097_alter_event_type.py
new file mode 100644
index 0000000000..b846d6ea9c
--- /dev/null
+++ b/hypha/apply/activity/migrations/0097_alter_event_type.py
@@ -0,0 +1,97 @@
+# Generated by Django 5.2.19 on 2026-11-09 21:02
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("activity", "0096_alter_event_type"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="event",
+            name="type",
+            field=models.CharField(
+                choices=[
+                    ("UPDATE_LEAD", "updated lead"),
+                    ("BATCH_UPDATE_LEAD", "batch updated lead"),
+                    ("EDIT_SUBMISSION", "edited submission"),
+                    ("APPLICANT_EDIT", "edited applicant"),
+                    ("NEW_SUBMISSION", "submitted new submission"),
+                    ("DRAFT_SUBMISSION", "submitted new draft submission"),
+                    ("SCREENING", "screened"),
+                    ("TRANSITION", "transitioned"),
+                    ("BATCH_TRANSITION", "batch transitioned"),
+                    ("DETERMINATION_OUTCOME", "sent determination outcome"),
+                    ("BATCH_DETERMINATION_OUTCOME", "sent batch determination outcome"),
+                    ("INVITED_TO_PROPOSAL", "invited to proposal"),
+                    ("REVIEWERS_UPDATED", "updated reviewers"),
+                    ("BATCH_REVIEWERS_UPDATED", "batch updated reviewers"),
+                    ("READY_FOR_REVIEW", "marked ready for review"),
+                    ("BATCH_READY_FOR_REVIEW", "marked batch ready for review"),
+                    ("NEW_REVIEW", "added new review"),
+                    ("COMMENT", "added comment"),
+                    ("PROPOSAL_SUBMITTED", "submitted proposal"),
+                    ("OPENED_SEALED", "opened sealed submission"),
+                    ("REVIEW_OPINION", "reviewed opinion"),
+                    ("DELETE_SUBMISSION", "deleted submission"),
+                    ("ANONYMIZE_SUBMISSION", "anonymized submission"),
+                    ("DELETE_REVIEW", "deleted review"),
+                    ("DELETE_REVIEW_OPINION", "deleted review opinion"),
+                    ("CREATED_PROJECT", "created project"),
+                    ("CREATED_SOW", "created a project SOW"),
+                    ("EDITED_SOW", "edited a project SOW"),
+                    ("CREATED_PF", "created a project form"),
+                    ("EDITED_PF", "edited a project form"),
+                    ("UPDATE_PROJECT_LEAD", "updated project lead"),
+                    ("UPDATE_PROJECT_TITLE", "updated project title"),
+                    (
+                        "UPDATE_PROJECT_CONTRACT_NUMBER",
+                        "updated project contract number",
+                    ),
+                    ("EDIT_REVIEW", "edited review"),
+                    ("SEND_FOR_APPROVAL", "sent for approval"),
+                    ("APPROVE_PROJECT", "approved project"),
+                    ("ASSIGN_PAF_APPROVER", "assign project form approver"),
+                    ("APPROVE_PAF", "approved project form"),
+                    ("PROJECT_TRANSITION", "transitioned project"),
+                    ("REQUEST_PROJECT_CHANGE", "requested project change"),
+                    ("SUBMIT_CONTRACT_DOCUMENTS", "submitted contract documents"),
+                    ("UPLOAD_DOCUMENT", "uploaded document to project"),
+                    ("UPLOAD_CONTRACT", "uploaded contract to project"),
+                    ("APPROVE_CONTRACT", "approved contract"),
+                    ("CREATE_INVOICE", "created invoice for project"),
+                    ("UPDATE_INVOICE_STATUS", "updated invoice status"),
+                    ("APPROVE_INVOICE", "approve invoice"),
+                    ("DELETE_INVOICE", "deleted invoice"),
+                    ("CREATE_DISBURSEMENT", "created disbursement"),
+                    ("UPDATE_DISBURSEMENT", "updated disbursement"),
+                    ("DELETE_DISBURSEMENT", "deleted disbursement"),
+                    ("SENT_TO_COMPLIANCE", "sent project to compliance"),
+                    ("UPDATE_INVOICE", "updated invoice"),
+                    ("SUBMIT_REPORT", "submitted report"),
+                    ("DELETE_REPORT", "deleted report"),
+                    ("SKIPPED_REPORT", "skipped report"),
+                    ("REPORT_FREQUENCY_CHANGED", "changed report frequency"),
+                    ("DISABLED_REPORTING", "disabled reporting"),
+                    ("REPORT_NOTIFY", "notified report"),
+                    ("REVIEW_REMINDER", "reminder to review"),
+                    ("BATCH_DELETE_SUBMISSION", "batch deleted submissions"),
+                    ("BATCH_ANONYMIZE_SUBMISSION", "batch anonymized submissions"),
+                    ("BATCH_ARCHIVE_SUBMISSION", "batch archive submissions"),
+                    ("BATCH_INVOICE_STATUS_UPDATE", "batch update invoice status"),
+                    ("STAFF_ACCOUNT_CREATED", "created new account"),
+                    ("STAFF_ACCOUNT_EDITED", "edited account"),
+                    ("ARCHIVE_SUBMISSION", "archived submission"),
+                    ("UNARCHIVE_SUBMISSION", "unarchived submission"),
+                    ("REMOVE_TASK", "remove task"),
+                    ("INVITE_COAPPLICANT", "invite co-applicant"),
+                    ("UPDATE_AUTHOR", "updated author"),
+                    ("COMMENT_ASSIGNED", "comment assigned"),
+                ],
+                max_length=50,
+                verbose_name="verb",
+            ),
+        ),
+    ]
diff --git a/hypha/apply/activity/options.py b/hypha/apply/activity/options.py
index 0b95a6ee72..b2b842d377 100644
--- a/hypha/apply/activity/options.py
+++ b/hypha/apply/activity/options.py
@@ -64,6 +64,9 @@ class MESSAGES(TextChoices):
     UPDATE_INVOICE_STATUS = "UPDATE_INVOICE_STATUS", _("updated invoice status")
     APPROVE_INVOICE = "APPROVE_INVOICE", _("approve invoice")
     DELETE_INVOICE = "DELETE_INVOICE", _("deleted invoice")
+    CREATE_DISBURSEMENT = "CREATE_DISBURSEMENT", _("created disbursement")
+    UPDATE_DISBURSEMENT = "UPDATE_DISBURSEMENT", _("updated disbursement")
+    DELETE_DISBURSEMENT = "DELETE_DISBURSEMENT", _("deleted disbursement")
     SENT_TO_COMPLIANCE = "SENT_TO_COMPLIANCE", _("sent project to compliance")
     UPDATE_INVOICE = "UPDATE_INVOICE", _("updated invoice")
     SUBMIT_REPORT = "SUBMIT_REPORT", _("submitted report")
diff --git a/hypha/apply/projects/forms/__init__.py b/hypha/apply/projects/forms/__init__.py
index a8dd172dfa..9b0244165c 100644
--- a/hypha/apply/projects/forms/__init__.py
+++ b/hypha/apply/projects/forms/__init__.py
@@ -1,3 +1,4 @@
+from .disbursement import DisbursementForm
 from .invoice import (
     BatchUpdateInvoiceStatusForm,
     ChangeInvoiceStatusForm,
@@ -54,4 +55,5 @@
     "ChangeInvoiceStatusForm",
     "EditInvoiceForm",
     "InvoiceTagsForm",
+    "DisbursementForm",
 ]
diff --git a/hypha/apply/projects/forms/disbursement.py b/hypha/apply/projects/forms/disbursement.py
new file mode 100644
index 0000000000..2d1e09eada
--- /dev/null
+++ b/hypha/apply/projects/forms/disbursement.py
@@ -0,0 +1,42 @@
+from django import forms
+from django.utils import timezone
+from django.utils.translation import gettext_lazy as _
+
+from ..models import Disbursement
+from .project import TrimmedDecimalInput
+
+
+class TrimmedSignedDecimalInput(TrimmedDecimalInput):
+    """``TrimmedDecimalInput`` that also accepts a leading minus, so the
+    disbursement amount can record repayments. Scoped to disbursements via a
+    dedicated template; the shared ``number.html`` stays positive-only.
+
+    """
+
+    template_name = "django/forms/widgets/number_signed.html"
+
+
+class DisbursementForm(forms.ModelForm):
+    """Create/edit a Disbursement.
+
+    Only the user-editable fields are exposed; ``contract``, ``created_by``
+    and ``updated_by`` are set by the views so that the model's ``save()``
+    audit log (wagtail.create/wagtail.edit) records the acting user. The
+    ``amount`` widget mirrors the contract amount fields so values render
+    trimmed but preserve full precision.
+
+    """
+
+    class Meta:
+        fields = ["amount", "date", "notes"]
+        model = Disbursement
+        widgets = {"amount": TrimmedSignedDecimalInput()}
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        # Default the date to today so a disbursement recorded on the day it
+        # is made does not need re-entering; the model field stays default-free.
+        self.fields["date"].initial = timezone.localdate()
+        self.fields["amount"].help_text = _(
+            "Amount sent to the grantee. Use a negative value to record a repayment."
+        )
diff --git a/hypha/apply/projects/templates/application_projects/modals/disbursement_confirm_delete.html b/hypha/apply/projects/templates/application_projects/modals/disbursement_confirm_delete.html
new file mode 100644
index 0000000000..f9e3d0a2e9
--- /dev/null
+++ b/hypha/apply/projects/templates/application_projects/modals/disbursement_confirm_delete.html
@@ -0,0 +1,7 @@
+{% load i18n %}
+
+<c-modal.confirm title="{% trans 'Delete disbursement' %}">
+    <p class="text-sm text-fg-muted">
+        {% trans "Are you sure you want to delete this disbursement? This action cannot be undone." %}
+    </p>
+</c-modal.confirm>
diff --git a/hypha/apply/projects/templates/application_projects/modals/disbursement_form.html b/hypha/apply/projects/templates/application_projects/modals/disbursement_form.html
new file mode 100644
index 0000000000..c33c5c492e
--- /dev/null
+++ b/hypha/apply/projects/templates/application_projects/modals/disbursement_form.html
@@ -0,0 +1,21 @@
+{% load i18n %}
+
+<c-modal.header>
+    {% if object %}{% trans "Edit disbursement" %}{% else %}{% trans "Add disbursement" %}{% endif %}
+</c-modal.header>
+
+<div class="p-4">
+    {% if contract and not contract.signed_by_applicant %}
+        {% comment %}Warn the user they are disbursing against a contract that
+        has not been countersigned yet. Link to the contract's sign-off flow
+        is left out for now to avoid stacking modals.{% endcomment %}
+        <div class="mb-4 alert alert-warning">
+            {% blocktrans with url=contract.get_absolute_url %}
+                This contract has not been countersigned. You are disbursing
+                toward a potentially unsigned contract.
+            {% endblocktrans %}
+            <a class="link link-hover" href="{{ url }}">{% trans "View contract" %}</a>.
+        </div>
+    {% endif %}
+    {% include "includes/dialog_form_base.html" with form=form value=value %}
+</div>
diff --git a/hypha/apply/projects/tests/factories.py b/hypha/apply/projects/tests/factories.py
index 1c7baf4755..3fce14f29a 100644
--- a/hypha/apply/projects/tests/factories.py
+++ b/hypha/apply/projects/tests/factories.py
@@ -13,6 +13,7 @@
 from hypha.apply.users.tests.factories import GroupFactory, StaffFactory, UserFactory
 from hypha.home.factories import ApplySiteFactory
 
+from ..models.disbursement import Disbursement
 from ..models.invoice import Invoice, SupportingDocument
 from ..models.project import (
     COMPLETE,
@@ -189,6 +190,18 @@ class Meta:
         skip_postgeneration_save = True
 
 
+class DisbursementFactory(factory.django.DjangoModelFactory):
+    contract = factory.SubFactory(ContractFactory)
+    amount = decimal.Decimal("257.41")
+    date = datetime.date(2543, 5, 23)
+    notes = ""
+    updated_by = factory.SubFactory(StaffFactory)
+
+    class Meta:
+        model = Disbursement
+        skip_postgeneration_save = True
+
+
 class PacketFileFactory(factory.django.DjangoModelFactory):
     category = factory.SubFactory(DocumentCategoryFactory)
     project = factory.SubFactory(ProjectFactory)
diff --git a/hypha/apply/projects/tests/test_views.py b/hypha/apply/projects/tests/test_views.py
index 1ed2f0ba39..7c7964d4bc 100644
--- a/hypha/apply/projects/tests/test_views.py
+++ b/hypha/apply/projects/tests/test_views.py
@@ -1,3 +1,4 @@
+import decimal
 import json
 from io import BytesIO
 
@@ -42,6 +43,7 @@
 from ..views.project import ContractsMixin, ProjectDetailApprovalView
 from .factories import (
     ContractFactory,
+    DisbursementFactory,
     DocumentCategoryFactory,
     InvoiceFactory,
     PacketFileFactory,
@@ -1394,3 +1396,335 @@ def test_cant_access_docx(self):
         project = ProjectFactory()
         response = self.get_page(project, url_kwargs={"export_type": "docx"})
         self.assertEqual(response.status_code, 403)
+
+
+class TestStaffCreateDisbursementView(BaseViewTestCase):
+    """Disbursement create/edit/delete views. The disbursement FK->Contract,
+    so routes are scoped under the project's contract (pk = project pk,
+    contract_pk, disbursement_pk). Only staff/finance may record disbursements.
+
+    """
+
+    base_view_name = "disbursement"
+    url_name = "funds:projects:{}"
+    user_factory = StaffFactory
+
+    def get_kwargs(self, instance):
+        # instance is a Contract
+        return {"pk": instance.project.pk, "contract_pk": instance.pk}
+
+    def test_can_get(self):
+        contract = ContractFactory()
+        response = self.get_page(contract)
+        self.assertEqual(response.status_code, 200)
+
+    def test_warns_for_unsigned_contract(self):
+        # A disbursement against a not-yet-countersigned contract shows a
+        # warning so the user knows they are disbursing toward an unsigned
+        # contract.
+        contract = ContractFactory(signed_by_applicant=False)
+        response = self.get_page(contract)
+        self.assertContains(response, "has not been countersigned")
+
+    def test_no_warning_for_countersigned_contract(self):
+        contract = ContractFactory(signed_by_applicant=True)
+        response = self.get_page(contract)
+        self.assertNotContains(response, "has not been countersigned")
+
+    def test_can_create(self):
+        contract = ContractFactory()
+        url = self.url(contract)
+        response = self.client.post(
+            url,
+            {"amount": "263.53", "date": "2541-03-07", "notes": "first tranche"},
+        )
+        self.assertEqual(response.status_code, 302)
+        # Saving returns to the project page (where the Add button is), not the
+        # contract PDF.
+        self.assertEqual(
+            response["Location"],
+            contract.project.get_absolute_url(),
+        )
+        self.assertEqual(contract.disbursements.count(), 1)
+        disbursement = contract.disbursements.get()
+        self.assertEqual(disbursement.amount, decimal.Decimal("263.53"))
+        self.assertEqual(disbursement.created_by, self.user)
+        self.assertEqual(disbursement.updated_by, self.user)
+
+    def test_can_create_negative_repayment(self):
+        contract = ContractFactory()
+        url = self.url(contract)
+        response = self.client.post(
+            url,
+            {"amount": "-269.71", "date": "2545-09-19", "notes": "repayment"},
+        )
+        self.assertEqual(response.status_code, 302)
+        self.assertEqual(
+            contract.disbursements.get().amount, decimal.Decimal("-269.71")
+        )
+
+    def test_create_records_event(self):
+        from hypha.apply.activity.models import Event
+
+        contract = ContractFactory()
+        self.client.post(
+            self.url(contract),
+            {"amount": "271.83", "date": "2547-11-29", "notes": ""},
+        )
+        # Event.source is a GenericForeignKey, so filter by object_id.
+        self.assertTrue(
+            Event.objects.filter(
+                type="CREATE_DISBURSEMENT", object_id=contract.project.id
+            ).exists()
+        )
+
+
+class TestApplicantCreateDisbursementView(BaseViewTestCase):
+    base_view_name = "disbursement"
+    url_name = "funds:projects:{}"
+    user_factory = ApplicantFactory
+
+    def get_kwargs(self, instance):
+        return {"pk": instance.project.pk, "contract_pk": instance.pk}
+
+    def test_cannot_get(self):
+        contract = ContractFactory()
+        response = self.get_page(contract)
+        self.assertEqual(response.status_code, 403)
+
+
+class TestFinanceCreateDisbursementView(BaseViewTestCase):
+    base_view_name = "disbursement"
+    url_name = "funds:projects:{}"
+    user_factory = FinanceFactory
+
+    def get_kwargs(self, instance):
+        return {"pk": instance.project.pk, "contract_pk": instance.pk}
+
+    def test_can_get(self):
+        contract = ContractFactory()
+        response = self.get_page(contract)
+        self.assertEqual(response.status_code, 200)
+
+    def test_can_create(self):
+        contract = ContractFactory()
+        response = self.client.post(
+            self.url(contract),
+            {"amount": "277.89", "date": "2549-01-13", "notes": ""},
+        )
+        self.assertEqual(response.status_code, 302)
+        self.assertEqual(response["Location"], contract.project.get_absolute_url())
+        self.assertEqual(contract.disbursements.count(), 1)
+        self.assertEqual(contract.disbursements.get().created_by, self.user)
+
+
+class TestStaffEditDisbursementView(BaseViewTestCase):
+    base_view_name = "disbursement-edit"
+    url_name = "funds:projects:{}"
+    user_factory = StaffFactory
+
+    def get_kwargs(self, instance):
+        # instance is a Disbursement
+        return {
+            "pk": instance.contract.project.pk,
+            "contract_pk": instance.contract.pk,
+            "disbursement_pk": instance.pk,
+        }
+
+    def test_can_get(self):
+        disbursement = DisbursementFactory()
+        response = self.get_page(disbursement)
+        self.assertEqual(response.status_code, 200)
+
+    def test_can_edit(self):
+        disbursement = DisbursementFactory(amount=decimal.Decimal("281.97"))
+        url = self.url(disbursement)
+        response = self.client.post(
+            url,
+            {
+                "amount": "293.59",
+                "date": disbursement.date.isoformat(),
+                "notes": "updated",
+            },
+        )
+        self.assertEqual(response.status_code, 302)
+        self.assertEqual(
+            response["Location"],
+            disbursement.contract.project.get_absolute_url(),
+        )
+        disbursement.refresh_from_db()
+        self.assertEqual(disbursement.amount, decimal.Decimal("293.59"))
+        self.assertEqual(disbursement.updated_by, self.user)
+
+    def test_edit_records_event(self):
+        from hypha.apply.activity.models import Event
+
+        disbursement = DisbursementFactory()
+        self.client.post(
+            self.url(disbursement),
+            {
+                "amount": "307.61",
+                "date": disbursement.date.isoformat(),
+                "notes": "",
+            },
+        )
+        self.assertTrue(
+            Event.objects.filter(
+                type="UPDATE_DISBURSEMENT",
+                object_id=disbursement.contract.project.id,
+            ).exists()
+        )
+
+
+class TestStaffDeleteDisbursementView(BaseViewTestCase):
+    base_view_name = "disbursement-delete"
+    url_name = "funds:projects:{}"
+    user_factory = StaffFactory
+
+    def get_kwargs(self, instance):
+        return {
+            "pk": instance.contract.project.pk,
+            "contract_pk": instance.contract.pk,
+            "disbursement_pk": instance.pk,
+        }
+
+    def test_can_get(self):
+        disbursement = DisbursementFactory()
+        response = self.get_page(disbursement)
+        self.assertEqual(response.status_code, 200)
+
+    def test_can_delete(self):
+        disbursement = DisbursementFactory()
+        contract = disbursement.contract
+        response = self.client.post(self.url(disbursement), {})
+        self.assertEqual(response.status_code, 302)
+        self.assertEqual(
+            response["Location"],
+            contract.project.get_absolute_url(),
+        )
+        self.assertFalse(contract.disbursements.filter(pk=disbursement.pk).exists())
+
+    def test_delete_records_event(self):
+        from hypha.apply.activity.models import Event
+
+        disbursement = DisbursementFactory()
+        contract = disbursement.contract
+        self.client.post(self.url(disbursement), {})
+        self.assertTrue(
+            Event.objects.filter(
+                type="DELETE_DISBURSEMENT", object_id=contract.project.id
+            ).exists()
+        )
+
+
+class TestApplicantDeleteDisbursementView(BaseViewTestCase):
+    base_view_name = "disbursement-delete"
+    url_name = "funds:projects:{}"
+    user_factory = ApplicantFactory
+
+    def get_kwargs(self, instance):
+        return {
+            "pk": instance.contract.project.pk,
+            "contract_pk": instance.contract.pk,
+            "disbursement_pk": instance.pk,
+        }
+
+    def test_cannot_get(self):
+        disbursement = DisbursementFactory()
+        response = self.get_page(disbursement)
+        self.assertEqual(response.status_code, 403)
+
+
+class TestFinanceEditDisbursementView(BaseViewTestCase):
+    base_view_name = "disbursement-edit"
+    url_name = "funds:projects:{}"
+    user_factory = FinanceFactory
+
+    def get_kwargs(self, instance):
+        return {
+            "pk": instance.contract.project.pk,
+            "contract_pk": instance.contract.pk,
+            "disbursement_pk": instance.pk,
+        }
+
+    def test_can_get(self):
+        disbursement = DisbursementFactory()
+        response = self.get_page(disbursement)
+        self.assertEqual(response.status_code, 200)
+
+
+class TestFinanceDeleteDisbursementView(BaseViewTestCase):
+    base_view_name = "disbursement-delete"
+    url_name = "funds:projects:{}"
+    user_factory = FinanceFactory
+
+    def get_kwargs(self, instance):
+        return {
+            "pk": instance.contract.project.pk,
+            "contract_pk": instance.contract.pk,
+            "disbursement_pk": instance.pk,
+        }
+
+    def test_can_get(self):
+        disbursement = DisbursementFactory()
+        response = self.get_page(disbursement)
+        self.assertEqual(response.status_code, 200)
+
+
+class TestDisbursementFormWidget(TestCase):
+    def test_amount_uses_trimmed_decimal_input(self):
+        from ..forms import DisbursementForm
+        from ..forms.project import TrimmedDecimalInput
+
+        form = DisbursementForm()
+        self.assertIsInstance(form.fields["amount"].widget, TrimmedDecimalInput)
+
+    def test_negatives_allowed(self):
+        from ..forms import DisbursementForm
+
+        form = DisbursementForm(
+            data={"amount": "-311.13", "date": "2551-03-17", "notes": ""}
+        )
+        self.assertTrue(form.is_valid(), form.errors)
+
+    def test_amount_input_pattern_allows_negative(self):
+        # The disbursement amount widget accepts a leading minus so
+        # repayments can be recorded; the shared number widget stays
+        # positive-only for the rest of the codebase.
+        from ..forms import DisbursementForm
+        from ..forms.disbursement import TrimmedSignedDecimalInput
+
+        form = DisbursementForm()
+        self.assertIsInstance(form.fields["amount"].widget, TrimmedSignedDecimalInput)
+        self.assertIn('pattern="-?[0-9.]*"', str(form["amount"]))
+
+    def test_exposes_expected_fields(self):
+        from ..forms import DisbursementForm
+
+        form = DisbursementForm()
+        self.assertEqual(set(form.fields), {"amount", "date", "notes"})
+
+    def test_date_defaults_to_today(self):
+        from django.utils import timezone
+
+        from ..forms import DisbursementForm
+
+        form = DisbursementForm()
+        self.assertEqual(form.fields["date"].initial, timezone.localdate())
+
+
+class TestDisbursementActivityMessage(TestCase):
+    def test_create_message_includes_amount_not_note(self):
+        from hypha.apply.activity.adapters.activity_feed import ActivityAdapter
+        from hypha.apply.activity.options import MESSAGES
+
+        from ..models import Disbursement
+
+        disbursement = Disbursement(
+            amount=decimal.Decimal("271.83"), notes="secret note"
+        )
+        message = ActivityAdapter().message(
+            MESSAGES.CREATE_DISBURSEMENT, disbursement=disbursement
+        )
+        self.assertIn("271.83", message)
+        self.assertNotIn("secret note", message)
diff --git a/hypha/apply/projects/urls.py b/hypha/apply/projects/urls.py
index 9181eaa217..65e4c59da0 100644
--- a/hypha/apply/projects/urls.py
+++ b/hypha/apply/projects/urls.py
@@ -16,8 +16,11 @@
     ChangeProjectstatusView,
     ContractDocumentPrivateMediaView,
     ContractPrivateMediaView,
+    CreateDisbursementView,
     CreateInvoiceView,
+    DeleteDisbursementView,
     DeleteInvoiceView,
+    EditDisbursementView,
     EditInvoiceView,
     InvoiceListView,
     InvoicePrivateMedia,
@@ -261,6 +264,28 @@
                     ApproveContractView.as_view(),
                     name="contract_approve",
                 ),
+                path(
+                    "contract/<int:contract_pk>/disbursement/",
+                    CreateDisbursementView.as_view(),
+                    name="disbursement",
+                ),
+                path(
+                    "contract/<int:contract_pk>/disbursements/<int:disbursement_pk>/",
+                    include(
+                        [
+                            path(
+                                "edit/",
+                                EditDisbursementView.as_view(),
+                                name="disbursement-edit",
+                            ),
+                            path(
+                                "delete/",
+                                DeleteDisbursementView.as_view(),
+                                name="disbursement-delete",
+                            ),
+                        ]
+                    ),
+                ),
                 path(
                     "download/<str:export_type>/",
                     ProjectDetailDownloadView.as_view(),
diff --git a/hypha/apply/projects/views/__init__.py b/hypha/apply/projects/views/__init__.py
index 318de5e34c..9ad4d71654 100644
--- a/hypha/apply/projects/views/__init__.py
+++ b/hypha/apply/projects/views/__init__.py
@@ -1,3 +1,8 @@
+from .disbursement import (
+    CreateDisbursementView,
+    DeleteDisbursementView,
+    EditDisbursementView,
+)
 from .invoice import (
     BatchUpdateInvoiceStatusView,
     ChangeInvoiceStatusView,
@@ -116,4 +121,7 @@
     "TagInvoiceView",
     "invoice_export_status",
     "invoice_export_download",
+    "CreateDisbursementView",
+    "EditDisbursementView",
+    "DeleteDisbursementView",
 ]
diff --git a/hypha/apply/projects/views/disbursement.py b/hypha/apply/projects/views/disbursement.py
new file mode 100644
index 0000000000..7c681804ac
--- /dev/null
+++ b/hypha/apply/projects/views/disbursement.py
@@ -0,0 +1,140 @@
+"""Create, update, and delete views for Disbursement (staff/finance only).
+
+Disbursements are entered in a modal on the project page; on save the user is
+returned to the project page (see ``get_success_url``). An activity/messenger
+notice is emitted for each create/update/delete; the amount is included in the
+notice, the note is not.
+
+"""
+
+from django.contrib.messages.views import SuccessMessageMixin
+from django.db import transaction
+from django.shortcuts import get_object_or_404
+from django.utils.decorators import method_decorator
+from django.utils.translation import gettext as _
+from django.views.generic import CreateView, DeleteView, UpdateView
+
+from hypha.apply.activity.messaging import MESSAGES, messenger
+from hypha.apply.users.decorators import staff_or_finance_required
+
+from ..forms import DisbursementForm
+from ..models import Disbursement, Project
+
+
+@method_decorator(staff_or_finance_required, name="dispatch")
+class CreateDisbursementView(SuccessMessageMixin, CreateView):
+    model = Disbursement
+    form_class = DisbursementForm
+    template_name = "application_projects/modals/disbursement_form.html"
+    success_message = _("Disbursement added")
+
+    def dispatch(self, request, *args, **kwargs):
+        self.project = get_object_or_404(Project, pk=kwargs["pk"])
+        self.contract = get_object_or_404(
+            self.project.contracts.all(), pk=kwargs["contract_pk"]
+        )
+        return super().dispatch(request, *args, **kwargs)
+
+    def get_context_data(self, **kwargs):
+        return super().get_context_data(
+            contract=self.contract,
+            project=self.project,
+            value=_("Save"),
+            **kwargs,
+        )
+
+    def form_valid(self, form):
+        form.instance.contract = self.contract
+        form.instance.created_by = self.request.user
+        form.instance.updated_by = self.request.user
+        response = super().form_valid(form)
+        messenger(
+            MESSAGES.CREATE_DISBURSEMENT,
+            request=self.request,
+            user=self.request.user,
+            source=self.project,
+            related=self.object,
+        )
+        return response
+
+    def get_success_url(self):
+        return self.project.get_absolute_url()
+
+
+@method_decorator(staff_or_finance_required, name="dispatch")
+class EditDisbursementView(SuccessMessageMixin, UpdateView):
+    model = Disbursement
+    form_class = DisbursementForm
+    template_name = "application_projects/modals/disbursement_form.html"
+    success_message = _("Disbursement updated")
+
+    def dispatch(self, request, *args, **kwargs):
+        self.project = get_object_or_404(Project, pk=kwargs["pk"])
+        self.contract = get_object_or_404(
+            self.project.contracts.all(), pk=kwargs["contract_pk"]
+        )
+        return super().dispatch(request, *args, **kwargs)
+
+    def get_object(self, queryset=None):
+        return get_object_or_404(
+            self.contract.disbursements.all(), pk=self.kwargs["disbursement_pk"]
+        )
+
+    def get_context_data(self, **kwargs):
+        return super().get_context_data(
+            contract=self.contract,
+            project=self.project,
+            value=_("Update"),
+            **kwargs,
+        )
+
+    def form_valid(self, form):
+        form.instance.updated_by = self.request.user
+        response = super().form_valid(form)
+        messenger(
+            MESSAGES.UPDATE_DISBURSEMENT,
+            request=self.request,
+            user=self.request.user,
+            source=self.project,
+            related=self.object,
+        )
+        return response
+
+    def get_success_url(self):
+        return self.project.get_absolute_url()
+
+
+@method_decorator(staff_or_finance_required, name="dispatch")
+class DeleteDisbursementView(DeleteView):
+    model = Disbursement
+    template_name = "application_projects/modals/disbursement_confirm_delete.html"
+
+    def dispatch(self, request, *args, **kwargs):
+        self.project = get_object_or_404(Project, pk=kwargs["pk"])
+        self.contract = get_object_or_404(
+            self.project.contracts.all(), pk=kwargs["contract_pk"]
+        )
+        return super().dispatch(request, *args, **kwargs)
+
+    def get_object(self, queryset=None):
+        return get_object_or_404(
+            self.contract.disbursements.all(), pk=self.kwargs["disbursement_pk"]
+        )
+
+    @transaction.atomic
+    def form_valid(self, form):
+        # Capture before super().form_valid() deletes the instance; the
+        # activity notice includes the amount, which is still on the object.
+        disbursement = self.object
+        response = super().form_valid(form)
+        messenger(
+            MESSAGES.DELETE_DISBURSEMENT,
+            request=self.request,
+            user=self.request.user,
+            source=self.project,
+            related=disbursement,
+        )
+        return response
+
+    def get_success_url(self):
+        return self.project.get_absolute_url()
diff --git a/hypha/templates/django/forms/widgets/number_signed.html b/hypha/templates/django/forms/widgets/number_signed.html
new file mode 100644
index 0000000000..ad9c4c4e4f
--- /dev/null
+++ b/hypha/templates/django/forms/widgets/number_signed.html
@@ -0,0 +1,27 @@
+{% load i18n %}
+{% comment %}
+Signed number input: like number.html but allows an optional leading minus
+so disbursements can record repayments. Scoped to the disbursement amount;
+the shared number.html stays positive-only for the rest of the codebase.
+{% endcomment %}
+<div {# fmt:off #}
+     x-data="{
+        value: '{% if widget.value != None %}{{ widget.value|stringformat:'s' }}{% endif %}',
+        get error() {
+            return this.value !== '' && isNaN(this.value) ? '{% trans "* This must be a number" %}': ''
+        }
+    }"{# fmt:on #}
+>
+    <input
+        class="input {{ widget.attrs.class|default:'' }}"
+        x-model='value'
+        :class="error ? 'invalid': ''"
+        type="text"
+        inputmode="numeric"
+        pattern="-?[0-9.]*"  {% comment %} Allow a digit with a decimal, optional leading minus (e.g. repayments). {% endcomment %}
+        name="{{ widget.name }}"
+        {% if widget.value != None %} value="{{ widget.value|stringformat:'s' }}"{% endif %}
+        {% include "django/forms/widgets/attrs.html" with skip_class_attr=True %}
+    >
+    <p x-cloak x-show="error" x-text="error" class="mt-2 text-error"></p>
+</div>

From 365f3c73710efba72fde1abbb8106fa916c54e04 Mon Sep 17 00:00:00 2001
From: "GLM-5.2 prompted by Jesse Bickel" <jbickel+llm@opentechstrategies.com>
Date: Fri, 21 Aug 2026 19:44:54 -0500
Subject: [PATCH 05/18] Disbursements: surface contracts and disbursements

Render a "Contracts and Disbursements" section where upstream places
invoices: it lists each contract (with its approved amount) and its
disbursements, with Add/Edit/Delete disbursement buttons gated by the
can_add_disbursement checker (staff/finance/contracting). Staff/finance
can also add further contracts from here, reusing the countersigned
contract form (no stage transition; the first contract still goes
through the contracting flow, which transitions the project). Notes
are staff/finance-only, so the Notes column is omitted for applicants.
Amounts display with a minimum of two decimal places, keeping any
extra precision, to match the contract amount rendering.

GLM-5.2
---
 .../migrations/0113_alter_contract_options.py |  19 ++
 .../migrations/0114_alter_contract_options.py |  20 ++
 hypha/apply/projects/models/project.py        |   1 +
 hypha/apply/projects/permissions.py           |  34 ++-
 .../includes/disbursements.html               | 110 ++++++++++
 .../modals/contract_form.html                 |   7 +
 .../application_projects/project_detail.html  |   2 +
 .../projects/templatetags/project_tags.py     |  11 +
 hypha/apply/projects/tests/test_views.py      | 195 ++++++++++++++++++
 hypha/apply/projects/urls.py                  |   6 +
 hypha/apply/projects/views/__init__.py        |   2 +
 hypha/apply/projects/views/project.py         |  34 +++
 12 files changed, 440 insertions(+), 1 deletion(-)
 create mode 100644 hypha/apply/projects/migrations/0113_alter_contract_options.py
 create mode 100644 hypha/apply/projects/migrations/0114_alter_contract_options.py
 create mode 100644 hypha/apply/projects/templates/application_projects/includes/disbursements.html
 create mode 100644 hypha/apply/projects/templates/application_projects/modals/contract_form.html

diff --git a/hypha/apply/projects/migrations/0113_alter_contract_options.py b/hypha/apply/projects/migrations/0113_alter_contract_options.py
new file mode 100644
index 0000000000..e6bf81f6ee
--- /dev/null
+++ b/hypha/apply/projects/migrations/0113_alter_contract_options.py
@@ -0,0 +1,19 @@
+# Harmonize Contract ordering with Disbursement: both newest-first
+# (reverse-chronological), matching the activity feed and invoice lists.
+#
+# Generated by Django 5.2.13 on 2026-08-23 00:10
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("application_projects", "0112_disbursement"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="contract",
+            options={"ordering": ["-created_at"]},
+        ),
+    ]
diff --git a/hypha/apply/projects/migrations/0114_alter_contract_options.py b/hypha/apply/projects/migrations/0114_alter_contract_options.py
new file mode 100644
index 0000000000..8254c62e63
--- /dev/null
+++ b/hypha/apply/projects/migrations/0114_alter_contract_options.py
@@ -0,0 +1,20 @@
+# Generated by Django 5.2.19 on 2026-11-09 21:03
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("application_projects", "0113_alter_contract_options"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="contract",
+            options={
+                "ordering": ["-created_at"],
+                "verbose_name": "contract",
+                "verbose_name_plural": "contracts",
+            },
+        ),
+    ]
diff --git a/hypha/apply/projects/models/project.py b/hypha/apply/projects/models/project.py
index dc659e61e2..df40ebc78c 100644
--- a/hypha/apply/projects/models/project.py
+++ b/hypha/apply/projects/models/project.py
@@ -765,6 +765,7 @@ class Contract(models.Model):
     class Meta:
         verbose_name = _("contract")
         verbose_name_plural = _("contracts")
+        ordering = ["-created_at"]
         constraints = [
             models.CheckConstraint(
                 condition=Q(currency__isnull=True) | Q(currency__regex=r"^[A-Z]{3}$"),
diff --git a/hypha/apply/projects/permissions.py b/hypha/apply/projects/permissions.py
index 28fa8f7d30..fbe0122d01 100644
--- a/hypha/apply/projects/permissions.py
+++ b/hypha/apply/projects/permissions.py
@@ -9,7 +9,7 @@
     CoApplicantRole,
 )
 from hypha.apply.users.models import User
-from hypha.apply.users.roles import Applicant, Staff
+from hypha.apply.users.roles import Applicant, Contracting, Finance, Staff
 
 from .models.project import (
     CLOSING,
@@ -492,6 +492,38 @@ def add_invoice(role, user, project) -> bool:
     return False
 
 
+@register_object_checker(name="add_disbursement")
+def can_add_disbursement(role, user, project) -> bool:
+    """Gate the Add/Edit/Delete disbursement buttons in the template.
+
+    Mirrors the view-side ``staff_or_finance_required`` decorator: Staff and
+    Finance (and superusers via rolepermissions' superpower) may record
+    disbursements. Contracting is intentionally excluded -- recording a
+    disbursement is a finance action, not a contracting one. No phase gate by
+    design (see ARDC: less phase gating than upstream invoices); the section
+    itself only renders once the project has a contract. ``can_`` prefix
+    follows the other checkers in this module; the registration name stays
+    ``add_disbursement`` for the ``{% can %}`` tag.
+
+    """
+    if role in (Staff, Finance):
+        return True
+    return False
+
+
+@register_object_checker(name="add_contract")
+def can_add_contract(role, user, project) -> bool:
+    """Gate the ``Add Contract`` button in the Contracts and Disbursements
+    section (staff/finance/contracting). Used to attach further contracts once
+    a project already has one; the first contract still goes through the
+    contracting flow, which transitions the project.
+
+    """
+    if role in (Staff, Finance, Contracting):
+        return True
+    return False
+
+
 permissions_map = {
     "contract_approve": can_approve_contract,
     "contract_upload": can_upload_contract,
diff --git a/hypha/apply/projects/templates/application_projects/includes/disbursements.html b/hypha/apply/projects/templates/application_projects/includes/disbursements.html
new file mode 100644
index 0000000000..18a8548679
--- /dev/null
+++ b/hypha/apply/projects/templates/application_projects/includes/disbursements.html
@@ -0,0 +1,110 @@
+{% load i18n heroicons %}
+{% load can from permission_tags %}
+{% load trimmed_decimal from project_tags %}
+
+{% comment %}
+Contracts and Disbursements section. Placed where upstream puts invoices, but
+with no status-based phase gate: it renders once the project has at least one
+contract. The Add/Edit/Delete disbursement buttons are gated by the
+``add_disbursement`` object checker (staff/finance); the list is visible to
+anyone who can view the project. Staff/finance can also add further contracts
+from here via the ``add_contract`` checker (the first contract still goes
+through the contracting flow, which transitions the project). Notes are
+staff/finance-only, so the Notes column is omitted for applicants.
+Loops contracts so it is correct in the 1:many Project:Contract world too.
+{% endcomment %}
+
+{% can "add_disbursement" object as can_add_disbursement %}
+{% can "add_contract" object as can_add_contract %}
+
+{% if object.contracts.exists %}
+    <section id="disbursements" class="card card-border">
+        <header class="card-header">
+            <h2 class="card-title">{% trans "Contracts and Disbursements" %}</h2>
+            {% if can_add_contract %}
+                <div class="card-actions">
+                    <a
+                        class="btn btn-primary btn-sm"
+                        href="{% url "apply:projects:contract_add" pk=object.pk %}"
+                        hx-get="{% url "apply:projects:contract_add" pk=object.pk %}"
+                        hx-target="#htmx-modal"
+                    >{% trans "Add Contract" %}</a>
+                </div>
+            {% endif %}
+        </header>
+
+        <div class="p-4 card-body">
+            {% for contract in object.contracts.all %}
+                <div class="mb-4 last:mb-0">
+                    <div class="flex justify-between items-center mb-1">
+                        <h3 class="text-sm font-semibold text-fg-muted">
+                            {% trans "Contract" %}
+                            <a class="link link-hover" href="{{ contract.get_absolute_url }}">#{{ contract.pk }}</a>
+                            {% if contract.amount_approved is not None %}
+                                <span class="text-fg-muted/80">
+                                    {% blocktrans with amount=contract.amount_approved|trimmed_decimal %}
+                                        (approved: {{ amount }})
+                                    {% endblocktrans %}
+                                </span>
+                            {% endif %}
+                        </h3>
+                        {% if can_add_disbursement %}
+                            <a
+                                class="btn btn-primary btn-sm"
+                                href="{% url "apply:projects:disbursement" pk=object.pk contract_pk=contract.pk %}"
+                                hx-get="{% url "apply:projects:disbursement" pk=object.pk contract_pk=contract.pk %}"
+                                hx-target="#htmx-modal"
+                            >
+                                {% trans "Add Disbursement" %}
+                            </a>
+                        {% endif %}
+                    </div>
+
+                    {% if contract.disbursements.exists %}
+                        <table class="table">
+                            <thead>
+                                <tr>
+                                    <th>{% trans "Date" %}</th>
+                                    <th>{% trans "Amount" %}</th>
+                                    {% if can_add_disbursement %}<th>
+                                        <span>{% trans "Notes" %} ({% trans "visible to staff and finance only" %})</span>
+                                    </th>{% endif %}
+                                    <th>{% if can_add_disbursement %}{% endif %}</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                {% for disbursement in contract.disbursements.all %}
+                                    <tr>
+                                        <td>{{ disbursement.date|date:"SHORT_DATE_FORMAT" }}</td>
+                                        <td>{{ disbursement.amount|trimmed_decimal }}</td>
+                                        {% if can_add_disbursement %}<td>{{ disbursement.notes|default:"-" }}</td>{% endif %}
+                                        <td>
+                                            {% if can_add_disbursement %}
+                                                <div class="flex gap-1">
+                                                    <a
+                                                        class="btn btn-ghost btn-xs"
+                                                        href="{% url "apply:projects:disbursement-edit" pk=object.pk contract_pk=contract.pk disbursement_pk=disbursement.pk %}"
+                                                        hx-get="{% url "apply:projects:disbursement-edit" pk=object.pk contract_pk=contract.pk disbursement_pk=disbursement.pk %}"
+                                                        hx-target="#htmx-modal"
+                                                    >{% heroicon_micro "pencil-square" size=16 aria_hidden=true %}<span class="sr-only">{% trans "Edit" %}</span></a>
+                                                    <a
+                                                        class="btn btn-ghost btn-xs"
+                                                        href="{% url "apply:projects:disbursement-delete" pk=object.pk contract_pk=contract.pk disbursement_pk=disbursement.pk %}"
+                                                        hx-get="{% url "apply:projects:disbursement-delete" pk=object.pk contract_pk=contract.pk disbursement_pk=disbursement.pk %}"
+                                                        hx-target="#htmx-modal"
+                                                    >{% heroicon_micro "trash" size=16 aria_hidden=true %}<span class="sr-only">{% trans "Delete" %}</span></a>
+                                                </div>
+                                            {% endif %}
+                                        </td>
+                                    </tr>
+                                {% endfor %}
+                            </tbody>
+                        </table>
+                    {% else %}
+                        <p class="py-1 px-2 text-sm text-fg-muted">{% trans "No disbursements yet." %}</p>
+                    {% endif %}
+                </div>
+            {% endfor %}
+        </div>
+    </section>
+{% endif %}
diff --git a/hypha/apply/projects/templates/application_projects/modals/contract_form.html b/hypha/apply/projects/templates/application_projects/modals/contract_form.html
new file mode 100644
index 0000000000..e5fb00847c
--- /dev/null
+++ b/hypha/apply/projects/templates/application_projects/modals/contract_form.html
@@ -0,0 +1,7 @@
+{% load i18n %}
+
+<c-modal.header>{% trans "Add contract" %}</c-modal.header>
+
+<div class="p-4">
+    {% include "includes/dialog_form_base.html" with form=form value=value %}
+</div>
diff --git a/hypha/apply/projects/templates/application_projects/project_detail.html b/hypha/apply/projects/templates/application_projects/project_detail.html
index 92d46a4a44..cb99afef44 100644
--- a/hypha/apply/projects/templates/application_projects/project_detail.html
+++ b/hypha/apply/projects/templates/application_projects/project_detail.html
@@ -58,6 +58,8 @@ <h2 class="pb-2 mb-2 font-semibold border-b text-h3">
                     </dl>
                 </header>
 
+                {% include "application_projects/includes/disbursements.html" %}
+
                 {% user_can_view_project_documents object user as can_view_project_documents %}
                 {% if can_view_project_documents %}
                     {% include "application_projects/includes/project_documents.html" %}
diff --git a/hypha/apply/projects/templatetags/project_tags.py b/hypha/apply/projects/templatetags/project_tags.py
index 0bbb733251..e7a9d4d742 100644
--- a/hypha/apply/projects/templatetags/project_tags.py
+++ b/hypha/apply/projects/templatetags/project_tags.py
@@ -424,3 +424,14 @@ def show_start_date(project) -> bool:
         CLOSING,
         COMPLETE,
     ]
+
+
+@register.filter
+def trimmed_decimal(value):
+    """Format a decimal with a minimum of 2 decimal places, preserving any
+    extra precision, so the disbursements table matches the amount input.
+
+    """
+    from hypha.apply.projects.forms.project import TrimmedDecimalInput
+
+    return TrimmedDecimalInput().format_value(value)
diff --git a/hypha/apply/projects/tests/test_views.py b/hypha/apply/projects/tests/test_views.py
index 7c7964d4bc..26fb375c03 100644
--- a/hypha/apply/projects/tests/test_views.py
+++ b/hypha/apply/projects/tests/test_views.py
@@ -1728,3 +1728,198 @@ def test_create_message_includes_amount_not_note(self):
         )
         self.assertIn("271.83", message)
         self.assertNotIn("secret note", message)
+
+
+class TestStaffDisbursementsSection(BaseProjectDetailTestCase):
+    user_factory = StaffFactory
+
+    def test_section_not_shown_without_contract(self):
+        project = ProjectFactory()
+        response = self.get_page(project)
+        self.assertNotContains(response, 'id="disbursements"')
+
+    def test_section_shown_with_contract(self):
+        project = ProjectFactory()
+        ContractFactory(project=project)
+        response = self.get_page(project)
+        self.assertContains(response, 'id="disbursements"')
+
+    def test_add_button_shown_to_staff(self):
+        project = ProjectFactory()
+        ContractFactory(project=project)
+        response = self.get_page(project)
+        self.assertContains(response, "Add Disbursement")
+
+    def test_add_contract_button_shown_to_staff(self):
+        project = ProjectFactory()
+        ContractFactory(project=project)
+        response = self.get_page(project)
+        self.assertContains(response, "Add Contract")
+
+    def test_section_header_is_contracts_and_disbursements(self):
+        project = ProjectFactory()
+        ContractFactory(project=project)
+        response = self.get_page(project)
+        self.assertContains(response, "Contracts and Disbursements")
+
+    def test_contract_approved_amount_shown(self):
+        from decimal import Decimal
+
+        project = ProjectFactory()
+        ContractFactory(project=project, amount_approved=Decimal("99.50"))
+        response = self.get_page(project)
+        self.assertContains(response, "(approved: 99.50)")
+
+    def test_edit_and_delete_links_shown_for_existing_disbursement(self):
+        from django.urls import reverse
+
+        from hypha.apply.projects.models import Disbursement
+
+        project = ProjectFactory()
+        contract = ContractFactory(project=project)
+        disbursement = DisbursementFactory(contract=contract)
+        response = self.get_page(project)
+        # The URL name is "disbursement-edit"/"disbursement-delete", but the
+        # rendered href is the resolved path (.../disbursements/<pk>/edit/),
+        # so assert on the reversed URLs rather than the hyphenated name.
+        edit_url = reverse(
+            "funds:projects:disbursement-edit",
+            kwargs={
+                "pk": project.pk,
+                "contract_pk": contract.pk,
+                "disbursement_pk": disbursement.pk,
+            },
+        )
+        delete_url = reverse(
+            "funds:projects:disbursement-delete",
+            kwargs={
+                "pk": project.pk,
+                "contract_pk": contract.pk,
+                "disbursement_pk": disbursement.pk,
+            },
+        )
+        self.assertContains(response, edit_url)
+        self.assertContains(response, delete_url)
+        # Sanity: the Disbursement row is the one we created.
+        self.assertEqual(Disbursement.objects.filter(contract=contract).count(), 1)
+
+    def test_empty_state_message(self):
+        project = ProjectFactory()
+        ContractFactory(project=project)
+        response = self.get_page(project)
+        self.assertContains(response, "No disbursements yet.")
+
+    def test_amount_displayed_with_minimum_two_decimals(self):
+        from decimal import Decimal
+
+        project = ProjectFactory()
+        contract = ContractFactory(project=project)
+        DisbursementFactory(contract=contract, amount=Decimal("99.5"))
+        response = self.get_page(project)
+        # 99.5 is padded to "99.50" to match the contract amount rendering.
+        self.assertContains(response, "99.50")
+
+    def test_amount_display_keeps_extra_precision(self):
+        from decimal import Decimal
+
+        project = ProjectFactory()
+        contract = ContractFactory(project=project)
+        DisbursementFactory(contract=contract, amount=Decimal("99.123"))
+        response = self.get_page(project)
+        # More than two decimal places are preserved, not truncated.
+        self.assertContains(response, "99.123")
+
+
+class TestApplicantDisbursementsSection(BaseProjectDetailTestCase):
+    user_factory = ApplicantFactory
+
+    def test_section_shown_read_only_with_contract(self):
+        project = ProjectFactory(user=self.user)
+        ContractFactory(project=project)
+        response = self.get_page(project)
+        self.assertContains(response, 'id="disbursements"')
+
+    def test_add_button_hidden_from_applicant(self):
+        project = ProjectFactory(user=self.user)
+        ContractFactory(project=project)
+        response = self.get_page(project)
+        self.assertNotContains(response, "Add Disbursement")
+
+    def test_edit_delete_hidden_from_applicant(self):
+        project = ProjectFactory(user=self.user)
+        contract = ContractFactory(project=project)
+        DisbursementFactory(contract=contract)
+        response = self.get_page(project)
+        self.assertNotContains(response, "disbursement-edit")
+        self.assertNotContains(response, "disbursement-delete")
+
+    def test_add_contract_button_hidden_from_applicant(self):
+        project = ProjectFactory(user=self.user)
+        ContractFactory(project=project)
+        response = self.get_page(project)
+        self.assertNotContains(response, "Add Contract")
+
+
+@override_settings(PROJECTS_PAYMENTS_MODEL="DISBURSEMENTS")
+class TestFinanceDisbursementsSection(BaseProjectDetailTestCase):
+    user_factory = FinanceFactory
+
+    def test_add_disbursement_button_shown_to_finance(self):
+        # Finance may record disbursements (matches staff_or_finance_required).
+        project = ProjectFactory()
+        ContractFactory(project=project)
+        response = self.get_page(project)
+        self.assertContains(response, "Add Disbursement")
+
+    def test_add_contract_button_shown_to_finance(self):
+        project = ProjectFactory()
+        ContractFactory(project=project)
+        response = self.get_page(project)
+        self.assertContains(response, "Add Contract")
+
+
+@override_settings(PROJECTS_PAYMENTS_MODEL="DISBURSEMENTS")
+class TestCreateContractView(BaseViewTestCase):
+    base_view_name = "contract_add"
+    url_name = "funds:projects:{}"
+    user_factory = StaffFactory
+
+    def get_kwargs(self, instance):
+        return {"pk": instance.id}
+
+    def test_get_form(self):
+        project = ProjectFactory()
+        ContractFactory(project=project)
+        response = self.get_page(project)
+        self.assertEqual(response.status_code, 200)
+
+    def test_post_creates_additional_contract(self):
+        from django.core.files.uploadedfile import SimpleUploadedFile
+
+        project = ProjectFactory(status=INVOICING_AND_REPORTING)
+        ContractFactory(project=project)
+        before = project.contracts.count()
+
+        response = self.post_page(
+            project,
+            {"file": SimpleUploadedFile("contract.pdf", b"contract-bytes")},
+        )
+        self.assertEqual(response.status_code, 200)
+        project.refresh_from_db()
+        # A new contract is attached; the project stage is unchanged (no
+        # transition: the first contract already moved the project on).
+        self.assertEqual(project.contracts.count(), before + 1)
+        self.assertEqual(project.status, INVOICING_AND_REPORTING)
+
+    def test_applicant_forbidden(self):
+        from django.core.files.uploadedfile import SimpleUploadedFile
+
+        applicant = ApplicantFactory()
+        self.client.force_login(applicant)
+        project = ProjectFactory(status=INVOICING_AND_REPORTING, user=applicant)
+        ContractFactory(project=project)
+        response = self.post_page(
+            project,
+            {"file": SimpleUploadedFile("contract.pdf", b"contract-bytes")},
+        )
+        self.assertEqual(response.status_code, 403)
diff --git a/hypha/apply/projects/urls.py b/hypha/apply/projects/urls.py
index 65e4c59da0..1f71e40e51 100644
--- a/hypha/apply/projects/urls.py
+++ b/hypha/apply/projects/urls.py
@@ -16,6 +16,7 @@
     ChangeProjectstatusView,
     ContractDocumentPrivateMediaView,
     ContractPrivateMediaView,
+    CreateContractView,
     CreateDisbursementView,
     CreateInvoiceView,
     DeleteDisbursementView,
@@ -224,6 +225,11 @@
                     UploadContractView.as_view(),
                     name="contract_upload",
                 ),
+                path(
+                    "contract/add/",
+                    CreateContractView.as_view(),
+                    name="contract_add",
+                ),
                 path(
                     "partial/contract/documents/",
                     partial_contracting_documents,
diff --git a/hypha/apply/projects/views/__init__.py b/hypha/apply/projects/views/__init__.py
index 9ad4d71654..0b8b3b7593 100644
--- a/hypha/apply/projects/views/__init__.py
+++ b/hypha/apply/projects/views/__init__.py
@@ -26,6 +26,7 @@
     ChangeProjectstatusView,
     ContractDocumentPrivateMediaView,
     ContractPrivateMediaView,
+    CreateContractView,
     ProjectDetailApprovalView,
     ProjectDetailDownloadView,
     ProjectDetailView,
@@ -97,6 +98,7 @@
     "UpdateLeadView",
     "ApproveContractView",
     "UploadContractView",
+    "CreateContractView",
     "ContractDocumentPrivateMediaView",
     "BaseProjectDetailView",
     "AdminProjectDetailView",
diff --git a/hypha/apply/projects/views/project.py b/hypha/apply/projects/views/project.py
index 77daa279a9..285dabc3f9 100644
--- a/hypha/apply/projects/views/project.py
+++ b/hypha/apply/projects/views/project.py
@@ -8,6 +8,7 @@
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.mixins import UserPassesTestMixin
 from django.contrib.auth.models import Group
+from django.contrib.messages.views import SuccessMessageMixin
 from django.core.exceptions import ObjectDoesNotExist, PermissionDenied
 from django.db import transaction
 from django.db.models import Q
@@ -15,6 +16,7 @@
     FileResponse,
     Http404,
     HttpResponse,
+    HttpResponseForbidden,
     HttpResponseRedirect,
 )
 from django.shortcuts import get_object_or_404, render
@@ -67,6 +69,7 @@
 )
 from hypha.apply.users.decorators import (
     staff_or_finance_or_contracting_required,
+    staff_or_finance_required,
     staff_required,
 )
 from hypha.apply.users.roles import CONTRACTING_GROUP_NAME
@@ -87,6 +90,7 @@
     ProjectSOWForm,
     SetPendingForm,
     SkipPAFApprovalProcessForm,
+    StaffUploadContractForm,
     SubmitContractDocumentsForm,
     UpdateProjectContractNumberForm,
     UpdateProjectDatesForm,
@@ -1001,6 +1005,36 @@ def post(self, *args, **kwargs):
         )
 
 
+@method_decorator(staff_or_finance_required, name="dispatch")
+class CreateContractView(SuccessMessageMixin, ProjectByIdMixin, CreateView):
+    """Add a further contract from the Contracts and Disbursements section
+    (DISBURSEMENTS model). The first contract still goes through the
+    contracting flow, so this view performs no stage transition.
+
+    """
+
+    form_class = StaffUploadContractForm
+    model = Contract
+    template_name = "application_projects/modals/contract_form.html"
+    success_message = _("Contract added")
+
+    def dispatch(self, request, *args, **kwargs):
+        self.project = self.get_object()
+        if has_object_permission("add_contract", request.user, obj=self.project):
+            return super().dispatch(request, *args, **kwargs)
+        return HttpResponseForbidden()
+
+    def form_valid(self, form):
+        form.instance.project = self.project
+        return super().form_valid(form)
+
+    def get_context_data(self, **kwargs):
+        return super().get_context_data(project=self.project, value=_("Save"), **kwargs)
+
+    def get_success_url(self):
+        return self.project.get_absolute_url()
+
+
 @method_decorator(login_required, name="dispatch")
 class UploadContractDocumentView(ProjectByIdMixin, View):
     form_class = UploadContractDocumentForm

From 7cffd1b799944a2c06acceefe050d0e9a2b29a4e Mon Sep 17 00:00:00 2001
From: "GLM-5.2 prompted by Jesse Bickel" <jbickel+llm@opentechstrategies.com>
Date: Fri, 21 Aug 2026 19:51:38 -0500
Subject: [PATCH 06/18] Disbursements: gate UI on PROJECTS_PAYMENTS_FLOW

The ARDC fork needs a per-contract disbursement ledger in place of
upstream's invoicing flow, but unconditionally removing the invoicing
UI would break other deployments sharing this fork base. Add
PROJECTS_PAYMENTS_FLOW (an INVOICING/DISBURSEMENTS/DISABLED enum) so
each deployment selects its payments flow. The project detail page
renders each section through a helper tag (project_can_have_invoices_
section / project_can_have_disbursements_section) that folds the
payments-flow check in with the existing visibility rules, keeping
the template terse; the contracting documents section stays during
Contracting and is hidden under DISBURSEMENTS once a contract exists
(the C&D section takes over). The contract upload forms
(UploadContractForm, UploadCountersignedContractForm, and the
CreateContractForm that extends it) likewise hide their
amount_requested, amount_approved and currency fields unless
DISBURSEMENTS is selected, so the ledger fields only appear where
the per-contract ledger exists. ARDC sets DISBURSEMENTS in ardc.py.

GLM-5.2
---
 hypha/apply/projects/forms/project.py         | 16 +++++
 hypha/apply/projects/payments.py              | 16 +++++
 .../application_projects/project_detail.html  | 10 ++-
 .../projects/templatetags/project_tags.py     | 59 +++++++++++++++++
 hypha/apply/projects/tests/test_forms.py      | 48 +++++++++++++-
 .../apply/projects/tests/test_templatetags.py | 64 ++++++++++++++++++-
 hypha/apply/projects/tests/test_views.py      | 51 ++++++++++++++-
 hypha/settings/base.py                        |  9 +++
 8 files changed, 268 insertions(+), 5 deletions(-)
 create mode 100644 hypha/apply/projects/payments.py

diff --git a/hypha/apply/projects/forms/project.py b/hypha/apply/projects/forms/project.py
index 8d4ce331ba..afb9aa494c 100644
--- a/hypha/apply/projects/forms/project.py
+++ b/hypha/apply/projects/forms/project.py
@@ -39,6 +39,7 @@
     Project,
     ProjectSOW,
 )
+from ..payments import PaymentsFlow
 
 User = get_user_model()
 
@@ -508,6 +509,12 @@ def __init__(self, *args, user=None, **kwargs):
         # the project-relative ownership check lives in can_upload_contract.
         if user is None or user.is_applicant:
             self.fields.pop("signed_and_approved")
+        # Amounts and currency belong to the per-contract disbursement ledger
+        # (DISBURSEMENTS flow); under INVOICING/DISABLED the contract form
+        # collects only the file and signed-and-approved flag, so hide them.
+        if settings.PROJECTS_PAYMENTS_FLOW != PaymentsFlow.DISBURSEMENTS:
+            for field in ("amount_requested", "amount_approved", "currency"):
+                self.fields.pop(field, None)
 
 
 class StaffUploadContractForm(FileFormMixin, forms.ModelForm):
@@ -533,6 +540,15 @@ class Meta:
         ]
         model = Contract
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        # Amounts and currency belong to the per-contract disbursement ledger
+        # (DISBURSEMENTS flow); under INVOICING/DISABLED the contract form
+        # collects only the file and signed-by-applicant flag, so hide them.
+        if settings.PROJECTS_PAYMENTS_FLOW != PaymentsFlow.DISBURSEMENTS:
+            for field in ("amount_requested", "amount_approved", "currency"):
+                self.fields.pop(field, None)
+
 
 class UploadDocumentForm(FileFormMixin, forms.ModelForm):
     document = SingleFileField(label=_("Document"), required=True)
diff --git a/hypha/apply/projects/payments.py b/hypha/apply/projects/payments.py
new file mode 100644
index 0000000000..135e613c3f
--- /dev/null
+++ b/hypha/apply/projects/payments.py
@@ -0,0 +1,16 @@
+"""The payments-flow choice used by ``PROJECTS_PAYMENTS_FLOW``.
+
+Kept dependency-free (no Django imports) so it can be imported from app code
+without triggering settings cycles; settings modules set the value as a plain
+string. ``PaymentsFlow`` subclasses ``str`` so members compare equal to
+their string values and work directly in template ``{% if %}`` comparisons.
+
+"""
+
+from enum import Enum
+
+
+class PaymentsFlow(str, Enum):
+    INVOICING = "INVOICING"
+    DISBURSEMENTS = "DISBURSEMENTS"
+    DISABLED = "DISABLED"
diff --git a/hypha/apply/projects/templates/application_projects/project_detail.html b/hypha/apply/projects/templates/application_projects/project_detail.html
index cb99afef44..c1ebfcdd09 100644
--- a/hypha/apply/projects/templates/application_projects/project_detail.html
+++ b/hypha/apply/projects/templates/application_projects/project_detail.html
@@ -58,7 +58,15 @@ <h2 class="pb-2 mb-2 font-semibold border-b text-h3">
                     </dl>
                 </header>
 
-                {% include "application_projects/includes/disbursements.html" %}
+                {% project_can_have_invoices_section object user as can_have_invoices_section %}
+                {% if can_have_invoices_section %}
+                    {% include "application_projects/includes/invoices.html" %}
+                {% endif %}
+
+                {% project_can_have_disbursements_section object as can_have_disbursements_section %}
+                {% if can_have_disbursements_section %}
+                    {% include "application_projects/includes/disbursements.html" %}
+                {% endif %}
 
                 {% user_can_view_project_documents object user as can_view_project_documents %}
                 {% if can_view_project_documents %}
diff --git a/hypha/apply/projects/templatetags/project_tags.py b/hypha/apply/projects/templatetags/project_tags.py
index e7a9d4d742..8964865d6f 100644
--- a/hypha/apply/projects/templatetags/project_tags.py
+++ b/hypha/apply/projects/templatetags/project_tags.py
@@ -13,6 +13,7 @@
     INTERNAL_APPROVAL,
     INVOICING_AND_REPORTING,
 )
+from hypha.apply.projects.payments import PaymentsFlow
 from hypha.apply.projects.permissions import has_permission
 from hypha.apply.projects.utils import get_project_public_status, no_pafreviewer_role
 
@@ -69,6 +70,16 @@ def user_can_view_project_documents(project, user):
 
 @register.simple_tag
 def user_can_view_contracting_documents(project, user):
+    if project.status == CONTRACTING and not user.is_apply_staff:
+        return False
+    if (
+        user.is_reviewer
+        and not user.is_apply_staff
+        and not user.is_staff
+        and not user.is_contracting
+        and not user.is_applicant
+    ):
+        return False
     if project.submission.co_applicants.filter(user=user).exists():
         co_applicant = project.submission.co_applicants.filter(user=user).first()
         if (
@@ -328,9 +339,57 @@ def user_next_step_instructions(project, user):
 def project_can_have_contracting_section(project):
     if project.status in [DRAFT, INTERNAL_APPROVAL]:
         return False
+    # Under DISBURSEMENTS the "Contracts and Disbursements" section lists the
+    # contracts, so hide the contracting documents section once a contract
+    # exists and the project is past the contracting stage (the first
+    # contract still goes through the contracting flow, which transitions the
+    # project).
+    if (
+        settings.PROJECTS_PAYMENTS_FLOW == PaymentsFlow.DISBURSEMENTS
+        and project.status != CONTRACTING
+        and project.contracts.exists()
+    ):
+        return False
     return True
 
 
+@register.simple_tag
+def project_can_have_invoices_section(project, user):
+    """Show the invoices section only under the INVOICING payments flow, and
+    only for users who may view invoices on a project that can have them.
+    Folds the payments-flow check in with the existing visibility rules so
+    the template stays terse.
+    """
+    if settings.PROJECTS_PAYMENTS_FLOW != PaymentsFlow.INVOICING:
+        return False
+    # project_can_have_invoices: invoices are visible once the project has
+    # moved past the contracting/internal-approval phases.
+    if project.status not in [
+        INVOICING_AND_REPORTING,
+        CLOSING,
+        COMPLETE,
+    ]:
+        return False
+    # user_can_view_invoices: co-applicants may be restricted from invoices.
+    if project.submission.co_applicants.filter(user=user).exists():
+        co_applicant = project.submission.co_applicants.filter(user=user).first()
+        if (
+            co_applicant
+            and CoApplicantProjectPermission.INVOICES
+            not in co_applicant.project_permission
+        ):
+            return False
+    return True
+
+
+@register.simple_tag
+def project_can_have_disbursements_section(project):
+    """Show the disbursements section only under the DISBURSEMENTS payments
+    flow. The include itself only renders once the project has a contract.
+    """
+    return settings.PROJECTS_PAYMENTS_FLOW == PaymentsFlow.DISBURSEMENTS
+
+
 @register.simple_tag
 def can_access_supporting_documents_section(project):
     if project.status not in [INVOICING_AND_REPORTING, CLOSING, COMPLETE]:
diff --git a/hypha/apply/projects/tests/test_forms.py b/hypha/apply/projects/tests/test_forms.py
index 74be2d3817..7d24058ab0 100644
--- a/hypha/apply/projects/tests/test_forms.py
+++ b/hypha/apply/projects/tests/test_forms.py
@@ -4,7 +4,7 @@
 from io import BytesIO
 
 from django.core.files.uploadedfile import SimpleUploadedFile
-from django.test import TestCase
+from django.test import TestCase, override_settings
 
 from hypha.apply.users.tests.factories import (
     FinanceFactory,
@@ -413,6 +413,7 @@ def test_staff_can_upload_signed(self):
         self.assertTrue(form.cleaned_data.get("signed_by_applicant"))
 
 
+@override_settings(PROJECTS_PAYMENTS_FLOW="DISBURSEMENTS")
 class TestContractUploadForm(TestCase):
     mock_file = SimpleUploadedFile(
         "test_contract.pdf", BytesIO(b"somebinarydata").read()
@@ -528,3 +529,48 @@ def test_blank_amount_renders_empty_not_dot_zero(self):
         self.assertIn('value=""', html_requested)
         self.assertNotIn('value=".00"', html_approved)
         self.assertNotIn('value=".00"', html_requested)
+
+
+class TestContractFormPaymentsFlowGating(TestCase):
+    """The contract forms expose ``amount_requested``, ``amount_approved``
+    and ``currency`` only under the DISBURSEMENTS payments flow; under
+    INVOICING or DISABLED those fields are popped so the form collects only
+    the file and the relevant signed flag.
+    """
+
+    amount_fields = ("amount_requested", "amount_approved", "currency")
+
+    def _forms(self):
+        # Unbound instances are enough to inspect declared fields after
+        # __init__ has run (the gating pops fields there).
+        return [
+            UploadContractForm(),
+            StaffUploadContractForm(),
+        ]
+
+    @override_settings(PROJECTS_PAYMENTS_FLOW="DISBURSEMENTS")
+    def test_amount_and_currency_fields_present_under_disbursements(self):
+        for form in self._forms():
+            for field in self.amount_fields:
+                self.assertIn(
+                    field, form.fields, f"{type(form).__name__} missing {field}"
+                )
+
+    @override_settings(PROJECTS_PAYMENTS_FLOW="INVOICING")
+    def test_amount_and_currency_fields_hidden_under_invoicing(self):
+        for form in self._forms():
+            # The file field always remains; only the ledger fields are hidden.
+            self.assertIn("file", form.fields)
+            for field in self.amount_fields:
+                self.assertNotIn(
+                    field, form.fields, f"{type(form).__name__} leaked {field}"
+                )
+
+    @override_settings(PROJECTS_PAYMENTS_FLOW="DISABLED")
+    def test_amount_and_currency_fields_hidden_under_disabled(self):
+        for form in self._forms():
+            self.assertIn("file", form.fields)
+            for field in self.amount_fields:
+                self.assertNotIn(
+                    field, form.fields, f"{type(form).__name__} leaked {field}"
+                )
diff --git a/hypha/apply/projects/tests/test_templatetags.py b/hypha/apply/projects/tests/test_templatetags.py
index e33773acc7..9622239579 100644
--- a/hypha/apply/projects/tests/test_templatetags.py
+++ b/hypha/apply/projects/tests/test_templatetags.py
@@ -1,4 +1,4 @@
-from django.test import TestCase
+from django.test import TestCase, override_settings
 
 from hypha.apply.users.tests.factories import (
     ApplicantFactory,
@@ -22,8 +22,13 @@
     INTERNAL_APPROVAL,
     INVOICING_AND_REPORTING,
 )
+from ..payments import PaymentsFlow
 from ..templatetags.contract_tools import user_can_upload_contract
 from ..templatetags.invoice_tools import can_change_status, can_delete, can_edit
+from ..templatetags.project_tags import (
+    project_can_have_disbursements_section,
+    project_can_have_invoices_section,
+)
 from .factories import ContractFactory, InvoiceFactory, ProjectFactory
 
 
@@ -261,3 +266,60 @@ def test_applicant_and_staff_cant_edit_in_decline(self):
 
         self.assertFalse(can_edit(invoice, applicant))
         self.assertFalse(can_edit(invoice, staff))
+
+
+class TestPaymentsFlowEnum(TestCase):
+    def test_members_equal_their_string_values(self):
+        # PaymentsFlow subclasses str so members compare equal to plain
+        # strings, which keeps the {% if %} comparisons in templates simple.
+        self.assertEqual(PaymentsFlow.INVOICING, "INVOICING")
+        self.assertEqual(PaymentsFlow.DISBURSEMENTS, "DISBURSEMENTS")
+        self.assertEqual(PaymentsFlow.DISABLED, "DISABLED")
+
+    def test_three_valid_values(self):
+        self.assertEqual(
+            {m.value for m in PaymentsFlow},
+            {"INVOICING", "DISBURSEMENTS", "DISABLED"},
+        )
+
+
+@override_settings(PROJECTS_PAYMENTS_FLOW="DISBURSEMENTS")
+class TestCanHaveDisbursementsSection(TestCase):
+    def test_shown_under_disbursements(self):
+        project = ProjectFactory()
+        self.assertTrue(project_can_have_disbursements_section(project))
+
+    @override_settings(PROJECTS_PAYMENTS_FLOW="INVOICING")
+    def test_hidden_under_invoicing(self):
+        project = ProjectFactory()
+        self.assertFalse(project_can_have_disbursements_section(project))
+
+    @override_settings(PROJECTS_PAYMENTS_FLOW="DISABLED")
+    def test_hidden_under_disabled(self):
+        project = ProjectFactory()
+        self.assertFalse(project_can_have_disbursements_section(project))
+
+
+@override_settings(PROJECTS_PAYMENTS_FLOW="INVOICING")
+class TestCanHaveInvoicesSection(TestCase):
+    def test_shown_under_invoicing_when_in_scope(self):
+        staff = StaffFactory()
+        project = ProjectFactory(status=INVOICING_AND_REPORTING)
+        self.assertTrue(project_can_have_invoices_section(project, staff))
+
+    def test_hidden_when_project_not_in_scope(self):
+        staff = StaffFactory()
+        project = ProjectFactory(status=CONTRACTING)
+        self.assertFalse(project_can_have_invoices_section(project, staff))
+
+    @override_settings(PROJECTS_PAYMENTS_FLOW="DISBURSEMENTS")
+    def test_hidden_under_disbursements(self):
+        staff = StaffFactory()
+        project = ProjectFactory(status=INVOICING_AND_REPORTING)
+        self.assertFalse(project_can_have_invoices_section(project, staff))
+
+    @override_settings(PROJECTS_PAYMENTS_FLOW="DISABLED")
+    def test_hidden_under_disabled(self):
+        staff = StaffFactory()
+        project = ProjectFactory(status=INVOICING_AND_REPORTING)
+        self.assertFalse(project_can_have_invoices_section(project, staff))
diff --git a/hypha/apply/projects/tests/test_views.py b/hypha/apply/projects/tests/test_views.py
index 26fb375c03..2732513b69 100644
--- a/hypha/apply/projects/tests/test_views.py
+++ b/hypha/apply/projects/tests/test_views.py
@@ -1730,6 +1730,7 @@ def test_create_message_includes_amount_not_note(self):
         self.assertNotIn("secret note", message)
 
 
+@override_settings(PROJECTS_PAYMENTS_FLOW="DISBURSEMENTS")
 class TestStaffDisbursementsSection(BaseProjectDetailTestCase):
     user_factory = StaffFactory
 
@@ -1738,6 +1739,20 @@ def test_section_not_shown_without_contract(self):
         response = self.get_page(project)
         self.assertNotContains(response, 'id="disbursements"')
 
+    @override_settings(PROJECTS_PAYMENTS_FLOW="INVOICING")
+    def test_section_hidden_when_invoicing(self):
+        project = ProjectFactory()
+        ContractFactory(project=project)
+        response = self.get_page(project)
+        self.assertNotContains(response, 'id="disbursements"')
+
+    @override_settings(PROJECTS_PAYMENTS_FLOW="DISABLED")
+    def test_section_hidden_when_disabled(self):
+        project = ProjectFactory()
+        ContractFactory(project=project)
+        response = self.get_page(project)
+        self.assertNotContains(response, 'id="disbursements"')
+
     def test_section_shown_with_contract(self):
         project = ProjectFactory()
         ContractFactory(project=project)
@@ -1829,7 +1844,39 @@ def test_amount_display_keeps_extra_precision(self):
         # More than two decimal places are preserved, not truncated.
         self.assertContains(response, "99.123")
 
+    def test_contracting_section_hidden_under_disbursements(self):
+        # The disbursements section already lists the contracts, so the
+        # contracting documents section is hidden under DISBURSEMENTS to
+        # avoid duplication.
+        from hypha.apply.projects.models.project import INVOICING_AND_REPORTING
+
+        project = ProjectFactory(status=INVOICING_AND_REPORTING)
+        ContractFactory(project=project)
+        response = self.get_page(project)
+        self.assertNotContains(response, 'id="contract-documents-section"')
+
+    @override_settings(PROJECTS_PAYMENTS_FLOW="INVOICING")
+    def test_contracting_section_shown_under_invoicing(self):
+        from hypha.apply.projects.models.project import INVOICING_AND_REPORTING
+
+        project = ProjectFactory(status=INVOICING_AND_REPORTING)
+        ContractFactory(project=project)
+        response = self.get_page(project)
+        self.assertContains(response, 'id="contract-documents-section"')
+
+    def test_contracting_section_shown_during_contracting_under_disbursements(self):
+        # The first contract still goes through the contracting flow, so the
+        # contracting section shows during the Contracting stage even under
+        # DISBURSEMENTS (a contract may already be uploaded, awaiting signoff).
+        from hypha.apply.projects.models.project import CONTRACTING
+
+        project = ProjectFactory(status=CONTRACTING)
+        ContractFactory(project=project)
+        response = self.get_page(project)
+        self.assertContains(response, 'id="contract-documents-section"')
+
 
+@override_settings(PROJECTS_PAYMENTS_FLOW="DISBURSEMENTS")
 class TestApplicantDisbursementsSection(BaseProjectDetailTestCase):
     user_factory = ApplicantFactory
 
@@ -1860,7 +1907,7 @@ def test_add_contract_button_hidden_from_applicant(self):
         self.assertNotContains(response, "Add Contract")
 
 
-@override_settings(PROJECTS_PAYMENTS_MODEL="DISBURSEMENTS")
+@override_settings(PROJECTS_PAYMENTS_FLOW="DISBURSEMENTS")
 class TestFinanceDisbursementsSection(BaseProjectDetailTestCase):
     user_factory = FinanceFactory
 
@@ -1878,7 +1925,7 @@ def test_add_contract_button_shown_to_finance(self):
         self.assertContains(response, "Add Contract")
 
 
-@override_settings(PROJECTS_PAYMENTS_MODEL="DISBURSEMENTS")
+@override_settings(PROJECTS_PAYMENTS_FLOW="DISBURSEMENTS")
 class TestCreateContractView(BaseViewTestCase):
     base_view_name = "contract_add"
     url_name = "funds:projects:{}"
diff --git a/hypha/settings/base.py b/hypha/settings/base.py
index 9fd3f5e489..0110af7c96 100644
--- a/hypha/settings/base.py
+++ b/hypha/settings/base.py
@@ -114,6 +114,15 @@
 # Allow a submission to have multiple projects associated.
 PROJECTS_ALLOW_MULTIPLE = env.bool("PROJECTS_ALLOW_MULTIPLE", False)
 
+# Which payments flow a deployment uses: "INVOICING" (upstream's approval-based
+# invoice system, the default), "DISBURSEMENTS" (the simplified per-contract
+# disbursement ledger), or "DISABLED" (neither). The project detail page gates
+# the invoices section on INVOICING and the disbursements section on
+# DISBURSEMENTS; DISABLED shows neither. The ARDC fork sets DISBURSEMENTS in
+# hypha/settings/ardc.py. Valid values are defined in
+# hypha.apply.projects.payments.PaymentsFlow.
+PROJECTS_PAYMENTS_FLOW = env.str("PROJECTS_PAYMENTS_FLOW", "INVOICING")
+
 # Default status for projects, must be a string literal of "draft" (default), "contracting", "invoicing_and_reporting" or "closing"
 # Will be used for auto-create or be the default selection in the project creation form
 PROJECTS_DEFAULT_STATUS = env.str("PROJECTS_DEFAULT_STATUS", "draft")

From 215c773eb5998dce10280bb93ac397a2e150eb76 Mon Sep 17 00:00:00 2001
From: Jesse Bickel <jbickel@opentechstrategies.com>
Date: Wed, 23 Sep 2026 10:50:46 -0500
Subject: [PATCH 07/18] On the Contract form, improve the currency input

Without this change, the currency code input widget was the same size
in appearance as the amounts. With this change, its size and maximum
length are proportioned more accurately.
---
 hypha/apply/projects/forms/project.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/hypha/apply/projects/forms/project.py b/hypha/apply/projects/forms/project.py
index afb9aa494c..129e8bf63b 100644
--- a/hypha/apply/projects/forms/project.py
+++ b/hypha/apply/projects/forms/project.py
@@ -55,6 +55,7 @@
     "MXN",
     "NGN",
 ]
+CURRENCY_MAX_LENGTH = 3
 
 
 def filter_request_choices(choices):
@@ -97,17 +98,20 @@ def render(self, name, value, attrs=None, renderer=None):
 
 class CurrencyCodeField(forms.CharField):
     def __init__(self, *args, **kwargs):
-        kwargs["max_length"] = 3
+        kwargs["max_length"] = CURRENCY_MAX_LENGTH
         kwargs["required"] = False
         kwargs["empty_value"] = None
         super().__init__(*args, **kwargs)
 
-        self.widget = CurrencyDatalistWidget(choices=TOP_CURRENCY_CODES)
+        self.widget = CurrencyDatalistWidget(
+            choices=TOP_CURRENCY_CODES,
+            attrs={"maxLength": CURRENCY_MAX_LENGTH, "style": "width:4rem;"},
+        )
 
         self.validators.append(
             RegexValidator(
                 regex=CURRENCY_CODE_REGEX,
-                message="Currency must be exactly 3 uppercase letters.",
+                message="Currency (when specified) must be exactly 3 uppercase letters.",
                 code="invalid",
             )
         )

From 5e710986a81f0351c54a41071329f5ab78849dfb Mon Sep 17 00:00:00 2001
From: Jesse Bickel <jbickel@opentechstrategies.com>
Date: Wed, 23 Sep 2026 10:58:46 -0500
Subject: [PATCH 08/18] On the Contract form, prepopulate currency

For convenience, use the system setting's `CURRENCY_CODE` to
prepopulate the currency field on a contract. It can still be left
blank for several reasons: it may not be known yet and it is still
important for old, existing data to allow `NULL`, also when not using
the `PROJECTS_PAYMENTS_FLOW=DISBURSEMENTS` setting it will be `NULL`.
---
 hypha/apply/projects/forms/project.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hypha/apply/projects/forms/project.py b/hypha/apply/projects/forms/project.py
index 129e8bf63b..0c784099d7 100644
--- a/hypha/apply/projects/forms/project.py
+++ b/hypha/apply/projects/forms/project.py
@@ -101,6 +101,7 @@ def __init__(self, *args, **kwargs):
         kwargs["max_length"] = CURRENCY_MAX_LENGTH
         kwargs["required"] = False
         kwargs["empty_value"] = None
+        kwargs["initial"] = settings.CURRENCY_CODE
         super().__init__(*args, **kwargs)
 
         self.widget = CurrencyDatalistWidget(

From 479b1af379e0a1367b2a61cd09c329e88cbc835c Mon Sep 17 00:00:00 2001
From: Jesse Bickel <jbickel@opentechstrategies.com>
Date: Wed, 23 Sep 2026 11:25:31 -0500
Subject: [PATCH 09/18] On Disbursements view, display Contract currency

Without this change, it is hard to tell what currency is disbursed.
With this change, it is easier because the contract's currency shows.
---
 .../application_projects/includes/disbursements.html   | 10 ++++++----
 hypha/apply/projects/tests/test_views.py               |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/hypha/apply/projects/templates/application_projects/includes/disbursements.html b/hypha/apply/projects/templates/application_projects/includes/disbursements.html
index 18a8548679..df1a7c0bff 100644
--- a/hypha/apply/projects/templates/application_projects/includes/disbursements.html
+++ b/hypha/apply/projects/templates/application_projects/includes/disbursements.html
@@ -42,9 +42,7 @@ <h3 class="text-sm font-semibold text-fg-muted">
                             <a class="link link-hover" href="{{ contract.get_absolute_url }}">#{{ contract.pk }}</a>
                             {% if contract.amount_approved is not None %}
                                 <span class="text-fg-muted/80">
-                                    {% blocktrans with amount=contract.amount_approved|trimmed_decimal %}
-                                        (approved: {{ amount }})
-                                    {% endblocktrans %}
+                                    ({% trans "Approved:" %} {{ contract.amount_approved|trimmed_decimal }} {{ contract.currency }})
                                 </span>
                             {% endif %}
                         </h3>
@@ -65,7 +63,11 @@ <h3 class="text-sm font-semibold text-fg-muted">
                             <thead>
                                 <tr>
                                     <th>{% trans "Date" %}</th>
-                                    <th>{% trans "Amount" %}</th>
+                                    {% if contract.currency is not None %}
+                                        <th>{% trans "Amount" %} ({{ contract.currency }})</th>
+                                    {% else %}
+                                        <th>{% trans "Amount" %}</th>
+                                    {% endif %}
                                     {% if can_add_disbursement %}<th>
                                         <span>{% trans "Notes" %} ({% trans "visible to staff and finance only" %})</span>
                                     </th>{% endif %}
diff --git a/hypha/apply/projects/tests/test_views.py b/hypha/apply/projects/tests/test_views.py
index 2732513b69..cb6957182c 100644
--- a/hypha/apply/projects/tests/test_views.py
+++ b/hypha/apply/projects/tests/test_views.py
@@ -1783,7 +1783,7 @@ def test_contract_approved_amount_shown(self):
         project = ProjectFactory()
         ContractFactory(project=project, amount_approved=Decimal("99.50"))
         response = self.get_page(project)
-        self.assertContains(response, "(approved: 99.50)")
+        self.assertContains(response, "Approved: 99.50")
 
     def test_edit_and_delete_links_shown_for_existing_disbursement(self):
         from django.urls import reverse

From 4b3ff79ad216eb56c19ed55637ec954b2570df11 Mon Sep 17 00:00:00 2001
From: LLM prompted by Jesse Bickel <jbickel+llm@opentechstrategies.com>
Date: Fri, 25 Sep 2026 14:31:45 -0500
Subject: [PATCH 10/18] Keep the Disbursements table inside its card

The disbursements table had no horizontal scroll wrapper. Its nowrap
thead gives it a ~707px minimum width, so on narrower viewports the
table and its Edit/Delete buttons rendered outside the card border.

Now the table scrolls within the card, as the sibling invoice and
report tables already do.

Made with GLM-5.3-Flash.
---
 .../includes/disbursements.html               | 84 ++++++++++---------
 1 file changed, 43 insertions(+), 41 deletions(-)

diff --git a/hypha/apply/projects/templates/application_projects/includes/disbursements.html b/hypha/apply/projects/templates/application_projects/includes/disbursements.html
index df1a7c0bff..bd50c9ae27 100644
--- a/hypha/apply/projects/templates/application_projects/includes/disbursements.html
+++ b/hypha/apply/projects/templates/application_projects/includes/disbursements.html
@@ -59,49 +59,51 @@ <h3 class="text-sm font-semibold text-fg-muted">
                     </div>
 
                     {% if contract.disbursements.exists %}
-                        <table class="table">
-                            <thead>
-                                <tr>
-                                    <th>{% trans "Date" %}</th>
-                                    {% if contract.currency is not None %}
-                                        <th>{% trans "Amount" %} ({{ contract.currency }})</th>
-                                    {% else %}
-                                        <th>{% trans "Amount" %}</th>
-                                    {% endif %}
-                                    {% if can_add_disbursement %}<th>
-                                        <span>{% trans "Notes" %} ({% trans "visible to staff and finance only" %})</span>
-                                    </th>{% endif %}
-                                    <th>{% if can_add_disbursement %}{% endif %}</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                {% for disbursement in contract.disbursements.all %}
+                        <div class="overflow-x-auto">
+                            <table class="table">
+                                <thead>
                                     <tr>
-                                        <td>{{ disbursement.date|date:"SHORT_DATE_FORMAT" }}</td>
-                                        <td>{{ disbursement.amount|trimmed_decimal }}</td>
-                                        {% if can_add_disbursement %}<td>{{ disbursement.notes|default:"-" }}</td>{% endif %}
-                                        <td>
-                                            {% if can_add_disbursement %}
-                                                <div class="flex gap-1">
-                                                    <a
-                                                        class="btn btn-ghost btn-xs"
-                                                        href="{% url "apply:projects:disbursement-edit" pk=object.pk contract_pk=contract.pk disbursement_pk=disbursement.pk %}"
-                                                        hx-get="{% url "apply:projects:disbursement-edit" pk=object.pk contract_pk=contract.pk disbursement_pk=disbursement.pk %}"
-                                                        hx-target="#htmx-modal"
-                                                    >{% heroicon_micro "pencil-square" size=16 aria_hidden=true %}<span class="sr-only">{% trans "Edit" %}</span></a>
-                                                    <a
-                                                        class="btn btn-ghost btn-xs"
-                                                        href="{% url "apply:projects:disbursement-delete" pk=object.pk contract_pk=contract.pk disbursement_pk=disbursement.pk %}"
-                                                        hx-get="{% url "apply:projects:disbursement-delete" pk=object.pk contract_pk=contract.pk disbursement_pk=disbursement.pk %}"
-                                                        hx-target="#htmx-modal"
-                                                    >{% heroicon_micro "trash" size=16 aria_hidden=true %}<span class="sr-only">{% trans "Delete" %}</span></a>
-                                                </div>
-                                            {% endif %}
-                                        </td>
+                                        <th>{% trans "Date" %}</th>
+                                        {% if contract.currency is not None %}
+                                            <th>{% trans "Amount" %} ({{ contract.currency }})</th>
+                                        {% else %}
+                                            <th>{% trans "Amount" %}</th>
+                                        {% endif %}
+                                        {% if can_add_disbursement %}<th>
+                                            <span>{% trans "Notes" %} ({% trans "visible to staff and finance only" %})</span>
+                                        </th>{% endif %}
+                                        <th>{% if can_add_disbursement %}{% endif %}</th>
                                     </tr>
-                                {% endfor %}
-                            </tbody>
-                        </table>
+                                </thead>
+                                <tbody>
+                                    {% for disbursement in contract.disbursements.all %}
+                                        <tr>
+                                            <td>{{ disbursement.date|date:"SHORT_DATE_FORMAT" }}</td>
+                                            <td>{{ disbursement.amount|trimmed_decimal }}</td>
+                                            {% if can_add_disbursement %}<td>{{ disbursement.notes|default:"-" }}</td>{% endif %}
+                                            <td>
+                                                {% if can_add_disbursement %}
+                                                    <div class="flex gap-1">
+                                                        <a
+                                                            class="btn btn-ghost btn-xs"
+                                                            href="{% url "apply:projects:disbursement-edit" pk=object.pk contract_pk=contract.pk disbursement_pk=disbursement.pk %}"
+                                                            hx-get="{% url "apply:projects:disbursement-edit" pk=object.pk contract_pk=contract.pk disbursement_pk=disbursement.pk %}"
+                                                            hx-target="#htmx-modal"
+                                                        >{% heroicon_micro "pencil-square" size=16 aria_hidden=true %}<span class="sr-only">{% trans "Edit" %}</span></a>
+                                                        <a
+                                                            class="btn btn-ghost btn-xs"
+                                                            href="{% url "apply:projects:disbursement-delete" pk=object.pk contract_pk=contract.pk disbursement_pk=disbursement.pk %}"
+                                                            hx-get="{% url "apply:projects:disbursement-delete" pk=object.pk contract_pk=contract.pk disbursement_pk=disbursement.pk %}"
+                                                            hx-target="#htmx-modal"
+                                                        >{% heroicon_micro "trash" size=16 aria_hidden=true %}<span class="sr-only">{% trans "Delete" %}</span></a>
+                                                    </div>
+                                                {% endif %}
+                                            </td>
+                                        </tr>
+                                    {% endfor %}
+                                </tbody>
+                            </table>
+                        </div>
                     {% else %}
                         <p class="py-1 px-2 text-sm text-fg-muted">{% trans "No disbursements yet." %}</p>
                     {% endif %}

From 2701081da67deea7f0da823ca78247dc780a70ff Mon Sep 17 00:00:00 2001
From: LLM prompted by Jesse Bickel <jbickel+llm@opentechstrategies.com>
Date: Tue, 29 Sep 2026 14:24:15 -0500
Subject: [PATCH 11/18] On Disbursement form, show Contract currency

Without this change, the Disbursement form's Amount label does not
say which currency the entered amount is in. With this change, the
related Contract's currency code shows next to the Amount label,
matching the Disbursements table header.

Assisted-by: GLM-5.3-Flash
---
 hypha/apply/projects/forms/disbursement.py | 10 +++++++++-
 hypha/apply/projects/tests/test_views.py   | 18 ++++++++++++++++++
 hypha/apply/projects/views/disbursement.py | 10 ++++++++++
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/hypha/apply/projects/forms/disbursement.py b/hypha/apply/projects/forms/disbursement.py
index 2d1e09eada..52fcf85f54 100644
--- a/hypha/apply/projects/forms/disbursement.py
+++ b/hypha/apply/projects/forms/disbursement.py
@@ -23,7 +23,9 @@ class DisbursementForm(forms.ModelForm):
     and ``updated_by`` are set by the views so that the model's ``save()``
     audit log (wagtail.create/wagtail.edit) records the acting user. The
     ``amount`` widget mirrors the contract amount fields so values render
-    trimmed but preserve full precision.
+    trimmed but preserve full precision. The views also pass the related
+    ``contract``, whose currency is shown on the ``amount`` label (e.g.
+    ``Amount (USD)``) so the unit of the entered amount is unambiguous.
 
     """
 
@@ -33,6 +35,7 @@ class Meta:
         widgets = {"amount": TrimmedSignedDecimalInput()}
 
     def __init__(self, *args, **kwargs):
+        contract = kwargs.pop("contract", None)
         super().__init__(*args, **kwargs)
         # Default the date to today so a disbursement recorded on the day it
         # is made does not need re-entering; the model field stays default-free.
@@ -40,3 +43,8 @@ def __init__(self, *args, **kwargs):
         self.fields["amount"].help_text = _(
             "Amount sent to the grantee. Use a negative value to record a repayment."
         )
+        # Contract.currency is nullable (old data, other payments flows), so
+        # only annotate the label when a code is actually recorded.
+        if contract is not None and contract.currency:
+            amount_field = self.fields["amount"]
+            amount_field.label = f"{amount_field.label} ({contract.currency})"
diff --git a/hypha/apply/projects/tests/test_views.py b/hypha/apply/projects/tests/test_views.py
index cb6957182c..24283d9b91 100644
--- a/hypha/apply/projects/tests/test_views.py
+++ b/hypha/apply/projects/tests/test_views.py
@@ -1431,6 +1431,18 @@ def test_no_warning_for_countersigned_contract(self):
         response = self.get_page(contract)
         self.assertNotContains(response, "has not been countersigned")
 
+    def test_amount_label_shows_contract_currency(self):
+        contract = ContractFactory(currency="USD")
+        response = self.get_page(contract)
+        self.assertContains(response, "Amount (USD)")
+
+    def test_amount_label_omits_missing_currency(self):
+        # Contracts may have no currency (old data, other payments flows),
+        # so the label must not show an empty parenthetical.
+        contract = ContractFactory(currency=None)
+        response = self.get_page(contract)
+        self.assertNotContains(response, "Amount (")
+
     def test_can_create(self):
         contract = ContractFactory()
         url = self.url(contract)
@@ -1536,6 +1548,12 @@ def test_can_get(self):
         response = self.get_page(disbursement)
         self.assertEqual(response.status_code, 200)
 
+    def test_amount_label_shows_contract_currency(self):
+        contract = ContractFactory(currency="EUR")
+        disbursement = DisbursementFactory(contract=contract)
+        response = self.get_page(disbursement)
+        self.assertContains(response, "Amount (EUR)")
+
     def test_can_edit(self):
         disbursement = DisbursementFactory(amount=decimal.Decimal("281.97"))
         url = self.url(disbursement)
diff --git a/hypha/apply/projects/views/disbursement.py b/hypha/apply/projects/views/disbursement.py
index 7c681804ac..085f1017bd 100644
--- a/hypha/apply/projects/views/disbursement.py
+++ b/hypha/apply/projects/views/disbursement.py
@@ -43,6 +43,11 @@ def get_context_data(self, **kwargs):
             **kwargs,
         )
 
+    def get_form_kwargs(self):
+        kwargs = super().get_form_kwargs()
+        kwargs["contract"] = self.contract
+        return kwargs
+
     def form_valid(self, form):
         form.instance.contract = self.contract
         form.instance.created_by = self.request.user
@@ -88,6 +93,11 @@ def get_context_data(self, **kwargs):
             **kwargs,
         )
 
+    def get_form_kwargs(self):
+        kwargs = super().get_form_kwargs()
+        kwargs["contract"] = self.contract
+        return kwargs
+
     def form_valid(self, form):
         form.instance.updated_by = self.request.user
         response = super().form_valid(form)

From 6f9637bd03f6ab0915c0a618094e20f037b29dfc Mon Sep 17 00:00:00 2001
From: Jesse Bickel <jbickel@opentechstrategies.com>
Date: Tue, 29 Sep 2026 14:54:44 -0500
Subject: [PATCH 12/18] Right-justify Disbursement amounts

In most currencies we use two decimal places and right-justify amounts
so this change does the same for the Disbursements table that shows up
in the Projects area.
---
 .../application_projects/includes/disbursements.html          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hypha/apply/projects/templates/application_projects/includes/disbursements.html b/hypha/apply/projects/templates/application_projects/includes/disbursements.html
index bd50c9ae27..58a2f5852e 100644
--- a/hypha/apply/projects/templates/application_projects/includes/disbursements.html
+++ b/hypha/apply/projects/templates/application_projects/includes/disbursements.html
@@ -67,7 +67,7 @@ <h3 class="text-sm font-semibold text-fg-muted">
                                         {% if contract.currency is not None %}
                                             <th>{% trans "Amount" %} ({{ contract.currency }})</th>
                                         {% else %}
-                                            <th>{% trans "Amount" %}</th>
+                                            <th align="right">{% trans "Amount" %}</th>
                                         {% endif %}
                                         {% if can_add_disbursement %}<th>
                                             <span>{% trans "Notes" %} ({% trans "visible to staff and finance only" %})</span>
@@ -79,7 +79,7 @@ <h3 class="text-sm font-semibold text-fg-muted">
                                     {% for disbursement in contract.disbursements.all %}
                                         <tr>
                                             <td>{{ disbursement.date|date:"SHORT_DATE_FORMAT" }}</td>
-                                            <td>{{ disbursement.amount|trimmed_decimal }}</td>
+                                            <td align="right">{{ disbursement.amount|trimmed_decimal }}</td>
                                             {% if can_add_disbursement %}<td>{{ disbursement.notes|default:"-" }}</td>{% endif %}
                                             <td>
                                                 {% if can_add_disbursement %}

From b09a3c70030a2f2793ef8f1dcc8284370300b0a7 Mon Sep 17 00:00:00 2001
From: LLM prompted by Jesse Bickel <jbickel+llm@opentechstrategies.com>
Date: Tue, 6 Oct 2026 15:25:32 -0500
Subject: [PATCH 13/18] On Disbursement form, prepopulate award amount

Staff previously keyed each disbursement amount from scratch. The
create form now starts from the awarded amount net of the
contract's existing disbursements, and editing keeps the amount.

GLM-5.3-Flash, an LLM supervised and prompted by @jbickel
---
 hypha/apply/projects/forms/disbursement.py | 18 ++++++++++-
 hypha/apply/projects/tests/test_views.py   | 37 ++++++++++++++++++++++
 2 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/hypha/apply/projects/forms/disbursement.py b/hypha/apply/projects/forms/disbursement.py
index 52fcf85f54..db46220056 100644
--- a/hypha/apply/projects/forms/disbursement.py
+++ b/hypha/apply/projects/forms/disbursement.py
@@ -1,4 +1,6 @@
 from django import forms
+from django.db.models import DecimalField, Sum, Value
+from django.db.models.functions import Coalesce
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 
@@ -25,7 +27,10 @@ class DisbursementForm(forms.ModelForm):
     ``amount`` widget mirrors the contract amount fields so values render
     trimmed but preserve full precision. The views also pass the related
     ``contract``, whose currency is shown on the ``amount`` label (e.g.
-    ``Amount (USD)``) so the unit of the entered amount is unambiguous.
+    ``Amount (USD)``) so the unit of the entered amount is unambiguous. On
+    create the ``amount`` prepopulates with the contract's approved amount
+    (else the project's awarded value) less this contract's existing
+    disbursements, still editable.
 
     """
 
@@ -40,6 +45,17 @@ def __init__(self, *args, **kwargs):
         # Default the date to today so a disbursement recorded on the day it
         # is made does not need re-entering; the model field stays default-free.
         self.fields["date"].initial = timezone.localdate()
+        # Prepopulate with the awarded amount net of this contract's
+        # disbursements; editing keeps the instance's recorded amount.
+        if self.instance.pk is None:
+            awarded = contract.amount_approved if contract is not None else None
+            if awarded is None and contract is not None:
+                awarded = contract.project.value
+            if awarded is not None:
+                disbursed = contract.disbursements.aggregate(
+                    total=Coalesce(Sum("amount"), Value(0), output_field=DecimalField())
+                )["total"]
+                self.fields["amount"].initial = awarded - disbursed
         self.fields["amount"].help_text = _(
             "Amount sent to the grantee. Use a negative value to record a repayment."
         )
diff --git a/hypha/apply/projects/tests/test_views.py b/hypha/apply/projects/tests/test_views.py
index 24283d9b91..e69975b6a4 100644
--- a/hypha/apply/projects/tests/test_views.py
+++ b/hypha/apply/projects/tests/test_views.py
@@ -1443,6 +1443,32 @@ def test_amount_label_omits_missing_currency(self):
         response = self.get_page(contract)
         self.assertNotContains(response, "Amount (")
 
+    def test_amount_prepopulates_from_contract_approved_amount(self):
+        contract = ContractFactory(amount_approved=decimal.Decimal("283.29"))
+        response = self.get_page(contract)
+        self.assertContains(response, 'value="283.29"')
+
+    def test_amount_prepopulates_from_project_value_without_contract_amount(self):
+        # Contracts recorded before per-contract amounts existed carry no
+        # approved amount; fall back to the project's awarded value.
+        project = ProjectFactory(value=decimal.Decimal("277"))
+        contract = ContractFactory(project=project, amount_approved=None)
+        response = self.get_page(contract)
+        self.assertContains(response, 'value="277.00"')
+
+    def test_amount_prepopulates_net_of_existing_disbursements(self):
+        contract = ContractFactory(amount_approved=decimal.Decimal("283.29"))
+        DisbursementFactory(contract=contract, amount=decimal.Decimal("31.11"))
+        response = self.get_page(contract)
+        self.assertContains(response, 'value="252.18"')
+
+    def test_amount_prepopulates_net_of_repayments(self):
+        # Repayments are negative, so they net the other way.
+        contract = ContractFactory(amount_approved=decimal.Decimal("283.29"))
+        DisbursementFactory(contract=contract, amount=decimal.Decimal("-17.13"))
+        response = self.get_page(contract)
+        self.assertContains(response, 'value="300.42"')
+
     def test_can_create(self):
         contract = ContractFactory()
         url = self.url(contract)
@@ -1554,6 +1580,17 @@ def test_amount_label_shows_contract_currency(self):
         response = self.get_page(disbursement)
         self.assertContains(response, "Amount (EUR)")
 
+    def test_edit_shows_instance_amount_not_contract_award(self):
+        # The full-award prepopulation applies on create only; editing an
+        # existing disbursement must show its recorded amount.
+        contract = ContractFactory(amount_approved=decimal.Decimal("281.83"))
+        disbursement = DisbursementFactory(
+            contract=contract, amount=decimal.Decimal("311.13")
+        )
+        response = self.get_page(disbursement)
+        self.assertContains(response, 'value="311.13"')
+        self.assertNotContains(response, 'value="281.83"')
+
     def test_can_edit(self):
         disbursement = DisbursementFactory(amount=decimal.Decimal("281.97"))
         url = self.url(disbursement)

From 0079eb7d62caba1d59d7760975373b50ad1d9357 Mon Sep 17 00:00:00 2001
From: LLM prompted by Jesse Bickel <jbickel+llm@opentechstrategies.com>
Date: Thu, 8 Oct 2026 10:26:11 -0500
Subject: [PATCH 14/18] Make disbursement notes visible to everyone

The Notes column in the Contracts and Disbursements section was
hidden from applicants and labelled "visible to staff and finance
only", so grantees could not see the notes staff record against
their disbursements.

Now anyone who can view the project sees the Notes column and its
contents; recording and editing disbursements stay staff/finance.

GLM-5.3-Flash, an LLM supervised and prompted by @jbickel
---
 .../includes/disbursements.html               | 11 ++++-----
 hypha/apply/projects/tests/test_views.py      | 23 +++++++++++++++++++
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/hypha/apply/projects/templates/application_projects/includes/disbursements.html b/hypha/apply/projects/templates/application_projects/includes/disbursements.html
index 58a2f5852e..1f41bcc9af 100644
--- a/hypha/apply/projects/templates/application_projects/includes/disbursements.html
+++ b/hypha/apply/projects/templates/application_projects/includes/disbursements.html
@@ -9,8 +9,9 @@
 ``add_disbursement`` object checker (staff/finance); the list is visible to
 anyone who can view the project. Staff/finance can also add further contracts
 from here via the ``add_contract`` checker (the first contract still goes
-through the contracting flow, which transitions the project). Notes are
-staff/finance-only, so the Notes column is omitted for applicants.
+through the contracting flow, which transitions the project). Disbursement
+notes are visible to everyone who can view the project; only the
+Add/Edit/Delete disbursement actions are staff/finance.
 Loops contracts so it is correct in the 1:many Project:Contract world too.
 {% endcomment %}
 
@@ -69,9 +70,7 @@ <h3 class="text-sm font-semibold text-fg-muted">
                                         {% else %}
                                             <th align="right">{% trans "Amount" %}</th>
                                         {% endif %}
-                                        {% if can_add_disbursement %}<th>
-                                            <span>{% trans "Notes" %} ({% trans "visible to staff and finance only" %})</span>
-                                        </th>{% endif %}
+                                        <th>{% trans "Notes" %}</th>
                                         <th>{% if can_add_disbursement %}{% endif %}</th>
                                     </tr>
                                 </thead>
@@ -80,7 +79,7 @@ <h3 class="text-sm font-semibold text-fg-muted">
                                         <tr>
                                             <td>{{ disbursement.date|date:"SHORT_DATE_FORMAT" }}</td>
                                             <td align="right">{{ disbursement.amount|trimmed_decimal }}</td>
-                                            {% if can_add_disbursement %}<td>{{ disbursement.notes|default:"-" }}</td>{% endif %}
+                                            <td>{{ disbursement.notes|default:"-" }}</td>
                                             <td>
                                                 {% if can_add_disbursement %}
                                                     <div class="flex gap-1">
diff --git a/hypha/apply/projects/tests/test_views.py b/hypha/apply/projects/tests/test_views.py
index e69975b6a4..47678cfb24 100644
--- a/hypha/apply/projects/tests/test_views.py
+++ b/hypha/apply/projects/tests/test_views.py
@@ -380,6 +380,18 @@ def test_applicant_can_see_lead(self):
         response = self.get_page(project, view_name="project_lead")
         self.assertContains(response, str(lead))
 
+    @override_settings(PROJECTS_PAYMENTS_FLOW="DISBURSEMENTS")
+    def test_applicant_can_see_disbursement_notes(self):
+        project = ProjectFactory(user=self.user)
+        DisbursementFactory(
+            contract__project=project,
+            amount=decimal.Decimal("251.47"),
+            notes="Prime tranche sent by wire.",
+        )
+        response = self.get_page(project)
+        self.assertContains(response, "Prime tranche sent by wire.")
+        self.assertNotContains(response, "visible to staff and finance only")
+
 
 class TestStaffProjectDetailView(BaseProjectDetailTestCase):
     user_factory = StaffFactory
@@ -405,6 +417,17 @@ def test_sibling_projects_listed_in_tab_dropdown(self):
         self.assertContains(response, "Hardware bucket")
         self.assertContains(response, "Travel bucket")
 
+    @override_settings(PROJECTS_PAYMENTS_FLOW="DISBURSEMENTS")
+    def test_staff_can_see_disbursement_notes(self):
+        project = ProjectFactory()
+        DisbursementFactory(
+            contract__project=project,
+            amount=decimal.Decimal("257.17"),
+            notes="Second tranche sent by wire.",
+        )
+        response = self.get_page(project)
+        self.assertContains(response, "Second tranche sent by wire.")
+
 
 class TestFinanceProjectDetailView(BaseProjectDetailTestCase):
     user_factory = FinanceFactory

From 061bebfc26149adccc82eea99ce9a65f4b40d444 Mon Sep 17 00:00:00 2001
From: LLM prompted by Jesse Bickel <jbickel+llm@opentechstrategies.com>
Date: Thu, 15 Oct 2026 19:21:40 -0500
Subject: [PATCH 15/18] Add all-disbursements admin table

Disbursements were only visible per project, with no way to see or
extract money movement across all projects. Add an admin-only ledger
at /apply/projects/disbursements/ (Staff Admin group or superuser):
one row per disbursement with contract requested/approved amounts
repeated, ISO 8601 disbursement-date and date-recorded columns,
date-range, currency and project-status filters, a numeric total when
a single currency is filtered, and filter-respecting CSV export. The
nav entry and page only exist under the DISBURSEMENTS payments flow.

GLM-5.3-Flash, an LLM supervised and prompted by @jbickel
---
 .../includes/table_filter_and_search.html     |  14 +-
 hypha/apply/projects/filters.py               |  66 ++++
 hypha/apply/projects/tables.py                |  99 ++++-
 .../disbursement_list.html                    |  32 ++
 hypha/apply/projects/tests/test_views.py      | 357 +++++++++++++++++-
 hypha/apply/projects/urls.py                  |   2 +
 hypha/apply/projects/utils.py                 | 136 +++++++
 hypha/apply/projects/views/__init__.py        |   2 +
 hypha/apply/projects/views/disbursement.py    |  78 +++-
 hypha/core/navigation.py                      |  48 ++-
 10 files changed, 810 insertions(+), 24 deletions(-)
 create mode 100644 hypha/apply/projects/templates/application_projects/disbursement_list.html

diff --git a/hypha/apply/funds/templates/funds/includes/table_filter_and_search.html b/hypha/apply/funds/templates/funds/includes/table_filter_and_search.html
index 40ab28b4bf..fd7c1be87f 100644
--- a/hypha/apply/funds/templates/funds/includes/table_filter_and_search.html
+++ b/hypha/apply/funds/templates/funds/includes/table_filter_and_search.html
@@ -1,7 +1,7 @@
 {% load django_tables2 i18n heroicons %}
 {% load querystrings table_tags static %}
 
-{% if heading or use_search %}
+{% if heading or use_search or include_export %}
     <div
         class="flex flex-wrap gap-4 justify-between items-center mb-2 w-full"
     >
@@ -62,6 +62,18 @@ <h2 class="section-header">{{ heading }}</h2>
                 {% heroicon_mini "arrow-down-tray" %}
             </a>
         {% endif %}
+
+        {% if include_export %}
+            <a
+                class="btn btn-square"
+                aria-label="{% trans 'Export as CSV' %}"
+                href="?{% if request.GET %}{{ request.GET.urlencode }}&{% endif %}format=csv"
+                data-tippy-content="{% trans 'Export as CSV' %}"
+            >
+                {% heroicon_mini "arrow-down-tray" aria_hidden=true %}
+            </a>
+        {% endif %}
+
     </div>
 {% endif %}
 
diff --git a/hypha/apply/projects/filters.py b/hypha/apply/projects/filters.py
index 0b13cebbbd..91ae28c0ab 100644
--- a/hypha/apply/projects/filters.py
+++ b/hypha/apply/projects/filters.py
@@ -10,13 +10,16 @@
     get_used_funds,
 )
 
+from .models.disbursement import Disbursement
 from .models.invoice import INVOICE_STATUS_CHOICES, Invoice
 from .models.project import (
     CLOSING,
     INVOICING_AND_REPORTING,
     PROJECT_STATUS_CHOICES,
+    Contract,
     Project,
 )
+from .reports.filters import DateRangeInputWidget
 
 User = get_user_model()
 
@@ -114,3 +117,66 @@ def filter_reporting(self, queryset, name, value):
             Q(outstanding_reports__lt=1) | Q(outstanding_reports__isnull=True),
             status__in=(INVOICING_AND_REPORTING, CLOSING),
         )
+
+
+NO_CURRENCY = "none"
+
+
+def get_currency_choices():
+    """Choices for the disbursement currency filter.
+
+    Currency lives on the related Contract, so the choices are the distinct
+    codes recorded on contracts, plus an explicit choice for rows whose
+    contract carries no code (they must remain filterable on their own so a
+    single-currency total stays reachable).
+
+    Called per FilterSet instantiation (DB-backed choices) and bound to the
+    filter's form field there, because django-filter's choice rendering does
+    not resolve callables.
+
+    """
+    codes = (
+        Contract.objects.filter(currency__isnull=False)
+        .values_list("currency", flat=True)
+        .distinct()
+        .order_by("currency")
+    )
+    return [(code, code) for code in codes] + [(NO_CURRENCY, _("No currency"))]
+
+
+class DisbursementListFilter(filters.FilterSet):
+    """Filters for the all-disbursements ledger. Minimal by design: date
+    range (the disbursement's own date, not the date it was entered),
+    currency and project status; more may be added on customer request.
+
+    """
+
+    date = filters.DateFromToRangeFilter(widget=DateRangeInputWidget)
+    currency = MultipleChoiceFilter(
+        label=_("Currency"),
+        method="filter_currency",
+    )
+    project_status = MultipleChoiceFilter(
+        field_name="contract__project__status",
+        label=_("Project status"),
+        choices=PROJECT_STATUS_CHOICES,
+    )
+
+    class Meta:
+        fields = ["date", "currency", "project_status"]
+        model = Disbursement
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.filters["currency"].field.choices = get_currency_choices()
+
+    def filter_currency(self, queryset, name, value):
+        codes = [code for code in value if code != NO_CURRENCY]
+        if NO_CURRENCY in value:
+            q = Q(contract__currency__isnull=True)
+            if codes:
+                q |= Q(contract__currency__in=codes)
+            return queryset.filter(q)
+        if codes:
+            return queryset.filter(contract__currency__in=codes)
+        return queryset
diff --git a/hypha/apply/projects/tables.py b/hypha/apply/projects/tables.py
index eaad7ba631..23a3e38b19 100644
--- a/hypha/apply/projects/tables.py
+++ b/hypha/apply/projects/tables.py
@@ -14,8 +14,8 @@
 from hypha.core.tables import RelativeTimeColumn
 
 from .forms.invoice import get_invoice_possible_transition_for_user
-from .models import Invoice, PAFApprovals, Project
-from .utils import get_project_title
+from .models import Disbursement, Invoice, PAFApprovals, Project
+from .utils import format_local_minute, format_trimmed_amount, get_project_title
 
 
 def render_invoice_actions(table, record):
@@ -331,3 +331,98 @@ class Meta:
         order_by = ("end_date",)
         template_name = "application_projects/tables/table.html"
         attrs = {"class": "table projects-table"}
+
+
+class AdminDisbursementListTable(tables.Table):
+    """Every disbursement across all projects, one row per disbursement.
+
+    The contract's requested/approved amounts repeat on each of its rows.
+    Amount columns carry no unit: currency is its own column so filtering to
+    a single currency guarantees a numeric total. The disbursement date
+    renders as ISO 8601; the entry date renders compactly in the active
+    timezone, rounded to the nearest minute (strict RFC 3339 stays in the
+    CSV export). The entry date carries a tooltip showing the edited time
+    when an edit rounds to a different minute, marked with an asterisk.
+
+    """
+
+    date = tables.Column(verbose_name=_("Disbursement date"))
+    created_at = tables.Column(verbose_name=_("Date recorded"))
+    project = tables.LinkColumn(
+        "funds:submissions:project",
+        text=lambda record: get_project_title(record.contract.project),
+        args=[A("contract__project__submission_id"), A("contract__project__pk")],
+        order_by=("contract__project__title",),
+        attrs={
+            "a": {
+                "class": "link link-hover text-h4 font-semibold break-words line-clamp-2 max-w-md",
+            },
+        },
+    )
+    contract = tables.LinkColumn(
+        "apply:projects:contract",
+        text=lambda record: f"#{record.contract_id}",
+        args=[A("contract__project__id"), A("contract_id")],
+        order_by=("contract_id",),
+    )
+    contract_requested = tables.Column(
+        verbose_name=_("Contract requested"),
+        accessor=A("contract__amount_requested"),
+        attrs={"th": {"class": "text-right"}, "td": {"class": "text-right"}},
+    )
+    contract_approved = tables.Column(
+        verbose_name=_("Contract approved"),
+        accessor=A("contract__amount_approved"),
+        attrs={"th": {"class": "text-right"}, "td": {"class": "text-right"}},
+    )
+    currency = tables.Column(
+        verbose_name=_("Currency"),
+        accessor=A("contract__currency"),
+        default="—",
+    )
+    amount = tables.Column(
+        verbose_name=_("Amount disbursed"),
+        attrs={"th": {"class": "text-right"}, "td": {"class": "text-right"}},
+    )
+    notes = tables.Column(attrs={"td": {"class": "max-w-md"}})
+
+    class Meta:
+        fields = [
+            "project",
+            "date",
+            "created_at",
+            "contract",
+            "contract_requested",
+            "contract_approved",
+            "currency",
+            "amount",
+            "notes",
+        ]
+        model = Disbursement
+        orderable = True
+        order_by = ("-date", "-created_at")
+        template_name = "application_projects/tables/table.html"
+        attrs = {"class": "table disbursements-table"}
+
+    def render_date(self, record):
+        return record.date.isoformat()
+
+    def render_created_at(self, record):
+        entry = format_local_minute(record.created_at)
+        edited = format_local_minute(record.updated_at)
+        if entry == edited:
+            return entry
+        return format_html(
+            '<span title="{}">{}*</span>',
+            _("Edited {}").format(edited),
+            entry,
+        )
+
+    def render_contract_requested(self, record):
+        return format_trimmed_amount(record.contract.amount_requested)
+
+    def render_contract_approved(self, record):
+        return format_trimmed_amount(record.contract.amount_approved)
+
+    def render_amount(self, record):
+        return format_trimmed_amount(record.amount)
diff --git a/hypha/apply/projects/templates/application_projects/disbursement_list.html b/hypha/apply/projects/templates/application_projects/disbursement_list.html
new file mode 100644
index 0000000000..c1f52fd470
--- /dev/null
+++ b/hypha/apply/projects/templates/application_projects/disbursement_list.html
@@ -0,0 +1,32 @@
+{% extends "base-apply.html" %}
+
+{% load render_table from django_tables2 %}
+{% load i18n static %}
+
+{% block title %}{% trans "Disbursements" %}{% endblock %}
+
+{% block hero %}
+    <c-hero>
+        <c-hero.header
+            title="{% trans 'All Disbursements' %} ({{ table.rows|length }})"
+        />
+    </c-hero>
+{% endblock %}
+
+{% block content %}
+    <div class="my-4">
+        {% include "funds/includes/table_filter_and_search.html" with include_export=True %}
+        {% if disbursements_total %}
+            <div class="flex justify-end items-center py-2 px-3 border rounded-t-box bg-base-200">
+                <span class="font-semibold">{% blocktrans count counter=table.rows|length %}Total disbursed ({{ counter }} record matching this filter){% plural %}Total disbursed ({{ counter }} records matching this filter){% endblocktrans %}: {{ disbursements_total }}</span>
+            </div>
+        {% endif %}
+        {% if table.rows %}
+            <div class="overflow-x-auto mb-4 border-b rounded-b-box border-x">
+                {% render_table table %}
+            </div>
+        {% else %}
+            <p class="p-4">{% trans "No Disbursements available." %}</p>
+        {% endif %}
+    </div>
+{% endblock content %}
diff --git a/hypha/apply/projects/tests/test_views.py b/hypha/apply/projects/tests/test_views.py
index 47678cfb24..3bf79485d7 100644
--- a/hypha/apply/projects/tests/test_views.py
+++ b/hypha/apply/projects/tests/test_views.py
@@ -1,9 +1,11 @@
+import csv
+import datetime
 import decimal
 import json
-from io import BytesIO
+from io import BytesIO, StringIO
 
 from django.conf import settings
-from django.contrib.auth.models import AnonymousUser
+from django.contrib.auth.models import AnonymousUser, Group
 from django.core.exceptions import PermissionDenied
 from django.test import RequestFactory, TestCase, override_settings
 from django.urls import reverse
@@ -15,7 +17,11 @@
     ApplicationSubmissionFactory,
     LabSubmissionFactory,
 )
-from hypha.apply.projects.utils import get_invoice_status_display_value
+from hypha.apply.projects.utils import (
+    format_local_minute,
+    get_invoice_status_display_value,
+)
+from hypha.apply.users.roles import TEAMADMIN_GROUP_NAME
 from hypha.apply.users.tests.factories import (
     ApplicantFactory,
     ApproverFactory,
@@ -30,6 +36,7 @@
 from hypha.home.factories import ApplySiteFactory
 
 from ..forms import SetPendingForm
+from ..models.disbursement import Disbursement
 from ..models.invoice import CHANGES_REQUESTED_BY_STAFF, DECLINED, SUBMITTED
 from ..models.project import (
     APPROVE,
@@ -1365,6 +1372,350 @@ def test_applicants_cannot_access_project_list_page(self):
         self.assertEqual(response.status_code, 403)
 
 
+@override_settings(PROJECTS_PAYMENTS_FLOW="DISBURSEMENTS")
+class TestDisbursementListView(TestCase):
+    """The admin ledger of every disbursement across all projects.
+
+    Admin-only (Staff Admin group or superuser) and gated on the
+    DISBURSEMENTS payments flow; the date filter targets the disbursement's
+    own date, not the date it was entered.
+
+    """
+
+    def make_staff_admin(self):
+        # Staff Admin requires the Staff group too (see the role's help text).
+        user = StaffFactory()
+        admin_group, _ = Group.objects.get_or_create(name=TEAMADMIN_GROUP_NAME)
+        user.groups.add(admin_group)
+        return user
+
+    def test_staff_admin_can_access(self):
+        DisbursementFactory()
+        self.client.force_login(self.make_staff_admin())
+
+        response = self.client.get(reverse("apply:projects:disbursements"), follow=True)
+        self.assertEqual(response.status_code, 200)
+
+    def test_superuser_can_access(self):
+        DisbursementFactory()
+        self.client.force_login(SuperUserFactory())
+
+        response = self.client.get(reverse("apply:projects:disbursements"), follow=True)
+        self.assertEqual(response.status_code, 200)
+
+    def test_staff_cannot_access(self):
+        DisbursementFactory()
+        self.client.force_login(StaffFactory())
+
+        response = self.client.get(reverse("apply:projects:disbursements"), follow=True)
+        self.assertEqual(response.status_code, 403)
+
+    def test_finance_cannot_access(self):
+        DisbursementFactory()
+        self.client.force_login(FinanceFactory())
+
+        response = self.client.get(reverse("apply:projects:disbursements"), follow=True)
+        self.assertEqual(response.status_code, 403)
+
+    def test_applicant_cannot_access(self):
+        DisbursementFactory()
+        self.client.force_login(UserFactory())
+
+        response = self.client.get(reverse("apply:projects:disbursements"), follow=True)
+        self.assertEqual(response.status_code, 403)
+
+    def test_not_found_when_payments_flow_is_not_disbursements(self):
+        DisbursementFactory()
+        self.client.force_login(SuperUserFactory())
+
+        with override_settings(PROJECTS_PAYMENTS_FLOW="INVOICING"):
+            response = self.client.get(
+                reverse("apply:projects:disbursements"), follow=True
+            )
+        self.assertEqual(response.status_code, 404)
+
+    def test_date_filter_uses_disbursement_date(self):
+        may_disbursement = DisbursementFactory(
+            date=datetime.date(2543, 5, 23), amount=decimal.Decimal("101.03")
+        )
+        june_disbursement = DisbursementFactory(
+            date=datetime.date(2543, 6, 19), amount=decimal.Decimal("97.01")
+        )
+        self.client.force_login(self.make_staff_admin())
+
+        response = self.client.get(
+            reverse("apply:projects:disbursements"),
+            {"date_after": "2543-06-01", "date_before": "2543-06-30"},
+        )
+        self.assertEqual(list(response.context["object_list"]), [june_disbursement])
+        self.assertNotIn(may_disbursement, response.context["object_list"])
+
+    def test_currency_filter(self):
+        usd_disbursement = DisbursementFactory(contract=ContractFactory(currency="USD"))
+        DisbursementFactory(contract=ContractFactory(currency="EUR"))
+        self.client.force_login(self.make_staff_admin())
+
+        response = self.client.get(
+            reverse("apply:projects:disbursements"), {"currency": "USD"}
+        )
+        self.assertEqual(list(response.context["object_list"]), [usd_disbursement])
+
+    def test_currency_filter_can_match_uncoded_contracts(self):
+        uncoded_disbursement = DisbursementFactory(contract=ContractFactory())
+        DisbursementFactory(contract=ContractFactory(currency="EUR"))
+        self.client.force_login(self.make_staff_admin())
+
+        response = self.client.get(
+            reverse("apply:projects:disbursements"), {"currency": "none"}
+        )
+        self.assertEqual(list(response.context["object_list"]), [uncoded_disbursement])
+
+    def test_project_status_filter(self):
+        contracting_disbursement = DisbursementFactory(
+            contract=ContractFactory(project=ProjectFactory(status=CONTRACTING)),
+        )
+        DisbursementFactory(
+            contract=ContractFactory(
+                project=ProjectFactory(status=INVOICING_AND_REPORTING)
+            ),
+        )
+        self.client.force_login(self.make_staff_admin())
+
+        response = self.client.get(
+            reverse("apply:projects:disbursements"), {"project_status": CONTRACTING}
+        )
+        self.assertEqual(
+            list(response.context["object_list"]), [contracting_disbursement]
+        )
+
+    def test_total_is_numeric_for_a_single_currency(self):
+        contract = ContractFactory(currency="USD")
+        DisbursementFactory(contract=contract, amount=decimal.Decimal("101.03"))
+        DisbursementFactory(contract=contract, amount=decimal.Decimal("97.01"))
+        self.client.force_login(self.make_staff_admin())
+
+        response = self.client.get(reverse("apply:projects:disbursements"))
+        self.assertEqual(response.context["disbursements_total"], "198.04 USD")
+        self.assertIn(
+            "Total disbursed (2 records matching this filter): 198.04 USD",
+            response.content.decode("utf-8"),
+        )
+
+    def test_total_elaborates_each_currency(self):
+        DisbursementFactory(
+            contract=ContractFactory(currency="USD"), amount=decimal.Decimal("499.03")
+        )
+        DisbursementFactory(
+            contract=ContractFactory(currency="MXN"), amount=decimal.Decimal("809.03")
+        )
+        DisbursementFactory(
+            contract=ContractFactory(currency="EUR"), amount=decimal.Decimal("1009.03")
+        )
+        self.client.force_login(self.make_staff_admin())
+
+        response = self.client.get(reverse("apply:projects:disbursements"))
+        self.assertEqual(
+            response.context["disbursements_total"],
+            "1009.03 EUR, 809.03 MXN, 499.03 USD",
+        )
+        self.assertIn(
+            "Total disbursed (3 records matching this filter): "
+            "1009.03 EUR, 809.03 MXN, 499.03 USD",
+            response.content.decode("utf-8"),
+        )
+
+    def test_total_lists_uncoded_amounts_last(self):
+        coded = ContractFactory(currency="USD")
+        DisbursementFactory(contract=coded, amount=decimal.Decimal("499.03"))
+        uncoded = ContractFactory()
+        DisbursementFactory(contract=uncoded, amount=decimal.Decimal("251.03"))
+        self.client.force_login(self.make_staff_admin())
+
+        response = self.client.get(reverse("apply:projects:disbursements"))
+        self.assertEqual(response.context["disbursements_total"], "499.03 USD, 251.03")
+
+    def test_total_is_numeric_without_code_when_no_currency(self):
+        contract = ContractFactory()
+        DisbursementFactory(contract=contract, amount=decimal.Decimal("101.03"))
+        DisbursementFactory(contract=contract, amount=decimal.Decimal("97.01"))
+        self.client.force_login(self.make_staff_admin())
+
+        response = self.client.get(reverse("apply:projects:disbursements"))
+        self.assertEqual(response.context["disbursements_total"], "198.04")
+        self.assertIn(
+            "Total disbursed (2 records matching this filter): 198.04",
+            response.content.decode("utf-8"),
+        )
+
+    def test_csv_export_includes_iso_dates_and_amounts(self):
+        contract = ContractFactory(
+            currency="USD",
+            amount_requested=decimal.Decimal("250.5"),
+            amount_approved=decimal.Decimal("249.99"),
+        )
+        DisbursementFactory(
+            contract=contract,
+            amount=decimal.Decimal("101.03"),
+            date=datetime.date(2543, 5, 23),
+            notes="wire #d7b9",
+        )
+        self.client.force_login(self.make_staff_admin())
+
+        response = self.client.get(
+            reverse("apply:projects:disbursements"), {"format": "csv"}
+        )
+        self.assertEqual(response.headers["Content-Type"], "text/csv")
+        content = response.content.decode("utf-8")
+        self.assertIn("2543-05-23", content)
+        self.assertIn(f"#{contract.pk}", content)
+        self.assertIn("250.50", content)
+        self.assertIn("101.03", content)
+        self.assertIn("USD", content)
+        self.assertIn("wire #d7b9", content)
+
+    def test_csv_export_respects_filters(self):
+        kept = DisbursementFactory(contract=ContractFactory(currency="USD"))
+        excluded = DisbursementFactory(contract=ContractFactory(currency="EUR"))
+        self.client.force_login(self.make_staff_admin())
+
+        response = self.client.get(
+            reverse("apply:projects:disbursements"),
+            {"currency": "USD", "format": "csv"},
+        )
+        content = response.content.decode("utf-8")
+        self.assertIn(f"#{kept.contract.pk}", content)
+        self.assertNotIn(f"#{excluded.contract.pk}", content)
+
+    def test_table_leads_with_project_then_dates(self):
+        DisbursementFactory()
+        self.client.force_login(self.make_staff_admin())
+
+        response = self.client.get(reverse("apply:projects:disbursements"))
+        self.assertEqual(
+            list(response.context["table"].columns.names())[:3],
+            ["project", "date", "created_at"],
+        )
+        self.assertIn("Amount disbursed", response.content.decode("utf-8"))
+
+    def test_entry_date_renders_minute_precision_locally(self):
+        DisbursementFactory()
+        self.client.force_login(self.make_staff_admin())
+
+        response = self.client.get(reverse("apply:projects:disbursements"))
+        self.assertRegex(
+            response.content.decode("utf-8"), r"\d{4}-\d{2}-\d{2} \d{2}:\d{2}(?![:\d])"
+        )
+
+    def test_entry_date_tooltip_shows_edit_when_minutes_differ(self):
+        disbursement = DisbursementFactory()
+        # queryset.update bypasses auto_now, so both timestamps can be pinned.
+        Disbursement.objects.filter(pk=disbursement.pk).update(
+            created_at=datetime.datetime(
+                2543, 5, 23, 14, 32, 0, tzinfo=datetime.timezone.utc
+            ),
+            updated_at=datetime.datetime(
+                2543, 5, 23, 14, 40, 0, tzinfo=datetime.timezone.utc
+            ),
+        )
+        self.client.force_login(self.make_staff_admin())
+
+        response = self.client.get(reverse("apply:projects:disbursements"))
+        content = response.content.decode("utf-8")
+        self.assertIn("2543-05-23 14:32*", content)
+        self.assertIn('title="Edited 2543-05-23 14:40"', content)
+
+    def test_entry_date_has_no_tooltip_when_minutes_match(self):
+        DisbursementFactory()
+        self.client.force_login(self.make_staff_admin())
+
+        response = self.client.get(reverse("apply:projects:disbursements"))
+        self.assertNotIn('title="Edited', response.content.decode("utf-8"))
+
+    def test_empty_state_shows_message(self):
+        self.client.force_login(self.make_staff_admin())
+
+        response = self.client.get(reverse("apply:projects:disbursements"))
+        content = response.content.decode("utf-8")
+        self.assertIn("No Disbursements available.", content)
+        self.assertNotIn("disbursements-table", content)
+
+    def test_export_link_visible(self):
+        DisbursementFactory()
+        self.client.force_login(self.make_staff_admin())
+
+        response = self.client.get(reverse("apply:projects:disbursements"))
+        self.assertIn(
+            'data-tippy-content="Export as CSV"', response.content.decode("utf-8")
+        )
+
+    def test_csv_export_follows_table_sort(self):
+        DisbursementFactory(
+            date=datetime.date(2543, 6, 19), amount=decimal.Decimal("101.03")
+        )
+        DisbursementFactory(
+            date=datetime.date(2543, 5, 23), amount=decimal.Decimal("97.01")
+        )
+        self.client.force_login(self.make_staff_admin())
+
+        response = self.client.get(
+            reverse("apply:projects:disbursements"), {"format": "csv"}
+        )
+        content = response.content.decode("utf-8")
+        self.assertLess(content.index("101.03"), content.index("97.01"))
+
+        response = self.client.get(
+            reverse("apply:projects:disbursements"), {"sort": "amount", "format": "csv"}
+        )
+        content = response.content.decode("utf-8")
+        self.assertLess(content.index("97.01"), content.index("101.03"))
+
+    def test_format_local_minute_rounds_to_nearest_minute(self):
+        self.assertEqual(
+            format_local_minute(datetime.datetime(2543, 5, 23, 14, 32, 29)),
+            "2543-05-23 14:32",
+        )
+        self.assertEqual(
+            format_local_minute(datetime.datetime(2543, 5, 23, 14, 32, 31)),
+            "2543-05-23 14:33",
+        )
+        self.assertEqual(
+            format_local_minute(
+                datetime.datetime(2543, 5, 23, 14, 32, 59, tzinfo=datetime.timezone.utc)
+            ),
+            "2543-05-23 14:33",
+        )
+
+    def test_csv_leads_with_submission_number_then_project(self):
+        disbursement = DisbursementFactory()
+        project = disbursement.contract.project
+        self.client.force_login(self.make_staff_admin())
+
+        response = self.client.get(
+            reverse("apply:projects:disbursements"), {"format": "csv"}
+        )
+        rows = list(csv.reader(StringIO(response.content.decode("utf-8"))))
+        self.assertEqual(
+            rows[0],
+            [
+                "Submission #",
+                "Project",
+                "Disbursement date",
+                "Date recorded",
+                "Updated at",
+                "Contract",
+                "Contract requested",
+                "Contract approved",
+                "Currency",
+                "Amount disbursed",
+                "Notes",
+            ],
+        )
+        self.assertEqual(rows[1][:2], [str(project.submission_id), project.title])
+        self.assertEqual(rows[1][2], "2543-05-23")
+        self.assertIn("T", rows[1][3])
+        self.assertIn("T", rows[1][4])
+
+
 class TestStaffProjectDetailDownloadView(BaseViewTestCase):
     base_view_name = "download"
     url_name = "funds:projects:{}"
diff --git a/hypha/apply/projects/urls.py b/hypha/apply/projects/urls.py
index 1f71e40e51..1d81461c44 100644
--- a/hypha/apply/projects/urls.py
+++ b/hypha/apply/projects/urls.py
@@ -21,6 +21,7 @@
     CreateInvoiceView,
     DeleteDisbursementView,
     DeleteInvoiceView,
+    DisbursementListView,
     EditDisbursementView,
     EditInvoiceView,
     InvoiceListView,
@@ -71,6 +72,7 @@
     path("all/", ProjectListView.as_view(), name="all"),
     path("reports/", include("hypha.apply.projects.reports.urls"), name="reports"),
     path("invoices/", InvoiceListView.as_view(), name="invoices"),
+    path("disbursements/", DisbursementListView.as_view(), name="disbursements"),
     path(
         "invoices/export-status/",
         invoice_export_status,
diff --git a/hypha/apply/projects/utils.py b/hypha/apply/projects/utils.py
index 8520ababeb..5cf4e5baf8 100644
--- a/hypha/apply/projects/utils.py
+++ b/hypha/apply/projects/utils.py
@@ -1,6 +1,8 @@
 import csv
 import io
+from datetime import timedelta
 
+from django.utils import timezone
 from django.utils.html import format_html
 from django.utils.translation import gettext_lazy as _
 from django_file_form.uploaded_file import PlaceholderUploadedFile
@@ -185,3 +187,137 @@ def get_placeholder_file(initial_file):
         PlaceholderUploadedFile(f.filename, size=f.size, file_id=f.name)
         for f in initial_file
     ]
+
+
+def export_projects_to_csv(projects_list, csv_stream):
+    header_row = [
+        "Submission #",
+        "Title",
+        "Organization",
+        "Status",
+        "Lead",
+        "Fund",
+        "Round",
+        "Reporting",
+        "Last payment request",
+        "End Date",
+    ]
+    data_list = []
+
+    for project in projects_list:
+        reporting_status = ""
+        if hasattr(project, "report_config"):
+            if project.report_config.is_up_to_date():
+                reporting_status = "Up to date"
+            else:
+                reporting_status = (
+                    f"{project.report_config.outstanding_reports()} outstanding"
+                )
+
+        values = {
+            header_row[0]: project.submission.id,
+            header_row[1]: project.title,
+            header_row[2]: project.submission.form_data.get("organization_name", ""),
+            header_row[3]: project.get_status_display(),
+            header_row[4]: project.lead,
+            header_row[5]: project.submission.page,
+            header_row[6]: project.submission.round,
+            header_row[7]: reporting_status,
+            header_row[8]: project.last_payment_request,
+            header_row[9]: project.end_date,
+        }
+        data_list.append(values)
+    # Columns will be in header_row order with values matched by key in data_list (order within each notwithstanding).
+    writer = csv.DictWriter(csv_stream, fieldnames=header_row, restval="")
+    writer.writeheader()
+    for data in data_list:
+        writer.writerow(data)
+
+
+def format_trimmed_amount(value):
+    """Trimmed decimal string for table/CSV amounts; em dash when absent.
+
+    Mirrors the amount input so ledger values never gain or lose precision.
+
+    """
+    if value is None:
+        return "—"
+    # Lazy import: forms.project depends on modules that import this file.
+    from .forms.project import TrimmedDecimalInput
+
+    return TrimmedDecimalInput().format_value(value)
+
+
+def format_local_minute(value):
+    """Compact table display for entry datetimes: the active timezone (the
+    user's zone when a deployment activates one, else the server's), rounded
+    to the nearest minute, space separator, no zone suffix.
+
+    The CSV export keeps strict RFC 3339 (T separator, full precision).
+
+    """
+    if timezone.is_aware(value):
+        rounded = timezone.localtime(value).replace(tzinfo=None)
+    else:
+        rounded = value.replace(tzinfo=None)
+    if rounded.second >= 30:
+        rounded += timedelta(minutes=1)
+    return rounded.replace(second=0, microsecond=0).strftime("%Y-%m-%d %H:%M")
+
+
+def export_disbursements_to_csv(disbursements, csv_stream):
+    """Export disbursements (typically the filtered ledger queryset) to CSV.
+
+    One row per disbursement; the contract's requested/approved amounts
+    repeat on each of its rows, mirroring the table. The row leads with
+    submission # and project. Amounts are bare and trimmed with the currency
+    in its own column; dates are strict RFC 3339 (T separator, full
+    precision), including the full updated_at; absent contract amounts
+    export as empty strings.
+
+    """
+    header_row = [
+        "Submission #",
+        "Project",
+        "Disbursement date",
+        "Date recorded",
+        "Updated at",
+        "Contract",
+        "Contract requested",
+        "Contract approved",
+        "Currency",
+        "Amount disbursed",
+        "Notes",
+    ]
+    data_list = []
+
+    for disbursement in disbursements:
+        contract = disbursement.contract
+        project = contract.project
+        values = {
+            header_row[0]: project.submission_id,
+            header_row[1]: project.title,
+            header_row[2]: disbursement.date.isoformat(),
+            header_row[3]: disbursement.created_at.isoformat(),
+            header_row[4]: disbursement.updated_at.isoformat(),
+            header_row[5]: f"#{contract.pk}",
+            header_row[6]: (
+                format_trimmed_amount(contract.amount_requested)
+                if contract.amount_requested is not None
+                else ""
+            ),
+            header_row[7]: (
+                format_trimmed_amount(contract.amount_approved)
+                if contract.amount_approved is not None
+                else ""
+            ),
+            header_row[8]: contract.currency or "",
+            header_row[9]: format_trimmed_amount(disbursement.amount),
+            header_row[10]: disbursement.notes,
+        }
+        data_list.append(values)
+    # Columns will be in header_row order with values matched by key in data_list (order within each notwithstanding).
+    writer = csv.DictWriter(csv_stream, fieldnames=header_row, restval="")
+    writer.writeheader()
+    for data in data_list:
+        writer.writerow(data)
diff --git a/hypha/apply/projects/views/__init__.py b/hypha/apply/projects/views/__init__.py
index 0b8b3b7593..08fe9d06d0 100644
--- a/hypha/apply/projects/views/__init__.py
+++ b/hypha/apply/projects/views/__init__.py
@@ -1,6 +1,7 @@
 from .disbursement import (
     CreateDisbursementView,
     DeleteDisbursementView,
+    DisbursementListView,
     EditDisbursementView,
 )
 from .invoice import (
@@ -126,4 +127,5 @@
     "CreateDisbursementView",
     "EditDisbursementView",
     "DeleteDisbursementView",
+    "DisbursementListView",
 ]
diff --git a/hypha/apply/projects/views/disbursement.py b/hypha/apply/projects/views/disbursement.py
index 085f1017bd..1acc8ac64e 100644
--- a/hypha/apply/projects/views/disbursement.py
+++ b/hypha/apply/projects/views/disbursement.py
@@ -7,18 +7,30 @@
 
 """
 
+from django.conf import settings
 from django.contrib.messages.views import SuccessMessageMixin
 from django.db import transaction
+from django.db.models import F, Sum
+from django.http import Http404, HttpResponse
 from django.shortcuts import get_object_or_404
 from django.utils.decorators import method_decorator
 from django.utils.translation import gettext as _
 from django.views.generic import CreateView, DeleteView, UpdateView
+from django_filters.views import FilterView
+from django_tables2 import SingleTableMixin
 
 from hypha.apply.activity.messaging import MESSAGES, messenger
-from hypha.apply.users.decorators import staff_or_finance_required
+from hypha.apply.users.decorators import (
+    staff_admin_required,
+    staff_or_finance_required,
+)
 
+from ..filters import DisbursementListFilter
 from ..forms import DisbursementForm
 from ..models import Disbursement, Project
+from ..payments import PaymentsFlow
+from ..tables import AdminDisbursementListTable
+from ..utils import export_disbursements_to_csv, format_trimmed_amount
 
 
 @method_decorator(staff_or_finance_required, name="dispatch")
@@ -148,3 +160,67 @@ def form_valid(self, form):
 
     def get_success_url(self):
         return self.project.get_absolute_url()
+
+
+@method_decorator(staff_admin_required, name="dispatch")
+class DisbursementListView(SingleTableMixin, FilterView):
+    """The admin ledger: every disbursement across every project.
+
+    Admin-only (Staff Admin group or superuser) because it exposes every
+    project's money movement in one place. Gated on the DISBURSEMENTS
+    payments flow, like the per-project disbursements section. The table
+    filters on the disbursement's own date, not the date it was entered, so
+    financial reports can be generated for particular periods; ``?format=csv``
+    exports the filtered rows.
+
+    """
+
+    filterset_class = DisbursementListFilter
+    queryset = Disbursement.objects.select_related("contract__project__submission")
+    table_class = AdminDisbursementListTable
+    template_name = "application_projects/disbursement_list.html"
+
+    def dispatch(self, request, *args, **kwargs):
+        if settings.PROJECTS_PAYMENTS_FLOW != PaymentsFlow.DISBURSEMENTS:
+            raise Http404("Disbursements are not the active payments flow")
+        return super().dispatch(request, *args, **kwargs)
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        # The CSV response discards page context, so skip the totals query.
+        if self.request.GET.get("format") != "csv":
+            context["disbursements_total"] = self.get_total_display()
+        return context
+
+    def get_total_display(self):
+        """Amount/currency pairs summed over the filtered rows, one pair per
+        currency (uncoded rows form their own pair without a code), e.g.
+        "499.03 USD, 809.03 MXN". Value only: the template renders it as
+        "Total disbursed (N records matching this filter)" between the
+        filters and the table. Table rows and per-project displays keep a
+        single numeric value ("Multiple currencies" when needed); only this
+        page summary elaborates every pair.
+
+        """
+        currency_groups = (
+            self.object_list.order_by()
+            .values("contract__currency")
+            .annotate(total=Sum("amount"))
+            .order_by(F("contract__currency").asc(nulls_last=True))
+        )
+        pairs = []
+        for group in currency_groups:
+            amount = format_trimmed_amount(group["total"])
+            currency = group["contract__currency"]
+            pairs.append(f"{amount} {currency}" if currency else amount)
+        return ", ".join(pairs)
+
+    def render_to_response(self, context, **response_kwargs):
+        if self.request.GET.get("format") == "csv":
+            response = HttpResponse(content_type="text/csv")
+            response["Content-Disposition"] = 'attachment; filename="disbursements.csv"'
+            # table.data.data carries the table's applied ordering (e.g.
+            # ?sort=), so the export matches what the user sees.
+            export_disbursements_to_csv(context["table"].data.data, response)
+            return response
+        return super().render_to_response(context, **response_kwargs)
diff --git a/hypha/core/navigation.py b/hypha/core/navigation.py
index ebd84a65eb..9fbcbc172a 100644
--- a/hypha/core/navigation.py
+++ b/hypha/core/navigation.py
@@ -8,6 +8,8 @@
 from django.urls import reverse_lazy
 from django.utils.translation import gettext_lazy as _
 
+from hypha.apply.projects.payments import PaymentsFlow
+
 logger = logging.getLogger(__name__)
 
 
@@ -47,6 +49,34 @@ def _calculate_is_active(
 
 
 def get_primary_navigation_items(request):
+    projects_sub_items = [
+        {
+            "title": _("All Projects"),
+            "url": reverse_lazy("apply:projects:all"),
+            "permission_method": "hypha.apply.users.decorators.is_apply_staff_or_finance_or_contracting_or_reviewer",
+        },
+        {
+            "title": _("Reporting"),
+            "url": reverse_lazy("apply:projects:reporting"),
+            "permission_method": "hypha.apply.users.decorators.is_apply_staff_or_finance_or_contracting_or_reviewer",
+        },
+        {
+            "title": _("Reports"),
+            "url": reverse_lazy("apply:projects:reports:submitted"),
+            "permission_method": "hypha.apply.users.decorators.is_apply_staff_or_finance_or_contracting_or_reviewer",
+        },
+    ]
+    # The disbursements ledger exists only under the DISBURSEMENTS payments
+    # flow and is admin-only, like the page itself.
+    if settings.PROJECTS_PAYMENTS_FLOW == PaymentsFlow.DISBURSEMENTS:
+        projects_sub_items.append(
+            {
+                "title": _("All Disbursements"),
+                "url": reverse_lazy("apply:projects:disbursements"),
+                "permission_method": "hypha.apply.users.decorators.is_apply_staff_admin",
+            }
+        )
+
     DEFAULT_NAV_ITEMS = [
         {
             "title": _("My Dashboard"),
@@ -97,23 +127,7 @@ def get_primary_navigation_items(request):
             "url": reverse_lazy("apply:projects:all"),
             "permission_method": "hypha.apply.users.decorators.is_apply_staff_or_finance_or_contracting",
             "active_url_regex": r"(.*)/projects?/",
-            "sub_items": [
-                {
-                    "title": _("All Projects"),
-                    "url": reverse_lazy("apply:projects:all"),
-                    "permission_method": "hypha.apply.users.decorators.is_apply_staff_or_finance_or_contracting",
-                },
-                {
-                    "title": _("Invoices"),
-                    "url": reverse_lazy("apply:projects:invoices"),
-                    "permission_method": "hypha.apply.users.decorators.is_apply_staff_or_finance",
-                },
-                {
-                    "title": _("Reports"),
-                    "url": reverse_lazy("apply:projects:reports:submitted"),
-                    "permission_method": "hypha.apply.users.decorators.is_apply_staff_or_finance",
-                },
-            ],
+            "sub_items": projects_sub_items,
         },
     ]
 

From 4feea191c183918d7c3f158ad7afcd2616508e1a Mon Sep 17 00:00:00 2001
From: LLM prompted by Jesse Bickel <jbickel+llm@opentechstrategies.com>
Date: Thu, 22 Oct 2026 14:44:58 -0500
Subject: [PATCH 16/18] Improve Disbursements UI labels and links

The per-contract Disbursements section gave weak labels: the
contract link read just "#65", the disbursement list had no heading,
and the first column said "Date".

The contract link now reads "Contract #65", the list carries an
"N Disbursements:" count heading under each contract, and the first
column is "Disbursement date", matching the All Disbursements table.

GLM-5.3-Flash, an LLM supervised and prompted by @jbickel
---
 .../includes/disbursements.html               | 12 +++++--
 hypha/apply/projects/tests/test_views.py      | 33 +++++++++++++++++++
 2 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/hypha/apply/projects/templates/application_projects/includes/disbursements.html b/hypha/apply/projects/templates/application_projects/includes/disbursements.html
index 1f41bcc9af..b8e0429276 100644
--- a/hypha/apply/projects/templates/application_projects/includes/disbursements.html
+++ b/hypha/apply/projects/templates/application_projects/includes/disbursements.html
@@ -39,8 +39,7 @@ <h2 class="card-title">{% trans "Contracts and Disbursements" %}</h2>
                 <div class="mb-4 last:mb-0">
                     <div class="flex justify-between items-center mb-1">
                         <h3 class="text-sm font-semibold text-fg-muted">
-                            {% trans "Contract" %}
-                            <a class="link link-hover" href="{{ contract.get_absolute_url }}">#{{ contract.pk }}</a>
+                            <a class="link link-hover" href="{{ contract.get_absolute_url }}">{% trans "Contract" %} #{{ contract.pk }}</a>
                             {% if contract.amount_approved is not None %}
                                 <span class="text-fg-muted/80">
                                     ({% trans "Approved:" %} {{ contract.amount_approved|trimmed_decimal }} {{ contract.currency }})
@@ -60,11 +59,18 @@ <h3 class="text-sm font-semibold text-fg-muted">
                     </div>
 
                     {% if contract.disbursements.exists %}
+                        <h4 class="mb-1 text-sm font-semibold text-fg-muted">
+                            {% blocktrans count counter=contract.disbursements.count trimmed %}
+                                {{ counter }} Disbursement:
+                            {% plural %}
+                                {{ counter }} Disbursements:
+                            {% endblocktrans %}
+                        </h4>
                         <div class="overflow-x-auto">
                             <table class="table">
                                 <thead>
                                     <tr>
-                                        <th>{% trans "Date" %}</th>
+                                        <th>{% trans "Disbursement date" %}</th>
                                         {% if contract.currency is not None %}
                                             <th>{% trans "Amount" %} ({{ contract.currency }})</th>
                                         {% else %}
diff --git a/hypha/apply/projects/tests/test_views.py b/hypha/apply/projects/tests/test_views.py
index 3bf79485d7..c58dca821c 100644
--- a/hypha/apply/projects/tests/test_views.py
+++ b/hypha/apply/projects/tests/test_views.py
@@ -2206,6 +2206,39 @@ def test_section_header_is_contracts_and_disbursements(self):
         response = self.get_page(project)
         self.assertContains(response, "Contracts and Disbursements")
 
+    def test_contract_link_includes_contract_word(self):
+        # The link text reads "Contract #65", not just "#65", so the
+        # destination is clear out of context (screen readers, copy-paste).
+        project = ProjectFactory()
+        contract = ContractFactory(project=project)
+        response = self.get_page(project)
+        self.assertContains(response, f"Contract #{contract.pk}")
+
+    def test_disbursements_labelled_with_count(self):
+        project = ProjectFactory()
+        contract = ContractFactory(project=project)
+        DisbursementFactory(contract=contract)
+        DisbursementFactory(contract=contract)
+        response = self.get_page(project)
+        self.assertContains(response, "2 Disbursements:")
+
+    def test_single_disbursement_label_is_singular(self):
+        project = ProjectFactory()
+        contract = ContractFactory(project=project)
+        DisbursementFactory(contract=contract)
+        response = self.get_page(project)
+        self.assertContains(response, "1 Disbursement:")
+        self.assertNotContains(response, "1 Disbursements:")
+
+    def test_date_column_is_disbursement_date(self):
+        # The per-contract table matches the All Disbursements table, where
+        # the first column is likewise "Disbursement date".
+        project = ProjectFactory()
+        contract = ContractFactory(project=project)
+        DisbursementFactory(contract=contract)
+        response = self.get_page(project)
+        self.assertContains(response, "Disbursement date")
+
     def test_contract_approved_amount_shown(self):
         from decimal import Decimal
 

From 3dc17066c48a7d25e978a7c2ea4cf2f8347c7b0b Mon Sep 17 00:00:00 2001
From: LLM prompted by Jesse Bickel <jbickel+llm@opentechstrategies.com>
Date: Tue, 13 Oct 2026 09:43:22 -0500
Subject: [PATCH 17/18] Show contracts total on projects table

Staff had to open each project to see its contract totals. The All
Projects table now shows a contracts total per project with its
currency code, and shows "Multiple currencies" instead of a
cross-currency sum when the amounts span more than one currency.
Projects with no approved amount entered show an em dash rather than
0.00, keeping absence distinct from a genuine zero. The column is
gated on the DISBURSEMENTS payments flow, where contracts carry
amounts at all.

GLM-5.3-Flash, an LLM supervised and prompted by @jbickel
---
 docs/user-guides/LEDGER_NOTES.md          |  17 ++
 hypha/apply/dashboard/tests/test_views.py |  17 +-
 hypha/apply/projects/forms/project.py     |  41 +--
 hypha/apply/projects/models/project.py    |  49 +++-
 hypha/apply/projects/tables.py            |  43 ++-
 hypha/apply/projects/tests/test_views.py  | 313 ++++++++++++++++++++++
 hypha/apply/projects/utils.py             |  57 +++-
 hypha/apply/projects/views/project.py     |  16 +-
 8 files changed, 523 insertions(+), 30 deletions(-)

diff --git a/docs/user-guides/LEDGER_NOTES.md b/docs/user-guides/LEDGER_NOTES.md
index 448aad10e8..a996ccb9fe 100644
--- a/docs/user-guides/LEDGER_NOTES.md
+++ b/docs/user-guides/LEDGER_NOTES.md
@@ -6,3 +6,20 @@ Negative amounts are allowed in case the grantee needs to repay.
 Wide currency amounts are allowed in cases of strange or inflated currencies.
 The currency code is left optional and relatively unconstrained in case of new
 or unofficial currencies.
+
+## Contracts total on the All Projects table and dashboards
+
+The All Projects table at `apply/projects/all/` and the projects tables on
+the staff, contracting, and applicant dashboards show a "Contracts total"
+column with the sum of the approved amounts recorded on each project's
+contracts, followed by the currency code when all of those amounts share one
+currency code. When a project's approved amounts do not share a single
+currency code — including coded amounts alongside uncoded amounts — the
+column shows "Multiple currencies" instead of a total. A project with no
+approved amount entered shows "—" because absence is not zero; a sum that
+genuinely totals zero shows as 0.00. The All Projects table's CSV export
+shows the same values with locale-neutral number formatting.
+
+The column is only present when `PROJECTS_PAYMENTS_FLOW` is
+`DISBURSEMENTS`; in the `INVOICING` and `DISABLED` flows it is neither
+computed nor shown (table, dashboards, CSV).
diff --git a/hypha/apply/dashboard/tests/test_views.py b/hypha/apply/dashboard/tests/test_views.py
index f2a9b2b94d..c50c4d2c88 100644
--- a/hypha/apply/dashboard/tests/test_views.py
+++ b/hypha/apply/dashboard/tests/test_views.py
@@ -1,4 +1,6 @@
-from django.test import TestCase
+import decimal
+
+from django.test import TestCase, override_settings
 from django.urls import reverse
 
 from hypha.apply.funds.tests.factories import (
@@ -175,6 +177,19 @@ def test_unassigned_staff_cant_see_projects_awaiting_review_stats_or_table(self)
         response = self.get_page()
         self.assertNotContains(response, "Projects awaiting approval")
 
+    @override_settings(PROJECTS_PAYMENTS_FLOW="DISBURSEMENTS")
+    def test_projects_table_shows_contracts_total(self):
+        project = ProjectFactory(lead=self.user, status=INVOICING_AND_REPORTING)
+        ContractFactory(
+            project=project, currency="XTS", amount_approved=decimal.Decimal("421")
+        )
+        ContractFactory(
+            project=project, currency="XTS", amount_approved=decimal.Decimal("571")
+        )
+
+        response = self.get_page()
+        self.assertContains(response, "992.00 XTS")
+
 
 class TestStaffDashboardWithWagtailAdminAccess(BaseViewTestCase):
     user_factory = StaffWithWagtailAdminAccessFactory
diff --git a/hypha/apply/projects/forms/project.py b/hypha/apply/projects/forms/project.py
index 0c784099d7..912b3c8ee4 100644
--- a/hypha/apply/projects/forms/project.py
+++ b/hypha/apply/projects/forms/project.py
@@ -118,6 +118,29 @@ def __init__(self, *args, **kwargs):
         )
 
 
+def trimmed_decimal_string(value):
+    """Dot-decimal string with a minimum of two decimal places.
+
+    Preserves extra precision. Returns None for None or unparsable
+    values.
+    """
+    if value is None:
+        return None
+    try:
+        s = format(Decimal(str(value)), "f")
+    except (InvalidOperation, ValueError):
+        return None
+    if "." in s:
+        int_part, frac_part = s.split(".")
+        # 1. Remove trailing zeros
+        frac_part = frac_part.rstrip("0")
+        # 2. Pad to minimum 2 decimal places
+        if len(frac_part) < 2:
+            frac_part = frac_part.ljust(2, "0")
+        return f"{int_part}.{frac_part}"
+    return f"{s}.00"
+
+
 class TrimmedDecimalInput(NumberInput):
     """
     Renders Decimal values with a minimum of 2 decimal places,
@@ -127,22 +150,10 @@ class TrimmedDecimalInput(NumberInput):
     localize = True
 
     def format_value(self, value):
-        if value is None:
-            return ""
-        try:
-            s = format(Decimal(str(value)), "f")
-        except (InvalidOperation, ValueError):
+        s = trimmed_decimal_string(value)
+        if s is None:
             return ""
-        if "." in s:
-            int_part, frac_part = s.split(".")
-            # 1. Remove trailing zeros
-            frac_part = frac_part.rstrip("0")
-            # 2. Pad to minimum 2 decimal places
-            if len(frac_part) < 2:
-                frac_part = frac_part.ljust(2, "0")
-            formatted = f"{int_part}.{frac_part}"
-            return number_format(formatted)
-        return number_format(f"{s}.00")
+        return number_format(s)
 
 
 class ApproveContractForm(forms.Form):
diff --git a/hypha/apply/projects/models/project.py b/hypha/apply/projects/models/project.py
index df40ebc78c..edca8b4835 100644
--- a/hypha/apply/projects/models/project.py
+++ b/hypha/apply/projects/models/project.py
@@ -45,6 +45,7 @@
 
 from ..admin_forms import ContractDocumentCategoryAdminForm
 from ..blocks import ProjectFormCustomFormFieldsBlock
+from ..payments import PaymentsFlow
 
 logger = logging.getLogger(__name__)
 
@@ -151,6 +152,49 @@ def with_last_payment(self):
             ),
         )
 
+    def with_contract_approved_total(self):
+        # A missing currency code is its own group so uncoded approved
+        # amounts never blend into a coded total.
+        # Subqueries, not joined aggregates: for_table() already aggregates
+        # over the invoices join, and combining aggregations over two
+        # one-to-many joins in one query multiplies both results (fan-out).
+        approved_contracts = Contract.objects.filter(
+            project=OuterRef("pk"),
+            amount_approved__isnull=False,
+        )
+        return self.annotate(
+            contract_approved_currency_count=Coalesce(
+                Subquery(
+                    approved_contracts.order_by()
+                    .values("project")
+                    .annotate(
+                        currency_count=Count(
+                            Coalesce("currency", Value("-")),
+                            distinct=True,
+                        ),
+                    )
+                    .values("currency_count"),
+                ),
+                Value(0),
+                output_field=models.IntegerField(),
+            ),
+            contract_approved_currency_code=Subquery(
+                approved_contracts.order_by("currency").values("currency")[:1],
+                output_field=models.CharField(max_length=3),
+            ),
+        ).annotate(
+            contract_approved_total=Case(
+                When(contract_approved_currency_count__gt=1, then=Value(None)),
+                default=Subquery(
+                    approved_contracts.order_by()
+                    .values("project")
+                    .annotate(total=Sum("amount_approved"))
+                    .values("total"),
+                ),
+                output_field=models.DecimalField(),
+            ),
+        )
+
     def with_outstanding_reports(self):
         Report = apps.get_model("project_reports", "Report")
         return self.annotate(
@@ -170,7 +214,7 @@ def with_outstanding_reports(self):
         )
 
     def for_table(self):
-        return (
+        qs = (
             self.with_amount_paid()
             .with_last_payment()
             .with_outstanding_reports()
@@ -182,6 +226,9 @@ def for_table(self):
             )
             .defer("form_data", "form_fields")
         )
+        if settings.PROJECTS_PAYMENTS_FLOW == PaymentsFlow.DISBURSEMENTS:
+            qs = qs.with_contract_approved_total()
+        return qs
 
     def for_reporting_table(self):
         today = timezone.now().date()
diff --git a/hypha/apply/projects/tables.py b/hypha/apply/projects/tables.py
index 23a3e38b19..20977769ac 100644
--- a/hypha/apply/projects/tables.py
+++ b/hypha/apply/projects/tables.py
@@ -2,6 +2,7 @@
 
 import django_tables2 as tables
 from django.conf import settings
+from django.db.models import F
 from django.utils.html import format_html
 from django.utils.safestring import mark_safe
 from django.utils.text import slugify
@@ -15,7 +16,13 @@
 
 from .forms.invoice import get_invoice_possible_transition_for_user
 from .models import Disbursement, Invoice, PAFApprovals, Project
-from .utils import format_local_minute, format_trimmed_amount, get_project_title
+from .payments import PaymentsFlow
+from .utils import (
+    format_local_minute,
+    format_trimmed_amount,
+    get_contract_approved_amounts_cell,
+    get_project_title,
+)
 
 
 def render_invoice_actions(table, record):
@@ -204,8 +211,23 @@ class BaseProjectsTable(tables.Table):
     contract_number = tables.Column(verbose_name=_("Contract #"), default="-")
     reporting = tables.Column(verbose_name=_("Reporting"), accessor="pk")
     last_payment_request = RelativeTimeColumn()
+    # render_contract_approved_total reads annotations that
+    # Project.objects.for_table() provides.
+    contract_approved_total = tables.Column(
+        verbose_name=_("Contracts total"),
+        accessor="pk",
+        order_by="contract_approved_total",
+        attrs={"th": {"align": "right"}, "td": {"align": "right"}},
+    )
     end_date = RelativeTimeColumn(verbose_name=_("End date"), accessor="proposed_end")
 
+    def __init__(self, *args, **kwargs):
+        if settings.PROJECTS_PAYMENTS_FLOW != PaymentsFlow.DISBURSEMENTS:
+            exclude = list(kwargs.get("exclude") or [])
+            exclude.append("contract_approved_total")
+            kwargs["exclude"] = exclude
+        super().__init__(*args, **kwargs)
+
     def order_reporting(self, qs, is_descending):
         direction = "-" if is_descending else ""
 
@@ -232,6 +254,23 @@ def render_reporting(self, record):
         display += gettext("{count} outstanding").format(count=outstanding_count)
         return mark_safe(display)
 
+    def render_contract_approved_total(self, record):
+        return get_contract_approved_amounts_cell(record, format_trimmed_amount)
+
+    def order_organization_name(self, qs, is_descending):
+        f = F("submission__form_data__organization_name")
+
+        qs = (
+            qs.order_by(f.desc(nulls_last=True))
+            if is_descending
+            else qs.order_by(f.asc(nulls_last=True))
+        )
+
+        return qs, True
+
+    def render_organization_name(self, record):
+        return record.submission.form_data.get("organization_name", "")
+
 
 class ProjectsDashboardTable(BaseProjectsTable):
     class Meta:
@@ -241,6 +280,7 @@ class Meta:
             "fund",
             "reporting",
             "last_payment_request",
+            "contract_approved_total",
             "end_date",
         ]
         model = Project
@@ -324,6 +364,7 @@ class Meta:
             "contract_number",
             "reporting",
             "last_payment_request",
+            "contract_approved_total",
             "end_date",
         ]
         model = Project
diff --git a/hypha/apply/projects/tests/test_views.py b/hypha/apply/projects/tests/test_views.py
index c58dca821c..693c79b965 100644
--- a/hypha/apply/projects/tests/test_views.py
+++ b/hypha/apply/projects/tests/test_views.py
@@ -9,6 +9,7 @@
 from django.core.exceptions import PermissionDenied
 from django.test import RequestFactory, TestCase, override_settings
 from django.urls import reverse
+from django.utils import translation
 
 from hypha.apply.activity.adapters.activity_feed import ActivityAdapter
 from hypha.apply.activity.options import MESSAGES
@@ -19,6 +20,7 @@
 )
 from hypha.apply.projects.utils import (
     format_local_minute,
+    get_contract_approved_amounts_cell,
     get_invoice_status_display_value,
 )
 from hypha.apply.users.roles import TEAMADMIN_GROUP_NAME
@@ -36,6 +38,8 @@
 from hypha.home.factories import ApplySiteFactory
 
 from ..forms import SetPendingForm
+from ..forms.project import TrimmedDecimalInput, trimmed_decimal_string
+from ..models import Project
 from ..models.disbursement import Disbursement
 from ..models.invoice import CHANGES_REQUESTED_BY_STAFF, DECLINED, SUBMITTED
 from ..models.project import (
@@ -1371,6 +1375,315 @@ def test_applicants_cannot_access_project_list_page(self):
         response = self.client.get(url, follow=True)
         self.assertEqual(response.status_code, 403)
 
+    @override_settings(PROJECTS_PAYMENTS_FLOW="DISBURSEMENTS")
+    def test_contract_approved_amounts_sum_shown_in_project_list(self):
+        project = ProjectFactory(status=INVOICING_AND_REPORTING)
+        ContractFactory(
+            project=project, currency="XTS", amount_approved=decimal.Decimal("421")
+        )
+        ContractFactory(
+            project=project, currency="XTS", amount_approved=decimal.Decimal("571")
+        )
+
+        self.client.force_login(StaffFactory())
+
+        url = reverse("apply:projects:all")
+
+        response = self.client.get(url, follow=True)
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "992.00 XTS")
+
+    @override_settings(PROJECTS_PAYMENTS_FLOW="DISBURSEMENTS")
+    def test_contract_approved_amounts_sum_without_currency_code(self):
+        project = ProjectFactory(status=INVOICING_AND_REPORTING)
+        ContractFactory(project=project, amount_approved=decimal.Decimal("421"))
+        ContractFactory(project=project, amount_approved=decimal.Decimal("571"))
+
+        self.client.force_login(StaffFactory())
+
+        url = reverse("apply:projects:all")
+
+        response = self.client.get(url, follow=True)
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "992.00")
+
+    @override_settings(PROJECTS_PAYMENTS_FLOW="DISBURSEMENTS")
+    def test_contract_approved_amounts_absent_without_contracts(self):
+        ProjectFactory(status=INVOICING_AND_REPORTING)
+
+        self.client.force_login(StaffFactory())
+
+        url = reverse("apply:projects:all")
+
+        response = self.client.get(url, follow=True)
+        self.assertEqual(response.status_code, 200)
+        table = response.context["table"]
+        self.assertEqual(table.rows[0].get_cell("contract_approved_total"), "—")
+
+    @override_settings(PROJECTS_PAYMENTS_FLOW="DISBURSEMENTS")
+    def test_contract_approved_amounts_zero_sum_shown(self):
+        project = ProjectFactory(status=INVOICING_AND_REPORTING)
+        ContractFactory(
+            project=project, currency="XTS", amount_approved=decimal.Decimal("0")
+        )
+
+        self.client.force_login(StaffFactory())
+
+        url = reverse("apply:projects:all")
+
+        response = self.client.get(url, follow=True)
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "0.00 XTS")
+
+    @override_settings(PROJECTS_PAYMENTS_FLOW="DISBURSEMENTS")
+    def test_contract_approved_amounts_not_summed_across_currencies(self):
+        project = ProjectFactory(status=INVOICING_AND_REPORTING)
+        ContractFactory(
+            project=project, currency="XTS", amount_approved=decimal.Decimal("421")
+        )
+        ContractFactory(
+            project=project, currency="QZC", amount_approved=decimal.Decimal("571")
+        )
+
+        self.client.force_login(StaffFactory())
+
+        url = reverse("apply:projects:all")
+
+        response = self.client.get(url, follow=True)
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "Multiple currencies")
+        self.assertNotContains(response, "992.00")
+
+    @override_settings(PROJECTS_PAYMENTS_FLOW="DISBURSEMENTS")
+    def test_contract_approved_amounts_not_summed_when_currency_code_missing(self):
+        project = ProjectFactory(status=INVOICING_AND_REPORTING)
+        ContractFactory(
+            project=project, currency="XTS", amount_approved=decimal.Decimal("421")
+        )
+        ContractFactory(project=project, amount_approved=decimal.Decimal("571"))
+
+        self.client.force_login(StaffFactory())
+
+        url = reverse("apply:projects:all")
+
+        response = self.client.get(url, follow=True)
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "Multiple currencies")
+        self.assertNotContains(response, "992.00")
+
+    @override_settings(PROJECTS_PAYMENTS_FLOW="DISBURSEMENTS")
+    def test_contract_approved_amounts_column_ordering(self):
+        with_total = ProjectFactory(status=INVOICING_AND_REPORTING)
+        ContractFactory(
+            project=with_total,
+            currency="XTS",
+            amount_approved=decimal.Decimal("571"),
+        )
+        without_total = ProjectFactory(status=INVOICING_AND_REPORTING)
+
+        self.client.force_login(StaffFactory())
+
+        url = reverse("apply:projects:all")
+
+        response = self.client.get(f"{url}?sort=contract_approved_total")
+        self.assertEqual(response.status_code, 200)
+        table = response.context["table"]
+        # Absent totals are NULL: last ascending, first descending.
+        self.assertEqual(
+            [row.record.pk for row in table.rows],
+            [with_total.pk, without_total.pk],
+        )
+
+        response = self.client.get(f"{url}?sort=-contract_approved_total")
+        self.assertEqual(response.status_code, 200)
+        table = response.context["table"]
+        self.assertEqual(
+            [row.record.pk for row in table.rows],
+            [without_total.pk, with_total.pk],
+        )
+
+    @override_settings(PROJECTS_PAYMENTS_FLOW="DISBURSEMENTS")
+    def test_contract_approved_amounts_right_justified(self):
+        ProjectFactory(status=INVOICING_AND_REPORTING)
+
+        self.client.force_login(StaffFactory())
+
+        url = reverse("apply:projects:all")
+
+        response = self.client.get(url, follow=True)
+        self.assertEqual(response.status_code, 200)
+        column = response.context["table"].columns["contract_approved_total"]
+        self.assertEqual(column.attrs["td"]["align"], "right")
+        self.assertEqual(column.attrs["th"]["align"], "right")
+
+    @override_settings(PROJECTS_PAYMENTS_FLOW="DISBURSEMENTS")
+    def test_contract_approved_total_not_inflated_by_invoices(self):
+        project = ProjectFactory(status=INVOICING_AND_REPORTING)
+        ContractFactory(
+            project=project, currency="XTS", amount_approved=decimal.Decimal("173")
+        )
+        ContractFactory(
+            project=project, currency="XTS", amount_approved=decimal.Decimal("179")
+        )
+        InvoiceFactory(project=project)
+        InvoiceFactory(project=project)
+
+        self.client.force_login(StaffFactory())
+
+        url = reverse("apply:projects:all")
+
+        response = self.client.get(url, follow=True)
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "352.00 XTS")
+        self.assertNotContains(response, "704.00")
+
+    @override_settings(PROJECTS_PAYMENTS_FLOW="DISBURSEMENTS")
+    def test_contract_approved_amounts_csv_value_locale_neutral(self):
+        project = ProjectFactory(status=INVOICING_AND_REPORTING)
+        ContractFactory(
+            project=project, currency="XTS", amount_approved=decimal.Decimal("421")
+        )
+        ContractFactory(
+            project=project, currency="XTS", amount_approved=decimal.Decimal("571")
+        )
+        project_row = Project.objects.for_table().get(pk=project.pk)
+
+        with translation.override("cs"):
+            self.assertEqual(
+                get_contract_approved_amounts_cell(project_row, trimmed_decimal_string),
+                "992.00 XTS",
+            )
+            self.assertEqual(
+                get_contract_approved_amounts_cell(
+                    project_row, TrimmedDecimalInput().format_value
+                ),
+                "992,00 XTS",
+            )
+
+    @override_settings(PROJECTS_PAYMENTS_FLOW="DISBURSEMENTS")
+    def test_contract_approved_amounts_included_in_csv_export(self):
+        project = ProjectFactory(status=INVOICING_AND_REPORTING)
+        ContractFactory(
+            project=project, currency="XTS", amount_approved=decimal.Decimal("421")
+        )
+        ContractFactory(
+            project=project, currency="XTS", amount_approved=decimal.Decimal("571")
+        )
+
+        self.client.force_login(StaffFactory())
+
+        url = reverse("apply:projects:all")
+
+        response = self.client.get(f"{url}?format=csv")
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "Contracts total")
+        self.assertContains(response, "992.00 XTS")
+
+    @override_settings(PROJECTS_PAYMENTS_FLOW="INVOICING")
+    def test_contract_total_column_absent_outside_disbursements_flow(self):
+        project = ProjectFactory(status=INVOICING_AND_REPORTING)
+        ContractFactory(
+            project=project, currency="XTS", amount_approved=decimal.Decimal("421")
+        )
+
+        self.client.force_login(StaffFactory())
+
+        url = reverse("apply:projects:all")
+
+        response = self.client.get(url, follow=True)
+        self.assertEqual(response.status_code, 200)
+        self.assertNotContains(response, "Contracts total")
+        self.assertNotContains(response, "421.00 XTS")
+
+        response = self.client.get(f"{url}?format=csv")
+        self.assertEqual(response.status_code, 200)
+        self.assertNotContains(response, "Contracts total")
+        self.assertNotContains(response, "421.00 XTS")
+
+    @override_settings(PROJECTS_PAYMENTS_FLOW="DISBURSEMENTS")
+    def test_csv_export_values_match_columns_with_contracts_flow(self):
+        project = ProjectFactory(
+            status=INVOICING_AND_REPORTING, proposed_end=datetime.date(2573, 6, 18)
+        )
+        ContractFactory(
+            project=project, currency="XTS", amount_approved=decimal.Decimal("421")
+        )
+        ContractFactory(
+            project=project, currency="XTS", amount_approved=decimal.Decimal("571")
+        )
+
+        self.client.force_login(StaffFactory())
+
+        url = reverse("apply:projects:all")
+
+        response = self.client.get(f"{url}?format=csv")
+        self.assertEqual(response.status_code, 200)
+
+        rows = list(csv.reader(StringIO(response.content.decode())))
+        self.assertEqual(len(rows), 2)
+        header, values = rows[0], dict(zip(*rows, strict=False))
+
+        self.assertEqual(
+            header,
+            [
+                "Submission #",
+                "Title",
+                "Organization",
+                "Status",
+                "Lead",
+                "Fund",
+                "Round",
+                "Reporting",
+                "Last payment request",
+                "Contracts total",
+                "End Date",
+            ],
+        )
+        self.assertEqual(values["Submission #"], str(project.submission.id))
+        self.assertEqual(values["Title"], project.title)
+        self.assertEqual(values["Contracts total"], "992.00 XTS")
+        self.assertEqual(values["End Date"], "2573-06-18")
+
+    @override_settings(PROJECTS_PAYMENTS_FLOW="INVOICING")
+    def test_csv_export_values_match_columns_outside_contracts_flow(self):
+        project = ProjectFactory(
+            status=INVOICING_AND_REPORTING, proposed_end=datetime.date(2577, 8, 25)
+        )
+        ContractFactory(
+            project=project, currency="XTS", amount_approved=decimal.Decimal("421")
+        )
+
+        self.client.force_login(StaffFactory())
+
+        url = reverse("apply:projects:all")
+
+        response = self.client.get(f"{url}?format=csv")
+        self.assertEqual(response.status_code, 200)
+
+        rows = list(csv.reader(StringIO(response.content.decode())))
+        self.assertEqual(len(rows), 2)
+        header, values = rows[0], dict(zip(*rows, strict=False))
+
+        self.assertEqual(
+            header,
+            [
+                "Submission #",
+                "Title",
+                "Organization",
+                "Status",
+                "Lead",
+                "Fund",
+                "Round",
+                "Reporting",
+                "Last payment request",
+                "End Date",
+            ],
+        )
+        self.assertNotIn("Contracts total", header)
+        self.assertEqual(values["Submission #"], str(project.submission.id))
+        self.assertEqual(values["Title"], project.title)
+        self.assertEqual(values["End Date"], "2577-08-25")
+
 
 @override_settings(PROJECTS_PAYMENTS_FLOW="DISBURSEMENTS")
 class TestDisbursementListView(TestCase):
diff --git a/hypha/apply/projects/utils.py b/hypha/apply/projects/utils.py
index 5cf4e5baf8..7096022a8a 100644
--- a/hypha/apply/projects/utils.py
+++ b/hypha/apply/projects/utils.py
@@ -2,6 +2,7 @@
 import io
 from datetime import timedelta
 
+from django.conf import settings
 from django.utils import timezone
 from django.utils.html import format_html
 from django.utils.translation import gettext_lazy as _
@@ -37,6 +38,7 @@
     PROJECT_STATUS_CHOICES,
     PAFReviewersRole,
 )
+from .payments import PaymentsFlow
 
 PROJECT_TITLE_TEMPLATE = "{text} <span class='text-fg-muted'>#{application_id}</span>"
 
@@ -189,7 +191,34 @@ def get_placeholder_file(initial_file):
     ]
 
 
+def get_contract_approved_amounts_cell(project, format_amount):
+    """Render a project's contracts total cell.
+
+    Returns "Multiple currencies" when the amounts span more than one
+    currency code, an em dash when no approved amount is entered
+    (absence is not zero), and otherwise the formatted total with its
+    currency code. format_amount renders the Decimal total: locale-aware
+    for the table, locale-neutral for the CSV export.
+    """
+    if project.contract_approved_currency_count > 1:
+        return _("Multiple currencies")
+    total = project.contract_approved_total
+    if total is None:
+        return "—"
+    amount = format_amount(total)
+    if project.contract_approved_currency_code:
+        return f"{amount} {project.contract_approved_currency_code}"
+    return amount
+
+
 def export_projects_to_csv(projects_list, csv_stream):
+    # Lazy import: forms.project depends on modules that import this file.
+    from .forms.project import trimmed_decimal_string
+
+    include_contracts_total = (
+        settings.PROJECTS_PAYMENTS_FLOW == PaymentsFlow.DISBURSEMENTS
+    )
+
     header_row = [
         "Submission #",
         "Title",
@@ -200,8 +229,10 @@ def export_projects_to_csv(projects_list, csv_stream):
         "Round",
         "Reporting",
         "Last payment request",
-        "End Date",
     ]
+    if include_contracts_total:
+        header_row.append("Contracts total")
+    header_row.append("End Date")
     data_list = []
 
     for project in projects_list:
@@ -215,17 +246,21 @@ def export_projects_to_csv(projects_list, csv_stream):
                 )
 
         values = {
-            header_row[0]: project.submission.id,
-            header_row[1]: project.title,
-            header_row[2]: project.submission.form_data.get("organization_name", ""),
-            header_row[3]: project.get_status_display(),
-            header_row[4]: project.lead,
-            header_row[5]: project.submission.page,
-            header_row[6]: project.submission.round,
-            header_row[7]: reporting_status,
-            header_row[8]: project.last_payment_request,
-            header_row[9]: project.end_date,
+            "Submission #": project.submission.id,
+            "Title": project.title,
+            "Organization": project.submission.form_data.get("organization_name", ""),
+            "Status": project.get_status_display(),
+            "Lead": project.lead,
+            "Fund": project.submission.page,
+            "Round": project.submission.round,
+            "Reporting": reporting_status,
+            "Last payment request": project.last_payment_request,
         }
+        if include_contracts_total:
+            values["Contracts total"] = get_contract_approved_amounts_cell(
+                project, trimmed_decimal_string
+            )
+        values["End Date"] = project.end_date
         data_list.append(values)
     # Columns will be in header_row order with values matched by key in data_list (order within each notwithstanding).
     writer = csv.DictWriter(csv_stream, fieldnames=header_row, restval="")
diff --git a/hypha/apply/projects/views/project.py b/hypha/apply/projects/views/project.py
index 285dabc3f9..512e6de558 100644
--- a/hypha/apply/projects/views/project.py
+++ b/hypha/apply/projects/views/project.py
@@ -122,6 +122,7 @@
 from ..reports.views import ReportingMixin
 from ..tables import ProjectsListTable
 from ..utils import (
+    export_projects_to_csv,
     get_paf_status_display,
     get_placeholder_file,
     get_project_status_choices,
@@ -2442,12 +2443,25 @@ def post(self, request, *args, **kwargs):
 @method_decorator(staff_or_finance_or_contracting_required, name="dispatch")
 class ProjectListView(SingleTableMixin, FilterView):
     filterset_class = ProjectListFilter
-    queryset = Project.objects.for_table()
     table_class = ProjectsListTable
     template_name = "application_projects/project_list.html"
 
     excluded_fields = settings.PROJECTS_TABLE_EXCLUDED_FIELDS
 
+    def get_queryset(self):
+        # Built per request so the contracts total follows the active
+        # PROJECTS_PAYMENTS_FLOW instead of the import-time setting.
+        return Project.objects.for_table()
+
+    def render_to_response(self, context, **response_kwargs):
+        if self.request.GET.get("format") == "csv":
+            response = HttpResponse(content_type="text/csv")
+            response["Content-Disposition"] = 'attachment; filename="projects.csv"'
+            export_projects_to_csv(context["object_list"], response)
+            return response
+        else:
+            return super().render_to_response(context, **response_kwargs)
+
     def get_filterset_kwargs(self, filterset_class, **kwargs):
         new_kwargs = super().get_filterset_kwargs(filterset_class)
         new_kwargs["exclude"] = self.excluded_fields

From 0b8524b54159d73e2a1fa54682edd0f3c81057d5 Mon Sep 17 00:00:00 2001
From: LLM prompted by Jesse Bickel <jbickel+llm@opentechstrategies.com>
Date: Wed, 14 Oct 2026 12:59:05 -0500
Subject: [PATCH 18/18] Show disbursement totals on All Projects table
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Staff tracking grant money had to open each project and read
through its contracts and disbursements to learn how much had
gone out. The All Projects list and its CSV export now show each
project's disbursement total, summed across all of its contracts,
with repayments netting out. Totals spanning more than one
currency, including a coded amount beside an uncoded one, show as
"Multiple currencies" instead of a blended amount; a single
currency code is shown beside the total. Projects without
disbursements show "—" rather than a misleading 0.00.

GLM-5.3-Flash, an LLM supervised and prompted by @jbickel
---
 docs/user-guides/LEDGER_NOTES.md          |  22 +--
 hypha/apply/projects/models/project.py    |  44 ++++++
 hypha/apply/projects/tables.py            |  14 ++
 hypha/apply/projects/tests/test_models.py | 125 ++++++++++++++-
 hypha/apply/projects/tests/test_views.py  | 177 +++++++++++++++++++++-
 hypha/apply/projects/utils.py             |  31 +++-
 6 files changed, 397 insertions(+), 16 deletions(-)

diff --git a/docs/user-guides/LEDGER_NOTES.md b/docs/user-guides/LEDGER_NOTES.md
index a996ccb9fe..ec0d54c1e2 100644
--- a/docs/user-guides/LEDGER_NOTES.md
+++ b/docs/user-guides/LEDGER_NOTES.md
@@ -7,19 +7,21 @@ Wide currency amounts are allowed in cases of strange or inflated currencies.
 The currency code is left optional and relatively unconstrained in case of new
 or unofficial currencies.
 
-## Contracts total on the All Projects table and dashboards
+## Contracts and disbursed totals on the All Projects table and dashboards
 
 The All Projects table at `apply/projects/all/` and the projects tables on
 the staff, contracting, and applicant dashboards show a "Contracts total"
 column with the sum of the approved amounts recorded on each project's
-contracts, followed by the currency code when all of those amounts share one
-currency code. When a project's approved amounts do not share a single
-currency code — including coded amounts alongside uncoded amounts — the
-column shows "Multiple currencies" instead of a total. A project with no
-approved amount entered shows "—" because absence is not zero; a sum that
-genuinely totals zero shows as 0.00. The All Projects table's CSV export
-shows the same values with locale-neutral number formatting.
+contracts, and a "Disbursed total" column with the sum of the disbursement
+amounts recorded against those contracts (negative disbursements, for
+repayments, net out). Each column is followed by the currency code when all
+of its underlying amounts share one currency code; when they do not —
+including coded amounts alongside uncoded ones — that column shows
+"Multiple currencies" instead of a total. A project with no approved amount
+entered, or with no disbursements, shows "—" because absence is not zero; a
+sum that genuinely totals zero shows as 0.00. The All Projects table's CSV
+export shows the same values with locale-neutral number formatting.
 
-The column is only present when `PROJECTS_PAYMENTS_FLOW` is
-`DISBURSEMENTS`; in the `INVOICING` and `DISABLED` flows it is neither
+Both columns are only present when `PROJECTS_PAYMENTS_FLOW` is
+`DISBURSEMENTS`; in the `INVOICING` and `DISABLED` flows they are neither
 computed nor shown (table, dashboards, CSV).
diff --git a/hypha/apply/projects/models/project.py b/hypha/apply/projects/models/project.py
index edca8b4835..26e424fca4 100644
--- a/hypha/apply/projects/models/project.py
+++ b/hypha/apply/projects/models/project.py
@@ -46,6 +46,7 @@
 from ..admin_forms import ContractDocumentCategoryAdminForm
 from ..blocks import ProjectFormCustomFormFieldsBlock
 from ..payments import PaymentsFlow
+from .disbursement import Disbursement
 
 logger = logging.getLogger(__name__)
 
@@ -195,6 +196,48 @@ def with_contract_approved_total(self):
             ),
         )
 
+    def with_disbursement_total(self):
+        # Subqueries, not joined aggregates: for_table() already aggregates
+        # over the invoices join, and combining aggregations over two
+        # one-to-many joins in one query multiplies both results (fan-out).
+        # A missing currency code is its own group so uncoded disbursements
+        # never blend into a coded total.
+        project_disbursements = Disbursement.objects.filter(
+            contract__project=OuterRef("pk"),
+        )
+        return self.annotate(
+            disbursement_currency_count=Subquery(
+                project_disbursements.order_by()
+                .values("contract__project")
+                .annotate(
+                    currency_count=Count(
+                        Coalesce("contract__currency", Value("-")),
+                        distinct=True,
+                    ),
+                )
+                .values("currency_count"),
+                output_field=models.IntegerField(),
+            ),
+            disbursement_currency_code=Subquery(
+                project_disbursements.order_by("contract__currency").values(
+                    "contract__currency"
+                )[:1],
+                output_field=models.CharField(max_length=3),
+            ),
+        ).annotate(
+            disbursement_total=Case(
+                When(disbursement_currency_count__gt=1, then=Value(None)),
+                # No Coalesce: no disbursements means no total (NULL), not 0.
+                default=Subquery(
+                    project_disbursements.order_by()
+                    .values("contract__project")
+                    .annotate(total=Sum("amount"))
+                    .values("total"),
+                ),
+                output_field=models.DecimalField(),
+            ),
+        )
+
     def with_outstanding_reports(self):
         Report = apps.get_model("project_reports", "Report")
         return self.annotate(
@@ -228,6 +271,7 @@ def for_table(self):
         )
         if settings.PROJECTS_PAYMENTS_FLOW == PaymentsFlow.DISBURSEMENTS:
             qs = qs.with_contract_approved_total()
+            qs = qs.with_disbursement_total()
         return qs
 
     def for_reporting_table(self):
diff --git a/hypha/apply/projects/tables.py b/hypha/apply/projects/tables.py
index 20977769ac..c91f82d05d 100644
--- a/hypha/apply/projects/tables.py
+++ b/hypha/apply/projects/tables.py
@@ -21,6 +21,7 @@
     format_local_minute,
     format_trimmed_amount,
     get_contract_approved_amounts_cell,
+    get_disbursement_total_cell,
     get_project_title,
 )
 
@@ -219,12 +220,20 @@ class BaseProjectsTable(tables.Table):
         order_by="contract_approved_total",
         attrs={"th": {"align": "right"}, "td": {"align": "right"}},
     )
+    # Non-empty accessor (pk) so django-tables2 calls render_disbursement_total.
+    disbursement_total = tables.Column(
+        verbose_name=_("Disbursed total"),
+        accessor="pk",
+        order_by="disbursement_total",
+        attrs={"th": {"align": "right"}, "td": {"align": "right"}},
+    )
     end_date = RelativeTimeColumn(verbose_name=_("End date"), accessor="proposed_end")
 
     def __init__(self, *args, **kwargs):
         if settings.PROJECTS_PAYMENTS_FLOW != PaymentsFlow.DISBURSEMENTS:
             exclude = list(kwargs.get("exclude") or [])
             exclude.append("contract_approved_total")
+            exclude.append("disbursement_total")
             kwargs["exclude"] = exclude
         super().__init__(*args, **kwargs)
 
@@ -257,6 +266,9 @@ def render_reporting(self, record):
     def render_contract_approved_total(self, record):
         return get_contract_approved_amounts_cell(record, format_trimmed_amount)
 
+    def render_disbursement_total(self, record):
+        return get_disbursement_total_cell(record, format_trimmed_amount)
+
     def order_organization_name(self, qs, is_descending):
         f = F("submission__form_data__organization_name")
 
@@ -281,6 +293,7 @@ class Meta:
             "reporting",
             "last_payment_request",
             "contract_approved_total",
+            "disbursement_total",
             "end_date",
         ]
         model = Project
@@ -365,6 +378,7 @@ class Meta:
             "reporting",
             "last_payment_request",
             "contract_approved_total",
+            "disbursement_total",
             "end_date",
         ]
         model = Project
diff --git a/hypha/apply/projects/tests/test_models.py b/hypha/apply/projects/tests/test_models.py
index 60db0b4cf7..8e872b2935 100644
--- a/hypha/apply/projects/tests/test_models.py
+++ b/hypha/apply/projects/tests/test_models.py
@@ -2,7 +2,7 @@
 from decimal import Decimal
 
 from django.contrib.contenttypes.models import ContentType
-from django.test import TestCase
+from django.test import TestCase, override_settings
 from wagtail.models import ModelLogEntry
 
 from hypha.apply.funds.tests.factories import ApplicationSubmissionFactory
@@ -12,6 +12,7 @@
     StaffFactory,
 )
 
+from ..forms.project import TrimmedDecimalInput
 from ..models.disbursement import Disbursement
 from ..models.invoice import (
     APPROVED_BY_FINANCE,
@@ -28,7 +29,8 @@
     invoice_status_user_choices,
 )
 from ..models.project import Project
-from .factories import ContractFactory, InvoiceFactory
+from ..utils import get_disbursement_total_cell
+from .factories import ContractFactory, InvoiceFactory, ProjectFactory
 
 
 class TestProjectModel(TestCase):
@@ -345,3 +347,122 @@ def test_notes_field_persisted(self):
         disbursement.save()
         disbursement.refresh_from_db()
         self.assertEqual(disbursement.notes, "Wire transfer for the reporting period.")
+
+
+@override_settings(PROJECTS_PAYMENTS_FLOW="DISBURSEMENTS")
+class TestProjectDisbursementTotal(TestCase):
+    def test_sums_disbursements_across_contracts(self):
+        project = ProjectFactory()
+        first_contract = ContractFactory(project=project)
+        second_contract = ContractFactory(project=project)
+        Disbursement(
+            contract=first_contract,
+            amount=Decimal("83.29"),
+            date=datetime.date(2541, 6, 11),
+        ).save()
+        Disbursement(
+            contract=second_contract,
+            amount=Decimal("97.31"),
+            date=datetime.date(2543, 8, 13),
+        ).save()
+        summed = Project.objects.for_table().get(pk=project.pk)
+        self.assertEqual(summed.disbursement_total, Decimal("180.60"))
+        self.assertIsNone(summed.disbursement_currency_code)
+
+    def test_no_disbursements_shows_no_total(self):
+        project = ProjectFactory()
+        summed = Project.objects.for_table().get(pk=project.pk)
+        self.assertIsNone(summed.disbursement_total)
+        self.assertIsNone(summed.disbursement_currency_count)
+        self.assertIsNone(summed.disbursement_currency_code)
+        # Absent, not zero: 0.00 would read as a real summed number.
+        self.assertEqual(
+            get_disbursement_total_cell(summed, TrimmedDecimalInput().format_value), "—"
+        )
+
+    def test_zero_sum_disbursements_show_zero_not_dash(self):
+        project = ProjectFactory()
+        contract = ContractFactory(project=project)
+        Disbursement(
+            contract=contract,
+            amount=Decimal("41.17"),
+            date=datetime.date(2585, 2, 27),
+        ).save()
+        Disbursement(
+            contract=contract,
+            amount=Decimal("-41.17"),
+            date=datetime.date(2587, 4, 29),
+        ).save()
+        summed = Project.objects.for_table().get(pk=project.pk)
+        self.assertEqual(summed.disbursement_total, Decimal("0"))
+        self.assertEqual(
+            get_disbursement_total_cell(summed, TrimmedDecimalInput().format_value),
+            "0.00",
+        )
+
+    def test_repayment_negative_amounts_net_out(self):
+        project = ProjectFactory()
+        contract = ContractFactory(project=project)
+        Disbursement(
+            contract=contract,
+            amount=Decimal("43.07"),
+            date=datetime.date(2545, 10, 17),
+        ).save()
+        Disbursement(
+            contract=contract,
+            amount=Decimal("-29.03"),
+            date=datetime.date(2547, 12, 19),
+        ).save()
+        summed = Project.objects.for_table().get(pk=project.pk)
+        self.assertEqual(summed.disbursement_total, Decimal("14.04"))
+
+    def test_totals_not_multiplied_by_invoice_and_disbursement_joins(self):
+        project = ProjectFactory()
+        first_contract = ContractFactory(project=project)
+        second_contract = ContractFactory(project=project)
+        Disbursement(
+            contract=first_contract,
+            amount=Decimal("23.09"),
+            date=datetime.date(2549, 2, 21),
+        ).save()
+        Disbursement(
+            contract=second_contract,
+            amount=Decimal("31.37"),
+            date=datetime.date(2551, 4, 23),
+        ).save()
+        InvoiceFactory(project=project, paid_value=Decimal("19.07"))
+        InvoiceFactory(project=project, paid_value=Decimal("29.17"))
+        summed = Project.objects.for_table().get(pk=project.pk)
+        self.assertEqual(summed.disbursement_total, Decimal("54.46"))
+        self.assertEqual(summed.amount_paid, Decimal("48.24"))
+
+    def test_single_currency_code_annotated(self):
+        project = ProjectFactory()
+        contract = ContractFactory(project=project, currency="XTS")
+        Disbursement(
+            contract=contract,
+            amount=Decimal("113.11"),
+            date=datetime.date(2575, 4, 29),
+        ).save()
+        summed = Project.objects.for_table().get(pk=project.pk)
+        self.assertEqual(summed.disbursement_total, Decimal("113.11"))
+        self.assertEqual(summed.disbursement_currency_count, 1)
+        self.assertEqual(summed.disbursement_currency_code, "XTS")
+
+    def test_mixed_currencies_have_no_single_total(self):
+        project = ProjectFactory()
+        coded = ContractFactory(project=project, currency="XTS")
+        other = ContractFactory(project=project, currency="QZC")
+        Disbursement(
+            contract=coded,
+            amount=Decimal("107.89"),
+            date=datetime.date(2577, 6, 23),
+        ).save()
+        Disbursement(
+            contract=other,
+            amount=Decimal("109.83"),
+            date=datetime.date(2579, 8, 31),
+        ).save()
+        summed = Project.objects.for_table().get(pk=project.pk)
+        self.assertIsNone(summed.disbursement_total)
+        self.assertEqual(summed.disbursement_currency_count, 2)
diff --git a/hypha/apply/projects/tests/test_views.py b/hypha/apply/projects/tests/test_views.py
index 693c79b965..0d15125987 100644
--- a/hypha/apply/projects/tests/test_views.py
+++ b/hypha/apply/projects/tests/test_views.py
@@ -1605,12 +1605,22 @@ def test_csv_export_values_match_columns_with_contracts_flow(self):
         project = ProjectFactory(
             status=INVOICING_AND_REPORTING, proposed_end=datetime.date(2573, 6, 18)
         )
-        ContractFactory(
+        first_contract = ContractFactory(
             project=project, currency="XTS", amount_approved=decimal.Decimal("421")
         )
         ContractFactory(
             project=project, currency="XTS", amount_approved=decimal.Decimal("571")
         )
+        Disbursement(
+            contract=first_contract,
+            amount=decimal.Decimal("269.03"),
+            date=datetime.date(2585, 4, 27),
+        ).save()
+        Disbursement(
+            contract=first_contract,
+            amount=decimal.Decimal("271.01"),
+            date=datetime.date(2587, 6, 29),
+        ).save()
 
         self.client.force_login(StaffFactory())
 
@@ -1636,12 +1646,14 @@ def test_csv_export_values_match_columns_with_contracts_flow(self):
                 "Reporting",
                 "Last payment request",
                 "Contracts total",
+                "Disbursed total",
                 "End Date",
             ],
         )
         self.assertEqual(values["Submission #"], str(project.submission.id))
         self.assertEqual(values["Title"], project.title)
         self.assertEqual(values["Contracts total"], "992.00 XTS")
+        self.assertEqual(values["Disbursed total"], "540.04 XTS")
         self.assertEqual(values["End Date"], "2573-06-18")
 
     @override_settings(PROJECTS_PAYMENTS_FLOW="INVOICING")
@@ -1680,10 +1692,173 @@ def test_csv_export_values_match_columns_outside_contracts_flow(self):
             ],
         )
         self.assertNotIn("Contracts total", header)
+        self.assertNotIn("Disbursed total", header)
         self.assertEqual(values["Submission #"], str(project.submission.id))
         self.assertEqual(values["Title"], project.title)
         self.assertEqual(values["End Date"], "2577-08-25")
 
+    @override_settings(PROJECTS_PAYMENTS_FLOW="DISBURSEMENTS")
+    def test_disbursement_total_rendered_in_table(self):
+        project = ProjectFactory(status=INVOICING_AND_REPORTING)
+        contract = ContractFactory(project=project)
+        Disbursement(
+            contract=contract,
+            amount=decimal.Decimal("211.43"),
+            date=datetime.date(2553, 6, 27),
+        ).save()
+
+        self.client.force_login(StaffFactory())
+
+        response = self.client.get(reverse("apply:projects:all"), follow=True)
+
+        self.assertContains(response, "211.43")
+
+    @override_settings(PROJECTS_PAYMENTS_FLOW="DISBURSEMENTS")
+    def test_disbursement_totals_sum_shown_with_single_currency_code(self):
+        project = ProjectFactory(status=INVOICING_AND_REPORTING)
+        first_contract = ContractFactory(project=project, currency="XTS")
+        second_contract = ContractFactory(project=project, currency="XTS")
+        Disbursement(
+            contract=first_contract,
+            amount=decimal.Decimal("191.39"),
+            date=datetime.date(2559, 12, 31),
+        ).save()
+        Disbursement(
+            contract=second_contract,
+            amount=decimal.Decimal("199.37"),
+            date=datetime.date(2561, 2, 27),
+        ).save()
+
+        self.client.force_login(StaffFactory())
+
+        url = reverse("apply:projects:all")
+
+        response = self.client.get(url, follow=True)
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "390.76 XTS")
+        self.assertContains(response, '<td align="right">')
+
+    @override_settings(PROJECTS_PAYMENTS_FLOW="DISBURSEMENTS")
+    def test_disbursement_totals_sum_without_currency_code(self):
+        project = ProjectFactory(status=INVOICING_AND_REPORTING)
+        first_contract = ContractFactory(project=project)
+        second_contract = ContractFactory(project=project)
+        Disbursement(
+            contract=first_contract,
+            amount=decimal.Decimal("223.43"),
+            date=datetime.date(2567, 8, 27),
+        ).save()
+        Disbursement(
+            contract=second_contract,
+            amount=decimal.Decimal("227.41"),
+            date=datetime.date(2569, 10, 23),
+        ).save()
+
+        self.client.force_login(StaffFactory())
+
+        url = reverse("apply:projects:all")
+
+        response = self.client.get(url, follow=True)
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "450.84")
+
+    @override_settings(PROJECTS_PAYMENTS_FLOW="DISBURSEMENTS")
+    def test_disbursement_totals_not_summed_across_currencies(self):
+        project = ProjectFactory(status=INVOICING_AND_REPORTING)
+        coded = ContractFactory(project=project, currency="XTS")
+        other = ContractFactory(project=project, currency="QZC")
+        Disbursement(
+            contract=coded,
+            amount=decimal.Decimal("233.33"),
+            date=datetime.date(2563, 4, 23),
+        ).save()
+        Disbursement(
+            contract=other,
+            amount=decimal.Decimal("239.31"),
+            date=datetime.date(2565, 6, 29),
+        ).save()
+
+        self.client.force_login(StaffFactory())
+
+        url = reverse("apply:projects:all")
+
+        response = self.client.get(url, follow=True)
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "Multiple currencies")
+        self.assertNotContains(response, "472.64")
+
+    @override_settings(PROJECTS_PAYMENTS_FLOW="DISBURSEMENTS")
+    def test_disbursement_totals_not_summed_when_currency_code_missing(self):
+        project = ProjectFactory(status=INVOICING_AND_REPORTING)
+        coded = ContractFactory(project=project, currency="XTS")
+        uncoded = ContractFactory(project=project)
+        Disbursement(
+            contract=coded,
+            amount=decimal.Decimal("241.79"),
+            date=datetime.date(2581, 10, 27),
+        ).save()
+        Disbursement(
+            contract=uncoded,
+            amount=decimal.Decimal("251.71"),
+            date=datetime.date(2583, 12, 29),
+        ).save()
+
+        self.client.force_login(StaffFactory())
+
+        url = reverse("apply:projects:all")
+
+        response = self.client.get(url, follow=True)
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "Multiple currencies")
+        self.assertNotContains(response, "493.50")
+
+    @override_settings(PROJECTS_PAYMENTS_FLOW="DISBURSEMENTS")
+    def test_disbursement_total_included_in_csv_export(self):
+        project = ProjectFactory(status=INVOICING_AND_REPORTING)
+        first_contract = ContractFactory(project=project, currency="XTS")
+        second_contract = ContractFactory(project=project, currency="XTS")
+        Disbursement(
+            contract=first_contract,
+            amount=decimal.Decimal("257.17"),
+            date=datetime.date(2571, 12, 27),
+        ).save()
+        Disbursement(
+            contract=second_contract,
+            amount=decimal.Decimal("263.21"),
+            date=datetime.date(2573, 2, 23),
+        ).save()
+
+        self.client.force_login(StaffFactory())
+
+        url = reverse("apply:projects:all")
+
+        response = self.client.get(f"{url}?format=csv")
+        self.assertEqual(response.status_code, 200)
+
+        rows = list(csv.reader(StringIO(response.content.decode())))
+        self.assertEqual(len(rows), 2)
+        header, values = rows[0], dict(zip(*rows, strict=False))
+
+        self.assertEqual(
+            header,
+            [
+                "Submission #",
+                "Title",
+                "Organization",
+                "Status",
+                "Lead",
+                "Fund",
+                "Round",
+                "Reporting",
+                "Last payment request",
+                "Contracts total",
+                "Disbursed total",
+                "End Date",
+            ],
+        )
+        self.assertEqual(values["Contracts total"], "—")
+        self.assertEqual(values["Disbursed total"], "520.38 XTS")
+
 
 @override_settings(PROJECTS_PAYMENTS_FLOW="DISBURSEMENTS")
 class TestDisbursementListView(TestCase):
diff --git a/hypha/apply/projects/utils.py b/hypha/apply/projects/utils.py
index 7096022a8a..6367c542da 100644
--- a/hypha/apply/projects/utils.py
+++ b/hypha/apply/projects/utils.py
@@ -211,11 +211,32 @@ def get_contract_approved_amounts_cell(project, format_amount):
     return amount
 
 
+def get_disbursement_total_cell(project, format_amount):
+    """Render a project's disbursed total cell.
+
+    Returns "Multiple currencies" when the disbursements span more than
+    one currency code (a coded amount beside an uncoded one counts as
+    multiple), an em dash when a project has no disbursements (absence is
+    not zero), and otherwise the formatted total with its currency code.
+    format_amount renders the Decimal total: locale-aware for the table,
+    locale-neutral for the CSV export.
+    """
+    if project.disbursement_currency_count is None:
+        return "—"
+    total = project.disbursement_total
+    if total is None:
+        return _("Multiple currencies")
+    amount = format_amount(total)
+    if project.disbursement_currency_code:
+        return f"{amount} {project.disbursement_currency_code}"
+    return amount
+
+
 def export_projects_to_csv(projects_list, csv_stream):
     # Lazy import: forms.project depends on modules that import this file.
     from .forms.project import trimmed_decimal_string
 
-    include_contracts_total = (
+    include_disbursements_columns = (
         settings.PROJECTS_PAYMENTS_FLOW == PaymentsFlow.DISBURSEMENTS
     )
 
@@ -230,8 +251,9 @@ def export_projects_to_csv(projects_list, csv_stream):
         "Reporting",
         "Last payment request",
     ]
-    if include_contracts_total:
+    if include_disbursements_columns:
         header_row.append("Contracts total")
+        header_row.append("Disbursed total")
     header_row.append("End Date")
     data_list = []
 
@@ -256,10 +278,13 @@ def export_projects_to_csv(projects_list, csv_stream):
             "Reporting": reporting_status,
             "Last payment request": project.last_payment_request,
         }
-        if include_contracts_total:
+        if include_disbursements_columns:
             values["Contracts total"] = get_contract_approved_amounts_cell(
                 project, trimmed_decimal_string
             )
+            values["Disbursed total"] = get_disbursement_total_cell(
+                project, trimmed_decimal_string
+            )
         values["End Date"] = project.end_date
         data_list.append(values)
     # Columns will be in header_row order with values matched by key in data_list (order within each notwithstanding).