Merge PR #1170 into 14.0

Signed-off-by max3903

Author: OCA-git-bot

fieldservice_recurring/models/fsm_recurring.py

@@ -152,7 +152,26 @@ def _get_rruleset(self):
         ruleset = rruleset()
         if self.state != "progress" or not self.fsm_frequency_set_id:
             return ruleset
-        # set next_date which is used as the rrule 'dtstart' parameter
+        next_date = self._get_next_date()
+        thru_date = self._get_thru_date()
+        # use variables to calulate and return the rruleset object
+        ruleset = self.fsm_frequency_set_id._get_rruleset(
+            dtstart=next_date, until=thru_date
+        )
+        return ruleset
+
+    def _get_thru_date(self):
+        """Get thru_date to use as rrule 'until' parameter"""
+        days_ahead = self.fsm_frequency_set_id.schedule_days
+        request_thru_date = datetime.now() + relativedelta(days=+days_ahead)
+        if self.end_date and (self.end_date < request_thru_date):
+            thru_date = self.end_date
+        else:
+            thru_date = request_thru_date
+        return thru_date
+
+    def _get_next_date(self):
+        """Get next_date which is used as the rrule 'dtstart' parameter"""
         next_date = self.start_date
         last_order = self.env["fsm.order"].search(
             [
@@ -165,18 +184,7 @@ def _get_rruleset(self):
         )
         if last_order:
             next_date = last_order.scheduled_date_start
-        # set thru_date to use as rrule 'until' parameter
-        days_ahead = self.fsm_frequency_set_id.schedule_days
-        request_thru_date = datetime.now() + relativedelta(days=+days_ahead)
-        if self.end_date and (self.end_date < request_thru_date):
-            thru_date = self.end_date
-        else:
-            thru_date = request_thru_date
-        # use variables to calulate and return the rruleset object
-        ruleset = self.fsm_frequency_set_id._get_rruleset(
-            dtstart=next_date, until=thru_date
-        )
-        return ruleset
+        return next_date
 
     def _prepare_order_values(self, date=None):
         self.ensure_one()