Removed "event" word from event description and changed ActionTypeCP to Description
This commit is contained in:
parent
0846f4678b
commit
b830c1dd8c
@ -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++;
|
||||
}
|
||||
|
||||
@ -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);
|
||||
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -55,7 +55,7 @@ print '<td class="liste_titre">'.$langs->trans('ID').'</td>';
|
||||
print '<td class="liste_titre" align="center">'.$langs->trans('Date').'</td>';
|
||||
print '<td class="liste_titre">'.$langs->trans('ActionByCP').'</td>';
|
||||
print '<td class="liste_titre">'.$langs->trans('UserUpdateCP').'</td>';
|
||||
print '<td class="liste_titre">'.$langs->trans('ActionTypeCP').'</td>';
|
||||
print '<td class="liste_titre">'.$langs->trans('Description').'</td>';
|
||||
print '<td class="liste_titre" align="right">'.$langs->trans('PrevSoldeCP').'</td>';
|
||||
print '<td class="liste_titre" align="right">'.$langs->trans('NewSoldeCP').'</td>';
|
||||
|
||||
|
||||
@ -85,7 +85,6 @@ MenuLogCP=Преглед на извършените административ
|
||||
LogCP=Вход на актуализации на празниците
|
||||
ActionByCP=В изпълнение на
|
||||
UserUpdateCP=За потребителя
|
||||
ActionTypeCP=Тип
|
||||
PrevSoldeCP=Предишна баланс
|
||||
NewSoldeCP=New Balance
|
||||
alreadyCPexist=Искането за почивка вече е направено на този период.
|
||||
|
||||
@ -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.
|
||||
|
||||
@ -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.
|
||||
|
||||
@ -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.
|
||||
|
||||
@ -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.
|
||||
|
||||
@ -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ış.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user