FIX Use the wrong logo size on PDF

Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2025-12-05 17:18:13 +01:00 · 2023-07-30 19:53:56 +02:00 · 2023-07-30 18:04:03 +02:00 · 2022-03-10 15:52:04 +01:00 · 2022-03-10 15:51:42 +01:00 · 2022-03-10 15:49:51 +01:00
6 changed files with 49 additions and 15 deletions
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -347,6 +347,7 @@ class Utils
 				{
 					$handlein = popen($fullcommandclear, 'r');
 					$i=0;
+					if ($handlein) {
 						while (!feof($handlein))
 						{
 							$i++;   // output line number
@@ -359,6 +360,7 @@ class Utils
 						}
 						pclose($handlein);
 					}
+				}


 				if ($compression == 'none') fclose($handle);
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -1251,9 +1251,17 @@ class pdf_einstein extends ModelePDFCommandes
 		// Logo
 		if (empty($conf->global->PDF_DISABLE_MYCOMPANY_LOGO))
 		{
-			$logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
 			if ($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))
 				{
 				    $height=pdf_getHeightForLogo($logo);
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -1563,9 +1563,17 @@ class pdf_crabe extends ModelePDFFactures
 		// Logo
 		if (empty($conf->global->PDF_DISABLE_MYCOMPANY_LOGO))
 		{
-			$logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
 			if ($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))
 				{
 				    $height=pdf_getHeightForLogo($logo);
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -1453,9 +1453,17 @@ class pdf_azur extends ModelePDFPropales
 		// Logo
 		if (empty($conf->global->PDF_DISABLE_MYCOMPANY_LOGO))
 		{
-			$logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
 			if ($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))
 				{
 				    $height=pdf_getHeightForLogo($logo);
--- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
@@ -1449,9 +1449,17 @@ class pdf_cyan extends ModelePDFPropales
 		// Logo
 		if (empty($conf->global->PDF_DISABLE_MYCOMPANY_LOGO))
 		{
-			$logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
 			if ($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))
 				{
 				    $height=pdf_getHeightForLogo($logo);
Author	SHA1	Message	Date
Laurent Destailleur	90854dc2bf	FIX Use the wrong logo size on PDF	2023-07-30 19:53:56 +02:00
Laurent Destailleur	b44ddaa696	FIX Use the wrong logo size on PDF	2023-07-30 18:04:03 +02:00
Laurent Destailleur	4569cb82b2	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2022-03-10 15:52:04 +01:00
Laurent Destailleur	04d33f4594	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2022-03-10 15:51:42 +01:00
Laurent Destailleur	af6e95aa79	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/core/class/utils.class.php	2022-03-10 15:49:51 +01:00
Laurent Destailleur	5d942c9d1a	Fix infinit logs	2022-03-10 15:46:00 +01:00
Laurent Destailleur	1541e20870	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/core/class/utils.class.php	2022-01-07 15:43:28 +01:00
Laurent Destailleur	53709cf509	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/core/class/utils.class.php	2022-01-07 15:40:05 +01:00
Laurent Destailleur	10e32c056e	FIX avoid infinite loop on dump with popen	2022-01-07 15:35:33 +01:00
Laurent Destailleur	0a72aed3d7	Fix missing space before union	2021-12-23 13:35:38 +01:00