Commit 290dc9f7 by Félicie

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

parents f54ca15d 04f149b4
Pipeline #2410 passed with stage
in 1 minute 24 seconds
...@@ -276,7 +276,7 @@ function display_possible_members() { ...@@ -276,7 +276,7 @@ function display_possible_members() {
$(document).ready(function() { $(document).ready(function() {
if (coop_is_connected()) { if (coop_is_connected()) {
$.ajaxSetup({ headers: { "X-CSRFToken": getCookie('csrftoken') } }); $.ajaxSetup({ headers: { "X-CSRFToken": getCookie('csrftoken') } });
dbc = new PouchDB(couchdb_dbname); dbc = new PouchDB(couchdb_server);
$(".page_content").show(); $(".page_content").show();
......
...@@ -632,9 +632,15 @@ class CagetteServices(models.Model): ...@@ -632,9 +632,15 @@ class CagetteServices(models.Model):
@staticmethod @staticmethod
def reopen_registration(registration_id, overrided_date=""): def reopen_registration(registration_id, overrided_date=""):
api = OdooAPI() api = OdooAPI()
f = {'state': 'open'} 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) return api.update('shift.registration', [int(registration_id)], f)
@staticmethod @staticmethod
......
...@@ -334,10 +334,9 @@ def cancel_shift(request): ...@@ -334,10 +334,9 @@ def cancel_shift(request):
listRegister = [int(request.POST['idRegister'])] listRegister = [int(request.POST['idRegister'])]
try: try:
response = cs.cancel_shift(listRegister)
# decrement extra_shift_done if param exists # decrement extra_shift_done if param exists
if 'extra_shift_done' in request.POST: 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 target = int(request.POST["extra_shift_done"]) - 1
# extra security # extra security
...@@ -346,6 +345,8 @@ def cancel_shift(request): ...@@ -346,6 +345,8 @@ def cancel_shift(request):
cm = CagetteMember(partner_id) cm = CagetteMember(partner_id)
cm.update_extra_shift_done(target) cm.update_extra_shift_done(target)
else:
response = cs.cancel_shift(listRegister)
return JsonResponse({"res" : 'response'}) return JsonResponse({"res" : 'response'})
except Exception as e: except Exception as e:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment