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

Merge pull request #8545 from atm-florian/7.0_fix8436

Browse Source 
fix #8436
This commit is contained in:
Laurent Destailleur 2018-04-11 17:23:40 +02:00 committed by GitHub
commit 693f0da2a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
htdocs/holiday/list.php
View File

@ -461,15 +461,19 @@ else
// Type // Type
print '<td class="liste_titre">'; print '<td class="liste_titre">';
$typeleaves=$holidaystatic->getTypes(1,-1); if (empty($mysoc->country_id)) {
$arraytypeleaves=array(); setEventMessages(null, array($langs->trans("ErrorSetACountryFirst"),$langs->trans("CompanyFoundation")),'errors');
foreach($typeleaves as $key => $val) } else {
{ $typeleaves=$holidaystatic->getTypes(1,-1);
$labeltoshow = ($langs->trans($val['code'])!=$val['code'] ? $langs->trans($val['code']) : $val['label']); $arraytypeleaves=array();
//$labeltoshow .= ($val['delay'] > 0 ? ' ('.$langs->trans("NoticePeriod").': '.$val['delay'].' '.$langs->trans("days").')':''); foreach($typeleaves as $key => $val)
$arraytypeleaves[$val['rowid']]=$labeltoshow; {
$labeltoshow = ($langs->trans($val['code'])!=$val['code'] ? $langs->trans($val['code']) : $val['label']);
//$labeltoshow .= ($val['delay'] > 0 ? ' ('.$langs->trans("NoticePeriod").': '.$val['delay'].' '.$langs->trans("days").')':'');
$arraytypeleaves[$val['rowid']]=$labeltoshow;
}
print $form->selectarray('search_type', $arraytypeleaves, $search_type, 1);
} }
print $form->selectarray('search_type', $arraytypeleaves, $search_type, 1);
print '</td>'; print '</td>';
// Duration // Duration
@ -524,7 +528,7 @@ if ($id && empty($user->rights->holiday->read_all) && ! in_array($id, $childids)
$result = 0; $result = 0;
} }
// Lines // Lines
elseif (! empty($holiday->holiday)) elseif (! empty($holiday->holiday) && !empty($mysoc->country_id))
{ {
$userstatic = new User($db); $userstatic = new User($db);
$approbatorstatic = new User($db); $approbatorstatic = new User($db);