FIX approval date was not visible if leave was canceled after

Dolibarr · Mar 19, 2018 · 14e8094 · 14e8094
1 parent ee3dcb7
commit 14e8094
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
@@ -1190,11 +1190,14 @@ function valider()
                 // Validator
                 if (!$edit) {
                     print '<tr>';
-                    print '<td class="titlefield">'.$langs->trans('ReviewedByCP').'</td>';
+                    print '<td class="titlefield">';
+                    if ($object->statut == 3 || $object->statut == 4) print $langs->trans('ApprovedBy');
+                    else print $langs->trans('ReviewedByCP');
+                    print '</td>';
                     print '<td>'.$valideur->getNomUrl(-1).'</td>';
                     print '</tr>';
                 } else {
-                    print '<tr>';
+                	print '<tr>';
                     print '<td class="titlefield">'.$langs->trans('ReviewedByCP').'</td>';
                     print '<td>';
         			print $form->select_dolusers($object->fk_validator, "valideur", 1, ($user->admin ? '' : array($user->id)));	// By default, hierarchical parent
@@ -1206,10 +1209,10 @@ function valider()
                 print '<td>'.$langs->trans('DateCreateCP').'</td>';
                 print '<td>'.dol_print_date($object->date_create,'dayhour').'</td>';
                 print '</tr>';
-                if ($object->statut == 3) {
+                if ($object->statut == 3 || $object->statut == 4) {
                     print '<tr>';
                     print '<td>'.$langs->trans('DateValidCP').'</td>';
-                    print '<td>'.dol_print_date($object->date_valid,'dayhour').'</td>';
+                    print '<td>'.dol_print_date($object->date_valid,'dayhour').'</td>';		// warning: date_valid is approval date on holiday module
                     print '</tr>';
                 }
                 if ($object->statut == 4) {