Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

FIX pagebreak when option PDF_ADD_POSITION is set

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
View File

@@ -557,10 +557,6 @@ class pdf_eratosthene extends ModelePDFCommandes
$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 - ($heightforfooter + $heightforfreetext + $heightforinfotot))) { // If photo too high, we moved completely on new page
@@ -644,6 +640,11 @@ class pdf_eratosthene extends ModelePDFCommandes
$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);