diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index cf0e5b886a5..67ebeb4d081 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -1015,11 +1015,6 @@ class Conf extends stdClass } } - // conf->main_checkbox_left_column = constant to set checkbox list to left - if (!isset($this->main_checkbox_left_column)) { - $this->main_checkbox_left_column = getDolGlobalInt("MAIN_CHECKBOX_LEFT_COLUMN"); - } - // Set PRODUIT_LIMIT_SIZE if never defined if (!isset($this->global->PRODUIT_LIMIT_SIZE)) { $this->global->PRODUIT_LIMIT_SIZE = 1000; @@ -1264,6 +1259,11 @@ class Conf extends stdClass $this->global->MAIN_CHECKBOX_LEFT_COLUMN = 1; } + // conf->main_checkbox_left_column = constant to set checkbox list to left + if (!isset($this->main_checkbox_left_column)) { + $this->main_checkbox_left_column = getDolGlobalInt("MAIN_CHECKBOX_LEFT_COLUMN"); + } + // For modules that want to disable top or left menu if (!empty($this->global->MAIN_HIDE_TOP_MENU)) { $this->dol_hide_topmenu = (int) (bool) getDolGlobalInt('MAIN_HIDE_TOP_MENU'); diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php index cae2a9f3935..61d21e9abe6 100644 --- a/htdocs/core/lib/date.lib.php +++ b/htdocs/core/lib/date.lib.php @@ -1344,7 +1344,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.