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

Fix pdf on letter format

Browse Source
This commit is contained in:
Laurent Destailleur 2022-03-17 15:01:15 +01:00
parent 3fe9b6b57c
commit 49e53abf53
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
View File

@ -837,7 +837,7 @@ class pdf_crabe extends ModelePDFFactures
$tab3_width = 80; $tab3_width = 80;
$tab3_height = 4; $tab3_height = 4;
if ($this->page_largeur < 210) { // To work with US executive format if ($this->page_largeur < 210) { // To work with US executive format
$tab3_posx -= 20; $tab3_posx -= 15;
} }
$default_font_size = pdf_getPDFFontSize($outputlangs); $default_font_size = pdf_getPDFFontSize($outputlangs);
@ -1211,7 +1211,8 @@ class pdf_crabe extends ModelePDFFactures
$col1x = 120; $col1x = 120;
$col2x = 170; $col2x = 170;
if ($this->page_largeur < 210) { // To work with US executive format if ($this->page_largeur < 210) { // To work with US executive format
$col2x -= 20; $col1x -= 15;
$col2x -= 10;
} }
$largcol2 = ($this->page_largeur - $this->marge_droite - $col2x); $largcol2 = ($this->page_largeur - $this->marge_droite - $col2x);

15
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
View File

@ -498,7 +498,7 @@ class pdf_sponge extends ModelePDFFactures
$pdf->useTemplate($tplidx); $pdf->useTemplate($tplidx);
} }
if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) { if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
$this->_pagehead($pdf, $object, 0, $outputlangs); $this->_pagehead($pdf, $object, 0, $outputlangs, $outputlangsbis);
} }
// $this->_pagefoot($pdf,$object,$outputlangs,1); // $this->_pagefoot($pdf,$object,$outputlangs,1);
$pdf->setTopMargin($tab_top_newpage); $pdf->setTopMargin($tab_top_newpage);
@ -556,7 +556,7 @@ class pdf_sponge extends ModelePDFFactures
$pdf->useTemplate($tplidx); $pdf->useTemplate($tplidx);
} }
if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) { if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
$this->_pagehead($pdf, $object, 0, $outputlangs); $this->_pagehead($pdf, $object, 0, $outputlangs, $outputlangsbis);
} }
$height_note = $posyafter - $tab_top_newpage; $height_note = $posyafter - $tab_top_newpage;
$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 + 1);
@ -578,7 +578,7 @@ class pdf_sponge extends ModelePDFFactures
$pdf->useTemplate($tplidx); $pdf->useTemplate($tplidx);
} }
if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) { if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
$this->_pagehead($pdf, $object, 0, $outputlangs); $this->_pagehead($pdf, $object, 0, $outputlangs, $outputlangsbis);
} }
$posyafter = $tab_top_newpage; $posyafter = $tab_top_newpage;
@ -873,7 +873,7 @@ class pdf_sponge extends ModelePDFFactures
$pdf->setPage($pagenb); $pdf->setPage($pagenb);
$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it. $pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) { if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
$this->_pagehead($pdf, $object, 0, $outputlangs); $this->_pagehead($pdf, $object, 0, $outputlangs, $outputlangsbis);
} }
} }
@ -891,7 +891,7 @@ class pdf_sponge extends ModelePDFFactures
} }
$pagenb++; $pagenb++;
if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) { if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
$this->_pagehead($pdf, $object, 0, $outputlangs); $this->_pagehead($pdf, $object, 0, $outputlangs, $outputlangsbis);
} }
} }
} }
@ -977,7 +977,7 @@ class pdf_sponge extends ModelePDFFactures
$tab3_width = 80; $tab3_width = 80;
$tab3_height = 4; $tab3_height = 4;
if ($this->page_largeur < 210) { // To work with US executive format if ($this->page_largeur < 210) { // To work with US executive format
$tab3_posx -= 20; $tab3_posx -= 15;
} }
$default_font_size = pdf_getPDFFontSize($outputlangs); $default_font_size = pdf_getPDFFontSize($outputlangs);
@ -1292,7 +1292,8 @@ class pdf_sponge extends ModelePDFFactures
$col1x = 120; $col1x = 120;
$col2x = 170; $col2x = 170;
if ($this->page_largeur < 210) { // To work with US executive format if ($this->page_largeur < 210) { // To work with US executive format
$col2x -= 20; $col1x -= 15;
$col2x -= 10;
} }
$largcol2 = ($this->page_largeur - $this->marge_droite - $col2x); $largcol2 = ($this->page_largeur - $this->marge_droite - $col2x);