diff --git a/htdocs/core/boxes/box_project.php b/htdocs/core/boxes/box_project.php
index 68095eaec31..0bc6d801e41 100644
--- a/htdocs/core/boxes/box_project.php
+++ b/htdocs/core/boxes/box_project.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2014      Marcos García          <marcosgdf@gmail.com>
  * Copyright (C) 2015      Frederic France        <frederic.france@free.fr>
  * Copyright (C) 2016      Juan José Menent       <jmenent@2byte.es>
+ * Copyright (C) 2020      Pierre Ardoin          <mapiolca@me.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -97,7 +98,8 @@ class box_project extends ModeleBoxes
 
             $sql = "SELECT p.rowid, p.ref, p.title, p.fk_statut, p.public";
             $sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
-            $sql.= " WHERE p.fk_statut = 1"; // Only open projects
+            $sql.= " WHERE p.entity IN (".getEntity('project').")"; // Only current entity or severals if permission ok
+			$sql.= " AND p.fk_statut = 1"; // Only open projects
             if (! $user->rights->projet->all->lire) $sql.= " AND p.rowid IN (".$projectsListId.")"; // public and assigned to, or restricted to company for external users
 
             $sql.= " ORDER BY p.datec DESC";
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 4c4a5212abd..acd4be35b79 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -1654,21 +1654,24 @@ class Holiday extends CommonObject
 		{
 			if ($type)
 			{
-				// Si utilisateur de Dolibarr
-
-				$sql = "SELECT u.rowid";
-				$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
+				// If user of Dolibarr
+				$sql = "SELECT";
+				if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+					$sql .= " DISTINCT";
+				}
+				$sql.= " u.rowid";
+				$sql.= " FROM ".MAIN_DB_PREFIX."user as u";
 
 				if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
 				{
 					$sql .= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
-					$sql .= " WHERE (ug.fk_user = u.rowid";
-					$sql .= " AND ug.entity = ".$conf->entity.")";
-					$sql .= " OR u.admin = 1";
+					$sql .= " WHERE ((ug.fk_user = u.rowid";
+					$sql .= " AND ug.entity IN (".getEntity('usergroup')."))";
+					$sql .= " OR u.entity = 0)"; // Show always superadmin
 				}
 				else
 				{
-					$sql .= " WHERE u.entity IN (0,".$conf->entity.")";
+					$sql .= " WHERE u.entity IN (".getEntity('user').")";
 				}
 				$sql .= " AND u.statut > 0";
 				if ($filters) $sql .= $filters;
@@ -1709,7 +1712,7 @@ class Holiday extends CommonObject
 				// We want only list of vacation balance for user ids
 				$sql = "SELECT DISTINCT cpu.fk_user";
 				$sql .= " FROM ".MAIN_DB_PREFIX."holiday_users as cpu, ".MAIN_DB_PREFIX."user as u";
-				$sql .= " WHERE cpu.fk_user = u.user";
+				$sql .= " WHERE cpu.fk_user = u.rowid";
 				if ($filters) $sql .= $filters;
 
 				$resql = $this->db->query($sql);
@@ -1750,17 +1753,24 @@ class Holiday extends CommonObject
 			// List for Dolibarr users
 			if ($type)
 			{
-				$sql = "SELECT u.rowid, u.lastname, u.firstname, u.gender, u.photo, u.employee, u.statut, u.fk_user";
+								// If user of Dolibarr
+				$sql = "SELECT";
+				if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+					$sql .= " DISTINCT";
+				}
+				$sql.= " u.rowid, u.lastname, u.firstname, u.gender, u.photo, u.employee, u.statut, u.fk_user";
 				$sql.= " FROM ".MAIN_DB_PREFIX."user as u";
 
 				if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
 				{
-					$sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
-					$sql.= " WHERE (ug.fk_user = u.rowid";
-					$sql.= " AND ug.entity = ".$conf->entity.")";
-					$sql.= " OR u.admin = 1";
-				} else {
-					$sql.= " WHERE u.entity IN (0,".$conf->entity.")";
+					$sql .= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
+					$sql .= " WHERE ((ug.fk_user = u.rowid";
+					$sql .= " AND ug.entity IN (".getEntity('usergroup')."))";
+					$sql .= " OR u.entity = 0)"; // Show always superadmin
+				}
+				else
+				{
+					$sql .= " WHERE u.entity IN (".getEntity('user').")";
 				}
 
 				$sql.= " AND u.statut > 0";
diff --git a/test/phpunit/HolidayTest.php b/test/phpunit/HolidayTest.php
index fbd4a846024..cd5a9f28138 100644
--- a/test/phpunit/HolidayTest.php
+++ b/test/phpunit/HolidayTest.php
@@ -247,21 +247,17 @@ class HolidayTest extends PHPUnit\Framework\TestCase
         $langs=$this->savlangs;
         $db=$this->savdb;
 
-        //$localobject->fetch($localobject->id);
+        $result = $localobject->fetchUsers(true, true, '');
+        $this->assertNotEquals($result, -1);
 
-        /*
-        $result=$localobject->getNomUrl(1);
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertNotEquals($result, '');
+        $result = $localobject->fetchUsers(true, false, '');
+        $this->assertNotEquals($result, -1);
 
-        $result=$localobject->getFullAddress(1);
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertContains("New address\nNew zip New town\nBelgium", $result);
+        $result = $localobject->fetchUsers(false, true, '');
+        $this->assertNotEquals($result, -1);
 
-        $localobject->info($localobject->id);
-        print __METHOD__." localobject->date_creation=".$localobject->date_creation."\n";
-        $this->assertNotEquals($localobject->date_creation, '');
-        */
+        $result = $localobject->fetchUsers(false, false, '');
+        $this->assertNotEquals($result, -1);
 
         return $localobject->id;
     }