diff --git a/i18n/en.pot b/i18n/en.pot
index b89585a062..8a2d42e9be 100644
--- a/i18n/en.pot
+++ b/i18n/en.pot
@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2026-06-10T13:04:43.537Z\n"
-"PO-Revision-Date: 2026-06-10T13:04:43.537Z\n"
+"POT-Creation-Date: 2026-06-19T18:35:22.256Z\n"
+"PO-Revision-Date: 2026-06-19T18:35:22.257Z\n"
 
 msgid "The application could not be loaded."
 msgstr "The application could not be loaded."
@@ -123,17 +123,43 @@ msgstr "Show less"
 msgid "Show more"
 msgstr "Show more"
 
+msgid "This value is validating"
+msgstr "This value is validating"
+
+msgid "Async field update failed"
+msgstr "Async field update failed"
+
 msgid "error encountered during field validation"
 msgstr "error encountered during field validation"
 
 msgid "error"
 msgstr "error"
 
-msgid "This value is validating"
-msgstr "This value is validating"
+msgid "{{programStageName}} completed"
+msgstr "{{programStageName}} completed"
 
-msgid "Async field update failed"
-msgstr "Async field update failed"
+msgid "Would you like to complete the enrollment and all active events as well?"
+msgstr "Would you like to complete the enrollment and all active events as well?"
+
+msgid "{{count}} event in {{programStageName}}"
+msgid_plural "{{count}} event in {{programStageName}}"
+msgstr[0] "{{count}} event in {{programStageName}}"
+msgstr[1] "{{count}} events in {{programStageName}}"
+
+msgid "Yes, complete enrollment and events"
+msgstr "Yes, complete enrollment and events"
+
+msgid "Complete enrollment only"
+msgstr "Complete enrollment only"
+
+msgid "No, cancel"
+msgstr "No, cancel"
+
+msgid "Would you like to complete the enrollment?"
+msgstr "Would you like to complete the enrollment?"
+
+msgid "Complete enrollment"
+msgstr "Complete enrollment"
 
 msgid "Area"
 msgstr "Area"
@@ -306,9 +332,6 @@ msgstr ""
 msgid "Yes, discard changes"
 msgstr "Yes, discard changes"
 
-msgid "No, cancel"
-msgstr "No, cancel"
-
 msgid "You don't have access to create an event in the current selections"
 msgstr "You don't have access to create an event in the current selections"
 
@@ -330,29 +353,6 @@ msgstr "Enroll in a program by selecting a program from the top bar."
 msgid "An error has occurred. See log for details"
 msgstr "An error has occurred. See log for details"
 
-msgid "{{programStageName}} completed"
-msgstr "{{programStageName}} completed"
-
-msgid "Would you like to complete the enrollment and all active events as well?"
-msgstr "Would you like to complete the enrollment and all active events as well?"
-
-msgid "{{count}} event in {{programStageName}}"
-msgid_plural "{{count}} event in {{programStageName}}"
-msgstr[0] "{{count}} event in {{programStageName}}"
-msgstr[1] "{{count}} events in {{programStageName}}"
-
-msgid "Yes, complete enrollment and events"
-msgstr "Yes, complete enrollment and events"
-
-msgid "Complete enrollment only"
-msgstr "Complete enrollment only"
-
-msgid "Would you like to complete the enrollment?"
-msgstr "Would you like to complete the enrollment?"
-
-msgid "Complete enrollment"
-msgstr "Complete enrollment"
-
 msgid "A duplicate exists (but there were some errors, see log for details"
 msgstr "A duplicate exists (but there were some errors, see log for details"
 
@@ -479,18 +479,6 @@ msgstr "To"
 msgid "Period"
 msgstr "Period"
 
-msgid "Please provide zero or a positive integer"
-msgstr "Please provide zero or a positive integer"
-
-msgid "Please specify the number of days"
-msgstr "Please specify the number of days"
-
-msgid "Days in the past"
-msgstr "Days in the past"
-
-msgid "Days in the future"
-msgstr "Days in the future"
-
 msgid "This week"
 msgstr "This week"
 
@@ -515,6 +503,18 @@ msgstr "Absolute range"
 msgid "Relative range"
 msgstr "Relative range"
 
+msgid "Please provide zero or a positive integer"
+msgstr "Please provide zero or a positive integer"
+
+msgid "Please specify the number of days"
+msgstr "Please specify the number of days"
+
+msgid "Days in the past"
+msgstr "Days in the past"
+
+msgid "Days in the future"
+msgstr "Days in the future"
+
 msgid "Please specify a date"
 msgstr "Please specify a date"
 
@@ -649,9 +649,6 @@ msgid_plural "Please enter at least {{minCharactersToSearch}} character to filte
 msgstr[0] "Please enter at least {{minCharactersToSearch}} character to filter"
 msgstr[1] "Please enter at least {{minCharactersToSearch}} characters to filter"
 
-msgid "Locked to{{escape}} {{buttonText}}"
-msgstr "Locked to{{escape}} {{buttonText}}"
-
 msgid "{{fromDate}} to {{toDate}}"
 msgstr "{{fromDate}} to {{toDate}}"
 
@@ -679,6 +676,9 @@ msgstr "after or equal to"
 msgid "before or equal to"
 msgstr "before or equal to"
 
+msgid "Locked to{{escape}} {{buttonText}}"
+msgstr "Locked to{{escape}} {{buttonText}}"
+
 msgid "More filters"
 msgstr "More filters"
 
@@ -712,6 +712,92 @@ msgstr "Notice"
 msgid "Close the notice"
 msgstr "Close the notice"
 
+msgid "tracked entity instance"
+msgstr "tracked entity instance"
+
+msgid "Enter details now is not available when creating a relationship"
+msgstr "Enter details now is not available when creating a relationship"
+
+msgid "Save new {{trackedEntityTypeName}} and link"
+msgstr "Save new {{trackedEntityTypeName}} and link"
+
+msgid "Link"
+msgstr "Link"
+
+msgid "Save as new {{trackedEntityName}}"
+msgstr "Save as new {{trackedEntityName}}"
+
+msgid "Some programs are being filtered."
+msgstr "Some programs are being filtered."
+
+msgid "Show all"
+msgstr "Show all"
+
+msgid "Program"
+msgstr "Program"
+
+msgid "Registration"
+msgstr "Registration"
+
+msgid "Organisation Unit"
+msgstr "Organisation Unit"
+
+msgid "All accessible"
+msgstr "All accessible"
+
+msgid "Selected"
+msgstr "Selected"
+
+msgid "Please select an organisation unit."
+msgstr "Please select an organisation unit."
+
+msgid "Organisation unit scope"
+msgstr "Organisation unit scope"
+
+msgid "Selected program"
+msgstr "Selected program"
+
+msgid "Search {{uniqueAttrName}}"
+msgstr "Search {{uniqueAttrName}}"
+
+msgid "Search by attributes"
+msgstr "Search by attributes"
+
+msgid "Search {{attributeName}}"
+msgstr "Search {{attributeName}}"
+
+msgid "Fill in at least {{count}} attribute to search"
+msgid_plural "Fill in at least {{count}} attribute to search"
+msgstr[0] "Fill in at least {{count}} attribute to search"
+msgstr[1] "Fill in at least {{count}} attributes to search"
+
+msgid "Missing search criteria"
+msgstr "Missing search criteria"
+
+msgid "Please fill in {{uniqueTEAName}} to search"
+msgstr "Please fill in {{uniqueTEAName}} to search"
+
+msgid "Back to search"
+msgstr "Back to search"
+
+msgid "Search form is missing. See log for details"
+msgstr "Search form is missing. See log for details"
+
+msgid "Could not retrieve metadata. Please try again later."
+msgstr "Could not retrieve metadata. Please try again later."
+
+msgid "Choose an organisation unit to start reporting"
+msgstr "Choose an organisation unit to start reporting"
+
+msgid "The enrollment event data could not be found"
+msgstr "The enrollment event data could not be found"
+
+msgid "Loading"
+msgstr "Loading"
+
+msgid "An error occurred while loading the form"
+msgstr "An error occurred while loading the form"
+
 msgid "Quick actions"
 msgstr "Quick actions"
 
@@ -724,6 +810,18 @@ msgstr "Make referral"
 msgid "No available program stages"
 msgstr "No available program stages"
 
+msgid "Enrollment with id \"{{enrollmentId}}\" does not exist"
+msgstr "Enrollment with id \"{{enrollmentId}}\" does not exist"
+
+msgid "Tracked entity instance with id \"{{teiId}}\" does not exist"
+msgstr "Tracked entity instance with id \"{{teiId}}\" does not exist"
+
+msgid "Program with id \"{{programId}}\" does not exist"
+msgstr "Program with id \"{{programId}}\" does not exist"
+
+msgid "An error occurred while fetching enrollments. Please enter a valid url."
+msgstr "An error occurred while fetching enrollments. Please enter a valid url."
+
 msgid "Invalid enrollment id {{enrollmentId}}."
 msgstr "Invalid enrollment id {{enrollmentId}}."
 
@@ -778,18 +876,6 @@ msgstr "Create a new event in this program."
 msgid "View working list in this program."
 msgstr "View working list in this program."
 
-msgid "Enrollment with id \"{{enrollmentId}}\" does not exist"
-msgstr "Enrollment with id \"{{enrollmentId}}\" does not exist"
-
-msgid "Tracked entity instance with id \"{{teiId}}\" does not exist"
-msgstr "Tracked entity instance with id \"{{teiId}}\" does not exist"
-
-msgid "Program with id \"{{programId}}\" does not exist"
-msgstr "Program with id \"{{programId}}\" does not exist"
-
-msgid "An error occurred while fetching enrollments. Please enter a valid url."
-msgstr "An error occurred while fetching enrollments. Please enter a valid url."
-
 msgid "An error has occurred"
 msgstr "An error has occurred"
 
@@ -885,9 +971,6 @@ msgstr ""
 "You don't have access to create a {{trackedEntityName}} in the current "
 "selections"
 
-msgid "Choose an organisation unit to start reporting"
-msgstr "Choose an organisation unit to start reporting"
-
 msgid "Choose the {{missingCategories}} to start reporting"
 msgstr "Choose the {{missingCategories}} to start reporting"
 
@@ -909,32 +992,8 @@ msgstr "Save {{trackedEntityTypeName}}"
 msgid "Save {{trackedEntityName}}"
 msgstr "Save {{trackedEntityName}}"
 
-msgid "Enter details now is not available when creating a relationship"
-msgstr "Enter details now is not available when creating a relationship"
-
-msgid "Save new {{trackedEntityTypeName}} and link"
-msgstr "Save new {{trackedEntityTypeName}} and link"
-
-msgid "Link"
-msgstr "Link"
-
-msgid "Save as new {{trackedEntityName}}"
-msgstr "Save as new {{trackedEntityName}}"
-
-msgid "Some programs are being filtered."
-msgstr "Some programs are being filtered."
-
-msgid "Show all"
-msgstr "Show all"
-
-msgid "Program"
-msgstr "Program"
-
-msgid "Organisation Unit"
-msgstr "Organisation Unit"
-
-msgid "Registration"
-msgstr "Registration"
+msgid "Register"
+msgstr "Register"
 
 msgid "Search results"
 msgstr "Search results"
