diff --git a/dev/tools/codespell/codespell-lines-ignore.txt b/dev/tools/codespell/codespell-lines-ignore.txt index d0c0498ad4c..feb1f084ef2 100644 --- a/dev/tools/codespell/codespell-lines-ignore.txt +++ b/dev/tools/codespell/codespell-lines-ignore.txt @@ -97,7 +97,7 @@ $sql .= " AND cs.periode >= '".$db->idate($search_date_limit_start)."'"; $sql .= " OR (cs.periode IS NULL AND cs.date_ech between '".$db->idate(dol_get_first_day($year))."' AND '".$db->idate(dol_get_last_day($year))."')"; $sql .= " SET reponses = '".$db->escape($nouveauchoix)."'"; - $sql .= " cs.rowid, cs.libelle, cs.fk_type as type, cs.periode as period, cs.date_ech, cs.amount as total,"; + $sql .= " cs.rowid, cs.libelle as label, cs.fk_type as type, cs.periode as period, cs.date_ech, cs.amount as total,"; $sql.= " ".MAIN_DB_PREFIX."notify_def as nd,"; $sql.= " AND nd.fk_action = ad.rowid"; $sql.= " WHERE u.rowid = nd.fk_user"; diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index e8a01a5e028..f8897ef55a1 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -9,6 +9,7 @@ * Copyright (C) 2017 Open-DSI * Copyright (C) 2021-2025 Frédéric France * Copyright (C) 2024-2025 MDW + * Copyright (C) 2026 Anthony Berton * * 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 @@ -460,6 +461,9 @@ if ($mode == 'show_day' || $mode == 'show_week' || $mode == 'show_month') { if ($search_categ_cus != 0) { $param .= '&search_categ_cus='.urlencode((string) ($search_categ_cus)); } +if ($check_holiday) { + $param .= '&check_holiday=1'; +} // Show navigation bar $nav = ''; @@ -629,7 +633,7 @@ if (!empty($conf->use_javascript_ajax)) { // If javascript on $s .= '