lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HOLIDAY_HIDE_FOR_NON_SALARIES replaces !HOLIDAY_FOR_NON_SALARIES_TOO

Browse Source
This commit is contained in:
Laurent Destailleur 2020-11-05 19:00:06 +01:00
parent 81bba56776
commit 38f1431534
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/lib/date.lib.php
View File

@ -619,7 +619,7 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
$specialdayrule = array();
// Check to ensure we use correct parameters
if ((($timestampEnd - $timestampStart) % 86400) != 0) return 'ErrorDates must use same hours and must be GMT dates';
if ((($timestampEnd - $timestampStart) % 86400) != 0) return 'Error Dates must use same hours and must be GMT dates';
if (empty($country_code)) $country_code = $mysoc->country_code;

4
htdocs/holiday/card.php
View File

@ -55,8 +55,8 @@ $now = dol_now();
$childids = $user->getAllChildIds(1);
$morefilter = 'AND employee = 1';
if (!empty($conf->global->HOLIDAY_FOR_NON_SALARIES_TOO)) $morefilter = '';
$morefilter = '';
if (!empty($conf->global->HOLIDAY_HIDE_FOR_NON_SALARIES)) $morefilter = 'AND employee = 1';
$error = 0;

4
htdocs/holiday/list.php
View File

@ -487,8 +487,8 @@ if ($resql)
if (!empty($arrayfields['cp.fk_user']['checked']))
{
$morefilter = 'AND employee = 1';
if (!empty($conf->global->HOLIDAY_FOR_NON_SALARIES_TOO)) $morefilter = '';
$morefilter = '';
if (!empty($conf->global->HOLIDAY_HIDE_FOR_NON_SALARIES)) $morefilter = 'AND employee = 1';
// User
$disabled = 0;