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

Better management of hidden option HOLIDAY_HIDE_BALANCE

Browse Source
This commit is contained in:
Laurent Destailleur 2018-03-19 15:13:36 +01:00
parent eb03fb7540
commit e0164884ee
2 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/holiday/card.php
View File

@ -831,6 +831,10 @@ if (empty($id) || $action == 'add' || $action == 'request' || $action == 'create
dol_fiche_end(); dol_fiche_end();
} }
elseif(! is_numeric($conf->global->HOLIDAY_HIDE_BALANCE))
{
print $langs->trans($conf->global->HOLIDAY_HIDE_BALANCE).'<br>';
}
dol_fiche_head(); dol_fiche_head();

7
htdocs/hrm/index.php
View File

@ -130,6 +130,8 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is usele
if (! empty($conf->holiday->enabled)) if (! empty($conf->holiday->enabled))
{ {
if (empty($conf->global->HOLIDAY_HIDE_BALANCE))
{
$user_id = $user->id; $user_id = $user->id;
print '<table class="noborder nohover" width="100%">'; print '<table class="noborder nohover" width="100%">';
@ -151,6 +153,11 @@ if (! empty($conf->holiday->enabled))
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
print '</table><br>'; print '</table><br>';
}
elseif (! is_numeric($conf->global->HOLIDAY_HIDE_BALANCE))
{
print $langs->trans($conf->global->HOLIDAY_HIDE_BALANCE).'<br>';
}
} }