diff --git a/gestion/lib/Service/Devis/DevisPdfLayoutManager.php b/gestion/lib/Service/Devis/DevisPdfLayoutManager.php index a80a2a6..8728c66 100644 --- a/gestion/lib/Service/Devis/DevisPdfLayoutManager.php +++ b/gestion/lib/Service/Devis/DevisPdfLayoutManager.php @@ -118,17 +118,17 @@ class DevisPdfLayoutManager $pdf->MultiCell(0, 7, trim(\OCA\Gestion\Helpers\FileExportHelpers::FormatTextForExport($clientInfo['address']))); $pdf->SetMargins(0, 0, 0); - $clientInfoYAxis += 14; + $clientInfoYAxis += 7; $pdf->SetXY($clientInfoXAxis, $clientInfoYAxis); $pdf->Cell(0, 7, trim(mb_convert_encoding(html_entity_decode($clientInfo['city']), 'ISO-8859-1', 'UTF-8'))); - if (!empty($clientInfo['siret'])) { + if (isset($clientInfo['siret']) && trim($clientInfo['siret']) !== '' && $clientInfo['siret'] !== null) { $clientInfoYAxis += 7; $pdf->SetXY($clientInfoXAxis, $clientInfoYAxis); $pdf->Cell(0, 7, 'Siret: ' . \OCA\Gestion\Helpers\FileExportHelpers::FormatTextForExport($clientInfo['siret'])); } - if (!empty($clientInfo['email'])) { + if (isset($clientInfo['email']) && trim($clientInfo['email']) !== '' && $clientInfo['email'] !== null) { $clientInfoYAxis += 7; $pdf->SetXY($clientInfoXAxis, $clientInfoYAxis); $pdf->Cell(0, 7, 'Email: ' . mb_convert_encoding(html_entity_decode($clientInfo['email']), 'ISO-8859-1', 'UTF-8'));