|
|
@@ -139,10 +139,10 @@ class pdf_typhon extends ModelePDFDeliveryOrder
|
|
|
$this->page_largeur = $formatarray['width'];
|
|
|
$this->page_hauteur = $formatarray['height'];
|
|
|
$this->format = array($this->page_largeur, $this->page_hauteur);
|
|
|
- $this->marge_gauche = isset($conf->global->MAIN_PDF_MARGIN_LEFT) ? $conf->global->MAIN_PDF_MARGIN_LEFT : 10;
|
|
|
- $this->marge_droite = isset($conf->global->MAIN_PDF_MARGIN_RIGHT) ? $conf->global->MAIN_PDF_MARGIN_RIGHT : 10;
|
|
|
- $this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
|
|
|
- $this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
|
|
|
+ $this->marge_gauche = isset($conf->global->MAIN_PDF_MARGIN_LEFT) ? getDolGlobalInt('MAIN_PDF_MARGIN_LEFT') : 10;
|
|
|
+ $this->marge_droite = isset($conf->global->MAIN_PDF_MARGIN_RIGHT) ? getDolGlobalInt('MAIN_PDF_MARGIN_RIGHT') : 10;
|
|
|
+ $this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? getDolGlobalInt('MAIN_PDF_MARGIN_TOP') : 10;
|
|
|
+ $this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? getDolGlobalInt('MAIN_PDF_MARGIN_BOTTOM') : 10;
|
|
|
|
|
|
$this->option_logo = 1; // Display logo FAC_PDF_LOGO
|
|
|
$this->option_tva = 1; // Manage the vat option FACTURE_TVAOPTION
|
Philippe GRAND