Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0

This commit is contained in:
Laurent Destailleur 2021-08-22 19:23:56 +02:00
commit 53a6e0cfaf

View File

@ -1630,6 +1630,7 @@ class Holiday extends CommonObject
$sql .= " WHERE u.entity IN (".getEntity('user').")";
}
$sql .= " AND u.statut > 0";
$sql .= " AND u.employee = 1"; // We only want employee users for holidays
if ($filters) $sql .= $filters;
$resql = $this->db->query($sql);
@ -1720,6 +1721,7 @@ class Holiday extends CommonObject
}
$sql .= " AND u.statut > 0";
$sql .= " AND u.employee = 1"; // We only want employee users for holidays
if ($filters) $sql .= $filters;
$resql = $this->db->query($sql);