diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php index 7c1aaefb8bf..e54b4b33439 100644 --- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php +++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php @@ -1262,12 +1262,12 @@ class pdf_einstein extends ModelePDFCommandes { if ($this->emetteur->logo) { - if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO)) - { - $logo=$conf->mycompany->dir_output.'/logos/thumbs/'.$this->emetteur->logo_small; - } - else { - $logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo; + $logodir = $conf->mycompany->dir_output; + if (!empty($conf->mycompany->multidir_output[$object->entity])) $logodir = $conf->mycompany->multidir_output[$object->entity]; + if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO)) { + $logo = $logodir.'/logos/thumbs/'.$this->emetteur->logo_small; + } else { + $logo = $logodir.'/logos/'.$this->emetteur->logo; } if (is_readable($logo)) { diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php index d3ffe96d4f5..1a01603fd4f 100644 --- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php @@ -1573,12 +1573,12 @@ class pdf_crabe extends ModelePDFFactures { if ($this->emetteur->logo) { - if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO)) - { - $logo=$conf->mycompany->dir_output.'/logos/thumbs/'.$this->emetteur->logo_small; - } - else { - $logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo; + $logodir = $conf->mycompany->dir_output; + if (!empty($conf->mycompany->multidir_output[$object->entity])) $logodir = $conf->mycompany->multidir_output[$object->entity]; + if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO)) { + $logo = $logodir.'/logos/thumbs/'.$this->emetteur->logo_small; + } else { + $logo = $logodir.'/logos/'.$this->emetteur->logo; } if (is_readable($logo)) { diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php index 80e80d24d7e..53d03b54ca2 100644 --- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php +++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php @@ -259,7 +259,7 @@ class pdf_azur extends ModelePDFPropales if (! $arephoto) { if ($conf->product->entity != $objphoto->entity) { - + $dir = $conf->product->multidir_output[$objphoto->entity].'/'.$midir; //Check repertories of current entities }else{ @@ -1471,12 +1471,12 @@ class pdf_azur extends ModelePDFPropales { if ($this->emetteur->logo) { - if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO)) - { - $logo=$conf->mycompany->dir_output.'/logos/thumbs/'.$this->emetteur->logo_small; - } - else { - $logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo; + $logodir = $conf->mycompany->dir_output; + if (!empty($conf->mycompany->multidir_output[$object->entity])) $logodir = $conf->mycompany->multidir_output[$object->entity]; + if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO)) { + $logo = $logodir.'/logos/thumbs/'.$this->emetteur->logo_small; + } else { + $logo = $logodir.'/logos/'.$this->emetteur->logo; } if (is_readable($logo)) { diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php index b2d1c9b4996..ccdaf5ad408 100644 --- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php +++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php @@ -1509,12 +1509,12 @@ class pdf_cyan extends ModelePDFPropales { if ($this->emetteur->logo) { - if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO)) - { - $logo=$conf->mycompany->dir_output.'/logos/thumbs/'.$this->emetteur->logo_small; - } - else { - $logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo; + $logodir = $conf->mycompany->dir_output; + if (!empty($conf->mycompany->multidir_output[$object->entity])) $logodir = $conf->mycompany->multidir_output[$object->entity]; + if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO)) { + $logo = $logodir.'/logos/thumbs/'.$this->emetteur->logo_small; + } else { + $logo = $logodir.'/logos/'.$this->emetteur->logo; } if (is_readable($logo)) {