add param include_interim=True

clinicedc · Feb 16, 2024 · b65719c · b65719c
1 parent 21e538a
commit b65719c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/edc_pharmacy/model_mixins/study_medication_crf_model_mixin.py b/edc_pharmacy/model_mixins/study_medication_crf_model_mixin.py
@@ -43,7 +43,9 @@ def save(self, *args, **kwargs):
             # overwrite the value of refill_end_datetime coming from
             # the form with the date of next visit or appointment.
             self.refill_end_datetime = getattr(
-                get_next_related_visit(self.related_visit), "report_datetime", None
+                get_next_related_visit(self.related_visit, include_interim=True),
+                "report_datetime",
+                None,
             ) or getattr(
                 get_next_appointment(self.related_visit.appointment, include_interim=True),
                 "appt_datetime",

diff --git a/edc_pharmacy/utils.py b/edc_pharmacy/utils.py
@@ -16,7 +16,9 @@ def update_previous_refill_end_datetime(instance):
     """Update refill_end_datetime from previous visit relative to the
     refill_start_datetime of this visit.
     """
-    if previous_visit := get_previous_related_visit(instance.related_visit):
+    if previous_visit := get_previous_related_visit(
+        instance.related_visit, include_interim=True
+    ):
         opts = {instance.__class__.related_visit_model_attr(): previous_visit}
         try:
             obj = instance.__class__.objects.get(**opts)