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

Tooltip to understand the new dictionary of holidays

Browse Source
This commit is contained in:
Laurent Destailleur 2020-01-15 14:54:17 +01:00
parent 141ca20269
commit 3bd95c205d
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/holiday/card.php
View File

@ -1283,6 +1283,10 @@ else
print '<tr>'; print '<tr>';
print '<td class="nowrap">'; print '<td class="nowrap">';
$htmlhelp = $langs->trans('NbUseDaysCPHelp'); $htmlhelp = $langs->trans('NbUseDaysCPHelp');
$includesaturday = (isset($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY) ? $conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY : 1);
$includesunday = (isset($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY) ? $conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY : 1);
if ($includesaturday) $htmlhelp.='<br>'.$langs->trans("DayIsANonWorkingDay", $langs->trans("Saturday"));
if ($includesunday) $htmlhelp.='<br>'.$langs->trans("DayIsANonWorkingDay", $langs->trans("Sunday"));
print $form->textwithpicto($langs->trans('NbUseDaysCP'), $htmlhelp); print $form->textwithpicto($langs->trans('NbUseDaysCP'), $htmlhelp);
print '</td>'; print '</td>';
print '<td>'.num_open_day($object->date_debut_gmt, $object->date_fin_gmt, 0, 1, $object->halfday).'</td>'; print '<td>'.num_open_day($object->date_debut_gmt, $object->date_fin_gmt, 0, 1, $object->halfday).'</td>';

3
htdocs/langs/en_US/holiday.lang
View File

@ -39,9 +39,10 @@ TypeOfLeaveId=Type of leave ID
TypeOfLeaveCode=Type of leave code TypeOfLeaveCode=Type of leave code
TypeOfLeaveLabel=Type of leave label TypeOfLeaveLabel=Type of leave label
NbUseDaysCP=Number of days of vacation consumed NbUseDaysCP=Number of days of vacation consumed
NbUseDaysCPHelp=The calculation takes into account the non working days and the holidays defined in the dictionary NbUseDaysCPHelp=The calculation takes into account the non working days and the holidays defined in the dictionary.
NbUseDaysCPShort=Days consumed NbUseDaysCPShort=Days consumed
NbUseDaysCPShortInMonth=Days consumed in month NbUseDaysCPShortInMonth=Days consumed in month
DayIsANonWorkingDay=%s is a non working day
DateStartInMonth=Start date in month DateStartInMonth=Start date in month
DateEndInMonth=End date in month DateEndInMonth=End date in month
EditCP=Edit EditCP=Edit