Skip to content

T
third-party
Commit 66e5be54 by Félicie
Options

fix bugs

parent c86826f8
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 7848-cannot-validate-qty-with-decimal-on-kg-product adaptation_supercafoutch adaptation_supercoop adaptation_supercoop_supercafoutch adpatation_chouette assistance_import_article coop_dev_necessitant_modules_bdm_odoo_modifies correctif_nb_rattrapages_creation_binome_avec_ajout_automatique_au_point_negatif dev_principale 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-prod-20221003 supercafoutch-230911 supercafoutch-230824 supercafoutch-230823 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!1582865-email-bdm-deletion,!164Intégration des dév. Cooperatic pour la Cagette
Pipeline #2115 passed with stage
in 1 minute 34 seconds
Showing with 11 additions and 6 deletions
members/admin.py
...@@ -556,8 +556,10 @@ def get_member_info(request, id): ...@@ -556,8 +556,10 @@ def get_member_info(request, id):
member = member[0] member = member[0]
parent = None parent = None
if member['parent_id']: if member['parent_id']:
parent = api.search_read('res.partner', [['id', '=', int(member['parent_id'][0])]], ['barcode_base'])[0] parent_barcode_base = api.search_read('res.partner', [['id', '=', int(member['parent_id'][0])]], ['barcode_base'])[0]
member['parent_barcode_base'] = parent['barcode_base'] member['parent_barcode_base'] = parent_barcode_base['barcode_base']
parent_email = api.search_read('res.partner', [['id', '=', int(member['parent_id'][0])]], ['email'])[0]
member['parent_email'] = parent_email['email']
res['member'] = member res['member'] = member
response = JsonResponse(res) response = JsonResponse(res)
else: else:
......
members/static/js/admin/manage_attached.js
...@@ -4,6 +4,9 @@ var childId = null; ...@@ -4,6 +4,9 @@ var childId = null;
var parentName = null; var parentName = null;
var childName = null; var childName = null;
var parentEmail = null;
var childEmail = null;
const possible_cooperative_state = { const possible_cooperative_state = {
suspended: "Rattrapage", suspended: "Rattrapage",
exempted: "Exempté.e", exempted: "Exempté.e",
...@@ -440,10 +443,10 @@ $(document).ready(function() { ...@@ -440,10 +443,10 @@ $(document).ready(function() {
traditional: true, traditional: true,
contentType: "application/json; charset=utf-8", contentType: "application/json; charset=utf-8",
success: function(data) { success: function(data) {
parentName = data.member.parent_barcode_base + ' - ' + data.member.parent_name parentName = data.member.parent_barcode_base + ' - ' + data.member.parent_name;
parentEmail = data.member.email parentEmail = data.member.parent_email;
childName = data.member.barcode_base + ' - ' + data.member.name childName = data.member.barcode_base + ' - ' + data.member.name;
childEmail = data.member.email childEmail = data.member.email;
confirmDeletion(childId); confirmDeletion(childId);
}, },
error: function(data) { error: function(data) {
......
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