From b9429fc98e81ae94491ab4f6225f16fa30042fc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Mon, 29 Apr 2013 17:24:02 +0200 Subject: [PATCH 1/5] Fixed a bug when showing users to define holidays --- htdocs/holiday/admin/holiday.php | 18 ++++++++++-------- htdocs/holiday/class/holiday.class.php | 4 ++-- htdocs/holiday/define_holiday.php | 2 +- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/htdocs/holiday/admin/holiday.php b/htdocs/holiday/admin/holiday.php index 6e7216332ea..e3a20662f5d 100644 --- a/htdocs/holiday/admin/holiday.php +++ b/htdocs/holiday/admin/holiday.php @@ -322,16 +322,18 @@ print ''."\n\n"; dol_fiche_end(); -/*$var=!$var; -print $langs->trans('nbUserCP').': '."\n"; -print $cp->getConfCP('nbUser')."
\n"; +/*$var=!$var; +print $langs->trans('nbUserCP').': '."\n"; +print $cp->getConfCP('nbUser')."
\n"; */ - -$var=!$var; -print $langs->trans('LastUpdateCP').': '."\n"; -print dol_print_date($db->jdate($cp->getConfCP('lastUpdate')),'dayhour','tzuser')."
\n"; -print '
'; +$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 "
\n"; + +print '
'; print_fiche_titre($langs->trans('TitleOptionEventCP'),'',''); diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php index 15445162af3..55971e64375 100644 --- a/htdocs/holiday/class/holiday.class.php +++ b/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++; diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php index 940c8b9a8be..3517fa1d11e 100644 --- a/htdocs/holiday/define_holiday.php +++ b/htdocs/holiday/define_holiday.php @@ -159,7 +159,7 @@ foreach($listUsers as $users) print ''.$users['rowid'].''; print ''; $userstatic->id=$users['rowid']; - $userstatic->lastname=$users['lastname']; + $userstatic->lastname=$users['name']; $userstatic->firstname=$users['firstname']; print $userstatic->getNomUrl(1); print ''; From 8837caeb6fa23e8667575dd52a267d3ec2786e1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Mon, 29 Apr 2013 17:57:24 +0200 Subject: [PATCH 2/5] Style improvement --- htdocs/holiday/define_holiday.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php index 3517fa1d11e..36e93d84271 100644 --- a/htdocs/holiday/define_holiday.php +++ b/htdocs/holiday/define_holiday.php @@ -145,8 +145,8 @@ print ''; print ''; print ""; print ''; -print ''; -print ''; +print ''; +print ''; print ''; print ''; @@ -163,7 +163,7 @@ foreach($listUsers as $users) $userstatic->firstname=$users['firstname']; print $userstatic->getNomUrl(1); print ''; - print ''."\n"; print ''."\n"; From 7dd457d2df04455e3343729f9a623b0b29f3355e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Mon, 29 Apr 2013 18:01:26 +0200 Subject: [PATCH 3/5] Added DurationDays string to the table --- htdocs/holiday/index.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/holiday/index.php b/htdocs/holiday/index.php index 06c75411453..8343a805081 100644 --- a/htdocs/holiday/index.php +++ b/htdocs/holiday/index.php @@ -289,11 +289,11 @@ if($user->rights->holiday->lire_tous) { print ''; } @@ -359,7 +359,7 @@ if (! empty($holiday->holiday)) print ''; print ''; print ''."\n"; From da9cbc6e58e507b68d38dbf95a48f0ea69c04c8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Mon, 29 Apr 2013 18:02:18 +0200 Subject: [PATCH 4/5] Corrected translation key --- htdocs/langs/bg_BG/holiday.lang | 2 +- htdocs/langs/en_US/holiday.lang | 2 +- htdocs/langs/es_ES/holiday.lang | 2 +- htdocs/langs/fr_FR/holiday.lang | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/langs/bg_BG/holiday.lang b/htdocs/langs/bg_BG/holiday.lang index 250872e523e..614539960d5 100644 --- a/htdocs/langs/bg_BG/holiday.lang +++ b/htdocs/langs/bg_BG/holiday.lang @@ -21,7 +21,7 @@ DateDebCP=Начална дата DateFinCP=Крайна дата DateCreateCP=Дата на създаване DraftCP=Проект -ToApproveCP=Очаква одобрение +ToReviewCP=Очаква одобрение ApprovedCP=Утвърден CancelCP=Отменен RefuseCP=Отказ diff --git a/htdocs/langs/en_US/holiday.lang b/htdocs/langs/en_US/holiday.lang index e2bf8d85209..5453b2b88e6 100644 --- a/htdocs/langs/en_US/holiday.lang +++ b/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 diff --git a/htdocs/langs/es_ES/holiday.lang b/htdocs/langs/es_ES/holiday.lang index a4c5c786980..5c234575d25 100644 --- a/htdocs/langs/es_ES/holiday.lang +++ b/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 diff --git a/htdocs/langs/fr_FR/holiday.lang b/htdocs/langs/fr_FR/holiday.lang index 5b133dbba9e..938ffaa155d 100644 --- a/htdocs/langs/fr_FR/holiday.lang +++ b/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 From bf36376215000d4120e4148314b703a95f2bcce0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Mon, 29 Apr 2013 18:05:11 +0200 Subject: [PATCH 5/5] Corrected ca_ES translations Translations made by Juanjo Menent (simnandez) --- htdocs/langs/ca_ES/holiday.lang | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/langs/ca_ES/holiday.lang b/htdocs/langs/ca_ES/holiday.lang index d77e31fbb7f..60adaa8faf3 100644 --- a/htdocs/langs/ca_ES/holiday.lang +++ b/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 %s dies abans.
'.$langs->trans('ID').''.$langs->trans('UserName').''.$langs->trans('Available').''.$langs->trans('UserName').''.$langs->trans('Available').''.$langs->trans('UpdateButtonCP').'
'; + print ''; print ''; print ' '.$langs->trans('days').''; - $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 ''.dol_print_date($infos_CP['date_fin'],'day').''; $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 ''.$holidaystatic->LibStatut($infos_CP['statut'],5).'