From 0e7889a68c0d5d97cb6862bab201704f0847ac2d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 1 Jul 2016 17:53:16 +0200
Subject: [PATCH] Fix must show label of leave type and not id.
---
htdocs/holiday/view_log.php | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php
index a9fe469c0cf..e4b5070f097 100644
--- a/htdocs/holiday/view_log.php
+++ b/htdocs/holiday/view_log.php
@@ -50,6 +50,8 @@ $langs->load('users');
$cp = new Holiday($db);
+$alltypeleaves=$cp->getTypes(1,-1); // To have labels
+
llxHeader('', $langs->trans('CPTitreMenu').' ('.$langs->trans("Year").' '.$year.')');
// Recent changes are more important than old changes
@@ -94,7 +96,10 @@ foreach($cp->logs as $logs_CP)
print '<td>'.$user_action->getNomUrl(1).'</td>';
print '<td>'.$user_update->getNomUrl(1).'</td>';
print '<td>'.$logs_CP['type_action'].'</td>';
- print '<td>'.$logs_CP['fk_type'].'</td>';
+ print '<td>';
+ $label=$alltypeleaves[$logs_CP['fk_type']]['label'];
+ print $label?$label:$logs_CP['fk_type'];
+ print '</td>';
print '<td style="text-align: right;">'.price2num($logs_CP['prev_solde'],5).' '.$langs->trans('days').'</td>';
print '<td style="text-align: right;">'.price2num($logs_CP['new_solde'],5).' '.$langs->trans('days').'</td>';
print '</tr>'."\n";
--
GitLab