Merge branch 'release/v18.8.14'

rowers/views/workoutviews.py

@@ -1934,6 +1934,7 @@ def workouts_setrpe_view(request):
 
     workouts = Workout.objects.filter(
         user=r,rpe=0,
+        duplicate=False,
         startdatetime__gte=startdate,
         startdatetime__lte=enddate
     ).order_by("-date", "-starttime")
@@ -1963,6 +1964,7 @@ def workouts_setrpe_view(request):
                     workout.save()
             workouts = Workout.objects.filter(
                 user=r,rpe=0,
+                duplicate=False,
                 startdatetime__gte=startdate,
                 startdatetime__lte=enddate
             ).order_by("-date", "-starttime")
@@ -2205,7 +2207,7 @@ def workouts_view(request, message='', successmessage='',
     timeperiod = startdate.strftime(
         '%Y-%m-%d')+'/'+enddate.strftime('%Y-%m-%d')
 
-    norpecount = len([w for w in workouts if w.rpe==0])
+    norpecount = len([w for w in workouts if w.rpe==0 and not w.duplicate])
     if norpecount and r.get_rpe_warnings:
         messages.info(request,'You have workouts with no RPE value set. \
         Click <a href="/rowers/workouts/setrpe">here</a> to update them. \