From 91fb2dacb94c5966f7a9bf441d7e060a613c2eb5 Mon Sep 17 00:00:00 2001
From: Nicolas Micoud <58596990+nmicoud@users.noreply.github.com>
Date: Mon, 8 Feb 2021 17:29:30 +0100
Subject: [PATCH] IDEMPIERE-4683 : Report : missing logo for PDF output (#562)

---
 .../src/org/compiere/Adempiere.java             | 17 +++++++++++++++++
 .../org/compiere/print/layout/LayoutEngine.java |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/org.adempiere.base/src/org/compiere/Adempiere.java b/org.adempiere.base/src/org/compiere/Adempiere.java
index 7440adc080..dfde6de899 100644
--- a/org.adempiere.base/src/org/compiere/Adempiere.java
+++ b/org.adempiere.base/src/org/compiere/Adempiere.java
@@ -83,6 +83,8 @@ public final class Adempiere
 	/** 48*15 Product Image.   	*/
 	static private final String	s_file48x15		= "images/iDempiere.png";
 	static private final String	s_file48x15HR	= "images/iDempiereHR.png";
+	/** Header Logo				*/
+	static private final String	s_fileHeaderLogo= "images/header-logo.png";
 	/** Support Email           */
 	static private String		s_supportEmail	= "";
 
@@ -99,6 +101,7 @@ public final class Adempiere
 	static private Image 		s_imageLogo;
 	static private ImageIcon 	s_imageIcon32;
 	static private ImageIcon 	s_imageIconLogo;
+	static private Image		s_headerLogo;
 
 	static private final String ONLINE_HELP_URL = "http://wiki.idempiere.org";
 
@@ -393,6 +396,20 @@ public final class Adempiere
 		return s_image48x15;
 	}   //  getImageLogoSmall
 
+	/**
+	 * Get Header logo
+	 * @return Image
+	 */
+	public static Image getHeaderLogo() {
+		if (s_headerLogo == null) {
+			Toolkit tk = Toolkit.getDefaultToolkit();
+			URL url = Core.getResourceFinder().getResource(s_fileHeaderLogo);
+			if (url != null)
+				s_headerLogo = tk.getImage(url);
+		}
+		return s_headerLogo;
+	}
+
 	/**
 	 *  Get Logo Image.
 	 *  @return Image Logo
diff --git a/org.adempiere.base/src/org/compiere/print/layout/LayoutEngine.java b/org.adempiere.base/src/org/compiere/print/layout/LayoutEngine.java
index 9e2ee1c4cf..ffecfbb5f5 100644
--- a/org.adempiere.base/src/org/compiere/print/layout/LayoutEngine.java
+++ b/org.adempiere.base/src/org/compiere/print/layout/LayoutEngine.java
@@ -948,7 +948,7 @@ public class LayoutEngine implements Pageable, Printable, Doc
 		if (ci.getLogoReport_ID() > 0) {
 			element = new ImageElement(ci.getLogoReport_ID(), false);
 		} else {
-			element = new ImageElement(org.compiere.Adempiere.getImageLogoSmall(true));	//	48x15
+			element = new ImageElement(org.compiere.Adempiere.getHeaderLogo());
 		}
 	//	element = new ImageElement(org.compiere.Adempiere.getImageLogo());	//	100x30
 		element.layout(48, 15, false, MPrintFormatItem.FIELDALIGNMENTTYPE_LeadingLeft);