Merge branch…

Merge branch '5766-CAGETTE-gain-de-point-non-souhaitable-dans-des-cas-de-deplacement-de-service' into 'dev_cooperatic'

properly set template_created when reopening registration not as a makeup

See merge request !262

shifts/models.py

@@ -328,11 +328,17 @@ class CagetteShift(models.Model):
                                 "state": 'open',
                                 "is_makeup":data['is_makeup'],
                                 "origin":canceled_res[0]['origin'] + ' reopened from memberspace'}
-                """In case shift to reopen is a makeup, we want the counter to be incremented once shift is done
-                That is why template_created must be set to false
-                However if shift to reopen is not a makeup, counter should not be incremented so template_created should not be changed."""
-                if data["is_makeup"]:
+
+                #following code is required to properly set template_created.
+                #TODO : factor with set_shift code
+                shift_type = "standard"
+                if data['shift_type'] == "ftop" or getattr(settings, 'USE_STANDARD_SHIFT', True) == False:
+                    shift_type = "ftop"
+                if (shift_type == "standard" and data['is_makeup'] is not True) or shift_type == "ftop":
+                    fieldsDatas['template_created'] = 1  # It's not true but otherwise, presence add 1 standard point , which is not wanted
+                else: #the else does not exist in set_shift but is mandatory here as template_created value in reopened registration can be any value
                     fieldsDatas["template_created"] = False
+
                 response = self.o_api.update('shift.registration', [shift_res['id']],  fieldsDatas)
         except Exception as e:
             coop_logger.error("Reopen shift : %s", str(e))