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

Fix status of holiday

Browse Source
This commit is contained in:
Laurent Destailleur 2019-05-27 20:25:40 +02:00
parent 2aa19e469d
commit 1ed7c225d7
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/holiday/card.php
View File

@ -1212,7 +1212,7 @@ else
print '<td>'.num_open_day($object->date_debut_gmt, $object->date_fin_gmt, 0, 1, $object->halfday).'</td>'; print '<td>'.num_open_day($object->date_debut_gmt, $object->date_fin_gmt, 0, 1, $object->halfday).'</td>';
print '</tr>'; print '</tr>';
if ($object->statut == 5) if ($object->statut == Holiday::STATUS_REFUSED)
{ {
print '<tr>'; print '<tr>';
print '<td>'.$langs->trans('DetailRefusCP').'</td>'; print '<td>'.$langs->trans('DetailRefusCP').'</td>';
@ -1265,7 +1265,7 @@ else
if (!$edit && $action != 'editvalidator') { if (!$edit && $action != 'editvalidator') {
print '<tr>'; print '<tr>';
print '<td class="titlefield">'; print '<td class="titlefield">';
if ($object->statut == 3 || $object->statut == 4) print $langs->trans('ApprovedBy'); if ($object->statut == Holiday::STATUS_APPROVED || $object->statut == Holiday::STATUS_CANCELED) print $langs->trans('ApprovedBy');
else print $langs->trans('ReviewedByCP'); else print $langs->trans('ReviewedByCP');
print '</td>'; print '</td>';
print '<td>'.$valideur->getNomUrl(-1); print '<td>'.$valideur->getNomUrl(-1);
@ -1304,19 +1304,19 @@ else
print '<td>'.$langs->trans('DateCreateCP').'</td>'; print '<td>'.$langs->trans('DateCreateCP').'</td>';
print '<td>'.dol_print_date($object->date_create, 'dayhour').'</td>'; print '<td>'.dol_print_date($object->date_create, 'dayhour').'</td>';
print '</tr>'; print '</tr>';
if ($object->statut == 3 || $object->statut == 4) { if ($object->statut == Holiday::STATUS_APPROVED || $object->statut == Holiday::STATUS_CANCELED) {
print '<tr>'; print '<tr>';
print '<td>'.$langs->trans('DateValidCP').'</td>'; print '<td>'.$langs->trans('DateValidCP').'</td>';
print '<td>'.dol_print_date($object->date_valid, 'dayhour').'</td>'; // warning: date_valid is approval date on holiday module print '<td>'.dol_print_date($object->date_valid, 'dayhour').'</td>'; // warning: date_valid is approval date on holiday module
print '</tr>'; print '</tr>';
} }
if ($object->statut == 4) { if ($object->statut == Holiday::STATUS_CANCELED) {
print '<tr>'; print '<tr>';
print '<td>'.$langs->trans('DateCancelCP').'</td>'; print '<td>'.$langs->trans('DateCancelCP').'</td>';
print '<td>'.dol_print_date($object->date_cancel, 'dayhour').'</td>'; print '<td>'.dol_print_date($object->date_cancel, 'dayhour').'</td>';
print '</tr>'; print '</tr>';
} }
if ($object->statut == 5) { if ($object->statut == Holiday::STATUS_REFUSED) {
print '<tr>'; print '<tr>';
print '<td>'.$langs->trans('DateRefusCP').'</td>'; print '<td>'.$langs->trans('DateRefusCP').'</td>';
print '<td>'.dol_print_date($object->date_refuse, 'dayhour').'</td>'; print '<td>'.dol_print_date($object->date_refuse, 'dayhour').'</td>';