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

Fix: date format

Browse Source
This commit is contained in:
Laurent Destailleur 2012-12-02 18:21:26 +01:00
parent fd22705de4
commit 86e08e87d5
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
htdocs/holiday/index.php
View File

@ -80,8 +80,9 @@ llxHeader(array(),$langs->trans('CPTitreMenu'));
$order = $db->order($sortfield,$sortorder).$db->plimit($conf->liste_limit + 1, $offset); $order = $db->order($sortfield,$sortorder).$db->plimit($conf->liste_limit + 1, $offset);
// WHERE // WHERE
if(!empty($search_ref)){ if(!empty($search_ref))
$filter.= " AND cp.rowid LIKE '%$search_ref%'\n"; {
$filter.= " AND cp.rowid LIKE '%".$db->escape($search_ref)."%'\n";
} }
// DATE START // DATE START
@ -125,17 +126,17 @@ if($year_create > 0) {
// EMPLOYE // EMPLOYE
if(!empty($search_employe) && $search_employe != -1) { if(!empty($search_employe) && $search_employe != -1) {
$filter.= " AND cp.fk_user = '$search_employe'\n"; $filter.= " AND cp.fk_user = '".$db->escape($search_employe)."'\n";
} }
// VALIDEUR // VALIDEUR
if(!empty($search_valideur) && $search_valideur != -1) { if(!empty($search_valideur) && $search_valideur != -1) {
$filter.= " AND cp.fk_validator = '$search_valideur'\n"; $filter.= " AND cp.fk_validator = '".$db->escape($search_valideur)."'\n";
} }
// STATUT // STATUT
if(!empty($search_statut) && $search_statut != -1) { if(!empty($search_statut) && $search_statut != -1) {
$filter.= " AND cp.statut = '$search_statut'\n"; $filter.= " AND cp.statut = '".$db->escape($search_statut)."'\n";
} }
/************************************* /*************************************
@ -146,7 +147,7 @@ if(!empty($search_statut) && $search_statut != -1) {
$user_id = $user->id; $user_id = $user->id;
// Récupération des congés payés de l'utilisateur ou de tous les users // Récupération des congés payés de l'utilisateur ou de tous les users
if(!$user->rights->holiday->lire_tous) if (!$user->rights->holiday->lire_tous)
{ {
$holiday_payes = $holiday->fetchByUser($user_id,$order,$filter); $holiday_payes = $holiday->fetchByUser($user_id,$order,$filter);
} }
@ -156,7 +157,7 @@ else
} }
// Si pas de congés payés // Si pas de congés payés
if($holiday_payes == 0) if ($holiday_payes == 0)
{ {
print_fiche_titre($langs->trans('CPTitreMenu')); print_fiche_titre($langs->trans('CPTitreMenu'));
@ -168,7 +169,7 @@ if($holiday_payes == 0)
} }
// Si erreur SQL // Si erreur SQL
if($holiday_payes == '-1') if ($holiday_payes == '-1')
{ {
print_fiche_titre($langs->trans('CPTitreMenu')); print_fiche_titre($langs->trans('CPTitreMenu'));
@ -290,8 +291,8 @@ if (! empty($holiday->holiday))
print '<td style="text-align: center;">'.dol_print_date($date,'day').'</td>'; print '<td style="text-align: center;">'.dol_print_date($date,'day').'</td>';
print '<td>'.$user->getNomUrl('1').'</td>'; print '<td>'.$user->getNomUrl('1').'</td>';
print '<td>'.$validator->getNomUrl('1').'</td>'; print '<td>'.$validator->getNomUrl('1').'</td>';
print '<td style="text-align: center;">'.$infos_CP['date_debut'].'</td>'; print '<td style="text-align: center;">'.dol_print_date($infos_CP['date_debut'],'day').'</td>';
print '<td style="text-align: center;">'.$infos_CP['date_fin'].'</td>'; print '<td style="text-align: center;">'.dol_print_date($infos_CP['date_fin'],'day').'</td>';
print '<td>'; print '<td>';
$nbopenedday=num_open_day($infos_CP['date_debut'],$infos_CP['date_fin'],0,1); $nbopenedday=num_open_day($infos_CP['date_debut'],$infos_CP['date_fin'],0,1);
print $nbopenedday; print $nbopenedday;
@ -317,7 +318,7 @@ print '<div style="float: right; margin-top: 8px;">';
print '<a href="./fiche.php?action=request" class="butAction">'.$langs->trans('AddCP').'</a>'; print '<a href="./fiche.php?action=request" class="butAction">'.$langs->trans('AddCP').'</a>';
print '</div>'; print '</div>';
// Fin de page
$db->close();
llxFooter(); llxFooter();
$db->close();
?> ?>