Commit 02e6f819 authored by Hamza Arfaoui's avatar Hamza Arfaoui

CAFI168

parent 5e1cae2c
......@@ -1126,7 +1126,7 @@ function listeClients($agence, $entites, $type, $motifs) {
array_push($liste, $tmp);
}
} else if ($type == "pris_en_charge") {
$q = "SELECT cl.id_client, cl.nbr, DATE_FORMAT(cl.date_arrivee, '%Hh%i') as date_arrivee,DATE_FORMAT(cl.date_priseencharge, '%Hh%i') as date_priseencharge, cl.date_cloture, cl.rdv, cl.rdv_type, cl.civ, cl.nom, cl.id_conseiller, cs.nom as conseillerNom, cl.id_action, csa.civ as civ_conseiller_action, csa.nom as nom_conseiller_action, csa.prenom as prenom_conseiller_action" . $additionalColumns . "
$q = "SELECT cl.id_client, cl.nbr, DATE_FORMAT(cl.date_arrivee, '%Hh%i') as date_arrivee,DATE_FORMAT(cl.date_priseencharge, '%Hh%i') as date_priseencharge, cl.date_cloture, cl.rdv, cl.rdv_type, cl.civ, cl.nom, cl.matricule, cl.id_conseiller, cs.nom as conseillerNom, cl.id_action, csa.civ as civ_conseiller_action, csa.nom as nom_conseiller_action, csa.prenom as prenom_conseiller_action" . $additionalColumns . "
FROM ca_clients cl
" . $leftJoins . "
LEFT OUTER JOIN ca_conseillers cs ON cl.id_conseiller=cs.id_conseiller
......@@ -1623,6 +1623,7 @@ function pileContenu($agence, $entites, $motifs, $conseiller, $data, $stats) {
if ($GLOBALS["BO_CONF"]["CLIENT"]["prenom"])
$cliNomClient .= $o->prenom . " ";
$cliNomClient .= $o->nom;
$cliNomClient .= isset($o->matricule) && !empty($o->matricule) ? " (".$o->matricule.")" : "";
$PCT = "";
......
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