lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #24406 from atm-lena/15.0_FIX_PDFExpeditionEspadon_Notes

Browse Source 
FIX - PDF Espadon => display extrafields
This commit is contained in:
Laurent Destailleur 2023-03-31 18:10:46 +02:00 committed by GitHub
commit ed6a0db1d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
View File

@ -394,20 +394,20 @@ class pdf_espadon extends ModelePdfExpedition
$label .= $object->tracking_url;
}
$height_trackingnumber += 6;
$height_trackingnumber += 4;
$pdf->SetFont('', 'B', $default_font_size - 2);
$pdf->writeHTMLCell(60, $height_trackingnumber, $this->posxdesc - 1, $tab_top_alt, $label, 0, 1, false, true, 'L');
$tab_top = $pdf->GetY();
}
}
$tab_top = $pdf->GetY();
}
// Notes
$pagenb = $pdf->getPage();
if (!empty($notetoshow) || !empty($object->tracking_number)) {
$tab_top -= 2;
$tab_top -= 1;
$tab_width = $this->page_largeur - $this->marge_gauche - $this->marge_droite;
$pageposbeforenote = $pagenb;
@ -476,7 +476,7 @@ class pdf_espadon extends ModelePdfExpedition
$height_note = $this->page_hauteur - ($tab_top_newpage + $heightforfooter) + $height_trackingnumber + 1;
$tab_top_newpage = $tab_topbeforetrackingnumber;
}
$pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
$pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 2);
} else {
if (empty($height_trackingnumber)) {
$height_note = $this->page_hauteur - ($tab_top + $heightforfooter);
@ -484,7 +484,7 @@ class pdf_espadon extends ModelePdfExpedition
$height_note = $this->page_hauteur - ($tab_top + $heightforfooter)+ $height_trackingnumber + 1;
$tab_top = $tab_topbeforetrackingnumber;
}
$pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
$pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 2);
}
// Add footer
@ -510,7 +510,7 @@ class pdf_espadon extends ModelePdfExpedition
$height_note = $posyafter - $tab_top + $height_trackingnumber + 1;
$tab_top = $tab_topbeforetrackingnumber;
}
$pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
$pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 2);
if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20))) {