diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php index 55971e64375..6b023eeb6b8 100644 --- a/htdocs/holiday/class/holiday.class.php +++ b/htdocs/holiday/class/holiday.class.php @@ -913,7 +913,7 @@ class Holiday extends CommonObject $new_solde = $now_holiday + $this->getConfCP('nbHolidayEveryMonth'); // On ajoute la modification dans le LOG - $this->addLogCP($user->id,$users[$i]['rowid'], $langs->trans('Event').': '.$langs->trans('HolidaysMonthlyUpdate'),$new_solde); + $this->addLogCP($user->id,$users[$i]['rowid'], $langs->trans('HolidaysMonthlyUpdate'),$new_solde); $i++; } diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php index a1cacebc74c..1b1bd8635d1 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]) ? ' ('.$_POST['note_holiday'][$userID].')' : ''); // We add the modification to the log - $holiday->addLogCP($user->id,$userID, $langs->trans('Event').': '.$langs->trans('ManualUpdate').$comment,$userValue); + $holiday->addLogCP($user->id,$userID, $langs->trans('ManualUpdate').$comment,$userValue); // Update of the days of the employee $holiday->updateSoldeCP($userID,$userValue); @@ -111,7 +111,7 @@ elseif($action == 'add_event') $new_holiday = $nb_holiday + $add_holiday; // On ajoute la modification dans le LOG - $holiday->addLogCP($user->id,$userCP, $langs->trans('Event').': '.$holiday->getNameEventCp($event),$new_holiday); + $holiday->addLogCP($user->id,$userCP, $holiday->getNameEventCp($event),$new_holiday); $holiday->updateSoldeCP($userCP,$new_holiday); diff --git a/htdocs/holiday/fiche.php b/htdocs/holiday/fiche.php index aa3287bc81a..ce67b25c6d1 100644 --- a/htdocs/holiday/fiche.php +++ b/htdocs/holiday/fiche.php @@ -380,7 +380,7 @@ if($action == 'confirm_valid') $newSolde = $soldeActuel - ($nbJour*$cp->getConfCP('nbHolidayDeducted')); // On ajoute la modification dans le LOG - $cp->addLogCP($userID,$cp->fk_user, $langs->trans('Event').': '.$langs->transnoentitiesnoconv("Holidays"),$newSolde); + $cp->addLogCP($userID,$cp->fk_user, $langs->transnoentitiesnoconv("Holidays"),$newSolde); // Mise à jour du solde $cp->updateSoldeCP($cp->fk_user,$newSolde); diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php index 9d4af31adb1..ebe5263b8d3 100644 --- a/htdocs/holiday/view_log.php +++ b/htdocs/holiday/view_log.php @@ -55,7 +55,7 @@ print ''.$langs->trans('ID').''; print ''.$langs->trans('Date').''; print ''.$langs->trans('ActionByCP').''; print ''.$langs->trans('UserUpdateCP').''; -print ''.$langs->trans('ActionTypeCP').''; +print ''.$langs->trans('Description').''; print ''.$langs->trans('PrevSoldeCP').''; print ''.$langs->trans('NewSoldeCP').''; diff --git a/htdocs/langs/bg_BG/holiday.lang b/htdocs/langs/bg_BG/holiday.lang index 614539960d5..56725319422 100644 --- a/htdocs/langs/bg_BG/holiday.lang +++ b/htdocs/langs/bg_BG/holiday.lang @@ -85,7 +85,6 @@ MenuLogCP=Преглед на извършените административ LogCP=Вход на актуализации на празниците ActionByCP=В изпълнение на UserUpdateCP=За потребителя -ActionTypeCP=Тип PrevSoldeCP=Предишна баланс NewSoldeCP=New Balance alreadyCPexist=Искането за почивка вече е направено на този период. diff --git a/htdocs/langs/ca_ES/holiday.lang b/htdocs/langs/ca_ES/holiday.lang index 32313bc82a6..da3d694d31a 100644 --- a/htdocs/langs/ca_ES/holiday.lang +++ b/htdocs/langs/ca_ES/holiday.lang @@ -80,7 +80,6 @@ MenuLogCP=Veure els logs de vacances LogCP=Logs d'actualitzacions de vacances ActionByCP=Realitzat per UserUpdateCP=Per a l'usuari -ActionTypeCP=Tipus PrevSoldeCP=Saldo anterior NewSoldeCP=Nou saldo alreadyCPexist=Ja s'ha efectuat una petició de vacances per a aquest període. diff --git a/htdocs/langs/en_US/holiday.lang b/htdocs/langs/en_US/holiday.lang index 1937625e4ae..044ce0dec41 100644 --- a/htdocs/langs/en_US/holiday.lang +++ b/htdocs/langs/en_US/holiday.lang @@ -80,7 +80,6 @@ MenuLogCP=View logs of holidays LogCP=Log of updates of holidays ActionByCP=Performed by UserUpdateCP=For the user -ActionTypeCP=Type PrevSoldeCP=Previous Balance NewSoldeCP=New Balance alreadyCPexist=A request for holidays has already been done on this period. diff --git a/htdocs/langs/es_ES/holiday.lang b/htdocs/langs/es_ES/holiday.lang index 21b9f1cfbe7..fbf408d2ae1 100644 --- a/htdocs/langs/es_ES/holiday.lang +++ b/htdocs/langs/es_ES/holiday.lang @@ -80,7 +80,6 @@ MenuLogCP=Ver los logs de vacaciones LogCP=Logs de actualizaciones de vacaciones ActionByCP=Realizado por UserUpdateCP=Para el usuario -ActionTypeCP=Tipo PrevSoldeCP=Saldo anterior NewSoldeCP=Nuevo saldo alreadyCPexist=Ya se ha efectuado una petición de vacaciones para este periodo. diff --git a/htdocs/langs/fr_FR/holiday.lang b/htdocs/langs/fr_FR/holiday.lang index 42e755ece07..9ff54da386d 100644 --- a/htdocs/langs/fr_FR/holiday.lang +++ b/htdocs/langs/fr_FR/holiday.lang @@ -80,7 +80,6 @@ MenuLogCP=Voir les logs des congés LogCP=Logs des mises à jours des congés ActionByCP=Réalisée par UserUpdateCP=Pour l'utilisateur -ActionTypeCP=Type PrevSoldeCP=Précédent Solde NewSoldeCP=Nouveau Solde alreadyCPexist=Une demande de congés à déjà été effectuée sur cette période. diff --git a/htdocs/langs/tr_TR/holiday.lang b/htdocs/langs/tr_TR/holiday.lang index d9291737449..27529977b3c 100644 --- a/htdocs/langs/tr_TR/holiday.lang +++ b/htdocs/langs/tr_TR/holiday.lang @@ -78,7 +78,6 @@ MenuLogCP=Tatil kayıtlarını gör LogCP=Tatil güncellemeleri kayıtı ActionByCP=Uygulayan UserUpdateCP=Bu kullanıcı için -ActionTypeCP=Türü PrevSoldeCP=Önceki Bakiye NewSoldeCP=Yeni Bakiye alreadyCPexist=Bu dönem için bir tatil isteği zaten yapılmış.