+
{selected_doc_img &&
- }
+ }
diff --git a/src/components/Notes_Evaluation.js b/src/components/Notes_Evaluation.js
index f6c39e5..a29849a 100644
--- a/src/components/Notes_Evaluation.js
+++ b/src/components/Notes_Evaluation.js
@@ -1599,7 +1599,7 @@ const Notes_Evaluation = (props) => {
var node = {
"_id": local_id,
"id": localid,
- "label": local_code,
+ "label": local_code+" - "+String(local_titre).substring(0, 20),
"code": local_code,
"titre": local_titre,
"class_id": local_class_id,
diff --git a/src/components/Partner_Facture.js b/src/components/Partner_Facture.js
index 2c6a19a..a4ff462 100644
--- a/src/components/Partner_Facture.js
+++ b/src/components/Partner_Facture.js
@@ -108,7 +108,7 @@ const Partner_Facture = (props) => {
const classes = useStyles();
const { action, orderid } = useParams();
-registerLocale('fr', fr);
+ registerLocale('fr', fr);
const history = useHistory();
const [submenu, setsubmenu] = useState("");
const [rowss, setRows] = useState([]);
@@ -124,15 +124,30 @@ registerLocale('fr', fr);
const [p_filtre1, setp_filtre1] = useState("");
const [p_filtre1_value, setp_filtre1_value] = useState();
+
+
const [p_filtre2, setp_filtre2] = useState("");
const [p_filtre2_value, setp_filtre2_value] = useState();
+
const [p_filtre3, setp_filtre3] = useState("");
const [p_filtre3_value, setp_filtre3_value] = useState();
+
const [p_filtre4, setp_filtre4] = useState("");
const [p_filtre4_value, setp_filtre4_value] = useState();
+
+
+ const [p_filter_date_creation_du, setp_filter_date_creation_du] = useState(new Date().toLocaleDateString('fr-FR'));
+ const [p_filter_date_creation_au, setp_filter_date_creation_au] = useState(new Date().toLocaleDateString('fr-FR'));
+ const [p_filter_date_echeance, setp_filter_date_echeance] = useState(new Date().toLocaleDateString('fr-FR'));
+ const [p_filtre_echeance_operateur, setp_filtre_echeance_operateur] = useState();
+ const [p_filtre_montant_ttc_operateur, setp_filtre_montant_ttc_operateur] = useState();
+ const [p_filtre_solde_operateur, setp_filtre_solde_operateur] = useState();
+
+
+
function ExpandableCell_50({ value }) {
const [expanded, setExpanded] = React.useState(false);
@@ -171,13 +186,14 @@ registerLocale('fr', fr);
{ field: 'order_header_ref_interne', headerName: 'Réf. Cmd', minWidth: 200, flex: 1, hide: true, editable: false },
{ field: 'invoice_header_type', headerName: 'Type', width: 100, hide: false, editable: false },
{ field: 'invoice_date', headerName: 'Date Facture', width: 150, hide: false, editable: false },
+ { field: 'invoice_date_echeance', headerName: 'Echéance', width: 150, hide: false, editable: false },
{ field: 'order_header_client_id', headerName: 'Client_Id', width: 150, hide: true, editable: false, disableExport: true },
{ field: 'order_header_client_nom', headerName: 'Nom Client', minWidth: 150, flex: 1 },
{ field: 'order_header_vendeur_id', headerName: 'Vendeur Id', width: 0, hide: true, editable: false, disableExport: true },
{ field: 'order_header_vendeur_nom_prenom', headerName: 'Vendeur', width: 150, flex: 1, editable: false },
{ field: 'order_header_date_cmd', headerName: 'Date Cmd', width: 150, hide: true, editable: false },
- { field: 'total_header_hors_taxe_after_header_reduction', headerName: 'Montant HT', width: 150, hide: false, editable: false },
+ { field: 'total_header_hors_taxe_before_header_reduction', headerName: 'Montant HT', width: 150, hide: false, editable: false },
{ field: 'order_header_tax_amount', headerName: 'Taxe', width: 150, hide: false, editable: false },
{ field: 'total_header_toutes_taxes', headerName: 'Montant TTC', width: 150, hide: false, editable: false },
{ field: 'reste_to_paye', headerName: 'A payer', width: 150, hide: false, editable: false },
@@ -1108,17 +1124,24 @@ registerLocale('fr', fr);
//document.getElementsByName("detail_header_type")[0].value = "";
if (mylocal_order.order_header_type)
setp_detail_header_type(mylocal_order.order_header_type);
+ else {
+ setp_detail_header_type("")
+ }
//document.getElementsByName("detail_header_ref_interne")[0].value = "";
if (mylocal_order.order_header_ref_interne) {
setp_detail_header_ref_interne(mylocal_order.order_header_ref_interne);
+ } else {
+ setp_detail_header_ref_interne("")
}
//document.getElementsByName("detail_header_ref_cient")[0].value = "";
if (mylocal_order.order_header_ref_client) {
setp_detail_header_ref_interne(mylocal_order.order_header_ref_client);
+ } else {
+ setp_detail_header_ref_interne("")
}
@@ -1126,6 +1149,9 @@ registerLocale('fr', fr);
if (mylocal_order.order_header_date_cmd) {
setp_detail_header_date_cmd(mylocal_order.order_header_date_cmd);
setp_detail_header_date_cmd_val(mylocal_order.order_header_date_cmd);
+ } else {
+ setp_detail_header_date_cmd("");
+ setp_detail_header_date_cmd_val("");
}
//document.getElementsByName("detail_header_date_expiration")[0].value = "";
@@ -1136,10 +1162,14 @@ registerLocale('fr', fr);
if (mylocal_order.order_header_paiement_condition_code) {
setp_detail_header_condition_paiement_code(mylocal_order.order_header_paiement_condition_code);
+ } else {
+ setp_detail_header_condition_paiement_code("")
}
if (mylocal_order.order_header_paiement_condition_id) {
setp_detail_header_condition_paiement_id(mylocal_order.order_header_paiement_condition_id);
+ } else {
+ setp_detail_header_condition_paiement_id("")
}
@@ -1156,22 +1186,32 @@ registerLocale('fr', fr);
if (mylocal_order.order_header_client_nom) {
setp_detail_header_client_nom(mylocal_order.order_header_client_nom);
setp_detail_header_client_nom_id(mylocal_order.order_header_client_id);
+ } else {
+ setp_detail_header_client_nom("");
+ setp_detail_header_client_nom_id("");
}
if (mylocal_order.order_header_email_client) {
setp_detail_header_email_client(mylocal_order.order_header_email_client);
+ } else {
+ setp_detail_header_email_client("")
}
+
//document.getElementsByName("detail_header_description")[0].value = "";
if (mylocal_order.order_header_description) {
setp_detail_header_description(mylocal_order.order_header_description);
+ } else {
+ setp_detail_header_description("")
}
//document.getElementsByName("detail_header_comment")[0].value = "";
if (mylocal_order.order_header_comment) {
setp_detail_header_comment(mylocal_order.order_header_comment);
+ } else {
+ setp_detail_header_comment("")
}
@@ -1179,6 +1219,9 @@ registerLocale('fr', fr);
if (mylocal_order.order_header_vendeur_nom_prenom) {
setp_detail_header_vendeur_nom(mylocal_order.order_header_vendeur_nom_prenom);
setp_detail_header_vendeur_nom_id(mylocal_order.order_header_vendeur_id);
+ } else {
+ setp_detail_header_vendeur_nom("");
+ setp_detail_header_vendeur_nom_id("");
}
@@ -1186,31 +1229,43 @@ registerLocale('fr', fr);
//document.getElementsByName("detail_header_fact_adresse")[0].value = "";
if (mylocal_order.order_header_adr_fact_adresse) {
setp_detail_header_fact_adr(mylocal_order.order_header_adr_fact_adresse);
+ } else {
+ setp_detail_header_fact_adr("")
}
//document.getElementsByName("detail_header_fact_code_postal")[0].value = "";
if (mylocal_order.order_header_adr_fact_code_postal) {
setp_detail_header_fact_code_postal(mylocal_order.order_header_adr_fact_code_postal);
+ } else {
+ setp_detail_header_fact_code_postal("")
}
//document.getElementsByName("detail_header_fact_ville")[0].value = "";
if (mylocal_order.order_header_adr_fact_ville) {
setp_detail_header_fact_ville(mylocal_order.order_header_adr_fact_ville);
+ } else {
+ setp_detail_header_fact_ville("")
}
//document.getElementsByName("detail_header_fact_pays")[0].value = "";
if (mylocal_order.order_header_adr_fact_pays) {
setp_detail_header_fact_pays(mylocal_order.order_header_adr_fact_pays);
+ } else {
+ setp_detail_header_fact_pays("")
}
//document.getElementsByName("detail_header_liv_adresse")[0].value = "";
if (mylocal_order.order_header_adr_liv_adresse) {
setp_detail_header_liv_adr(mylocal_order.order_header_adr_liv_adresse);
+ } else {
+ setp_detail_header_liv_adr("")
}
//document.getElementsByName("detail_header_liv_code_postal")[0].value = "";
if (mylocal_order.order_header_adr_liv_code_postal) {
setp_detail_header_liv_code_postal(mylocal_order.order_header_adr_liv_code_postal);
+ } else {
+ setp_detail_header_liv_code_postal("")
}
if (mylocal_order.invoice_date_echeance) {
@@ -1236,11 +1291,15 @@ registerLocale('fr', fr);
//document.getElementsByName("detail_header_liv_ville")[0].value = "";
if (mylocal_order.order_header_adr_liv_ville) {
sep_detail_header_liv_ville(mylocal_order.order_header_adr_liv_ville);
+ } else {
+ sep_detail_header_liv_ville("")
}
//document.getElementsByName("detail_header_liv_pays")[0].value = "";
if (mylocal_order.order_header_adr_liv_pays) {
setp_detail_header_liv_pays(mylocal_order.order_header_adr_liv_pays);
+ } else {
+ setp_detail_header_liv_pays("")
}
@@ -1248,32 +1307,44 @@ registerLocale('fr', fr);
//document.getElementsByName("detail_header_total_ht")[0].value = "";
if (mylocal_order.order_header_total_ht) {
setp_detail_header_total_ht(mylocal_order.order_header_total_ht);
+ } else {
+ setp_detail_header_total_ht("")
}
//document.getElementsByName("detail_header_total_tax")[0].value = "";
if (mylocal_order.order_header_tax_amount) {
setp_detail_header_total_tax(mylocal_order.order_header_tax_amount);
+ } else {
+ setp_detail_header_total_tax("")
}
//document.getElementsByName("detail_header_total_ttc")[0].value = "";
if (mylocal_order.order_header_total_ttc) {
setp_detail_header_total_ttc(mylocal_order.order_header_total_ttc);
+ } else {
+ setp_detail_header_total_ttc("")
}
//document.getElementsByName("detail_header_type_reduction")[0].value = "";
if (mylocal_order.order_header_type_reduction) {
setp_detail_header_type_reduction(mylocal_order.order_header_type_reduction);
+ } else {
+ setp_detail_header_type_reduction("")
}
//document.getElementsByName("detail_header_type_reduction_valeur")[0].value = "";
if (mylocal_order.order_header_type_reduction_valeur) {
setp_detail_header_type_reduction_valeur(mylocal_order.order_header_type_reduction_valeur);
+ } else {
+ setp_detail_header_type_reduction_valeur("")
}
if (mylocal_order.order_header_montant_reduction) {
setp_detail_header_total_reduction_amount(mylocal_order.order_header_montant_reduction);
+ } else {
+ setp_detail_header_total_reduction_amount("")
}
@@ -1283,19 +1354,27 @@ registerLocale('fr', fr);
if (mylocal_order.total_header_hors_taxe_before_header_reduction) {
setp_detail_total_header_hors_taxe_before_header_reduction(mylocal_order.total_header_hors_taxe_before_header_reduction);
+ } else {
+ setp_detail_total_header_hors_taxe_before_header_reduction("")
}
if (mylocal_order.total_header_hors_taxe_after_header_reduction) {
setp_detail_total_header_hors_taxe_after_header_reduction(mylocal_order.total_header_hors_taxe_after_header_reduction);
+ } else {
+ setp_detail_total_header_hors_taxe_after_header_reduction("");
}
if (mylocal_order.order_header_tax_amount) {
setp_detail_order_header_tax_amount(mylocal_order.order_header_tax_amount);
+ } else {
+ setp_detail_order_header_tax_amount("")
}
if (mylocal_order.total_header_toutes_taxes) {
setp_detail_total_header_toutes_taxes(mylocal_order.total_header_toutes_taxes);
+ } else {
+ setp_detail_total_header_toutes_taxes("")
}
if (mylocal_order.total_lines_hors_taxe_before_lines_reduction) {
@@ -1304,6 +1383,8 @@ registerLocale('fr', fr);
if (mylocal_order.total_lines_hors_taxe_after_lines_reduction) {
setp_detail_total_lines_hors_taxe_after_lines_reduction(mylocal_order.total_lines_hors_taxe_after_lines_reduction);
+ } else {
+ setp_detail_total_lines_hors_taxe_after_lines_reduction("")
}
@@ -1502,6 +1583,27 @@ registerLocale('fr', fr);
}
+
+ function print_invoice_pdf_acquited() {
+ const stored_cookie = getCookie('tokenmysypart');
+
+ var nom_fichier_cmd = "Facture_" + invoice_internal_ref + ".pdf";
+ // console.log(" nom_fichier_cmd = ", nom_fichier_cmd, " --- selected_id = ", selected_id);
+
+ var url = process.env.REACT_APP_API_URL + "myclass/api/GerneratePDF_Partner_Invoice_regeneration/" + stored_cookie + "/" + selected_id;
+
+ //console.log(" nom_fichier_cmd = ", nom_fichier_cmd, " --- selected_id = ", selected_id, " --- url =", url);
+
+ axios.get(url, { responseType: 'blob', },)
+ .then((res) => {
+ fileDownload(res.data, nom_fichier_cmd)
+ }).catch((error) => {
+ console.error('Error:', error);
+
+ });
+ }
+
+
const [Getall_Parter_Invoice_With_Filter_api, setGetall_Parter_Invoice_With_Filter_api] = useState();
const [Getall_Parter_Invoice_With_Filter_message, setGetall_Parter_Invoice_With_Filter_message] = useState();
const [Getall_Parter_Invoice_With_Filter_result, setGetall_Parter_Invoice_With_Filter_result] = useState();
@@ -1523,29 +1625,94 @@ registerLocale('fr', fr);
var filtre4_value = "";
// Recuperation des valeurs de filtres
- if (p_filtre1_value) {
+
+ if (p_filtre1) {
filtre1_value = p_filtre1_value;
- form.append(filtre1, filtre1_value);
+
+ if (filtre1 === "date_echeance" && p_filter_date_echeance) {
+ form.append("date_echeance", p_filter_date_echeance);
+ form.append("echeance_operateur", p_filtre_echeance_operateur);
+ }
+ else if (filtre1 === "date_creation" && p_filter_date_creation_du && p_filter_date_creation_au) {
+ form.append("date_facture_debut", p_filter_date_creation_du);
+ form.append("date_facture_fin", p_filter_date_creation_au);
+ }
+ else if (filtre1 === "montant_ttc" && p_filtre1_value && p_filtre_montant_ttc_operateur) {
+ form.append("montant_ttc", filtre1_value);
+ form.append("montant_ttc_operateur", p_filtre_montant_ttc_operateur);
+ }
+ else if (filtre1 === "solde" && p_filtre1_value && p_filtre_solde_operateur) {
+ form.append("solde", p_filtre1_value);
+ form.append("solde_operateur", p_filtre_solde_operateur);
+ }
+
+ else if (filtre1_value) {
+ form.append(filtre1, filtre1_value);
+ }
+
}
- if (p_filtre2_value) {
+ if (p_filtre2) {
filtre2_value = p_filtre2_value;
- form.append(filtre2, filtre2_value);
+
+ if (p_filtre2 === "date_echeance" && p_filter_date_echeance) {
+ form.append("date_echeance", p_filter_date_echeance);
+ form.append("echeance_operateur", p_filtre_echeance_operateur);
+ }
+ else if (p_filtre2 === "date_creation" && p_filter_date_creation_du && p_filter_date_creation_au) {
+ form.append("date_facture_debut", p_filter_date_creation_du);
+ form.append("date_facture_fin", p_filter_date_creation_au);
+ }
+ else if (p_filtre2 === "montant_ttc" && p_filtre2_value && p_filtre_montant_ttc_operateur) {
+ form.append("montant_ttc", filtre2_value);
+ form.append("montant_ttc_operateur", p_filtre_montant_ttc_operateur);
+ }
+ else if (p_filtre2 === "solde" && p_filtre2_value && p_filtre_solde_operateur) {
+ form.append("solde", p_filtre2_value);
+ form.append("solde_operateur", p_filtre_solde_operateur);
+ }
+
+ else if (filtre2_value) {
+ form.append(filtre2, filtre2_value);
+ }
+
+
}
- if (p_filtre3_value) {
+ if (p_filtre3) {
filtre3_value = p_filtre3_value;
- form.append(filtre3, p_filtre3_value);
+
+ if (p_filtre3 === "date_echeance" && p_filter_date_echeance) {
+ form.append("date_echeance", p_filter_date_echeance);
+ form.append("echeance_operateur", p_filtre_echeance_operateur);
+ }
+ else if (p_filtre3 === "date_creation" && p_filter_date_creation_du && p_filter_date_creation_au) {
+ form.append("date_facture_debut", p_filter_date_creation_du);
+ form.append("date_facture_fin", p_filter_date_creation_au);
+ }
+ else if (p_filtre3 === "montant_ttc" && p_filtre_montant_ttc_operateur && p_filtre3_value) {
+ form.append("montant_ttc", p_filtre3_value);
+ form.append("montant_ttc_operateur", p_filtre_montant_ttc_operateur);
+ }
+ else if (p_filtre3 === "solde" && p_filtre3_value && p_filtre_solde_operateur) {
+ form.append("solde", p_filtre3_value);
+ form.append("solde_operateur", p_filtre_solde_operateur);
+ }
+
+ else if (p_filtre3_value) {
+ form.append(filtre3, p_filtre3_value);
+ }
+
+
}
- if (p_filtre4_value) {
- filtre4_value = p_filtre4_value;
- form.append(filtre4, p_filtre4_value);
- }
+
const stored_cookie = getCookie('tokenmysypart');
form.append("token", stored_cookie);
+ console.log(" ### form = ", form)
+
var myurl = process.env.REACT_APP_API_URL + "myclass/api/Get_List_Partner_Invoice_with_filter/";
axios.post(myurl, form).then(res => {
@@ -1587,6 +1754,10 @@ registerLocale('fr', fr);
form.append("token", stored_cookie);
form.append("invoice_id", selected_id);
+ if (facture_mail_type && facture_mail_type === "aquited") {
+ form.append("invoice_regeneration", "1");
+ }
+
for (let i = 0; i < tab_invoice_mail_pieces_jointes_result.length; i++) {
form.append('File', tab_invoice_mail_pieces_jointes_result[i]);
}
@@ -2420,15 +2591,27 @@ registerLocale('fr', fr);
const New_Option_Filter = [
{ "id": "ref_interne_invoice", "label": "Num Facture", "value": "ref_interne_invoice" },
+ { "id": "client_nom", "label": "Nom Client", "value": "client_nom" },
+ { "id": "solde", "label": "Reste à payer", "value": "solde" },
+ { "id": "montant_ttc", "label": "Montant TTC", "value": "montant_ttc" },
+ { "id": "date_echeance", "label": "Echéance", "value": "date_echeance" },
+ { "id": "date_creation", "label": "Date Création (jj/mm/aaaa) ", "value": "date_creation" },
+ { "id": "session_code", "label": "Lié a la session/promo (code externe)", "value": "session_code" },
+ { "id": "formation", "label": "Lié a la Formation (code externe)", "value": "formation" },
{ "id": "ref_interne_cmd", "label": "Ref. Interne Cmd", "value": "ref_interne_cmd" },
{ "id": "ref_externe", "label": "Ref. Externe Cmd (chez le client)", "value": "ref_externe" },
- { "id": "client_nom", "label": "Nom Client", "value": "client_nom" },
- { "id": "formation", "label": "Lié a la Formation (code externe)", "value": "formation" },
{ "id": "", "label": "", "value": "" },
{ "id": "1", "label": "", "value": "1" }, // Cette ligne pour couvrir l'ajout d'une ligne de filter. C'est fait expres.
]
+ const New_Option_filter_montant = [
+ { "id": "egale", "label": "=", "value": "egale" },
+ { "id": "inf_egale", "label": "<=", "value": "inf_egale" },
+ { "id": "sup_egale", "label": ">=", "value": "sup_egale" },
+ ]
+
+
function handleClick_menu_droite_facture(e) {
console.log(" III ");
}
@@ -2443,6 +2626,14 @@ registerLocale('fr', fr);
]
+
+ const New_Option_facture_mail = [
+ { "id": "original", "label": "Facture Originale", "value": "original" },
+ { "id": "aquited", "label": "Facture Aquitée", "value": "aquited" },
+ ]
+
+ const [facture_mail_type, setfacture_mail_type] = useState("original");
+
// DEBUT EXPORT EXCEL DATAGRID
function CustomToolbar(props) {
@@ -2466,7 +2657,7 @@ registerLocale('fr', fr);
function getExcelData(apiRef) {
// Select rows and columns
const filteredSortedRowIds = gridFilteredSortedRowIdsSelector(apiRef);
- const visibleColumnsField = gridVisibleColumnFieldsSelector(apiRef).filter((data) => (data) !== "__check__" );
+ const visibleColumnsField = gridVisibleColumnFieldsSelector(apiRef).filter((data) => (data) !== "__check__");
// Format the data. Here we only keep the value
@@ -2496,7 +2687,7 @@ registerLocale('fr', fr);
function handleExport(apiRef, data_colums) {
const data = getExcelData(apiRef);
- const visibleColumnsField = gridVisibleColumnFieldsSelector(apiRef).filter((data) => (data) !== "__check__" );
+ const visibleColumnsField = gridVisibleColumnFieldsSelector(apiRef).filter((data) => (data) !== "__check__");
const local_config = {
keys: visibleColumnsField,
@@ -3032,8 +3223,37 @@ registerLocale('fr', fr);
+
+ Facture Originale ou Acquittée ?
+ {New_Option_facture_mail && New_Option_facture_mail.length > 0 &&
(data).value === String(facture_mail_type))[0].label}
+ options={New_Option_facture_mail}
+ onChange={(event, value) => {
+ if (value && value.value) {
+ setfacture_mail_type(value.value);
+ } else {
+ setfacture_mail_type("");
+ }
-
+ }}
+
+ renderInput={(params) =>
+ }
+ />}
+
+
+
+
+
+
+
Pièces jointes à la facture
@@ -3069,12 +3289,12 @@ registerLocale('fr', fr);
{tab_invoice_mail_pieces_jointes_result &&
-
+
Liste des pièces jointes
{
{tab_invoice_mail_pieces_jointes_result && tab_invoice_mail_pieces_jointes_result.map((val) => (
-