lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #901 from marcosgdf/develop

Browse Source 
Holidays module improvements
This commit is contained in:
Laurent Destailleur 2013-04-29 10:28:47 -07:00
commit f8b4551ef6
9 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/holiday/admin/holiday.php
View File

@ -329,7 +329,9 @@ print $cp->getConfCP('nbUser')."<br>\n";
$var=!$var; $var=!$var;
print $langs->trans('LastUpdateCP').': '."\n"; print $langs->trans('LastUpdateCP').': '."\n";
print dol_print_date($db->jdate($cp->getConfCP('lastUpdate')),'dayhour','tzuser')."<br>\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 '<br>';

4
htdocs/holiday/class/holiday.class.php
View File

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

8
htdocs/holiday/define_holiday.php
View File

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

2
htdocs/holiday/index.php
View File

@ -359,7 +359,7 @@ if (! empty($holiday->holiday))
print '<td align="center">'.dol_print_date($infos_CP['date_fin'],'day').'</td>'; print '<td align="center">'.dol_print_date($infos_CP['date_fin'],'day').'</td>';
print '<td align="right">'; print '<td align="right">';
$nbopenedday=num_open_day($infos_CP['date_debut'], $infos_CP['date_fin'], 0, 1, $infos_CP['halfday']); $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 '<td align="right">'.$holidaystatic->LibStatut($infos_CP['statut'],5).'</td>';
print '</tr>'."\n"; print '</tr>'."\n";

2
htdocs/langs/bg_BG/holiday.lang
View File

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

6
htdocs/langs/ca_ES/holiday.lang
View File

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

2
htdocs/langs/en_US/holiday.lang
View File

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

2
htdocs/langs/es_ES/holiday.lang
View File

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

2
htdocs/langs/fr_FR/holiday.lang
View File

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