Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-06 09:02:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22456 from grandoc/new_branch_29_09_2022

Browse Source 
update code toward php8
This commit is contained in:
Laurent Destailleur
2022-10-04 18:10:01 +02:00
committed by GitHub
parent cebba515ad 43dfb1dff0
commit dc30cb19b5
31 changed files with 31 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/core/modules/delivery/doc/pdf_storm.modules.php
View File

@@ -921,8 +921,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
*/
protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
{
global $conf;
$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
$showdetails = getDolGlobalInt('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS', 0);
return pdf_pagefoot($pdf, $outputlangs, 'DELIVERY_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
}

3
htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
View File

@@ -920,8 +920,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
*/
protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
{
global $conf;
$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
$showdetails = getDolGlobalInt('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS', 0);
return pdf_pagefoot($pdf, $outputlangs, 'DELIVERY_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
}
}