From d50c1a7603d7bc18bc62a0ded07172be8bdfa025 Mon Sep 17 00:00:00 2001
From: Vincent Dieltiens <v.dieltiens@jdc-airports.com>
Date: Tue, 12 Oct 2021 23:23:57 +0200
Subject: [PATCH 1/2] preview of expense report file using pdf file instead of
 generated image

---
 htdocs/expensereport/card.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 6e40b6b3a77..f700feb400b 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -2174,7 +2174,10 @@ if ($action == 'create') {
 											// If the preview file is found
 											if (file_exists($fileimage)) {
 												$thumbshown = 1;
+												$urlforhref = getAdvancedPreviewUrl($modulepart, $relativepath.'/'.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(!empty($object->entity) ? $object->entity : $conf->entity));
+												print '<a href="'.$urlforhref['url'].'" class="'.$urlforhref['css'].'" target="'.$urlforhref['target'].'" mime="'.$urlforhref['mime'].'">';
 												print '<img height="'.$heightforphotref.'" class="photo photowithmargin photowithborder" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($relativepathimage).'">';
+												print '</a>';
 											}
 										}
 									}

From 5ec6d02bfc51a9e00430b41d0bf7294047e30fd1 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Sun, 17 Oct 2021 12:49:45 +0200
Subject: [PATCH 2/2] Fix php 8  error

from develop v15
---
 htdocs/main.inc.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 07ab0949a10..6dc3e7bd532 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1042,6 +1042,16 @@ if (!defined('NOLOGIN')) {
 
 		//Required if advanced permissions are used with MAIN_USE_ADVANCED_PERMS
 		if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
+			if (empty($user->rights->user->user_advance)) {
+				$user->rights->user->user_advance = new stdClass(); // To avoid warnings
+			}
+			if (empty($user->rights->user->self_advance)) {
+				$user->rights->user->self_advance = new stdClass(); // To avoid warnings
+			}
+			if (empty($user->rights->user->group_advance)) {
+				$user->rights->user->group_advance = new stdClass(); // To avoid warnings
+			}
+
 			$user->rights->user->user_advance->readperms = 1;
 			$user->rights->user->user_advance->write = 1;
 			$user->rights->user->self_advance->readperms = 1;