@@ -954,9 +1013,6 @@ msgstr "Link to an existing {{trackedEntityType}}"
 msgid "Create new {{trackedEntityType}}"
 msgstr "Create new {{trackedEntityType}}"
 
-msgid "Register"
-msgstr "Register"
-
 msgid "Back"
 msgstr "Back"
 
@@ -966,6 +1022,15 @@ msgstr "events"
 msgid "event"
 msgstr "event"
 
+msgid "Event could not be loaded. Are you sure it exists?"
+msgstr "Event could not be loaded. Are you sure it exists?"
+
+msgid "Event could not be loaded"
+msgstr "Event could not be loaded"
+
+msgid "Organisation unit could not be loaded"
+msgstr "Organisation unit could not be loaded"
+
 msgid "View changelog"
 msgstr "View changelog"
 
@@ -991,79 +1056,14 @@ msgstr "This event doesn't have any relationships"
 msgid "Warnings"
 msgstr "Warnings"
 
-msgid "Event could not be loaded. Are you sure it exists?"
-msgstr "Event could not be loaded. Are you sure it exists?"
+msgid "First Page"
+msgstr "First Page"
 
-msgid "Event could not be loaded"
-msgstr "Event could not be loaded"
+msgid "Previous Page"
+msgstr "Previous Page"
 
-msgid "Organisation unit could not be loaded"
-msgstr "Organisation unit could not be loaded"
-
-msgid "tracked entity instance"
-msgstr "tracked entity instance"
-
-msgid "All accessible"
-msgstr "All accessible"
-
-msgid "Selected"
-msgstr "Selected"
-
-msgid "Please select an organisation unit."
-msgstr "Please select an organisation unit."
-
-msgid "Organisation unit scope"
-msgstr "Organisation unit scope"
-
-msgid "Selected program"
-msgstr "Selected program"
-
-msgid "Search {{uniqueAttrName}}"
-msgstr "Search {{uniqueAttrName}}"
-
-msgid "Search by attributes"
-msgstr "Search by attributes"
-
-msgid "Search {{attributeName}}"
-msgstr "Search {{attributeName}}"
-
-msgid "Fill in at least {{count}} attribute to search"
-msgid_plural "Fill in at least {{count}} attribute to search"
-msgstr[0] "Fill in at least {{count}} attribute to search"
-msgstr[1] "Fill in at least {{count}} attributes to search"
-
-msgid "Missing search criteria"
-msgstr "Missing search criteria"
-
-msgid "Please fill in {{uniqueTEAName}} to search"
-msgstr "Please fill in {{uniqueTEAName}} to search"
-
-msgid "Back to search"
-msgstr "Back to search"
-
-msgid "Search form is missing. See log for details"
-msgstr "Search form is missing. See log for details"
-
-msgid "Could not retrieve metadata. Please try again later."
-msgstr "Could not retrieve metadata. Please try again later."
-
-msgid "The enrollment event data could not be found"
-msgstr "The enrollment event data could not be found"
-
-msgid "Loading"
-msgstr "Loading"
-
-msgid "An error occurred while loading the form"
-msgstr "An error occurred while loading the form"
-
-msgid "First Page"
-msgstr "First Page"
-
-msgid "Previous Page"
-msgstr "Previous Page"
-
-msgid "Next Page"
-msgstr "Next Page"
+msgid "Next Page"
+msgstr "Next Page"
 
 msgid "Possible duplicates found"
 msgstr "Possible duplicates found"
@@ -1371,15 +1371,24 @@ msgstr "Remove mark for follow-up"
 msgid "Mark for follow-up"
 msgstr "Mark for follow-up"
 
+msgid "An error occurred while transferring ownership"
+msgstr "An error occurred while transferring ownership"
+
 msgid "Transfer"
 msgstr "Transfer"
 
-msgid "An error occurred while transferring ownership"
-msgstr "An error occurred while transferring ownership"
+msgid "Cancelled"
+msgstr "Cancelled"
 
 msgid "Existing dates for auto-generated events will not be updated."
 msgstr "Existing dates for auto-generated events will not be updated."
 
+msgid "Add coordinates"
+msgstr "Add coordinates"
+
+msgid "Add area"
+msgstr "Add area"
+
 msgid "Latitude"
 msgstr "Latitude"
 
@@ -1421,6 +1430,9 @@ msgstr ""
 "You will lose access to the enrollment when transferring ownership to "
 "{{organisationUnit}}."
 
+msgid "organisation unit"
+msgstr "organisation unit"
+
 msgid "Transfer Ownership"
 msgstr "Transfer Ownership"
 
@@ -1431,6 +1443,16 @@ msgstr ""
 "Choose the organisation unit to which enrollment ownership should be "
 "transferred."
 
+msgid "Cannot transfer to this {{orgUnitLabel}}"
+msgstr "Cannot transfer to this {{orgUnitLabel}}"
+
+msgid ""
+"The enrollment date is outside the selected {{orgUnitLabel}}'s opening and "
+"closing dates."
+msgstr ""
+"The enrollment date is outside the selected {{orgUnitLabel}}'s opening and "
+"closing dates."
+
 msgid "Enrollment date"
 msgstr "Enrollment date"
 
@@ -1449,15 +1471,6 @@ msgstr "Started at{{escape}}"
 msgid "Owned by{{escape}}"
 msgstr "Owned by{{escape}}"
 
-msgid "Cancelled"
-msgstr "Cancelled"
-
-msgid "Add coordinates"
-msgstr "Add coordinates"
-
-msgid "Add area"
-msgstr "Add area"
-
 msgid "Program stage not found"
 msgstr "Program stage not found"
 
@@ -1617,6 +1630,9 @@ msgstr "{{trackedEntityName}} profile"
 msgid "Profile"
 msgstr "Profile"
 
+msgid "Fix errors in the form to continue."
+msgstr "Fix errors in the form to continue."
+
 msgid "There is a problem with this form"
 msgstr "There is a problem with this form"
 
@@ -1629,9 +1645,6 @@ msgstr "There was a problem saving changes"
 msgid "Try again or contact your system administrator for support"
 msgstr "Try again or contact your system administrator for support"
 
-msgid "Fix errors in the form to continue."
-msgstr "Fix errors in the form to continue."
-
 msgid "You do not have access to delete this {{trackedEntityTypeName}}"
 msgstr "You do not have access to delete this {{trackedEntityTypeName}}"
 
@@ -1668,12 +1681,36 @@ msgstr "No attributes configured"
 msgid "{{trackedEntityTypeName}} profile"
 msgstr "{{trackedEntityTypeName}} profile"
 
+msgid "Enter details now"
+msgstr "Enter details now"
+
+msgid "Link to an existing event"
+msgstr "Link to an existing event"
+
+msgid "The event was successfully linked"
+msgstr "The event was successfully linked"
+
+msgid "An error occurred while linking the event"
+msgstr "An error occurred while linking the event"
+
+msgid "Scheduled date"
+msgstr "Scheduled date"
+
+msgid "Report date"
+msgstr "Report date"
+
 msgid "Choose a {{linkableStageLabel}} event"
 msgstr "Choose a {{linkableStageLabel}} event"
 
 msgid "Select an event"
 msgstr "Select an event"
 
+msgid "Please enter a date"
+msgstr "Please enter a date"
+
+msgid "Please select a valid event"
+msgstr "Please select a valid event"
+
 msgid "{{ linkableStageLabel }} can only have one event"
 msgstr "{{ linkableStageLabel }} can only have one event"
 
@@ -1692,29 +1729,104 @@ msgstr "Enter details"
 msgid "Linked event"
 msgstr "Linked event"
 
-msgid "Enter details now"
-msgstr "Enter details now"
+msgid "Changelog"
+msgstr "Changelog"
 
-msgid "Link to an existing event"
-msgstr "Link to an existing event"
+msgid "No changes to display"
+msgstr "No changes to display"
 
-msgid "The event was successfully linked"
-msgstr "The event was successfully linked"
+msgid "Data item"
+msgstr "Data item"
 
-msgid "An error occurred while linking the event"
-msgstr "An error occurred while linking the event"
+msgid "Updated"
+msgstr "Updated"
 
-msgid "Scheduled date"
-msgstr "Scheduled date"
+msgid "Created"
+msgstr "Created"
 
-msgid "Report date"
-msgstr "Report date"
+msgid "Deleted"
+msgstr "Deleted"
 
-msgid "Please enter a date"
-msgstr "Please enter a date"
+msgid "Sort by date"
+msgstr "Sort by date"
 
-msgid "Please select a valid event"
-msgstr "Please select a valid event"
+msgid "User"
+msgstr "User"
+
+msgid "Sort by username"
+msgstr "Sort by username"
+
+msgid "Sort by data item"
+msgstr "Sort by data item"
+
+msgid "Change"
+msgstr "Change"
+
+msgid "Value"
+msgstr "Value"
+
+msgid "File"
+msgstr "File"
+
+msgid "Image"
+msgstr "Image"
+
+msgid "Delete relationship"
+msgstr "Delete relationship"
+
+msgid "Deleting the relationship is permanent and cannot be undone."
+msgstr "Deleting the relationship is permanent and cannot be undone."
+
+msgid "Are you sure you want to delete this relationship?"
+msgstr "Are you sure you want to delete this relationship?"
+
+msgid "Yes, delete relationship"
+msgstr "Yes, delete relationship"
+
+msgid "An error occurred while deleting the relationship."
+msgstr "An error occurred while deleting the relationship."
+
+msgid "Show {{ rest }} more"
+msgstr "Show {{ rest }} more"
+
+msgid "To open this relationship, please wait until saving is complete"
+msgstr "To open this relationship, please wait until saving is complete"
+
+msgid "This enrollment doesn't have any relationships"
+msgstr "This enrollment doesn't have any relationships"
+
+msgid "Type"
+msgstr "Type"
+
+msgid "Created date"
+msgstr "Created date"
+
+msgid "Program stage name"
+msgstr "Program stage name"
+
+msgid "New {{trackedEntityTypeName}} relationship"
+msgstr "New {{trackedEntityTypeName}} relationship"
+
+msgid "An error occurred while adding the relationship"
+msgstr "An error occurred while adding the relationship"
+
+msgid "Missing implementation step"
+msgstr "Missing implementation step"
+
+msgid "Go back without saving relationship"
+msgstr "Go back without saving relationship"
+
+msgid "New Relationship"
+msgstr "New Relationship"
+
+msgid "Link to an existing {{tetName}}"
+msgstr "Link to an existing {{tetName}}"
+
+msgid "Something went wrong while loading relationships. Please try again later."
+msgstr "Something went wrong while loading relationships. Please try again later."
+
+msgid "{{trackedEntityTypeName}} relationships"
+msgstr "{{trackedEntityTypeName}} relationships"
 
 msgid "This stage can only have one event"
 msgstr "This stage can only have one event"
@@ -1743,9 +1855,6 @@ msgstr "Skip"
 msgid "To open this event, please wait until saving is complete"
 msgstr "To open this event, please wait until saving is complete"
 
-msgid "Show {{ rest }} more"
-msgstr "Show {{ rest }} more"
-
 msgid "Go to full {{ eventName }}"
 msgstr "Go to full {{ eventName }}"
 
@@ -1809,6 +1918,9 @@ msgstr "You do not have access to remove the link between these events"
 msgid "You do not have access to remove the link and delete the linked event"
 msgstr "You do not have access to remove the link and delete the linked event"
 
+msgid "Scheduled"
+msgstr "Scheduled"
+
 msgid "An error occurred while loading the widget."
 msgstr "An error occurred while loading the widget."
 
@@ -1819,114 +1931,15 @@ msgstr ""
 "This {{stageName}} event is linked to a {{linkedStageName}} event. Review "
 "the linked event details before entering data below"
 
-msgid "Scheduled"
-msgstr "Scheduled"
-
-msgid "Changelog"
-msgstr "Changelog"
-
-msgid "No changes to display"
-msgstr "No changes to display"
-
-msgid "Data item"
-msgstr "Data item"
-
-msgid "Updated"
-msgstr "Updated"
-
-msgid "Created"
-msgstr "Created"
-
-msgid "Deleted"
-msgstr "Deleted"
-
-msgid "Sort by date"
-msgstr "Sort by date"
-
-msgid "User"
-msgstr "User"
-
-msgid "Sort by username"
-msgstr "Sort by username"
-
-msgid "Sort by data item"
-msgstr "Sort by data item"
-
-msgid "Change"
-msgstr "Change"
-
-msgid "Value"
-msgstr "Value"
-
-msgid "File"
-msgstr "File"
-
-msgid "Image"
-msgstr "Image"
-
-msgid "New {{trackedEntityTypeName}} relationship"
-msgstr "New {{trackedEntityTypeName}} relationship"
-
-msgid "Missing implementation step"
-msgstr "Missing implementation step"
-
-msgid "Go back without saving relationship"
-msgstr "Go back without saving relationship"
-
-msgid "New Relationship"
-msgstr "New Relationship"
-
-msgid "Link to an existing {{tetName}}"
-msgstr "Link to an existing {{tetName}}"
-
-msgid "An error occurred while adding the relationship"
-msgstr "An error occurred while adding the relationship"
-
-msgid "Something went wrong while loading relationships. Please try again later."
-msgstr "Something went wrong while loading relationships. Please try again later."
-
-msgid "{{trackedEntityTypeName}} relationships"
-msgstr "{{trackedEntityTypeName}} relationships"
-
-msgid "Delete relationship"
-msgstr "Delete relationship"
-
-msgid "Deleting the relationship is permanent and cannot be undone."
-msgstr "Deleting the relationship is permanent and cannot be undone."
-
-msgid "Are you sure you want to delete this relationship?"
-msgstr "Are you sure you want to delete this relationship?"
-
-msgid "Yes, delete relationship"
-msgstr "Yes, delete relationship"
-
-msgid "An error occurred while deleting the relationship."
-msgstr "An error occurred while deleting the relationship."
-
-msgid "To open this relationship, please wait until saving is complete"
-msgstr "To open this relationship, please wait until saving is complete"
-
-msgid "This enrollment doesn't have any relationships"
-msgstr "This enrollment doesn't have any relationships"
-
-msgid "Type"
-msgstr "Type"
-
-msgid "Created date"
-msgstr "Created date"
-
-msgid "Program stage name"
-msgstr "Program stage name"
-
 msgid "Working list could not be loaded"
 msgstr "Working list could not be loaded"
 
-msgid "Download data..."
-msgstr "Download data..."
-
 msgid "an error occurred loading working lists"
 msgstr "an error occurred loading working lists"
 
+msgid "Download data..."
+msgstr "Download data..."
+
 msgid "You do not have access to complete events"
 msgstr "You do not have access to complete events"
 
@@ -1972,6 +1985,12 @@ msgstr "This cannot be undone."
 msgid "Are you sure you want to delete the selected events?"
 msgstr "Are you sure you want to delete the selected events?"
 
+msgid "Working list could not be updated"
+msgstr "Working list could not be updated"
+
+msgid "an error occurred loading the working lists"
+msgstr "an error occurred loading the working lists"
+
 msgid "Owner organisation unit"
 msgstr "Owner organisation unit"
 
@@ -2112,12 +2131,6 @@ msgstr "Are you sure you want to delete?"
 msgid "An error occurred while deleting the records"
 msgstr "An error occurred while deleting the records"
 
-msgid "Working list could not be updated"
-msgstr "Working list could not be updated"
-
-msgid "an error occurred loading the working lists"
-msgstr "an error occurred loading the working lists"
-
 msgid "Update view"
 msgstr "Update view"
 
@@ -2298,6 +2311,19 @@ msgstr "Please enter a valid time"
 msgid "Please enter a time"
 msgstr "Please enter a time"
 
+msgid ""
+"Date must be within the {{orgUnitLabel}}'s opening and closing dates "
+"({{opening}} – {{closed}})"
+msgstr ""
+"Date must be within the {{orgUnitLabel}}'s opening and closing dates "
+"({{opening}} – {{closed}})"
+
+msgid "Date cannot be before the {{orgUnitLabel}}'s opening date ({{opening}})"
+msgstr "Date cannot be before the {{orgUnitLabel}}'s opening date ({{opening}})"
+
+msgid "Date cannot be after the {{orgUnitLabel}}'s closing date ({{closed}})"
+msgstr "Date cannot be after the {{orgUnitLabel}}'s closing date ({{closed}})"
+
 msgid ""
 "The following attribute type is not supported for searching and has been "
 "hidden"
diff --git a/src/core_modules/capture-core/components/DataEntries/Enrollment/EnrollmentDataEntry.component.tsx b/src/core_modules/capture-core/components/DataEntries/Enrollment/EnrollmentDataEntry.component.tsx
index 81802aa393..eab277cd72 100644
--- a/src/core_modules/capture-core/components/DataEntries/Enrollment/EnrollmentDataEntry.component.tsx
+++ b/src/core_modules/capture-core/components/DataEntries/Enrollment/EnrollmentDataEntry.component.tsx
@@ -4,6 +4,11 @@ import i18n from '@dhis2/d2-i18n';
 import moment from 'moment';
 import { type OrgUnit } from '@dhis2/rules-engine-javascript';
 import { convertDateObjectToDateFormatString } from 'capture-core/utils/converters/date';
+import {
+    getOrgUnitOpeningCalendarMin,
+    getOrgUnitClosingCalendarMax,
+} from 'capture-core/utils/orgUnits/getOrgUnitCalendarBounds';
+import { getOrgUnitLabel } from 'capture-core/utils/orgUnits/getOrgUnitLabel';
 import { isLangRtl } from '../../../utils/rtl';
 import {
     DataEntry,
@@ -118,14 +123,14 @@ const getEnrollmentDateSettings = () => {
             required: true,
             calendarWidth: props.formHorizontal ? 250 : 350,
             popupAnchorPosition: getCalendarAnchorPosition(props.formHorizontal),
-            calendarMax: !props.enrollmentMetadata.allowFutureEnrollmentDate ?
-                convertDateObjectToDateFormatString(moment()) :
-                undefined,
+            calendarMax: getOrgUnitClosingCalendarMax(props.orgUnit, !props.enrollmentMetadata.allowFutureEnrollmentDate),
+            calendarMin: getOrgUnitOpeningCalendarMin(props.orgUnit),
             calendarType: systemSettingsStore.get().calendar,
             dateFormat: systemSettingsStore.get().dateFormat,
         }),
         getPropName: () => 'enrolledAt',
-        getValidatorContainers: getEnrollmentDateValidatorContainer,
+        getValidatorContainers: (props: any) =>
+            getEnrollmentDateValidatorContainer(props?.orgUnit, getOrgUnitLabel(props?.programId)),
         getPassOnFieldData: () => true,
         getMeta: () => ({
             placement: placements.TOP,
diff --git a/src/core_modules/capture-core/components/DataEntries/Enrollment/fieldValidators/enrollmentDate.validatorContainersGetter.ts b/src/core_modules/capture-core/components/DataEntries/Enrollment/fieldValidators/enrollmentDate.validatorContainersGetter.ts
index 90cd7edda6..1bc1279fd4 100644
--- a/src/core_modules/capture-core/components/DataEntries/Enrollment/fieldValidators/enrollmentDate.validatorContainersGetter.ts
+++ b/src/core_modules/capture-core/components/DataEntries/Enrollment/fieldValidators/enrollmentDate.validatorContainersGetter.ts
@@ -1,6 +1,11 @@
 import i18n from '@dhis2/d2-i18n';
 import { hasValue } from 'capture-core-utils/validators/form';
-import { isValidDate, isValidNonFutureDate } from '../../../../utils/validation/validators/form';
+import {
+    isValidDate,
+    isValidNonFutureDate,
+    getWithinOrgUnitDateRangeValidator,
+} from '../../../../utils/validation/validators/form';
+import type { OrgUnitDateRange } from '../../../../utils/orgUnits/getOrgUnitCalendarBounds';
 
 const isValidEnrollmentDate = (value: string, internalComponentError?: {error?: string, errorCode?: string}) => {
     if (!value) {
@@ -10,7 +15,7 @@ const isValidEnrollmentDate = (value: string, internalComponentError?: {error?:
     return isValidDate(value, internalComponentError);
 };
 
-export const getEnrollmentDateValidatorContainer = () => {
+export const getEnrollmentDateValidatorContainer = (orgUnit?: OrgUnitDateRange | null, orgUnitLabel?: string | null) => {
     const validatorContainers = [
         {
             validator: hasValue,
@@ -24,6 +29,12 @@ export const getEnrollmentDateValidatorContainer = () => {
         { validator: isValidNonFutureDate,
             errorMessage: i18n.t('A date in the future is not allowed'),
         },
+        {
+            // The message is built by the validator itself (it interpolates the org unit's
+            // opening/closing dates and label), so the static fallback is intentionally empty.
+            validator: getWithinOrgUnitDateRangeValidator(orgUnit, orgUnitLabel),
+            errorMessage: '',
+        },
     ];
     return validatorContainers;
 };
diff --git a/src/core_modules/capture-core/components/DataEntries/SingleEventRegistrationEntry/DataEntryWrapper/DataEntry/DataEntry.component.tsx b/src/core_modules/capture-core/components/DataEntries/SingleEventRegistrationEntry/DataEntryWrapper/DataEntry/DataEntry.component.tsx
index a60123b6fe..3156959bc1 100644
--- a/src/core_modules/capture-core/components/DataEntries/SingleEventRegistrationEntry/DataEntryWrapper/DataEntry/DataEntry.component.tsx
+++ b/src/core_modules/capture-core/components/DataEntries/SingleEventRegistrationEntry/DataEntryWrapper/DataEntry/DataEntry.component.tsx
@@ -4,6 +4,10 @@ import type { ReduxAction } from 'capture-core-utils/types';
 import i18n from '@dhis2/d2-i18n';
 import { type OrgUnit } from '@dhis2/rules-engine-javascript';
 import { isLangRtl } from '../../../../../utils/rtl';
+import {
+    getOrgUnitOpeningCalendarMin,
+    getOrgUnitClosingCalendarMax,
+} from '../../../../../utils/orgUnits/getOrgUnitCalendarBounds';
 import { DataEntry as DataEntryContainer } from '../../../../DataEntry/DataEntry.container';
 import { withCancelButton } from '../../../../DataEntry/withCancelButton';
 import { withDataEntryField } from '../../../../DataEntry/dataEntryField/withDataEntryField';
@@ -175,6 +179,8 @@ const buildReportDateSettingsFn = () => {
             calendarWidth: props.formHorizontal ? 250 : 350,
             orientation: getOrientation(props.formHorizontal),
             popupAnchorPosition: getCalendarAnchorPosition(props.formHorizontal),
+            calendarMax: getOrgUnitClosingCalendarMax(props.orgUnit),
+            calendarMin: getOrgUnitOpeningCalendarMin(props.orgUnit),
             calendarType: systemSettingsStore.get().calendar,
             dateFormat: systemSettingsStore.get().dateFormat,
         }),
@@ -521,6 +527,7 @@ type Props = {
     programName: string,
     orgUnitId: string,
     orgUnit: OrgUnit,
+    orgUnitWithDates?: OrgUnit,
     orgUnitName: string,
     stageName: string,
     onUpdateDataEntryField: (orgUnit: OrgUnit) => (innerAction: ReduxAction<any, any>) => void,
@@ -650,6 +657,7 @@ class NewEventDataEntry extends Component<Props & WithStyles<typeof getStyles>>
             onStartAsyncUpdateField,
             programName, // eslint-disable-line
             orgUnit,
+            orgUnitWithDates,
             orgUnitName, // eslint-disable-line
             classes,
             onSave,
@@ -671,7 +679,7 @@ class NewEventDataEntry extends Component<Props & WithStyles<typeof getStyles>>
                         fieldOptions={this.fieldOptions}
                         dataEntrySections={this.dataEntrySections}
                         relationshipsRef={this.setRelationshipsInstance}
-                        orgUnit={orgUnit}
+                        orgUnit={orgUnitWithDates ?? orgUnit}
                         // @ts-expect-error - keeping original functionality as before ts rewrite
                         orgUnitId={orgUnit?.id}
                         {...passOnProps}
diff --git a/src/core_modules/capture-core/components/DataEntries/SingleEventRegistrationEntry/DataEntryWrapper/DataEntry/DataEntry.container.ts b/src/core_modules/capture-core/components/DataEntries/SingleEventRegistrationEntry/DataEntryWrapper/DataEntry/DataEntry.container.tsx
similarity index 82%
rename from src/core_modules/capture-core/components/DataEntries/SingleEventRegistrationEntry/DataEntryWrapper/DataEntry/DataEntry.container.ts
rename to src/core_modules/capture-core/components/DataEntries/SingleEventRegistrationEntry/DataEntryWrapper/DataEntry/DataEntry.container.tsx
index 6248331077..b93fa80427 100644
--- a/src/core_modules/capture-core/components/DataEntries/SingleEventRegistrationEntry/DataEntryWrapper/DataEntry/DataEntry.container.ts
+++ b/src/core_modules/capture-core/components/DataEntries/SingleEventRegistrationEntry/DataEntryWrapper/DataEntry/DataEntry.container.tsx
@@ -1,5 +1,6 @@
+import React from 'react';
 import { v4 as uuid } from 'uuid';
-import { connect } from 'react-redux';
+import { connect, useSelector } from 'react-redux';
 import i18n from '@dhis2/d2-i18n';
 import { batchActions } from 'redux-batched-actions';
 import type { OrgUnit } from '@dhis2/rules-engine-javascript';
@@ -24,6 +25,7 @@ import {
 } from './dataEntry.selectors';
 import type { RenderFoundation } from '../../../../../metaData';
 import { withLoadingIndicator, withErrorMessageHandler } from '../../../../../HOC';
+import { useOrgUnitWithDates } from '../../../../../metadataRetrieval/coreOrgUnit';
 import { newEventSaveTypes } from './newEventSaveTypes';
 
 const makeMapStateToProps = () => {
@@ -32,8 +34,8 @@ const makeMapStateToProps = () => {
     const mapStateToProps = (state: any, props: any) => ({
         recentlyAddedRelationshipId: state.newEventPage.recentlyAddedRelationshipId,
         ready: !state.activePage.isDataEntryLoading,
-        error: !props.formFoundation ?
-            i18n.t('This is not an event program or the metadata is corrupt. See log for details.') : null,
+        error: props.formFoundation ?
+            null : i18n.t('This is not an event program or the metadata is corrupt. See log for details.'),
         programName: programNameSelector(state),
         orgUnit: state.dataEntriesFieldsValue['singleEvent-newEvent']?.orgUnit,
         orgUnitName: state.dataEntriesFieldsValue['singleEvent-newEvent']?.orgUnit?.name,
@@ -110,6 +112,17 @@ const mapDispatchToProps = (dispatch: any) => ({
         },
 });
 
-export const DataEntry = connect(makeMapStateToProps, mapDispatchToProps)(
+const ConnectedDataEntry = connect(makeMapStateToProps, mapDispatchToProps)(
     withLoadingIndicator()(withErrorMessageHandler()(DataEntryComponent)),
 );
+
+// The org unit is selected within the form (and lives in redux), so we enrich the field value
+// here — not in the parent wrapper — with its opening/closing dates, allowing the occurred-date
+// field to enforce the org unit's open/close range. The bare `orgUnit` (save/rules) is untouched.
+export const DataEntry = (props: any) => {
+    const orgUnitFieldValue = useSelector(
+        (state: any) => state.dataEntriesFieldsValue['singleEvent-newEvent']?.orgUnit,
+    );
+    const orgUnitWithDates = useOrgUnitWithDates(orgUnitFieldValue);
+    return <ConnectedDataEntry {...props} orgUnitWithDates={orgUnitWithDates} />;
+};
diff --git a/src/core_modules/capture-core/components/DataEntries/SingleEventRegistrationEntry/DataEntryWrapper/DataEntry/fieldValidators/eventDate.validatorContainersGetter.ts b/src/core_modules/capture-core/components/DataEntries/SingleEventRegistrationEntry/DataEntryWrapper/DataEntry/fieldValidators/eventDate.validatorContainersGetter.ts
index 769cad5481..61ee55490c 100644
--- a/src/core_modules/capture-core/components/DataEntries/SingleEventRegistrationEntry/DataEntryWrapper/DataEntry/fieldValidators/eventDate.validatorContainersGetter.ts
+++ b/src/core_modules/capture-core/components/DataEntries/SingleEventRegistrationEntry/DataEntryWrapper/DataEntry/fieldValidators/eventDate.validatorContainersGetter.ts
@@ -1,8 +1,13 @@
 import { hasValue } from 'capture-core-utils/validators/form';
 import i18n from '@dhis2/d2-i18n';
-import { isValidDate, isValidPeriod } from '../../../../../../utils/validation/validators/form';
+import {
+    isValidDate,
+    isValidPeriod,
+    getWithinOrgUnitDateRangeValidator,
+} from '../../../../../../utils/validation/validators/form';
 import { convertFormToClient } from '../../../../../../converters';
 import { dataElementTypes } from '../../../../../../metaData';
+import { getOrgUnitLabel } from '../../../../../../utils/orgUnits/getOrgUnitLabel';
 
 const preValidateDate = (
     value?: string,
@@ -47,4 +52,10 @@ export const getEventDateValidatorContainers = (props?: any) => [
         validator: (value: string) => validateNotExpired(value, props),
         errorMessage: '',
     },
+    {
+        // The message is built by the validator itself (it interpolates the org unit's
+        // opening/closing dates and label), so the static fallback is intentionally empty.
+        validator: getWithinOrgUnitDateRangeValidator(props?.orgUnit, getOrgUnitLabel(props?.programId)),
+        errorMessage: '',
+    },
 ];
diff --git a/src/core_modules/capture-core/components/WidgetEnrollment/TransferModal/TransferModal.component.tsx b/src/core_modules/capture-core/components/WidgetEnrollment/TransferModal/TransferModal.component.tsx
index 0ed8c66bc4..59e19942ec 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollment/TransferModal/TransferModal.component.tsx
+++ b/src/core_modules/capture-core/components/WidgetEnrollment/TransferModal/TransferModal.component.tsx
@@ -6,12 +6,16 @@ import {
     ModalActions,
     ButtonStrip,
     Button,
+    NoticeBox,
 } from '@dhis2/ui';
 import i18n from '@dhis2/d2-i18n';
+import { isIsoDateWithinOrgUnitRange } from 'capture-core/utils/validation/validators/form';
+import { getOrgUnitLabel } from 'capture-core/utils/orgUnits/getOrgUnitLabel';
 import type { TransferModalProps } from './TransferModal.types';
 import { OrgUnitField } from './OrgUnitField';
 import { useTransferValidation } from './hooks/useTransferValidation';
 import { InfoBoxes } from './InfoBoxes';
+import { useCoreOrgUnit } from '../../../metadataRetrieval/coreOrgUnit';
 
 export const TransferModal = ({
     enrollment,
@@ -31,6 +35,12 @@ export const TransferModal = ({
         ownerOrgUnitId,
     });
 
+    // The enrollment date must fall within the destination org unit's opening/closing range
+    const { orgUnit: destinationOrgUnit } = useCoreOrgUnit(selectedOrgUnit?.id ?? '');
+    const enrollmentDateOutsideRange = !!selectedOrgUnit
+        && !isIsoDateWithinOrgUnitRange(enrollment.enrolledAt, destinationOrgUnit);
+    const orgUnitLabel = getOrgUnitLabel(enrollment.program) || i18n.t('organisation unit');
+
     const handleOnUpdateOwnership = async () => {
         if (!selectedOrgUnit) return;
         await onUpdateOwnership({
@@ -65,6 +75,22 @@ export const TransferModal = ({
                     programAccessLevel={programAccessLevel}
                     orgUnitScopes={orgUnitScopes}
                 />
+
+                {enrollmentDateOutsideRange && (
+                    <NoticeBox
+                        error
+                        title={i18n.t('Cannot transfer to this {{orgUnitLabel}}', {
+                            orgUnitLabel,
+                            interpolation: { escapeValue: false },
+                        })}
+                        dataTest={'transfer-enrollment-date-out-of-range'}
+                    >
+                        {i18n.t(
+                            "The enrollment date is outside the selected {{orgUnitLabel}}'s opening and closing dates.",
+                            { orgUnitLabel, interpolation: { escapeValue: false } },
+                        )}
+                    </NoticeBox>
+                )}
             </ModalContent>
 
             <ModalActions>
@@ -76,7 +102,7 @@ export const TransferModal = ({
                     <Button
                         dataTest={'widget-enrollment-transfer-button'}
                         primary
-                        disabled={!ready || !selectedOrgUnit}
+                        disabled={!ready || !selectedOrgUnit || enrollmentDateOutsideRange}
                         loading={isTransferLoading}
                         onClick={handleOnUpdateOwnership}
                     >
diff --git a/src/core_modules/capture-core/components/WidgetEnrollment/TransferModal/TransferModal.types.ts b/src/core_modules/capture-core/components/WidgetEnrollment/TransferModal/TransferModal.types.ts
index f09635cf61..08ecc83b00 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollment/TransferModal/TransferModal.types.ts
+++ b/src/core_modules/capture-core/components/WidgetEnrollment/TransferModal/TransferModal.types.ts
@@ -1,7 +1,7 @@
 import type { UpdateEnrollmentOwnership } from '../Actions/Transfer/hooks/useUpdateOwnership';
 
 export type TransferModalProps = {
-    enrollment: { program: string };
+    enrollment: { program: string, enrolledAt?: string };
     ownerOrgUnitId: string;
     setOpenTransfer: (toggle: boolean) => void;
     onUpdateOwnership: UpdateEnrollmentOwnership;
diff --git a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/DataEntry/DataEntry.component.tsx b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/DataEntry/DataEntry.component.tsx
index 411a31e2e6..0553136296 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/DataEntry/DataEntry.component.tsx
+++ b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/DataEntry/DataEntry.component.tsx
@@ -4,6 +4,10 @@ import type { WithStyles } from 'capture-core-utils/styles';
 import { withStyles, withTheme } from 'capture-core-utils/styles';
 import i18n from '@dhis2/d2-i18n';
 import { isLangRtl } from '../../../utils/rtl';
+import {
+    getOrgUnitOpeningCalendarMin,
+    getOrgUnitClosingCalendarMax,
+} from '../../../utils/orgUnits/getOrgUnitCalendarBounds';
 import { DataEntry as DataEntryContainer } from '../../DataEntry/DataEntry.container';
 import { withDataEntryField } from '../../DataEntry/dataEntryField/withDataEntryField';
 import { withDataEntryNotesHandler } from '../../DataEntry/dataEntryNotes/withDataEntryNotesHandler';
@@ -160,6 +164,8 @@ const buildReportDateSettingsFn = () => {
             calendarWidth: props.formHorizontal ? 250 : 350,
             orientation: getOrientation(props.formHorizontal),
             popupAnchorPosition: getCalendarAnchorPosition(props.formHorizontal),
+            calendarMax: getOrgUnitClosingCalendarMax(props.orgUnit),
+            calendarMin: getOrgUnitOpeningCalendarMin(props.orgUnit),
             calendarType: systemSettingsStore.get().calendar,
             dateFormat: systemSettingsStore.get().dateFormat,
         }),
diff --git a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/DataEntry/DataEntry.container.tsx b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/DataEntry/DataEntry.container.tsx
index 5b1f9e9a42..2a787cb943 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/DataEntry/DataEntry.container.tsx
+++ b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/DataEntry/DataEntry.container.tsx
@@ -15,6 +15,7 @@ import {
 import type { AddEventSaveType } from './addEventSaveTypes';
 import type { ContainerProps } from './dataEntry.types';
 import { useProgramExpiryForUser } from '../../../hooks';
+import { useOrgUnitWithDates } from '../../../metadataRetrieval/coreOrgUnit';
 
 export const DataEntry = ({ rulesExecutionDependenciesClientFormatted, id, ...passOnProps }: ContainerProps) => {
     const dispatch = useDispatch();
@@ -22,6 +23,8 @@ export const DataEntry = ({ rulesExecutionDependenciesClientFormatted, id, ...pa
     const dataEntryItemId = useSelector(({ dataEntries }: any) => dataEntries[id] && dataEntries[id].itemId);
     const dataEntryKey = getDataEntryKey(id, dataEntryItemId);
     const orgUnitFieldValue = useSelector(({ dataEntriesFieldsValue }: any) => dataEntriesFieldsValue[dataEntryKey].orgUnit);
+    // Enrich the selected org unit with its opening/closing dates so event date fields can enforce them
+    const orgUnitFieldValueWithDates = useOrgUnitWithDates(orgUnitFieldValue);
     const expiryPeriod = useProgramExpiryForUser(programId);
     const onUpdateDataEntryField = useCallback((innerAction: ReduxAction<any, any>) => {
         const { dataEntryId, itemId } = innerAction.payload;
@@ -80,7 +83,7 @@ export const DataEntry = ({ rulesExecutionDependenciesClientFormatted, id, ...pa
         <DataEntryComponent
             {...passOnProps}
             id={id}
-            orgUnitFieldValue={orgUnitFieldValue}
+            orgUnitFieldValue={orgUnitFieldValueWithDates}
             programId={programId}
             expiryPeriod={expiryPeriod}
             onUpdateDataEntryField={onUpdateDataEntryField}
diff --git a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/DataEntry/fieldValidators/eventDate.validatorContainersGetter.ts b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/DataEntry/fieldValidators/eventDate.validatorContainersGetter.ts
index c873724f29..b69a678e0d 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/DataEntry/fieldValidators/eventDate.validatorContainersGetter.ts
+++ b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/DataEntry/fieldValidators/eventDate.validatorContainersGetter.ts
@@ -1,8 +1,13 @@
 import { hasValue } from 'capture-core-utils/validators/form';
 import i18n from '@dhis2/d2-i18n';
-import { isValidDate, isValidPeriod } from '../../../../utils/validation/validators/form';
+import {
+    isValidDate,
+    isValidPeriod,
+    getWithinOrgUnitDateRangeValidator,
+} from '../../../../utils/validation/validators/form';
 import { convertFormToClient } from '../../../../converters';
 import { dataElementTypes } from '../../../../metaData';
+import { getOrgUnitLabel } from '../../../../utils/orgUnits/getOrgUnitLabel';
 
 const preValidateDate = (
     value?: string | null,
@@ -47,4 +52,10 @@ export const getEventDateValidatorContainers = (props?: any) => [
         validator: (value: string) => validateNotExpired(value, props),
         errorMessage: '',
     },
+    {
+        // The message is built by the validator itself (it interpolates the org unit's
+        // opening/closing dates and label), so the static fallback is intentionally empty.
+        validator: getWithinOrgUnitDateRangeValidator(props?.orgUnit, getOrgUnitLabel(props?.programId)),
+        errorMessage: '',
+    },
 ];
diff --git a/src/core_modules/capture-core/components/WidgetEventEdit/DataEntry/fieldValidators/eventDate.validatorContainersGetter.ts b/src/core_modules/capture-core/components/WidgetEventEdit/DataEntry/fieldValidators/eventDate.validatorContainersGetter.ts
index f3cbb1b18f..baab0ed8db 100644
--- a/src/core_modules/capture-core/components/WidgetEventEdit/DataEntry/fieldValidators/eventDate.validatorContainersGetter.ts
+++ b/src/core_modules/capture-core/components/WidgetEventEdit/DataEntry/fieldValidators/eventDate.validatorContainersGetter.ts
@@ -1,8 +1,13 @@
 import i18n from '@dhis2/d2-i18n';
 import { hasValue } from 'capture-core-utils/validators/form';
-import { isValidDate, isValidPeriod } from '../../../../utils/validation/validators/form';
+import {
+    isValidDate,
+    isValidPeriod,
+    getWithinOrgUnitDateRangeValidator,
+} from '../../../../utils/validation/validators/form';
 import { convertFormToClient } from '../../../../converters';
 import { dataElementTypes } from '../../../../metaData';
+import { getOrgUnitLabel } from '../../../../utils/orgUnits/getOrgUnitLabel';
 
 const preValidateDate = (value?: string, internalComponentError?: {error?: string, errorCode?: string}) => {
     if (!value) {
@@ -43,4 +48,13 @@ export const getEventDateValidatorContainers = (props: Record<string, unknown> =
         validator: (value: string) => validateNotExpired(value, props),
         errorMessage: '',
     },
+    {
+        // The message is built by the validator itself (it interpolates the org unit's
+        // opening/closing dates and label), so the static fallback is intentionally empty.
+        validator: getWithinOrgUnitDateRangeValidator(
+            props?.orgUnit as { openingDate?: string, closedDate?: string },
+            getOrgUnitLabel(props?.programId as string | undefined),
+        ),
+        errorMessage: '',
+    },
 ];
diff --git a/src/core_modules/capture-core/components/WidgetEventEdit/EditEventDataEntry/EditEventDataEntry.component.tsx b/src/core_modules/capture-core/components/WidgetEventEdit/EditEventDataEntry/EditEventDataEntry.component.tsx
index a14687d4aa..12c06694dc 100644
--- a/src/core_modules/capture-core/components/WidgetEventEdit/EditEventDataEntry/EditEventDataEntry.component.tsx
+++ b/src/core_modules/capture-core/components/WidgetEventEdit/EditEventDataEntry/EditEventDataEntry.component.tsx
@@ -6,6 +6,10 @@ import i18n from '@dhis2/d2-i18n';
 import type { OrgUnit } from '@dhis2/rules-engine-javascript';
 import type { ReduxAction } from 'capture-core-utils/types';
 import { getEventDateValidatorContainers } from '../DataEntry/fieldValidators/eventDate.validatorContainersGetter';
+import {
+    getOrgUnitOpeningCalendarMin,
+    getOrgUnitClosingCalendarMax,
+} from '../../../utils/orgUnits/getOrgUnitCalendarBounds';
 import { withMainButton } from '../DataEntry/withMainButton';
 import type { RenderFoundation } from '../../../metaData';
 import { WidgetEventSchedule } from '../../WidgetEventSchedule';
@@ -139,6 +143,8 @@ const buildReportDateSettingsFn = () => {
             calendarWidth: 350,
             label: props.formFoundation.getLabel('occurredAt'),
             required: true,
+            calendarMax: getOrgUnitClosingCalendarMax(props.orgUnit),
+            calendarMin: getOrgUnitOpeningCalendarMin(props.orgUnit),
             calendarType: systemSettingsStore.get().calendar,
             dateFormat: systemSettingsStore.get().dateFormat,
         }),
diff --git a/src/core_modules/capture-core/components/WidgetEventEdit/WidgetEventEdit.container.tsx b/src/core_modules/capture-core/components/WidgetEventEdit/WidgetEventEdit.container.tsx
index a4bb9b7194..3f200de871 100644
--- a/src/core_modules/capture-core/components/WidgetEventEdit/WidgetEventEdit.container.tsx
+++ b/src/core_modules/capture-core/components/WidgetEventEdit/WidgetEventEdit.container.tsx
@@ -19,6 +19,7 @@ import { WidgetHeader } from './WidgetHeader';
 import { WidgetTwoEventWorkspace, WidgetTwoEventWorkspaceWrapperTypes } from '../WidgetTwoEventWorkspace';
 import { useProgramExpiryForUser, useEnrollmentEditEventPageMode, useAvailableProgramStages } from '../../hooks';
 import { useAuthorities } from '../../utils/authority/useAuthorities';
+import { useOrgUnitWithDates } from '../../metadataRetrieval/coreOrgUnit';
 
 const styles: Readonly<any> = {
     container: {
@@ -102,6 +103,8 @@ const WidgetEventEditPlain = ({
     const orgUnit = loadedValues?.orgUnit;
     const occurredAt = loadedValues?.dataEntryValues?.occurredAt;
     const expiryPeriod = useProgramExpiryForUser(programId);
+    // Enrich the event's org unit with its opening/closing dates so event date fields can enforce them
+    const orgUnitWithDates = useOrgUnitWithDates(orgUnit);
 
     const availableProgramStages = useAvailableProgramStages(stage, teiId, enrollmentId, programId);
     const { hasAuthority: canUncompleteEvent } = useAuthorities({ authorities: ['F_UNCOMPLETE_EVENT'] });
@@ -155,7 +158,7 @@ const WidgetEventEditPlain = ({
                                 <EditEventDataEntry
                                     dataEntryId={dataEntryIds.ENROLLMENT_EVENT}
                                     formFoundation={formFoundation}
-                                    orgUnit={orgUnit}
+                                    orgUnit={orgUnitWithDates}
                                     programId={programId}
                                     stageId={stageId}
                                     teiId={teiId}
diff --git a/src/core_modules/capture-core/components/WidgetEventSchedule/ScheduleDate/ScheduleDate.component.tsx b/src/core_modules/capture-core/components/WidgetEventSchedule/ScheduleDate/ScheduleDate.component.tsx
index 9426f632a1..5ab5ff9593 100644
--- a/src/core_modules/capture-core/components/WidgetEventSchedule/ScheduleDate/ScheduleDate.component.tsx
+++ b/src/core_modules/capture-core/components/WidgetEventSchedule/ScheduleDate/ScheduleDate.component.tsx
@@ -9,7 +9,16 @@ import {
     withDisplayMessages,
     withInternalChangeHandler,
 } from 'capture-core/components/FormFields/New';
-import { isValidDate, isValidPeriod } from 'capture-core/utils/validation/validators/form';
+import {
+    isValidDate,
+    isValidPeriod,
+    getWithinOrgUnitDateRangeValidator,
+} from 'capture-core/utils/validation/validators/form';
+import {
+    getOrgUnitOpeningCalendarMin,
+    getOrgUnitClosingCalendarMax,
+} from 'capture-core/utils/orgUnits/getOrgUnitCalendarBounds';
+import { getOrgUnitLabel } from 'capture-core/utils/orgUnits/getOrgUnitLabel';
 import { hasValue } from 'capture-core-utils/validators/form';
 import { systemSettingsStore } from '../../../metaDataMemoryStores';
 import labelTypeClasses from './dataEntryFieldLabels.module.css';
@@ -61,6 +70,7 @@ const ScheduleDatePlain = ({
     classes,
     hideDueDate,
     expiryPeriod,
+    programId,
 }: Props) => {
     const validateDate = (dateString: string, internalComponentError: any) => {
         if (!hasValue(dateString)) {
@@ -78,6 +88,14 @@ const ScheduleDatePlain = ({
             };
         }
 
+        const orgUnitRangeValidation = getWithinOrgUnitDateRangeValidator(orgUnit, getOrgUnitLabel(programId))(dateString);
+        if (orgUnitRangeValidation !== true) {
+            return {
+                error: true,
+                validationText: orgUnitRangeValidation.errorMessage,
+            };
+        }
+
         if (!expiryPeriod) {
             return {
                 error: false,
@@ -113,6 +131,8 @@ const ScheduleDatePlain = ({
                     value={scheduleDate}
                     width="100%"
                     calendarWidth={350}
+                    calendarMin={getOrgUnitOpeningCalendarMin(orgUnit)}
+                    calendarMax={getOrgUnitClosingCalendarMax(orgUnit)}
                     styles={baseInputStyles}
                     onBlur={(date: string, internalComponentError: any) => {
                         setScheduleDate(date);
diff --git a/src/core_modules/capture-core/components/WidgetEventSchedule/ScheduleDate/ScheduleDate.types.ts b/src/core_modules/capture-core/components/WidgetEventSchedule/ScheduleDate/ScheduleDate.types.ts
index 65f9ecab11..b73d86113b 100644
--- a/src/core_modules/capture-core/components/WidgetEventSchedule/ScheduleDate/ScheduleDate.types.ts
+++ b/src/core_modules/capture-core/components/WidgetEventSchedule/ScheduleDate/ScheduleDate.types.ts
@@ -19,6 +19,8 @@ export type PlainProps = {
         displayName: string;
         path: string;
         selected: string[];
+        openingDate?: string;
+        closedDate?: string;
     } | null;
     expiryPeriod?: {
         expiryPeriodType?: string | null;
diff --git a/src/core_modules/capture-core/components/WidgetEventSchedule/WidgetEventSchedule.container.tsx b/src/core_modules/capture-core/components/WidgetEventSchedule/WidgetEventSchedule.container.tsx
index 2b99d00290..4274061d00 100644
--- a/src/core_modules/capture-core/components/WidgetEventSchedule/WidgetEventSchedule.container.tsx
+++ b/src/core_modules/capture-core/components/WidgetEventSchedule/WidgetEventSchedule.container.tsx
@@ -6,6 +6,7 @@ import moment from 'moment';
 import { pipe } from 'capture-core-utils';
 import { getProgramAndStageForProgram, TrackerProgram, dataElementTypes } from '../../metaData';
 import { getCachedOrgUnitName } from '../../metadataRetrieval/orgUnitName';
+import { useOrgUnitWithDates } from '../../metadataRetrieval/coreOrgUnit';
 import { useLocationQuery } from '../../utils/routing';
 import { CurrentUser } from '../../utils/userInfo/CurrentUser';
 import { generateUID } from '../../utils/uid/generateUID';
@@ -62,6 +63,8 @@ export const WidgetEventSchedule = ({
             setScheduledOrgUnit(orgUnit);
         }
     }, [orgUnitName, initialOrgUnitId]);
+    // Enrich the scheduling org unit with its opening/closing dates so the schedule date can enforce them
+    const scheduledOrgUnitWithDates = useOrgUnitWithDates(scheduledOrgUnit);
     const [isFormValid, setIsFormValid] = useState(false);
     const convertScheduleDate = (date: any, validationResult = { error: false }) => {
         if (!date || validationResult?.error) {
@@ -209,7 +212,7 @@ export const WidgetEventSchedule = ({
             onSchedule={onHandleSchedule}
             onAddNote={onAddNote}
             eventCountInOrgUnit={eventCountInOrgUnit}
-            orgUnit={scheduledOrgUnit}
+            orgUnit={scheduledOrgUnitWithDates}
             notes={notes}
             selectedCategories={selectedCategories}
             categoryOptionsError={categoryOptionsError}
diff --git a/src/core_modules/capture-core/metadataRetrieval/coreOrgUnit/coreOrgUnit.types.ts b/src/core_modules/capture-core/metadataRetrieval/coreOrgUnit/coreOrgUnit.types.ts
index f556a3378c..e156d97fdf 100644
--- a/src/core_modules/capture-core/metadataRetrieval/coreOrgUnit/coreOrgUnit.types.ts
+++ b/src/core_modules/capture-core/metadataRetrieval/coreOrgUnit/coreOrgUnit.types.ts
@@ -8,6 +8,9 @@ export type CoreOrgUnit = {
     code: string,
     path: string,
     groups: Array<OrgUnitGroup>,
+    // ISO date strings (Gregorian) as returned by the API; either may be absent
+    openingDate?: string,
+    closedDate?: string,
 };
 
 
diff --git a/src/core_modules/capture-core/metadataRetrieval/coreOrgUnit/fetchCoreOrgUnit.ts b/src/core_modules/capture-core/metadataRetrieval/coreOrgUnit/fetchCoreOrgUnit.ts
index 3e952d9ca9..7b174dfca4 100644
--- a/src/core_modules/capture-core/metadataRetrieval/coreOrgUnit/fetchCoreOrgUnit.ts
+++ b/src/core_modules/capture-core/metadataRetrieval/coreOrgUnit/fetchCoreOrgUnit.ts
@@ -11,7 +11,7 @@ export async function fetchCoreOrgUnit(
         querySingleResource({
             resource: `organisationUnits/${orgUnitId}`,
             params: {
-                fields: 'displayName,code,path',
+                fields: 'displayName,code,path,openingDate,closedDate',
             },
         }),
         getAssociatedOrgUnitGroups(orgUnitId),
@@ -20,6 +20,8 @@ export async function fetchCoreOrgUnit(
         name: orgUnit.displayName,
         code: orgUnit.code,
         path: orgUnit.path,
+        openingDate: orgUnit.openingDate,
+        closedDate: orgUnit.closedDate,
         groups,
     }));
 }
diff --git a/src/core_modules/capture-core/metadataRetrieval/coreOrgUnit/index.ts b/src/core_modules/capture-core/metadataRetrieval/coreOrgUnit/index.ts
index bf681b7a83..13a9bed2b8 100644
--- a/src/core_modules/capture-core/metadataRetrieval/coreOrgUnit/index.ts
+++ b/src/core_modules/capture-core/metadataRetrieval/coreOrgUnit/index.ts
@@ -1,4 +1,5 @@
 export { useCoreOrgUnit } from './useCoreOrgUnit';
+export { useOrgUnitWithDates } from './useOrgUnitWithDates';
 export { getCoreOrgUnit, orgUnitFetched } from './coreOrgUnit.actions';
 export { getCoreOrgUnitEpic } from './getCoreOrgUnit.epics';
 export { getCoreOrgUnitFn } from './getCoreOrgUnitFn';
diff --git a/src/core_modules/capture-core/metadataRetrieval/coreOrgUnit/useCoreOrgUnit.tsx b/src/core_modules/capture-core/metadataRetrieval/coreOrgUnit/useCoreOrgUnit.tsx
index 0b14108661..f79c0fd114 100644
--- a/src/core_modules/capture-core/metadataRetrieval/coreOrgUnit/useCoreOrgUnit.tsx
+++ b/src/core_modules/capture-core/metadataRetrieval/coreOrgUnit/useCoreOrgUnit.tsx
@@ -13,8 +13,11 @@ export function useCoreOrgUnit(orgUnitId: string): {
     const dispatch = useDispatch();
     const reduxOrgUnit = useSelector(({ organisationUnits }: any) => organisationUnits && organisationUnits[orgUnitId]);
     const fetchId = reduxOrgUnit ? undefined : orgUnitId;
-    // These hooks do no work when id is undefined
-    const { orgUnit, error } = useOrganisationUnit(fetchId, 'displayName,code,path');
+    // These hooks do no work when id is undefined.
+    // NB: openingDate/closedDate must stay in this field list — they back the org-unit date-range
+    // enforcement. Any other code path dispatching orgUnitFetched must include them too, or a
+    // cached org unit will fail open (undefined bounds → validation passes).
+    const { orgUnit, error } = useOrganisationUnit(fetchId, 'displayName,code,path,openingDate,closedDate');
     const { orgUnitGroups, error: groupError } = useOrgUnitGroups(fetchId);
 
     if (reduxOrgUnit) {
diff --git a/src/core_modules/capture-core/metadataRetrieval/coreOrgUnit/useOrgUnitWithDates.ts b/src/core_modules/capture-core/metadataRetrieval/coreOrgUnit/useOrgUnitWithDates.ts
new file mode 100644
index 0000000000..10ea31bb94
--- /dev/null
+++ b/src/core_modules/capture-core/metadataRetrieval/coreOrgUnit/useOrgUnitWithDates.ts
@@ -0,0 +1,17 @@
+import { useMemo } from 'react';
+import { useCoreOrgUnit } from './useCoreOrgUnit';
+
+/**
+ * Enriches an org unit (which may lack date metadata, e.g. a tree-selected value that only
+ * carries id/name/path) with its openingDate/closedDate, so date fields can enforce the org
+ * unit's opening/closing range. Returns a memoized object; a falsy input is returned unchanged.
+ */
+export function useOrgUnitWithDates<T extends { id?: string | null }>(orgUnit?: T | null) {
+    const { orgUnit: coreOrgUnit } = useCoreOrgUnit(orgUnit?.id ?? '');
+    return useMemo(
+        () => (orgUnit
+            ? { ...orgUnit, openingDate: coreOrgUnit?.openingDate, closedDate: coreOrgUnit?.closedDate }
+            : orgUnit),
+        [orgUnit, coreOrgUnit?.openingDate, coreOrgUnit?.closedDate],
+    );
+}
diff --git a/src/core_modules/capture-core/utils/orgUnits/getOrgUnitCalendarBounds.test.js b/src/core_modules/capture-core/utils/orgUnits/getOrgUnitCalendarBounds.test.js
new file mode 100644
index 0000000000..11454aad94
--- /dev/null
+++ b/src/core_modules/capture-core/utils/orgUnits/getOrgUnitCalendarBounds.test.js
@@ -0,0 +1,46 @@
+import { systemSettingsStore } from '../../metaDataMemoryStores';
+import { getOrgUnitOpeningCalendarMin, getOrgUnitClosingCalendarMax } from './getOrgUnitCalendarBounds';
+
+describe('getOrgUnitCalendarBounds', () => {
+    beforeAll(() => {
+        systemSettingsStore.set({ calendar: 'gregory', dateFormat: 'YYYY-MM-DD' });
+    });
+
+    describe('getOrgUnitOpeningCalendarMin', () => {
+        it('returns undefined when there is no opening date', () => {
+            expect(getOrgUnitOpeningCalendarMin(undefined)).toBeUndefined();
+            expect(getOrgUnitOpeningCalendarMin({})).toBeUndefined();
+        });
+
+        it('returns the opening date as a local-calendar string, ignoring any time component', () => {
+            expect(getOrgUnitOpeningCalendarMin({ openingDate: '2023-01-01T00:00:00.000' })).toBe('2023-01-01');
+            expect(getOrgUnitOpeningCalendarMin({ openingDate: '2023-01-01' })).toBe('2023-01-01');
+        });
+    });
+
+    describe('getOrgUnitClosingCalendarMax', () => {
+        it('returns undefined when neither a closing date nor a future limit applies', () => {
+            expect(getOrgUnitClosingCalendarMax(undefined, false)).toBeUndefined();
+            expect(getOrgUnitClosingCalendarMax({}, false)).toBeUndefined();
+        });
+
+        it('returns the closing date when only a closing date applies', () => {
+            expect(getOrgUnitClosingCalendarMax({ closedDate: '2023-06-30T00:00:00.000' }, false)).toBe('2023-06-30');
+        });
+
+        it('returns a date when only the no-future limit applies', () => {
+            const result = getOrgUnitClosingCalendarMax(undefined, true);
+            expect(result).toMatch(/^\d{4}-\d{2}-\d{2}$/);
+        });
+
+        it('uses the closing date when it is earlier than the no-future limit', () => {
+            expect(getOrgUnitClosingCalendarMax({ closedDate: '2000-01-01' }, true)).toBe('2000-01-01');
+        });
+
+        it('uses the no-future limit when the closing date is later than today', () => {
+            const earliestOfFutureClosingAndToday = getOrgUnitClosingCalendarMax({ closedDate: '2999-12-31' }, true);
+            const todayOnly = getOrgUnitClosingCalendarMax(undefined, true);
+            expect(earliestOfFutureClosingAndToday).toBe(todayOnly);
+        });
+    });
+});
diff --git a/src/core_modules/capture-core/utils/orgUnits/getOrgUnitCalendarBounds.ts b/src/core_modules/capture-core/utils/orgUnits/getOrgUnitCalendarBounds.ts
new file mode 100644
index 0000000000..3797cdf64c
--- /dev/null
+++ b/src/core_modules/capture-core/utils/orgUnits/getOrgUnitCalendarBounds.ts
@@ -0,0 +1,33 @@
+import moment from 'moment';
+import { formatMomentEn } from 'capture-core-utils/date';
+import { convertIsoToLocalCalendar } from '../converters/date';
+
+export type OrgUnitDateRange = { openingDate?: string | null, closedDate?: string | null };
+
+// The org unit opening date as a local-calendar string, for use as a calendar min bound.
+// Truncate any time component first so the conversion can't shift the day across timezones
+// (kept symmetrical with the closing-date handling below).
+export const getOrgUnitOpeningCalendarMin = (orgUnit?: OrgUnitDateRange | null) =>
+    (orgUnit?.openingDate ? convertIsoToLocalCalendar(orgUnit.openingDate.split('T')[0]) : undefined);
+
+// Combines an optional "no future date" limit with the org unit closing date, returning the
+// earlier of the two as a local-calendar string for use as a calendar max bound.
+export const getOrgUnitClosingCalendarMax = (
+    orgUnit?: OrgUnitDateRange | null,
+    futureNotAllowed = false,
+) => {
+    const candidates: Array<string> = [];
+    if (futureNotAllowed) {
+        candidates.push(formatMomentEn(moment(), 'YYYY-MM-DD'));
+    }
+    if (orgUnit?.closedDate) {
+        candidates.push(orgUnit.closedDate.split('T')[0]);
+    }
+    if (!candidates.length) {
+        return undefined;
+    }
+    // ISO (YYYY-MM-DD) strings sort chronologically, so the first is the earliest bound
+    candidates.sort((a, b) => a.localeCompare(b));
+    const [earliestIso] = candidates;
+    return convertIsoToLocalCalendar(earliestIso);
+};
diff --git a/src/core_modules/capture-core/utils/orgUnits/getOrgUnitLabel.ts b/src/core_modules/capture-core/utils/orgUnits/getOrgUnitLabel.ts
new file mode 100644
index 0000000000..2c980d1706
--- /dev/null
+++ b/src/core_modules/capture-core/utils/orgUnits/getOrgUnitLabel.ts
@@ -0,0 +1,10 @@
+import { programCollection } from 'capture-core/metaDataMemoryStores';
+import { getProgramLabel } from 'capture-core/metaData';
+
+/**
+ * Resolves the program's configured custom "organisation unit" label (DHIS2-16610), or undefined
+ * when none is set — letting callers fall back to the default term. Non-hook, so it can be used
+ * from form validators that run outside React render.
+ */
+export const getOrgUnitLabel = (programId?: string | null): string | undefined =>
+    getProgramLabel(programId ? programCollection.get(programId) : undefined, 'orgUnit');
diff --git a/src/core_modules/capture-core/utils/validation/validators/form/getWithinOrgUnitDateRangeValidator.test.js b/src/core_modules/capture-core/utils/validation/validators/form/getWithinOrgUnitDateRangeValidator.test.js
new file mode 100644
index 0000000000..c245534232
--- /dev/null
+++ b/src/core_modules/capture-core/utils/validation/validators/form/getWithinOrgUnitDateRangeValidator.test.js
@@ -0,0 +1,141 @@
+import { systemSettingsStore } from '../../../../metaDataMemoryStores';
+import { getWithinOrgUnitDateRangeValidator, isIsoDateWithinOrgUnitRange } from './getWithinOrgUnitDateRangeValidator';
+
+describe('getWithinOrgUnitDateRangeValidator', () => {
+    beforeAll(() => {
+        systemSettingsStore.set({ calendar: 'gregory', dateFormat: 'YYYY-MM-DD' });
+    });
+
+    const orgUnit = {
+        openingDate: '2023-01-01T00:00:00.000',
+        closedDate: '2023-06-30T00:00:00.000',
+    };
+
+    const isValid = result => result === true || result?.valid === true;
+
+    it('passes when no value is provided', () => {
+        expect(isValid(getWithinOrgUnitDateRangeValidator(orgUnit)(undefined))).toBe(true);
+        expect(isValid(getWithinOrgUnitDateRangeValidator(orgUnit)(''))).toBe(true);
+    });
+
+    it('passes when the org unit has no opening or closing date', () => {
+        expect(isValid(getWithinOrgUnitDateRangeValidator(undefined)('2020-01-01'))).toBe(true);
+        expect(isValid(getWithinOrgUnitDateRangeValidator({})('2020-01-01'))).toBe(true);
+    });
+
+    it('passes for a date within the range', () => {
+        expect(isValid(getWithinOrgUnitDateRangeValidator(orgUnit)('2023-03-15'))).toBe(true);
+    });
+
+    it('is inclusive of both the opening and the closing date', () => {
+        expect(isValid(getWithinOrgUnitDateRangeValidator(orgUnit)('2023-01-01'))).toBe(true);
+        expect(isValid(getWithinOrgUnitDateRangeValidator(orgUnit)('2023-06-30'))).toBe(true);
+    });
+
+    it('fails for a date before the opening date', () => {
+        const result = getWithinOrgUnitDateRangeValidator(orgUnit)('2022-12-31');
+        expect(result).toMatchObject({ valid: false });
+    });
+
+    it('fails for a date after the closing date', () => {
+        const result = getWithinOrgUnitDateRangeValidator(orgUnit)('2023-07-01');
+        expect(result).toMatchObject({ valid: false });
+    });
+
+    it('only enforces the lower bound when only an opening date is set', () => {
+        const validator = getWithinOrgUnitDateRangeValidator({ openingDate: '2023-01-01T00:00:00.000' });
+        expect(validator('2022-12-31')).toMatchObject({ valid: false });
+        expect(isValid(validator('2025-01-01'))).toBe(true);
+    });
+
+    it('only enforces the upper bound when only a closing date is set', () => {
+        const validator = getWithinOrgUnitDateRangeValidator({ closedDate: '2023-06-30T00:00:00.000' });
+        expect(validator('2023-07-01')).toMatchObject({ valid: false });
+        expect(isValid(validator('2020-01-01'))).toBe(true);
+    });
+
+    it('treats an opening date equal to the closing date as a single valid day', () => {
+        // metadata permits openingDate == closedDate (a one-day window)
+        const oneDay = getWithinOrgUnitDateRangeValidator({
+            openingDate: '2023-04-10T00:00:00.000',
+            closedDate: '2023-04-10T00:00:00.000',
+        });
+        expect(isValid(oneDay('2023-04-10'))).toBe(true);
+        expect(oneDay('2023-04-09')).toMatchObject({ valid: false });
+        expect(oneDay('2023-04-11')).toMatchObject({ valid: false });
+    });
+
+    describe('isIsoDateWithinOrgUnitRange', () => {
+        it('returns true for an ISO date within the inclusive range', () => {
+            expect(isIsoDateWithinOrgUnitRange('2023-03-15T00:00:00.000', orgUnit)).toBe(true);
+            expect(isIsoDateWithinOrgUnitRange('2023-01-01', orgUnit)).toBe(true);
+            expect(isIsoDateWithinOrgUnitRange('2023-06-30', orgUnit)).toBe(true);
+        });
+
+        it('returns false for an ISO date outside the range', () => {
+            expect(isIsoDateWithinOrgUnitRange('2022-12-31', orgUnit)).toBe(false);
+            expect(isIsoDateWithinOrgUnitRange('2023-07-01', orgUnit)).toBe(false);
+        });
+
+        it('returns true when the date or the bounds are missing', () => {
+            expect(isIsoDateWithinOrgUnitRange(undefined, orgUnit)).toBe(true);
+            expect(isIsoDateWithinOrgUnitRange('2010-01-01', undefined)).toBe(true);
+            expect(isIsoDateWithinOrgUnitRange('2010-01-01', {})).toBe(true);
+        });
+    });
+
+    describe('error message org unit label', () => {
+        it('uses the default term when no custom label is provided', () => {
+            const result = getWithinOrgUnitDateRangeValidator(orgUnit)('2022-12-31');
+            expect(result.errorMessage).toContain('organisation unit');
+        });
+
+        it('uses the provided custom org unit label instead of the default term', () => {
+            const result = getWithinOrgUnitDateRangeValidator(orgUnit, 'Facility')('2022-12-31');
+            expect(result.errorMessage).toContain('Facility');
+            expect(result.errorMessage).not.toContain('organisation unit');
+        });
+    });
+
+    describe('with a non-Gregorian calendar (nepali)', () => {
+        beforeAll(() => {
+            systemSettingsStore.set({ calendar: 'nepali', dateFormat: 'YYYY-MM-DD' });
+        });
+        afterAll(() => {
+            systemSettingsStore.set({ calendar: 'gregory', dateFormat: 'YYYY-MM-DD' });
+        });
+
+        // The form value is entered in the active (nepali) calendar, while the org unit bounds
+        // stay gregorian ISO. The nepali (Bikram Sambat) dates below are the verified equivalents
+        // of the gregorian org unit range 2023-01-01 .. 2023-06-30:
+        //   2079-09-17 BS == 2023-01-01, 2079-09-16 BS == 2022-12-31,
+        //   2079-10-01 BS == 2023-01-15, 2080-03-15 BS == 2023-06-30, 2080-03-16 BS == 2023-07-01.
+        it('enforces the gregorian org unit range against nepali-calendar input', () => {
+            const validator = getWithinOrgUnitDateRangeValidator(orgUnit);
+            // within the range
+            expect(isValid(validator('2079-10-01'))).toBe(true);
+            // inclusive of both boundaries
+            expect(isValid(validator('2079-09-17'))).toBe(true);
+            expect(isValid(validator('2080-03-15'))).toBe(true);
+            // outside the range on either side
+            expect(validator('2079-09-16')).toMatchObject({ valid: false });
+            expect(validator('2080-03-16')).toMatchObject({ valid: false });
+        });
+    });
+
+    describe('with the DHIS2 "gregorian" calendar id', () => {
+        beforeAll(() => {
+            systemSettingsStore.set({ calendar: 'gregorian', dateFormat: 'YYYY-MM-DD' });
+        });
+        afterAll(() => {
+            systemSettingsStore.set({ calendar: 'gregory', dateFormat: 'YYYY-MM-DD' });
+        });
+
+        it('enforces the range using the production calendar id, not just the Temporal id', () => {
+            const validator = getWithinOrgUnitDateRangeValidator(orgUnit);
+            expect(isValid(validator('2023-03-15'))).toBe(true);
+            expect(validator('2022-12-31')).toMatchObject({ valid: false });
+            expect(validator('2023-07-01')).toMatchObject({ valid: false });
+        });
+    });
+});
diff --git a/src/core_modules/capture-core/utils/validation/validators/form/getWithinOrgUnitDateRangeValidator.ts b/src/core_modules/capture-core/utils/validation/validators/form/getWithinOrgUnitDateRangeValidator.ts
new file mode 100644
index 0000000000..6c7b0e6b8b
--- /dev/null
+++ b/src/core_modules/capture-core/utils/validation/validators/form/getWithinOrgUnitDateRangeValidator.ts
@@ -0,0 +1,115 @@
+import { Temporal } from '@js-temporal/polyfill';
+import i18n from '@dhis2/d2-i18n';
+import log from 'loglevel';
+import { convertToIso8601 } from '@dhis2/multi-calendar-dates';
+import { systemSettingsStore } from 'capture-core/metaDataMemoryStores';
+import { convertIsoToLocalCalendar } from '../../../converters/date';
+import type { OrgUnitDateRange } from '../../../orgUnits/getOrgUnitCalendarBounds';
+
+// Parses a Gregorian/ISO date string (date-only or full datetime) into a PlainDate.
+const isoToPlainDate = (isoDate?: string | null): Temporal.PlainDate | null => {
+    if (!isoDate) {
+        return null;
+    }
+    try {
+        return Temporal.PlainDate.from(isoDate.split('T')[0]);
+    } catch (error) {
+        log.debug(`getWithinOrgUnitDateRangeValidator: could not parse ISO date "${isoDate}"`, error);
+        return null;
+    }
+};
+
+// Parses a form value (a date string in the active calendar) into a Gregorian PlainDate.
+// We convert via convertToIso8601 (which yields a Gregorian {year, month, day}) rather than
+// round-tripping through moment().toISOString(), which would shift the day in non-UTC timezones.
+const localToPlainDate = (localDate?: string | null): Temporal.PlainDate | null => {
+    if (!localDate) {
+        return null;
+    }
+    try {
+        const calendar = systemSettingsStore.get().calendar;
+        const { year, month, day } = convertToIso8601(localDate, calendar as any);
+        return new Temporal.PlainDate(year, month, day);
+    } catch (error) {
+        log.debug(`getWithinOrgUnitDateRangeValidator: could not parse local date "${localDate}"`, error);
+        return null;
+    }
+};
+
+// Core boundary check: both bounds inclusive, day granularity. A missing bound leaves that side
+// unconstrained; an unparseable date passes (dedicated date-format validators report invalid input).
+const isPlainDateWithinOrgUnitRange = (date: Temporal.PlainDate | null, orgUnit?: OrgUnitDateRange | null): boolean => {
+    if (!date) {
+        return true;
+    }
+    const opening = isoToPlainDate(orgUnit?.openingDate);
+    const closed = isoToPlainDate(orgUnit?.closedDate);
+
+    if (opening && Temporal.PlainDate.compare(date, opening) < 0) {
+        return false;
+    }
+    if (closed && Temporal.PlainDate.compare(date, closed) > 0) {
+        return false;
+    }
+    return true;
+};
+
+// Checks a Gregorian/ISO date string against the org unit's opening/closing range. Used where the
+// date is already stored (e.g. an enrollment date during transfer), not entered in the active calendar.
+export const isIsoDateWithinOrgUnitRange = (isoDate?: string | null, orgUnit?: OrgUnitDateRange | null): boolean =>
+    isPlainDateWithinOrgUnitRange(isoToPlainDate(isoDate), orgUnit);
+
+const buildErrorMessage = (
+    openingDate?: string | null,
+    closedDate?: string | null,
+    orgUnitLabel?: string | null,
+): string => {
+    // Truncate any time component before converting, so the day can't shift across timezones
+    // (kept symmetrical with the parsing in isoToPlainDate and getOrgUnitCalendarBounds).
+    const opening = openingDate ? convertIsoToLocalCalendar(openingDate.split('T')[0]) : undefined;
+    const closed = closedDate ? convertIsoToLocalCalendar(closedDate.split('T')[0]) : undefined;
+    const orgUnit = orgUnitLabel || i18n.t('organisation unit');
+
+    if (opening && closed) {
+        return i18n.t(
+            "Date must be within the {{orgUnitLabel}}'s opening and closing dates ({{opening}} – {{closed}})",
+            { orgUnitLabel: orgUnit, opening, closed, interpolation: { escapeValue: false } },
+        );
+    }
+    if (opening) {
+        return i18n.t(
+            "Date cannot be before the {{orgUnitLabel}}'s opening date ({{opening}})",
+            { orgUnitLabel: orgUnit, opening, interpolation: { escapeValue: false } },
+        );
+    }
+    return i18n.t(
+        "Date cannot be after the {{orgUnitLabel}}'s closing date ({{closed}})",
+        { orgUnitLabel: orgUnit, closed, interpolation: { escapeValue: false } },
+    );
+};
+
+/**
+ * Builds a form validator that constrains a date to the org unit's opening/closing range.
+ * Both bounds are inclusive and compared at day granularity. A missing bound leaves that
+ * side unconstrained; if neither is set the validator always passes.
+ * @param orgUnit the org unit whose openingDate/closedDate (ISO/Gregorian) bound the date
+ * @param orgUnitLabel the configured custom "organisation unit" label, used in the error message
+ */
+export const getWithinOrgUnitDateRangeValidator = (orgUnit?: OrgUnitDateRange | null, orgUnitLabel?: string | null) =>
+    (value?: string | null) => {
+        const openingDate = orgUnit?.openingDate;
+        const closedDate = orgUnit?.closedDate;
+
+        if (!value || (!openingDate && !closedDate)) {
+            return true;
+        }
+
+        if (isPlainDateWithinOrgUnitRange(localToPlainDate(value), orgUnit)) {
+            return true;
+        }
+
+        return {
+            valid: false,
+            errorMessage: buildErrorMessage(openingDate, closedDate, orgUnitLabel),
+        };
+    };
diff --git a/src/core_modules/capture-core/utils/validation/validators/form/index.ts b/src/core_modules/capture-core/utils/validation/validators/form/index.ts
index e94afc1ba9..26e0ced011 100644
--- a/src/core_modules/capture-core/utils/validation/validators/form/index.ts
+++ b/src/core_modules/capture-core/utils/validation/validators/form/index.ts
@@ -4,6 +4,7 @@ export { isValidAge } from './ageValidator';
 export { isValidNonFutureDate } from './isValidNonFutureDate';
 export { isValidPeriod } from './expiredPeriod';
 export { getDateRangeValidator } from './getDateRangeValidator';
+export { getWithinOrgUnitDateRangeValidator, isIsoDateWithinOrgUnitRange } from './getWithinOrgUnitDateRangeValidator';
 export { getDateTimeRangeValidator } from './getDateTimeRangeValidator';
 export { getNumberRangeValidator } from './getNumberRangeValidator';
 export { getTimeRangeValidator } from './getTimeRangeValidator';
diff --git a/src/core_modules/capture-ui/DateAndTimeFields/DateField/Date.component.tsx b/src/core_modules/capture-ui/DateAndTimeFields/DateField/Date.component.tsx
index 62e6901205..b603947922 100644
--- a/src/core_modules/capture-ui/DateAndTimeFields/DateField/Date.component.tsx
+++ b/src/core_modules/capture-ui/DateAndTimeFields/DateField/Date.component.tsx
@@ -27,6 +27,7 @@ export class DateField extends React.Component<Props, State> {
             calendarWidth,
             inputWidth,
             calendarMax,
+            calendarMin,
             value,
             innerMessage,
             calendarType,
@@ -63,6 +64,7 @@ export class DateField extends React.Component<Props, State> {
                     disabled={!!this.props.disabled}
                     locale={locale}
                     maxDate={calendarMax}
+                    minDate={calendarMin}
                     {...errorProps as any}
                 />
             </div>
diff --git a/src/core_modules/capture-ui/DateAndTimeFields/DateField/Date.types.ts b/src/core_modules/capture-ui/DateAndTimeFields/DateField/Date.types.ts
index 3c3a731a4b..778dbe7323 100644
--- a/src/core_modules/capture-ui/DateAndTimeFields/DateField/Date.types.ts
+++ b/src/core_modules/capture-ui/DateAndTimeFields/DateField/Date.types.ts
@@ -22,6 +22,7 @@ export type Props = {
     placeholder?: string;
     label?: string;
     calendarMax?: any;
+    calendarMin?: any;
     innerMessage?: any;
     dateFormat?: 'YYYY-MM-DD' | 'DD-MM-YYYY' | null;
     calendarType?: 'gregory' | 'iso8601' | 'hebrew' | 'islamic' | 'islamic-umalqura' | 'islamic-tbla' |