Merge branch 'dev_cooperatic' into 3867-ratio-button-binome-option

members/static/js/admin/manage_regular_shifts.js

@@ -276,7 +276,7 @@ function display_possible_members() {
 $(document).ready(function() {
     if (coop_is_connected()) {
         $.ajaxSetup({ headers: { "X-CSRFToken": getCookie('csrftoken') } });
-        dbc = new PouchDB(couchdb_dbname);
+        dbc = new PouchDB(couchdb_server);
 
         $(".page_content").show();
 

shifts/models.py

@@ -632,9 +632,15 @@ class CagetteServices(models.Model):
 
     @staticmethod
     def reopen_registration(registration_id, overrided_date=""):
-        
         api = OdooAPI()
         f = {'state': 'open'}
+        try:
+            cond = [['id', '=', int(registration_id)]]
+            fields = ['partner_id']
+            res = api.search_read('shift.registration', cond, fields)
+            coop_logger.info("On invalide la présence de  %s ", res[0]['partner_id'][1])
+        except Exception as e:
+            coop_logger.error("On invalide shift_registration  %s (erreur : %s)", str(registration_id), str(e))
         return api.update('shift.registration', [int(registration_id)], f)
 
     @staticmethod

shifts/views.py

@@ -334,10 +334,9 @@ def cancel_shift(request):
             listRegister = [int(request.POST['idRegister'])]
 
             try:
-                response = cs.cancel_shift(listRegister)
-
                 # decrement extra_shift_done if param exists
                 if 'extra_shift_done' in request.POST:
+                    response = cs.cancel_shift(listRegister, origin='memberspace extra shift done')
                     target = int(request.POST["extra_shift_done"]) - 1
 
                     # extra security
@@ -346,6 +345,8 @@ def cancel_shift(request):
 
                     cm = CagetteMember(partner_id)
                     cm.update_extra_shift_done(target)
+                else:
+                    response = cs.cancel_shift(listRegister)
 
                 return JsonResponse({"res" : 'response'})
             except Exception as e: