Commit 86d0337b authored by Tédé NGUYEN KHAC's avatar Tédé NGUYEN KHAC

Merge branch '2bugFix' into 'master'

2 bug fix de formatage dates et caractères simple-quote

See merge request !12
parents 6abcfde9 76956625
......@@ -136,7 +136,7 @@ function notairesListing($criteres)
$message.= '<td class=tabliste>'.$jour_n.'/'.$mois_n.'/'.$annee_n.'</td>';
list($annee_d, $mois_d, $jour_d) = preg_split('/[.\-\/]+/', $row['date_deces']);
$message.= '<td class=tabliste>'.$jour_d.'/'.$mois_d.'/'.$annee_d.'</td>';
$message.= '<td class=tabliste>'.$row['lieu_deces'].'</td>';
$message.= '<td class=tabliste>'.stripslashes($row['lieu_deces']).'</td>';
list($annee_a, $mois_a, $jour_a) = preg_split('/[.\-\/]+/', $row['date_acte']);
$message.= '<td class=tabliste>'.$jour_a.'/'.$mois_a.'/'.$annee_a.'</td>';
if ( isGestionnaire() || isAdmin() ){
......@@ -172,4 +172,4 @@ function notairesListing($criteres)
?>
\ No newline at end of file
?>
......@@ -666,7 +666,7 @@ function generer_pdf($num_rech, $choix, $corps_texte_pdf)
$date_courrierNotaire = strftime("%A %d %B %Y ", strtotime($dateNotaire));
$pdf->Ln(5);
$pdf->SetX(110);
$txt = "<po></po><po>" . utf8_decode($ville_service) . ", le " . $date_courrierNotaire . "</po>";
$txt = "<po></po><po>" . utf8_decode($ville_service) . ", le " . utf8_decode($date_courrierNotaire) . "</po>";
$pdf->WriteTag(0, 5, $txt, 0, "R", 0, "0,0,0,7");
$pdf->Ln(3);
......@@ -1026,4 +1026,4 @@ function getValue($arr, $key)
return NULL;
}
?>
\ No newline at end of file
?>
......
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