From 1d61cd75f2a357e5696d575c32a9b7bef3110894 Mon Sep 17 00:00:00 2001 From: ldestailleur Date: Wed, 6 Aug 2025 19:39:58 +0200 Subject: [PATCH 1/2] Fix CI --- htdocs/core/lib/date.lib.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php index ff9ce9215d3..aa0f4520a5e 100644 --- a/htdocs/core/lib/date.lib.php +++ b/htdocs/core/lib/date.lib.php @@ -1074,7 +1074,9 @@ function num_open_day($timestampStart, $timestampEnd, $inhour = 0, $lastday = 0, // Check if start/end days are working days just ONCE to optimize performance // by avoiding redundant calls to the potentially slow num_public_holiday() function. + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition $isStartDayWorking = (num_public_holiday($timestampStart, $timestampStart, $country_code, 1) == 0); + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition $isEndDayWorking = (num_public_holiday($timestampEnd, $timestampEnd, $country_code, 1) == 0); // Deduct 0.5 if the leave starts in the afternoon of a working day. From 91e88af806fa29656600b2d5a23afe73adb813d1 Mon Sep 17 00:00:00 2001 From: HENRY Florian Date: Wed, 6 Aug 2025 19:40:20 +0200 Subject: [PATCH 2/2] fix: backport fix PR #34833 for next version (#34884) --- htdocs/societe/document.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php index abfa6495892..addf2ec2609 100644 --- a/htdocs/societe/document.php +++ b/htdocs/societe/document.php @@ -183,10 +183,11 @@ print ''; print dol_get_fiche_end(); -$modulepart = 'societe'; +$modulepart = 'company'; $permissiontoadd = $user->hasRight('societe', 'creer'); $permtoedit = $user->hasRight('societe', 'creer'); $param = '&id='.$object->id; +$relativepathwithnofile = $object->id . '/'; include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php'; // End of page