Fix: Correction of overlapping text in the payment list (#26186)

This commit is contained in:
dev2a 2023-10-11 18:00:25 +02:00 committed by GitHub
parent 205a863aef
commit b2ec9132ee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 7 deletions

View file

@ -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++;
}

View file

@ -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++;
}