From 500bd9c1f240160bf6e42586c480f6265683f2df Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 5 Mar 2026 00:46:08 +0100 Subject: [PATCH 01/13] FIX height of confirm popup --- htdocs/comm/propal/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php index f440471ac4b..487c9d614c3 100644 --- a/htdocs/comm/propal/card.php +++ b/htdocs/comm/propal/card.php @@ -2738,7 +2738,7 @@ if ($action == 'create') { $formquestion[] = array('type' => 'date', 'name' => 'date_delivery', 'label' => $langs->trans("DeliveryDate"), 'value' => $object->delivery_date); } // Incomplete payment. We ask if reason = discount or other - $formconfirm = $form->formconfirm(dolBuildUrl($_SERVER["PHP_SELF"], ['id' => $object->id]), $langs->trans('ToClone'), $langs->trans('ConfirmClonePropal', $object->ref), 'confirm_clone', $formquestion, 'yes', 1, 250, 600); + $formconfirm = $form->formconfirm(dolBuildUrl($_SERVER["PHP_SELF"], ['id' => $object->id]), $langs->trans('ToClone'), $langs->trans('ConfirmClonePropal', $object->ref), 'confirm_clone', $formquestion, 'yes', 1, 0, 600); } // Subtotal line form From 418f0c2e30e41e853913dfb0088258cdfbae983b Mon Sep 17 00:00:00 2001 From: Anthony Berton <34568357+BB2A-Anthony@users.noreply.github.com> Date: Thu, 5 Mar 2026 01:16:38 +0100 Subject: [PATCH 02/13] FIX - Added user filtering for displaying leave in the calendar (#37385) * FIX - Added user filtering for displaying leave in the calendar * Add restric * Save param check_holiday * Copy --------- Co-authored-by: Anthony Berton --- htdocs/comm/action/index.php | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 71255ec4a7c..25bc578cc99 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -7,8 +7,9 @@ * Copyright (C) 2014 Cedric GROSS * Copyright (C) 2015 Marcos García * Copyright (C) 2017 Open-DSI - * Copyright (C) 2021-2025 Frédéric France - * Copyright (C) 2024-2025 MDW + * 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 @@ -456,6 +457,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 = ''; @@ -1163,9 +1167,14 @@ if ($user->hasRight("holiday", "read")) { $sql .= " AND x.date_debut <= '".$db->idate(dol_get_last_day($year, $month))."'"; $sql .= " AND x.date_fin >= '".$db->idate(dol_get_first_day($year, $month))."'"; } - if (!$user->hasRight('holiday', 'readall')) { + if (!$user->hasRight('holiday', 'readall') || $filtert == '-3') { + // Restrict on users of current user and his children $sql .= " AND x.fk_user IN(".$db->sanitize(implode(", ", $user->getAllChildIds(1))).") "; } + if ($filtert > 0) { + // Restrict on user + $sql .= " AND x.fk_user = ".((int) $filtert); + } $resql = $db->query($sql); if ($resql) { From 6ba163880ac89b1d13605a53ba9161ecc7d6f94e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 5 Mar 2026 12:34:36 +0100 Subject: [PATCH 03/13] Fix filter --- htdocs/projet/list.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php index 0c0a0e1a6aa..8e12efbee88 100644 --- a/htdocs/projet/list.php +++ b/htdocs/projet/list.php @@ -1209,11 +1209,14 @@ if ($search_opp_amount != '') { if ($search_budget_amount != '') { $param .= '&search_budget_amount='.urlencode($search_budget_amount); } +if ($search_usage_opportunity != '') { + $param .= '&search_usage_opportunity='.urlencode($search_usage_opportunity); +} if ($search_usage_task != '') { $param .= '&search_usage_task='.urlencode($search_usage_task); } if ($search_usage_bill_time != '') { - $param .= '&search_usage_opportunity='.urlencode($search_usage_bill_time); + $param .= '&search_usage_bill_time='.urlencode($search_usage_bill_time); } if ($search_usage_event_organization != '') { $param .= '&search_usage_event_organization='.urlencode($search_usage_event_organization); From 35eb6853fdfd905e5c11e973a52462b9ef982d88 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 5 Mar 2026 12:45:25 +0100 Subject: [PATCH 04/13] FIX Fetch of lead status --- htdocs/core/class/cleadstatus.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/class/cleadstatus.class.php b/htdocs/core/class/cleadstatus.class.php index 46122f12a54..6d131c0a3c4 100644 --- a/htdocs/core/class/cleadstatus.class.php +++ b/htdocs/core/class/cleadstatus.class.php @@ -145,8 +145,8 @@ class CLeadStatus extends CommonDict if ($id) { $sql_where[] = " t.rowid = ".((int) $id); } - if ($code >= 0) { - $sql_where[] = " t.code = ".((int) $code); + if ($code) { + $sql_where[] = " t.code = '".$this->db->escape($code)."'"; } if (count($sql_where) > 0) { $sql .= ' WHERE '.implode(' AND ', $sql_where); From 0eb3c9e68dbda29a0755fe20191d52a4fcd5aec2 Mon Sep 17 00:00:00 2001 From: Anthony Berton <34568357+BB2A-Anthony@users.noreply.github.com> Date: Thu, 5 Mar 2026 13:46:02 +0100 Subject: [PATCH 05/13] FIX - Reload page after check holiday for save param (#37410) Co-authored-by: Anthony Berton --- htdocs/comm/action/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 25bc578cc99..1ba921a7920 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -629,7 +629,7 @@ if (!empty($conf->use_javascript_ajax)) { // If javascript on $s .= '