diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php index db84049d46e..fbd951ba5b8 100644 --- a/htdocs/api/class/api_setup.class.php +++ b/htdocs/api/class/api_setup.class.php @@ -1,13 +1,13 @@ - * Copyright (C) 2016 Laurent Destailleur - * Copyright (C) 2017 Regis Houssin - * Copyright (C) 2017 Neil Orley - * Copyright (C) 2018-2025 Frédéric France - * Copyright (C) 2018-2022 Thibault FOUCART - * Copyright (C) 2024 Jon Bendtsen +/* Copyright (C) 2016 Xebax Christy + * Copyright (C) 2016 Laurent Destailleur + * Copyright (C) 2017-2025 Regis Houssin + * Copyright (C) 2017 Neil Orley + * Copyright (C) 2018-2025 Frédéric France + * Copyright (C) 2018-2022 Thibault FOUCART + * Copyright (C) 2024 Jon Bendtsen * Copyright (C) 2024-2025 MDW - * Copyright (C) 2025 Charlene Benke + * Copyright (C) 2025 Charlene Benke * * * This program is free software; you can redistribute it and/or modify @@ -1056,7 +1056,8 @@ class Setup extends DolibarrApi $sql = "SELECT rowid, code, label, affect, delay, newbymonth, fk_country"; $sql .= " FROM ".MAIN_DB_PREFIX."c_holiday_types as t"; - $sql .= " WHERE t.active = ".((int) $active); + $sql .= " WHERE t.entity IN (".getEntity('c_holiday_types').")"; + $sql .= " AND t.active = ".((int) $active); if ($fk_country) { $sql .= " AND (t.fk_country = ".((int) $fk_country); $sql .= " OR t.fk_country is null)"; @@ -1135,7 +1136,8 @@ class Setup extends DolibarrApi $sql = "SELECT id, code, dayrule, day, month, year, fk_country, code as label"; $sql .= " FROM ".MAIN_DB_PREFIX."c_hrm_public_holiday as t"; - $sql .= " WHERE t.active = ".((int) $active); + $sql .= " WHERE t.entity IN (".getEntity('c_hrm_public_holiday').")"; + $sql .= " AND t.active = ".((int) $active); if ($fk_country) { $sql .= " AND (t.fk_country = ".((int) $fk_country); $sql .= " OR t.fk_country is null)";