Skip to content

T
third-party
Commit 290dc9f7 by Félicie
Options

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

parents f54ca15d 04f149b4
dev_cooperatic … #5673_bug_calendrier_echange_service 3832-makeups-and-member-status-update 4081 4444_improve_presence_recording 4709 4778-reception-dont-get-finished-orders 4809-remove-shelf-value-col-to-reduce-server-load 4880-rapports-reception-faux 4950-douchage-appli-reception 5474-et-5462-Voir-les-rattrapages-choisis-dans-admin-bdm-et-corrige-lenteur-affichage-admin-rattrapages 5641-reception-trier-a-la-maj-prix-dans-ordre-de-pointage-quantites 6286_bug_encaissement_souscription_cheque_espece 6813-marking-parent-gone-when-unpairing-binom-does-not-unsuscribe-parent-from-shift-template 6832--certaines-absences-engendrent-une-erreur 7723-7559-change-purchase-order-workflow-django-side 7731-third-party-side-brinks-pos-export-not-working 7747-inventaire-par-article 7800-make-test-solution-work 7819-prevent-adding-product-already-in-order 7848-cannot-validate-qty-with-decimal-on-kg-product 7918_bug_quantites_stade_demande_prix adpatation_chouette assistance_import_article coop_dev_necessitant_modules_bdm_odoo_modifies correctif_nb_rattrapages_creation_binome_avec_ajout_automatique_au_point_negatif export_capital_detenu fix_bug_process_picking fusion_custom_graoucoop graoucoop_backup graoucoop_prod graoucoop_tmp hot_fix_shelf_labels_auto_print impression_etiquettes_rayons integration_lien_precommandes_dans_espace_membre lacagette_prod local_branch meal-voucher-and-label-printer-software-bug migration-v12 pour_graoucoop_prod pour_version_prod_cagette refonte_espace_membre_sc retouches_tickets_supercoop sc-setup-stock-app supercafoutch-preprod supercafoutch-prod-20221003 supercafoutch_prod ticket_4146 supercafoutch_20250120_151258 supercafoutch_20250120_150340 supercafoutch_20240909_080630 supercafoutch_20240609_115709 supercafoutch_20240212_082431 supercafoutch_20240107_181851 supercafoutch_prod_until_240107 supercafoutch-230911 supercafoutch-230824 supercafoutch-230823-the-true-one migration-v12-tag lacagette_20240310_074751 lacagette_20240107_122554 lacagette_20240107_120916 graoucoop_20240609_122614 cagette_testtag cagette-230814 cagette-230630
2 merge requests!2013867-ratio-button-binome-option,!218Ticket 4292
Pipeline #2410 passed with stage
in 1 minute 24 seconds
Showing with 11 additions and 4 deletions
members/static/js/admin/manage_regular_shifts.js
...@@ -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();
......
shifts/models.py
...@@ -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
......
shifts/views.py
...@@ -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