Merge branch 'release/0.1.13'

VERSION

@@ -1 +1 @@
-0.1.12
+0.1.13

meta_prn/admin/end_of_study_admin.py

@@ -27,6 +27,7 @@ class EndOfStudyAdmin(ModelAdminSubjectDashboardMixin, SimpleHistoryAdmin):
                     "subject_identifier",
                     "offschedule_datetime",
                     "offschedule_reason",
+                    "other_offschedule_reason",
                     "death_date",
                 )
             },

meta_prn/form_validators/end_of_study.py

@@ -1,5 +1,5 @@
 from edc_consent.constants import CONSENT_WITHDRAWAL
-from edc_constants.constants import DEAD
+from edc_constants.constants import DEAD, OTHER
 from edc_form_validators import FormValidator
 
 
@@ -11,22 +11,28 @@ def clean(self):
 
         self.validate_death_report_if_deceased()
 
-        self.required_if(DEAD, field="termination_reason", field_required="death_date")
+        self.validate_other_specify(
+            field="offschedule_reason",
+            other_specify_field="other_offschedule_reason",
+            other_stored_value=OTHER,
+        )
+
+        self.required_if(DEAD, field="offschedule_reason", field_required="death_date")
 
         self.required_if(
             CONSENT_WITHDRAWAL,
-            field="termination_reason",
+            field="offschedule_reason",
             field_required="consent_withdrawal_reason",
         )
 
         self.required_if(
             "included_in_error",
-            field="termination_reason",
+            field="offschedule_reason",
             field_required="included_in_error",
         )
 
         self.required_if(
             "included_in_error",
-            field="termination_reason",
+            field="offschedule_reason",
             field_required="included_in_error_date",
         )