also consider a makeup reset when it's a new subscription

members/admin.py

@@ -623,10 +623,11 @@ def shift_subscription(request):
                     }, 
                     status=409
                 )
-            # https://redmine.coopdev.fr/issues/4715
-            lower_makeup_count_to_zero_if_moving_from_std_to_non_std(api, partner_id, shift_type, res)
 
             res["unsubscribe_member"] = m.unsubscribe_member(changing_shift = True)
+
+        # https://redmine.coopdev.fr/issues/4715
+        lower_makeup_count_to_zero_if_moving_from_std_to_non_std(api, partner_id, shift_type, res)
         reg_id = m.create_coop_shift_subscription(shift_template_id, shift_type)
 
         # Return necessary data