Merge pull request #901 from marcosgdf/develop

Holidays module improvements

htdocs/holiday/admin/holiday.php

@@ -322,16 +322,18 @@ print '</form>'."\n\n";
 dol_fiche_end();
 
 
-/*$var=!$var;
-print $langs->trans('nbUserCP').': '."\n";
-print $cp->getConfCP('nbUser')."<br>\n";
+/*$var=!$var;
+print $langs->trans('nbUserCP').': '."\n";
+print $cp->getConfCP('nbUser')."<br>\n";
 */
-
-$var=!$var;
-print $langs->trans('LastUpdateCP').': '."\n";
-print dol_print_date($db->jdate($cp->getConfCP('lastUpdate')),'dayhour','tzuser')."<br>\n";
 
-print '<br>';
+$var=!$var;
+print $langs->trans('LastUpdateCP').': '."\n";
+if ($cp->getConfCP('lastUpdate')) print dol_print_date($db->jdate($cp->getConfCP('lastUpdate')),'dayhour','tzuser');
+else print $langs->trans('None');
+print "<br>\n";
+
+print '<br>';
 
 print_fiche_titre($langs->trans('TitleOptionEventCP'),'','');
 

htdocs/holiday/class/holiday.class.php

@@ -1151,7 +1151,7 @@ class Holiday extends CommonObject
                         $obj = $this->db->fetch_object($resql);
 
                         $tab_result[$i]['rowid'] = $obj->rowid;
-                        $tab_result[$i]['name'] = $obj->name;
+                        $tab_result[$i]['name'] = $obj->lastname;
                         $tab_result[$i]['firstname'] = $obj->firstname;
 
                         $i++;
@@ -1191,7 +1191,7 @@ class Holiday extends CommonObject
                         $obj = $this->db->fetch_object($resql);
 
                         $tab_result[$i]['rowid'] = $obj->fk_user;
-                        $tab_result[$i]['name'] = $obj->name;
+                        $tab_result[$i]['name'] = $obj->lastname;
                         $tab_result[$i]['firstname'] = $obj->firstname;
 
                         $i++;

htdocs/holiday/define_holiday.php

@@ -145,8 +145,8 @@ print '<input type="hidden" name="action" value="update" />';
 print '<table class="noborder" width="100%;">';
 print "<tr class=\"liste_titre\">";
 print '<td width="5%">'.$langs->trans('ID').'</td>';
-print '<td width="20%">'.$langs->trans('UserName').'</td>';
-print '<td width="10%">'.$langs->trans('Available').'</td>';
+print '<td width="60%">'.$langs->trans('UserName').'</td>';
+print '<td width="20%" style="text-align:center">'.$langs->trans('Available').'</td>';
 print '<td>'.$langs->trans('UpdateButtonCP').'</td>';
 print '</tr>';
 
@@ -159,11 +159,11 @@ foreach($listUsers as $users)
     print '<td>'.$users['rowid'].'</td>';
     print '<td>';
     $userstatic->id=$users['rowid'];
-    $userstatic->lastname=$users['lastname'];
+    $userstatic->lastname=$users['name'];
     $userstatic->firstname=$users['firstname'];
     print $userstatic->getNomUrl(1);
     print '</td>';
-    print '<td>';
+    print '<td style="text-align:center">';
     print '<input type="text" value="'.$holiday->getCPforUser($users['rowid']).'" name="nb_holiday['.$users['rowid'].']" size="5" style="text-align: center;"/>';
     print ' '.$langs->trans('days').'</td>'."\n";
     print '<td><input type="submit" name="update_cp['.$users['rowid'].']" value="'.dol_escape_htmltag($langs->trans("Update")).'" class="button"/></td>'."\n";

htdocs/holiday/index.php

@@ -289,11 +289,11 @@ if($user->rights->holiday->lire_tous)
 {
     print '<td class="liste_titre" align="left">';
 
-    $validator = new UserGroup($db);
-    $excludefilter=$user->admin?'':'u.rowid <> '.$user->id;
-    $valideurobjects = $validator->listUsersForGroup($excludefilter);
-    $valideurarray = array();
-    foreach($valideurobjects as $val) $valideurarray[$val->id]=$val->id;
+    $validator = new UserGroup($db);
+    $excludefilter=$user->admin?'':'u.rowid <> '.$user->id;
+    $valideurobjects = $validator->listUsersForGroup($excludefilter);
+    $valideurarray = array();
+    foreach($valideurobjects as $val) $valideurarray[$val->id]=$val->id;
     $form->select_users($search_valideur,"search_valideur",1,"",0,$valideurarray,'');
     print '</td>';
 }
@@ -359,7 +359,7 @@ if (! empty($holiday->holiday))
 		print '<td align="center">'.dol_print_date($infos_CP['date_fin'],'day').'</td>';
 		print '<td align="right">';
 		$nbopenedday=num_open_day($infos_CP['date_debut'], $infos_CP['date_fin'], 0, 1, $infos_CP['halfday']);
-		print $nbopenedday;
+		print $nbopenedday.' '.$langs->trans('DurationDays');
 		print '<td align="right">'.$holidaystatic->LibStatut($infos_CP['statut'],5).'</td>';
 		print '</tr>'."\n";
 

htdocs/langs/bg_BG/holiday.lang

@@ -21,7 +21,7 @@ DateDebCP=Начална дата
 DateFinCP=Крайна дата
 DateCreateCP=Дата на създаване
 DraftCP=Проект
-ToApproveCP=Очаква одобрение
+ToReviewCP=Очаква одобрение
 ApprovedCP=Утвърден
 CancelCP=Отменен
 RefuseCP=Отказ

htdocs/langs/ca_ES/holiday.lang

@@ -15,13 +15,13 @@ DateDebCP=Data inici
 DateFinCP=Data fi
 DateCreateCP=Data de creació
 DraftCP=Esborrany
-ToValidateCP=En espera de validació
-ValidateCP=Validada
+ToReviewCP=A l'espera d'aprovació
+ApprvedCP=Aprovada
 CancelCP=Anul·lada
 RefuseCP=Rebutjada
 ValidatorCP=Validador
 ListeCP=Llista de vacances
-ValidateByCP=Serà validada per
+ReviewedByCP=Serà revisada per
 DescCP=Descripció
 SendRequestCP=Enviar la petició de vacances
 DelayToRequestCP=Les peticions de vacances s'han de fer almenys <b>%s dies</b> abans.

htdocs/langs/en_US/holiday.lang

@@ -15,7 +15,7 @@ DateDebCP=Start date
 DateFinCP=End date
 DateCreateCP=Creation date
 DraftCP=Draft
-ToApproveCP=Awaiting approval
+ToReviewCP=Awaiting approval
 ApprovedCP=Approved
 CancelCP=Canceled
 RefuseCP=Refused

htdocs/langs/es_ES/holiday.lang

@@ -15,7 +15,7 @@ DateDebCP=Fecha inicio
 DateFinCP=Fecha fin
 DateCreateCP=Fecha de creación
 DraftCP=Borrador
-ToApproveCP=En espera de aprobación
+ToReviewCP=En espera de aprobación
 ApprovedCP=Aprobada
 CancelCP=Anulada
 RefuseCP=Rechazada

htdocs/langs/fr_FR/holiday.lang

@@ -15,7 +15,7 @@ DateDebCP=Date Début
 DateFinCP=Date Fin
 DateCreateCP=Date de création
 DraftCP=Brouillon
-ToApproveCP=En attente d'approbation
+ToReviewCP=En attente d'approbation
 ApprovedCP=Approuvé
 CancelCP=Annulée
 RefuseCP=Refusée