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

FIX private property can't be read when building pdf

Browse Source
This commit is contained in:
Laurent Destailleur 2016-07-28 23:51:09 +02:00
parent 80ac99e9b1
commit 74a9bbbf38
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/core/lib/pdf.lib.php
View File

@ -319,14 +319,16 @@ function pdfGetHeightForHtmlContent(&$pdf, $htmlcontent)
{ {
for ($page=$start_page; $page <= $end_page; ++$page) { for ($page=$start_page; $page <= $end_page; ++$page) {
$pdf->setPage($page); $pdf->setPage($page);
$tmpm=$pdf->getMargins();
$tMargin = $tmpm['top'];
if ($page == $start_page) { if ($page == $start_page) {
// first page // first page
$height = $pdf->h - $start_y - $pdf->bMargin; $height = $pdf->getPageHeight() - $start_y - $pdf->getBreakMargin();
} elseif ($page == $end_page) { } elseif ($page == $end_page) {
// last page // last page
$height = $end_y - $pdf->tMargin; $height = $end_y - $tMargin;
} else { } else {
$height = $pdf->h - $pdf->tMargin - $pdf->bMargin; $height = $pdf->getPageHeight() - $tMargin - $pdf->getBreakMargin();
} }
} }
} }
@ -949,7 +951,7 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass
if ($line) // Free text if ($line) // Free text
{ {
//$line="eee<br>\nfd<strong>sf</strong>sdf<br>\nghfghg<br>"; //$line="eee<br>\nfd<strong>sf</strong>sdf<br>\nghfghg<br>";
if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) // by default if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
{ {
$width=20000; $align='L'; // By default, ask a manual break: We use a large value 20000, to not have automatic wrap. This make user understand, he need to add CR on its text. $width=20000; $align='L'; // By default, ask a manual break: We use a large value 20000, to not have automatic wrap. This make user understand, he need to add CR on its text.
if (! empty($conf->global->MAIN_USE_AUTOWRAP_ON_FREETEXT)) { if (! empty($conf->global->MAIN_USE_AUTOWRAP_ON_FREETEXT)) {