From 35293e75c8a3852d2d95f735b540e2bc79753dff Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 3 Aug 2024 15:01:24 +0200
Subject: [PATCH] Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git
 into 20.0

---
 htdocs/core/multicompany_page.php | 9 ++++++---
 htdocs/theme/eldy/global.inc.php  | 6 ++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/multicompany_page.php b/htdocs/core/multicompany_page.php
index a047ef74968..203313deabe 100644
--- a/htdocs/core/multicompany_page.php
+++ b/htdocs/core/multicompany_page.php
@@ -58,6 +58,9 @@ $langs->load("main");
 $right = ($langs->trans("DIRECTION") == 'rtl' ? 'left' : 'right');
 $left = ($langs->trans("DIRECTION") == 'rtl' ? 'right' : 'left');
 
+if (!isModEnabled('multicompany')) {
+	httponly_accessforbidden('No multicompany module enabled');
+}
 
 
 /*
@@ -113,15 +116,15 @@ if (!isModEnabled('multicompany')) {
 		$listofentities = array();
 	}
 
-	$multicompanyList .= '<ul class="ullistonly left" style="list-style: none;">';
+	$multicompanyList .= '<ul class="ullistonly left" style="list-style: none; padding: 0">';
 	foreach ($listofentities as $entityid => $entitycursor) {
 		$url = DOL_URL_ROOT.'/core/multicompany_page.php?action=switchentity&token='.newToken().'&entity='.((int) $entityid).($backtourl ? '&backtourl='.urlencode($backtourl) : '');
 		$multicompanyList .= '<li class="lilistonly" style="height: 2.5em; font-size: 1.15em;">';
-		$multicompanyList .= '<a class="dropdown-item multicompany-item" id="multicompany-item-'.$entityid.'" data-id="'.$entityid.'" href="'.dol_escape_htmltag($url).'">';
+		$multicompanyList .= '<a class="dropdown-item multicompany-item paddingtopimp paddingbottomimp" id="multicompany-item-'.$entityid.'" data-id="'.$entityid.'" href="'.dol_escape_htmltag($url).'">';
 		$multicompanyList .= img_picto('', 'entity', 'class="pictofixedwidth"');
 		$multicompanyList .= dol_escape_htmltag($entitycursor);
 		if ($conf->entity == $entityid) {
-			$multicompanyList .= ' <span class="opacitymedium">('.$langs->trans("Currently").')</span>';
+			$multicompanyList .= ' <span class="opacitymedium">'.img_picto($langs->trans("Currently"), 'tick').'</span>';
 		}
 		$multicompanyList .= '</a>';
 		$multicompanyList .= '</li>';
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 8f99b911fba..f01c76f2821 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1024,12 +1024,18 @@ td.wordbreak img, td.wordbreakimp img {
 .paddingtop {
 	padding-top: 4px;
 }
+.paddingtopimp {
+	padding-top: 4px !important;
+}
 .paddingtop2 {
 	padding-top: 2px;
 }
 .paddingbottom {
 	padding-bottom: 4px;
 }
+.paddingbottomimp {
+	padding-bottom: 4px !important;
+}
 .paddingbottom2 {
 	padding-bottom: 2px;
 }