From b2ec9132eeb9f919c43a2cf9d04febf6788c4ecd Mon Sep 17 00:00:00 2001 From: dev2a Date: Wed, 11 Oct 2023 18:00:25 +0200 Subject: [PATCH] Fix: Correction of overlapping text in the payment list (#26186) --- htdocs/core/modules/facture/doc/pdf_crabe.modules.php | 8 +++++--- htdocs/core/modules/facture/doc/pdf_sponge.modules.php | 9 +++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php index 88b21d64bc7..fda39f6882e 100644 --- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php @@ -1010,8 +1010,9 @@ class pdf_crabe extends ModelePDFFactures if ($resql) { $num = $this->db->num_rows($resql); $i = 0; + $y += 3; + $maxY = $y; while ($i < $num) { - $y += 3; if ($tab3_top + $y >= ($this->page_hauteur - $heightforfooter)) { $y = 0; $current_page++; @@ -1037,11 +1038,12 @@ class pdf_crabe extends ModelePDFFactures $oper = $outputlangs->transnoentitiesnoconv("PaymentTypeShort".$row->code); $pdf->MultiCell(20, 3, $oper, 0, 'L', 0); + $maxY = max($pdf->GetY() - $tab3_top - 3, $maxY); $pdf->SetXY($tab3_posx + 58, $tab3_top + $y); $pdf->MultiCell(30, 3, $row->num, 0, 'L', 0); - + $y = $maxY = max($pdf->GetY() - $tab3_top - 3, $maxY); $pdf->line($tab3_posx, $tab3_top + $y + 3, $tab3_posx + $tab3_width, $tab3_top + $y + 3); - + $y += 3; $i++; } diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php index fe3c2d73ebb..c823f398cd3 100644 --- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php @@ -1164,10 +1164,10 @@ class pdf_sponge extends ModelePDFFactures if ($resql) { $num = $this->db->num_rows($resql); $i = 0; + $y += 3; + $maxY = $y; while ($i < $num) { - $y += 3; $row = $this->db->fetch_object($resql); - $pdf->SetXY($tab3_posx, $tab3_top + $y); $pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($row->date), 'day', false, $outputlangs, true), 0, 'L', 0); $pdf->SetXY($tab3_posx + 21, $tab3_top + $y); @@ -1176,11 +1176,12 @@ class pdf_sponge extends ModelePDFFactures $oper = $outputlangs->transnoentitiesnoconv("PaymentTypeShort".$row->code); $pdf->MultiCell(20, 3, $oper, 0, 'L', 0); + $maxY = max($pdf->GetY() - $tab3_top - 3, $maxY); $pdf->SetXY($tab3_posx + 58, $tab3_top + $y); $pdf->MultiCell(30, 3, $row->num, 0, 'L', 0); - + $y = $maxY = max($pdf->GetY() - 3 - $tab3_top, $maxY); $pdf->line($tab3_posx, $tab3_top + $y + 3, $tab3_posx + $tab3_width, $tab3_top + $y + 3); - + $y += 3; $i++; }