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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2016-01-12 22:54:32 +01:00
commit cd2695d1f5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/compta/hrm.php
View File

@ -142,7 +142,7 @@ $langs->load("boxes");
// Last expense report (new module) // Last leave requests
if (! empty($conf->holiday->enabled) && $user->rights->holiday->read) if (! empty($conf->holiday->enabled) && $user->rights->holiday->read)
{ {
$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, x.rowid, x.rowid as ref, x.fk_type, x.date_debut as date_start, x.date_fin as date_end, x.halfday, x.tms as dm, x.statut as status"; $sql = "SELECT u.rowid as uid, u.lastname, u.firstname, x.rowid, x.rowid as ref, x.fk_type, x.date_debut as date_start, x.date_fin as date_end, x.halfday, x.tms as dm, x.statut as status";
@ -207,7 +207,7 @@ if (! empty($conf->holiday->enabled) && $user->rights->holiday->read)
} }
else else
{ {
print '<tr '.$bc[$var].'><td colspan="5">'.$langs->trans("None").'</td></tr>'; print '<tr '.$bc[$var].'><td colspan="7">'.$langs->trans("None").'</td></tr>';
} }
print '</table><br>'; print '</table><br>';
} }