diff --git a/src/components/DisplayPartnerSession.js b/src/components/DisplayPartnerSession.js index 46c3c09..8d985f8 100644 --- a/src/components/DisplayPartnerSession.js +++ b/src/components/DisplayPartnerSession.js @@ -5390,7 +5390,7 @@ const DisplayPartnerSession = (props) => { const [p_one_location_type_label, setp_one_location_type_label] = useState(""); const [p_one_is_bpf, setp_one_is_bpf] = useState("0"); - const [p_one_is_bpf_label, setp_one_is_bpf_label] = useState("Non"); + const [p_one_is_bpf_label, setp_one_is_bpf_label] = useState("Oui"); function annuleSessionUpdate() { clearSessionFields(); @@ -15849,7 +15849,7 @@ const DisplayPartnerSession = (props) => { } else { setp_one_is_bpf(""); - setp_one_is_bpf_label(""); + setp_one_is_bpf_label("Non"); } }} diff --git a/src/components/Partner_Commande.js b/src/components/Partner_Commande.js index 3f06841..20164fb 100644 --- a/src/components/Partner_Commande.js +++ b/src/components/Partner_Commande.js @@ -1442,6 +1442,7 @@ const Partner_Commande = (props) => { } + //document.getElementsByName("detail_nom_client")[0].value = ""; if (mylocal_order.order_header_client_nom) { setp_detail_header_client_nom(mylocal_order.order_header_client_nom); @@ -1598,6 +1599,13 @@ const Partner_Commande = (props) => { } + if (mylocal_order.order_header_inclus_bpf) { + setp_add_cmd_header_order_inclus_bpf(mylocal_order.order_header_inclus_bpf); + } else { + setp_add_cmd_header_order_inclus_bpf(""); + } + + disable_Order_Header_DetailFields(); order_header_submenu_main(); @@ -2094,7 +2102,7 @@ const Partner_Commande = (props) => { if (mylocal_order.order_line_type_apprenant) { setp_add_line_item_type_apprenant(mylocal_order.order_line_type_apprenant); - }else{ + } else { setp_add_line_item_type_apprenant(""); } @@ -2155,6 +2163,7 @@ const Partner_Commande = (props) => { function submenu_add_one_order() { + clean_order_detail_fields(); Getall_Partner_Paiement_Condition(); setp_add_cmd_header_order_type("commande"); @@ -2166,6 +2175,8 @@ const Partner_Commande = (props) => { function submenu_add_one_quotation() { + clean_order_detail_fields(); + Getall_Parter_Devis_Config_Points(); Getall_Partner_Paiement_Condition(); setp_add_cmd_header_order_type("devis"); @@ -2257,6 +2268,12 @@ const Partner_Commande = (props) => { document.getElementsByName("detail_header_type")[0].style.backgroundColor = "#FFFFFF"; } + if (document.getElementsByName("order_header_inclus_bpf")[0]) { + document.getElementsByName("order_header_inclus_bpf")[0].disabled = false; + document.getElementsByName("order_header_inclus_bpf")[0].style.backgroundColor = "#FFFFFF"; + } + + if (document.getElementsByName("detail_header_status")[0]) { document.getElementsByName("detail_header_status")[0].disabled = false; document.getElementsByName("detail_header_status")[0].style.backgroundColor = "#FFFFFF"; @@ -2415,6 +2432,12 @@ const Partner_Commande = (props) => { document.getElementsByName("detail_header_type")[0].style.backgroundColor = "#ECEFF1"; } + if (document.getElementsByName("order_header_inclus_bpf")[0]) { + document.getElementsByName("order_header_inclus_bpf")[0].disabled = true; + document.getElementsByName("order_header_inclus_bpf")[0].style.backgroundColor = "#ECEFF1"; + } + + if (document.getElementsByName("detail_header_status")[0]) { document.getElementsByName("detail_header_status")[0].disabled = true; document.getElementsByName("detail_header_status")[0].style.backgroundColor = "#ECEFF1"; @@ -2724,6 +2747,12 @@ const Partner_Commande = (props) => { form.append("order_header_montant_reduction", ""); + if (p_add_cmd_header_order_inclus_bpf) + form.append("order_header_inclus_bpf", p_add_cmd_header_order_inclus_bpf); + else + form.append("order_header_inclus_bpf", ""); + + //console.log(" form == ", form); var myurl = ""; @@ -2975,8 +3004,8 @@ const Partner_Commande = (props) => { form.append("order_line_type_reduction", p_add_line_item_type_reduction); form.append("order_line_type_valeur", p_add_line_item_reduction_value); form.append("order_line_montant_reduction", String(total_reduction)); - - + + form.append("order_line_montant_hors_taxes", String(total_base1)); @@ -3020,7 +3049,7 @@ const Partner_Commande = (props) => { return; } - console.log("### form = ", form); + //console.log("### form = ", form); var myurl = process.env.REACT_APP_API_URL + "myclass/api/Add_Update_Partner_Order_Line/"; @@ -3118,6 +3147,7 @@ const Partner_Commande = (props) => { setp_add_line_item_taxe(""); setp_add_line_item_taxe_amount(""); setp_add_line_item_total_amount_ttc(""); + setp_add_line_item_type_apprenant(""); setpartner_taux_tva("20"); @@ -3175,6 +3205,7 @@ const Partner_Commande = (props) => { form.append("order_header_adr_liv_code_postal", p_detail_header_liv_code_postal); form.append("order_header_adr_liv_ville", p_detail_header_liv_ville); form.append("order_header_adr_liv_pays", p_detail_header_liv_pays); + form.append("order_header_inclus_bpf", p_add_cmd_header_order_inclus_bpf); if (!p_add_cmd_header_client_id || String(p_add_cmd_header_client_id).length < 2) { @@ -3274,6 +3305,8 @@ const Partner_Commande = (props) => { const [p_add_cmd_header_ref_client, setp_add_cmd_header_ref_client] = useState(""); const [p_add_cmd_header_condition_paiement_id, setp_add_cmd_header_condition_paiement_id] = useState(""); + const [p_add_cmd_header_order_inclus_bpf, setp_add_cmd_header_order_inclus_bpf] = useState("1"); + function clean_order_detail_fields() { setp_add_cmd_header_client_id(); @@ -3284,6 +3317,7 @@ const Partner_Commande = (props) => { setp_add_cmd_header_date_expiration_cmd(date_today_90j.toLocaleDateString('fr-FR')); setp_add_cmd_header_order_type(); setp_add_cmd_header_order_location_type("1"); + setp_add_cmd_header_order_inclus_bpf("1"); setp_add_cmd_header_ref_client(); setp_add_cmd_header_condition_paiement_id(""); @@ -4546,6 +4580,21 @@ const Partner_Commande = (props) => { ] + const inclus_bpf_tab = [ + { + value: '1', + label: 'Oui', + }, + { + value: '0', + label: 'Non', + }, + { + value: '', + label: '', + }, + + ]; return ( @@ -5920,6 +5969,8 @@ const Partner_Commande = (props) => { if (value && value.value) { setp_add_cmd_header_order_location_type(value.value); + } else { + setp_add_cmd_header_order_location_type(""); } }} @@ -5932,29 +5983,37 @@ const Partner_Commande = (props) => { />} - {/* +
Inclus BPF
+ {inclus_bpf_tab && inclus_bpf_tab.length > 0 && p_add_cmd_header_order_inclus_bpf && { - setp_add_cmd_header_order_location_type(e.target.value); + value={inclus_bpf_tab.filter((data) => (data).value === String(p_add_cmd_header_order_inclus_bpf))[0].label} + options={inclus_bpf_tab} + onChange={(event, value) => { + if (value && value.value) { + setp_add_cmd_header_order_inclus_bpf(value.value); + } else { + setp_add_cmd_header_order_inclus_bpf(""); + } + }} + + renderInput={(params) => } - } + />} - select - > - Inter   - Intra   - Autre   - - */}
+ +
Commentaire
{ } />} - {/* { - setp_detail_header_statut(e.target.value); - setOrder_data_changed("1"); - } - } - > - Brouillon    - En cours   - Fermé   - Annulé   - */}
} @@ -6653,6 +6689,53 @@ const Partner_Commande = (props) => { /> + + {String(order_data_edit_mode) !== "1" &&
Inclus BPF
+ (data).value === String(p_add_cmd_header_order_inclus_bpf))[0].label} + /> + +
} + + + {String(order_data_edit_mode) === "1" &&
Inclus BPF
+ {inclus_bpf_tab && inclus_bpf_tab.length > 0 && (data).value === String(p_add_cmd_header_order_inclus_bpf))[0].label} + options={inclus_bpf_tab} + onChange={(event, value) => { + setOrder_data_changed("1"); + if (value && value.value) { + setp_add_cmd_header_order_inclus_bpf(value.value); + } else { + setp_add_cmd_header_order_inclus_bpf(""); + } + + }} + + renderInput={(params) => + } + />} +
} + + + {String(order_data_edit_mode) === "1" &&
Conditions Paiement
@@ -7577,7 +7660,51 @@ const Partner_Commande = (props) => { {String(selected_order_header_type) === "commande" && String(p_detail_header_statut_label).toLowerCase() === "traité" && - } + Facturer + } + + modal + nested + position="center center" + > + {close => ( +
+ +
MySy Information
+
+ {' '} + + En confirmant cette opération, vous allez lancer le processus de facturation.
+
+
+
+ + +
+
+ +
+
+
+ )} +
+ + } {String(selected_order_header_type) === "devis" &&