diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php index b790b9154e9..f8e444470c3 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++; } @@ -1660,43 +1660,43 @@ class Holiday extends CommonObject $resql=$this->db->query($sql); // Si pas d'erreur SQL - if ($resql) { + if ($resql) { - $i = 0; - $tab_result = $this->logs; - $num = $this->db->num_rows($resql); + $i = 0; + $tab_result = $this->logs; + $num = $this->db->num_rows($resql); - // Si pas d'enregistrement - if(!$num) { + // Si pas d'enregistrement + if(!$num) { return 2; - } + } - // On liste les résultats et on les ajoutent dans le tableau - while($i < $num) { + // On liste les résultats et on les ajoutent dans le tableau + while($i < $num) { - $obj = $this->db->fetch_object($resql); + $obj = $this->db->fetch_object($resql); - $tab_result[$i]['rowid'] = $obj->rowid; - $tab_result[$i]['date_action'] = $obj->date_action; - $tab_result[$i]['fk_user_action'] = $obj->fk_user_action; - $tab_result[$i]['fk_user_update'] = $obj->fk_user_update; - $tab_result[$i]['type_action'] = $obj->type_action; - $tab_result[$i]['prev_solde'] = $obj->prev_solde; - $tab_result[$i]['new_solde'] = $obj->new_solde; + $tab_result[$i]['rowid'] = $obj->rowid; + $tab_result[$i]['date_action'] = $obj->date_action; + $tab_result[$i]['fk_user_action'] = $obj->fk_user_action; + $tab_result[$i]['fk_user_update'] = $obj->fk_user_update; + $tab_result[$i]['type_action'] = $obj->type_action; + $tab_result[$i]['prev_solde'] = $obj->prev_solde; + $tab_result[$i]['new_solde'] = $obj->new_solde; - $i++; - } - // Retourne 1 et ajoute le tableau à la variable - $this->logs = $tab_result; - return 1; - } - else - { - // Erreur SQL - $this->error="Error ".$this->db->lasterror(); - dol_syslog(get_class($this)."::fetchLog ".$this->error, LOG_ERR); - return -1; - } + $i++; + } + // Retourne 1 et ajoute le tableau à la variable + $this->logs = $tab_result; + return 1; + } + else + { + // Erreur SQL + $this->error="Error ".$this->db->lasterror(); + dol_syslog(get_class($this)."::fetchLog ".$this->error, LOG_ERR); + return -1; + } } /** 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 83523ea4557..624287d9bb4 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($user->id,$cp->fk_user, $langs->trans('Event').': '.$langs->transnoentitiesnoconv("Holidays"),$newSolde); + $cp->addLogCP($user->id,$cp->fk_user, $langs->transnoentitiesnoconv("Holidays"),$newSolde); // Mise à jour du solde $cp->updateSoldeCP($cp->fk_user,$newSolde); diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php index f184cdc201e..ea87ea6fda0 100644 --- a/htdocs/holiday/month_report.php +++ b/htdocs/holiday/month_report.php @@ -54,7 +54,7 @@ $month = GETPOST('month_start'); $year = GETPOST('year_start'); if(empty($month)) { - $month = date('m'); + $month = date('n'); } if(empty($year)) { $year = date('Y'); @@ -65,7 +65,7 @@ $sql.= " FROM llx_holiday cp"; $sql.= " LEFT JOIN llx_user u ON cp.fk_user = u.rowid"; $sql.= " WHERE cp.statut = 3"; // Approved // TODO Use BETWEEN instead of date_format -$sql.= " AND (date_format(cp.date_debut, '%Y-%m') = '$year-$month' OR date_format(cp.date_fin, '%Y-%m') = '$year-$month')"; +$sql.= " AND (date_format(cp.date_debut, '%Y-%c') = '$year-$month' OR date_format(cp.date_fin, '%Y-%c') = '$year-$month')"; $sql.= " ORDER BY u.lastname,cp.date_debut"; $result = $db->query($sql); @@ -77,8 +77,9 @@ print '
'; print '
'."\n"; -print $langs->trans('Month').':  '; -$htmlother->select_year($year,'year_start',1,10,3); +print $langs->trans('Month').': '; +print $htmlother->select_month($month, 'month_start').' '; +print $htmlother->select_year($year,'year_start',1,10,3); print ''; @@ -126,7 +127,7 @@ if($num == '0') { print ''; print ''.$holidaystatic->getNomUrl(1).''; - print ''.$user->lastname.' '.$user->firstname.''; + print ''.$user->getNomUrl(1).''; print ''.dol_print_date($start_date,'day'); print ''; print ''.dol_print_date($end_date,'day'); diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php index 29c58c4dec7..0e77e574513 100644 --- a/htdocs/holiday/view_log.php +++ b/htdocs/holiday/view_log.php @@ -43,7 +43,8 @@ llxHeader(array(),$langs->trans('CPTitreMenu')); $cp = new Holiday($db); -$log_holiday = $cp->fetchLog('',''); +//Recent changes are more important than old changes +$log_holiday = $cp->fetchLog('ORDER BY cpl.rowid DESC',''); print_fiche_titre($langs->trans('LogCP')); @@ -55,7 +56,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').''; @@ -75,8 +76,8 @@ foreach($cp->logs as $logs_CP) print ''; print ''.$logs_CP['rowid'].''; print ''.$logs_CP['date_action'].''; - print ''.$user_action->getFullName($langs).''; - print ''.$user_update->getFullName($langs).''; + print ''.$user_action->getNomUrl(1).''; + print ''.$user_update->getNomUrl(1).''; print ''.$logs_CP['type_action'].''; print ''.$logs_CP['prev_solde'].' '.$langs->trans('days').''; print ''.$logs_CP['new_solde'].' '.$langs->trans('days').''; 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ış.