Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions fieldservice_recurring/models/fsm_recurring.py
Original file line number Diff line number Diff line change
Expand Up @@ -219,15 +219,13 @@ def _generate_orders(self):
"""
orders = self.env["fsm.order"]
for rec in self:
order_dates = []
for order in rec.fsm_order_ids:
if order.scheduled_date_start:
order_dates.append(order.scheduled_date_start.date())
max_orders = rec.max_orders if rec.max_orders > 0 else False
order_count = rec.fsm_order_count
for date in rec._get_rruleset():
if date.date() in order_dates:
continue
dates = list(rec._get_rruleset())
if order_count > 0:
# skip first date since an order already exists for that date
dates = dates[1:]
for date in dates:
if max_orders > order_count or not max_orders:
orders |= rec._create_order(date=date)
order_count += 1
Expand Down