FIX Use the wrong logo size on PDF

Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
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 · 2022-03-10 15:46:00 +01:00
9 changed files with 57 additions and 15 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -120,6 +120,7 @@ install:
  composer self-update
  composer -n init
  composer -n config vendor-dir htdocs/includes
+  composer -n config -g vendor-dir htdocs/includes
  echo

 - |
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -347,17 +347,19 @@ class Utils
 				{
 					$handlein = popen($fullcommandclear, 'r');
 					$i=0;
-					while (!feof($handlein))
-					{
-						$i++;   // output line number
-						$read = fgets($handlein);
-						// Exclude warning line we don't want
-						if ($i == 1 && preg_match('/Warning.*Using a password/i', $read)) continue;
-						fwrite($handle, $read);
-						if (preg_match('/'.preg_quote('-- Dump completed').'/i', $read)) $ok=1;
-						elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i', $read)) $ok=1;
+					if ($handlein) {
+						while (!feof($handlein))
+						{
+							$i++;   // output line number
+							$read = fgets($handlein);
+							// Exclude warning line we don't want
+							if ($i == 1 && preg_match('/Warning.*Using a password/i', $read)) continue;
+							fwrite($handle, $read);
+							if (preg_match('/'.preg_quote('-- Dump completed').'/i', $read)) $ok=1;
+							elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i', $read)) $ok=1;
+						}
+						pclose($handlein);
 					}
-					pclose($handlein);
 				}


--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -1872,6 +1872,12 @@ function dolGetElementUrl($objectid,$objecttype,$withpicto=0,$option='')
 		$classpath = 'fourn/class';
 		$module='fournisseur';
 	}
+	elseif ($objecttype == 'supplier_proposal') {
+		$classfile = 'supplier_proposal';
+		$classname = 'SupplierProposal';
+		$classpath = 'supplier_proposal/class';
+		$module = 'supplier_proposal';
+	}
 	elseif ($objecttype == 'stock')   {
 		$classpath = 'product/stock/class';
 		$classfile='entrepot';
--- 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);
--- a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
+++ b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
@@ -299,6 +299,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
        		//Build array of quantity ordered by product
        		if (is_array($order->lines) && count($order->lines)>0) {
        			foreach($order->lines as $orderline) {
+					if (empty($conf->global->STOCK_SUPPORTS_SERVICES) && $orderline->product_type > 0) continue;
        				$qtyordred[$orderline->fk_product]+=$orderline->qty;
        			}
        		}
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -2146,7 +2146,7 @@ class ExpenseReport extends CommonObject
        $sql = "SELECT DISTINCT ur.fk_user";
        $sql.= " FROM ".MAIN_DB_PREFIX."user_rights as ur, ".MAIN_DB_PREFIX."rights_def as rd";
        $sql.= " WHERE ur.fk_id = rd.id and rd.module = 'expensereport' AND rd.perms = 'approve'";                                              // Permission 'Approve';
-        $sql.= "UNION";
+        $sql.= " UNION";
        $sql.= " SELECT DISTINCT ugu.fk_user";
        $sql.= " FROM ".MAIN_DB_PREFIX."usergroup_user as ugu, ".MAIN_DB_PREFIX."usergroup_rights as ur, ".MAIN_DB_PREFIX."rights_def as rd";
        $sql.= " WHERE ugu.fk_usergroup = ur.fk_usergroup AND ur.fk_id = rd.id and rd.module = 'expensereport' AND rd.perms = 'approve'";       // Permission 'Approve';
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
Laurent Destailleur	5e1cd459b1	Fix travis	2020-11-15 23:47:53 +01:00
Laurent Destailleur	0f435f9901	Merge pull request #15098 from atm-gauthier/9.0_fix_worklow_order_auto_validated_with_shipping_validate_must_no_consider_services FIX : WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING must not consider serv…	2020-10-22 16:18:11 +02:00
Laurent Destailleur	a9117fe864	Update interface_20_modWorkflow_WorkflowManager.class.php	2020-10-22 16:18:00 +02:00
Laurent Destailleur	8ce929d509	Merge pull request #15069 from ATM-Consulting/fix/9.0_linked_object_on_supplier_proposal_events FIX 9.0 - when users create an event from a supplier proposal, the "linked objects" section says "Deleted"	2020-10-22 16:10:49 +02:00
Got2be	c2ad40043f	FIX : WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING must not consider services while STOCK_SUPPORTS_SERVICES is empty	2020-10-22 16:10:47 +02:00
Florian Mortgat	529dfb8dfb	FIX 9.0 - supplier proposals as linked objects of events are not correctly fetched	2020-10-20 16:37:15 +02:00