2
0
forked from Wavyzz/dolibarr

FIX pagebreak when option PDF_ADD_POSITION is set

This commit is contained in:
Laurent Destailleur
2024-10-18 18:43:59 +02:00
parent 8f868ef3b9
commit f9eb82de7f
5 changed files with 22 additions and 18 deletions

View File

@@ -714,10 +714,6 @@ class pdf_sponge extends ModelePDFFactures
$posYAfterImage = 0;
$posYAfterDescription = 0;
if ($this->getColumnStatus('position')) {
$this->printStdColumnContent($pdf, $curY, 'position', $i + 1);
}
if ($this->getColumnStatus('photo')) {
// We start with Photo of product line
if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - $page_bottom_margin)) { // If photo too high, we moved completely on new page
@@ -799,6 +795,11 @@ class pdf_sponge extends ModelePDFFactures
$pdf->SetFont('', '', $default_font_size - 1); // We reposition the default font
// # of line
if ($this->getColumnStatus('position')) {
$this->printStdColumnContent($pdf, $curY, 'position', $i + 1);
}
// VAT Rate
if ($this->getColumnStatus('vat')) {
$vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);