Skip to content

Fix: $nexY cross-page corruption when MAIN_PDF_DATA_ON_FIRST_PAGE is … #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
atm-jonathan wants to merge 1 commit into
base: 19.0
Choose a base branch
from
Open

Fix: $nexY cross-page corruption when MAIN_PDF_DATA_ON_FIRST_PAGE is … #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,6 +575,7 @@ public function write_file($object, $outputlangs, $srctemplatepath = '', $hidede
}

$nexY = $pdf->GetY();
$nexYAfterDesc = $nexY;
$pageposafter = $pdf->getPage();
$pdf->setPage($pageposbefore);
$pdf->setTopMargin($this->marge_haute);
Expand Down Expand Up @@ -608,6 +609,12 @@ public function write_file($object, $outputlangs, $srctemplatepath = '', $hidede
}


// Restore nexY from the correct page when prices were printed on a previous page
if ($pageposafter > $pageposbefore && !empty($showpricebeforepagebreak)) {
$nexY = $nexYAfterDesc;
$pdf->setPage($pageposafter);
}

$parameters = array(
'object' => $object,
'i' => $i,
Expand Down
8 changes: 7 additions & 1 deletion htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,7 @@ public function write_file($object, $outputlangs, $srctemplatepath = '', $hidede


$nexY = max($pdf->GetY(), $posYAfterImage);

$nexYAfterDesc = $nexY;

$pageposafter = $pdf->getPage();

Expand Down Expand Up @@ -695,6 +695,12 @@ public function write_file($object, $outputlangs, $srctemplatepath = '', $hidede
}
}

// Restore nexY from the correct page when prices were printed on a previous page
if ($pageposafter > $pageposbefore && !empty($showpricebeforepagebreak)) {
$nexY = $nexYAfterDesc;
$pdf->setPage($pageposafter);
}

$parameters = array(
'object' => $object,
'i' => $i,
Expand Down
7 changes: 7 additions & 0 deletions htdocs/core/modules/delivery/doc/pdf_storm.modules.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,7 @@ public function write_file($object, $outputlangs, $srctemplatepath = '', $hidede
}

$nexY = $pdf->GetY();
$nexYAfterDesc = $nexY;
$pageposafter = $pdf->getPage();
$pdf->setPage($pageposbefore);
$pdf->setTopMargin($this->marge_haute);
Expand Down Expand Up @@ -498,6 +499,12 @@ public function write_file($object, $outputlangs, $srctemplatepath = '', $hidede
$pdf->SetLineStyle(array('dash'=>0));
}

// Restore nexY from the correct page when content was printed on a previous page
if ($pageposafter > $pageposbefore && !empty($showpricebeforepagebreak)) {
$nexY = $nexYAfterDesc;
$pdf->setPage($pageposafter);
}

$nexY += 2; // Add space between lines

// Detect if some page were added automatically and output _tableau for past pages
Expand Down
7 changes: 7 additions & 0 deletions htdocs/core/modules/facture/doc/pdf_sponge.modules.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -775,6 +775,7 @@ public function write_file($object, $outputlangs, $srctemplatepath = '', $hidede
}

$nexY = max($pdf->GetY(), $posYAfterImage, $posYAfterDescription);
$nexYAfterDesc = $nexY;

$pageposafter = $pdf->getPage();
$pdf->setPage($pageposbefore);
Expand Down Expand Up @@ -858,6 +859,12 @@ public function write_file($object, $outputlangs, $srctemplatepath = '', $hidede
}


// Restore nexY from the correct page when prices were printed on a previous page
if ($pageposafter > $pageposbefore && !empty($showpricebeforepagebreak)) {
$nexY = $nexYAfterDesc;
$pdf->setPage($pageposafter);
}

$parameters = array(
'object' => $object,
'i' => $i,
Expand Down
7 changes: 7 additions & 0 deletions htdocs/core/modules/propale/doc/pdf_cyan.modules.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,6 +632,7 @@ public function write_file($object, $outputlangs, $srctemplatepath = '', $hidede
}

$nexY = $pdf->GetY();
$nexYAfterDesc = $nexY;
$pageposafter = $pdf->getPage();

$pdf->setPage($pageposbefore);
Expand Down Expand Up @@ -708,6 +709,12 @@ public function write_file($object, $outputlangs, $srctemplatepath = '', $hidede
}
}

// Restore nexY from the correct page when prices were printed on a previous page
if ($pageposafter > $pageposbefore && !empty($showpricebeforepagebreak)) {
$nexY = $nexYAfterDesc;
$pdf->setPage($pageposafter);
}

$parameters = array(
'object' => $object,
'i' => $i,
Expand Down
8 changes: 7 additions & 1 deletion htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,7 +592,7 @@ public function write_file($object, $outputlangs, $srctemplatepath = '', $hidede


$nexY = max($pdf->GetY(), $posYAfterImage);

$nexYAfterDesc = $nexY;

$pageposafter = $pdf->getPage();

Expand Down Expand Up @@ -663,6 +663,12 @@ public function write_file($object, $outputlangs, $srctemplatepath = '', $hidede
}
}

// Restore nexY from the correct page when prices were printed on a previous page
if ($pageposafter > $pageposbefore && !empty($showpricebeforepagebreak)) {
$nexY = $nexYAfterDesc;
$pdf->setPage($pageposafter);
}

$parameters = array(
'object' => $object,
'i' => $i,
Expand Down
7 changes: 7 additions & 0 deletions htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,6 +567,7 @@ public function write_file($object, $outputlangs = '', $srctemplatepath = '', $h
}

$nexY = $pdf->GetY();
$nexYAfterDesc = $nexY;
$pageposafter = $pdf->getPage();
$pdf->setPage($pageposbefore);
$pdf->setTopMargin($this->marge_haute);
Expand Down Expand Up @@ -635,6 +636,12 @@ public function write_file($object, $outputlangs = '', $srctemplatepath = '', $h
}
}

// Restore nexY from the correct page when prices were printed on a previous page
if ($pageposafter > $pageposbefore && !empty($showpricebeforepagebreak)) {
$nexY = $nexYAfterDesc;
$pdf->setPage($pageposafter);
}

$parameters = array(
'object' => $object,
'i' => $i,
Expand Down
7 changes: 7 additions & 0 deletions htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,6 +566,7 @@ public function write_file($object, $outputlangs = '', $srctemplatepath = '', $h
}

$nexY = $pdf->GetY();
$nexYAfterDesc = $nexY;
$pageposafter = $pdf->getPage();
$pdf->setPage($pageposbefore);
$pdf->setTopMargin($this->marge_haute);
Expand Down Expand Up @@ -634,6 +635,12 @@ public function write_file($object, $outputlangs = '', $srctemplatepath = '', $h
}
}

// Restore nexY from the correct page when prices were printed on a previous page
if ($pageposafter > $pageposbefore && !empty($showpricebeforepagebreak)) {
$nexY = $nexYAfterDesc;
$pdf->setPage($pageposafter);
}

$parameters = array(
'object' => $object,
'i' => $i,
Expand Down
Loading