From 40047c0a7fd08210955afe822dd642a98ad5cb20 Mon Sep 17 00:00:00 2001
From: A R R R Associates <admin@arrrassociates.com>
Date: Thu, 3 Sep 2026 15:44:47 +0530
Subject: [PATCH] Fix engagement period validation for non periodic services

---
 app/modules/services/engagements_ui.py                        | 1 +
 app/modules/services/templates/services/engagements/form.html | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/modules/services/engagements_ui.py b/app/modules/services/engagements_ui.py
index 961cd34..64181d7 100644
--- a/app/modules/services/engagements_ui.py
+++ b/app/modules/services/engagements_ui.py
@@ -1321,6 +1321,7 @@ def subscription_edit_page(request: Request, subscription_id: int):
             selected_client_id=row.client_id,
             financial_year=row.financial_year,
             period_choices=period_choices_for_service(row.financial_year, getattr(row.catalogue, "recurrence_type", None)),
+            period_required=recurrence_requires_period(getattr(row.catalogue, "recurrence_type", None)),
         )
     finally:
         db.close()
diff --git a/app/modules/services/templates/services/engagements/form.html b/app/modules/services/templates/services/engagements/form.html
index 110f200..622019b 100644
--- a/app/modules/services/templates/services/engagements/form.html
+++ b/app/modules/services/templates/services/engagements/form.html
@@ -52,7 +52,7 @@
     <div id="engagement-period-field">
       <label class="mb-2 block text-sm font-medium text-slate-700">Return / Engagement Period</label>
       {% if mode == 'edit' %}
-        <select name="period_label" required class="w-full rounded-xl border border-slate-300 px-4 py-2 text-sm">
+        <select name="period_label" {% if period_required %}required{% endif %} class="w-full rounded-xl border border-slate-300 px-4 py-2 text-sm">
           {% for value, label in period_choices %}<option value="{{ value }}" {% if subscription and subscription.period_label == value %}selected{% endif %}>{{ label }}</option>{% endfor %}
         </select>
       {% else %}