Merge branch '16.0' of [email protected]:Dolibarr/dolibarr.git into 17.0

ATM-Consulting · Mar 11, 2024 · 2df1ea2 · 2df1ea2
2 parents ce4dc61 + ab760df
commit 2df1ea2
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
@@ -2661,7 +2661,11 @@ public function RemoveFromGroup($group, $entity, $notrigger = 0)
 		$sql = "DELETE FROM ".$this->db->prefix()."usergroup_user";
 		$sql .= " WHERE fk_user  = ".((int) $this->id);
 		$sql .= " AND fk_usergroup = ".((int) $group);
-		$sql .= " AND entity = ".((int) $entity);
+		if (empty($entity)) {
+			$sql .= " AND entity IN (0, 1)";	// group may be in entity 0 (so $entity=0) and link with user into entity 1.
+		} else {
+			$sql .= " AND entity = ".((int) $entity);
+		}
 
 		$result = $this->db->query($sql);
 		if ($result) {