diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php index 0e39f591bdd..553555c47ab 100644 --- a/htdocs/holiday/class/holiday.class.php +++ b/htdocs/holiday/class/holiday.class.php @@ -889,7 +889,7 @@ class Holiday extends CommonObject $month = date('m',$now); $lastUpdate = $this->getConfCP('lastUpdate'); $monthLastUpdate = $lastUpdate[4].$lastUpdate[5]; - //print 'month: '.$month.' '.$lastUpdate.' '.$monthLastUpdate; + //print 'month: '.$month.' '.$lastUpdate.' '.$monthLastUpdate;exit; // Si la date du mois n'est pas la même que celle sauvegardée, on met à jour le timestamp if ($month != $monthLastUpdate) diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php index 4b37a8b53c5..3c5fda7afd9 100644 --- a/htdocs/holiday/define_holiday.php +++ b/htdocs/holiday/define_holiday.php @@ -71,7 +71,7 @@ if ($action == 'update' && isset($_POST['update_cp'])) $comment = ((isset($_POST['note_holiday'][$userID]) && !empty($_POST['note_holiday'][$userID])) ? ' ('.$_POST['note_holiday'][$userID].')' : ''); // We add the modification to the log - $holiday->addLogCP($user->id,$userID, $langs->trans('ManualUpdate').$comment,$userValue); + $holiday->addLogCP($user->id,$userID, $langs->transnoentitiesnoconv('ManualUpdate').$comment,$userValue); // Update of the days of the employee $holiday->updateSoldeCP($userID,$userValue); diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php index 566fdbcf502..dba8969adca 100644 --- a/htdocs/holiday/view_log.php +++ b/htdocs/holiday/view_log.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2007-2014 Laurent Destailleur * Copyright (C) 2011 Dimitri Mouillard * * This program is free software; you can redistribute it and/or modify @@ -37,7 +37,7 @@ if(!$user->rights->holiday->view_log) accessforbidden(); /* * View -*/ + */ $langs->load('users'); @@ -45,7 +45,7 @@ llxHeader(array(),$langs->trans('CPTitreMenu')); $cp = new Holiday($db); -//Recent changes are more important than old changes +// Recent changes are more important than old changes $log_holiday = $cp->fetchLog('ORDER BY cpl.rowid DESC',''); print_fiche_titre($langs->trans('LogCP'));