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

Merge pull request #929 from marcosgdf/holidays-minor

Browse Source 
Minor changes in holidays module
This commit is contained in:
Juanjo Menent 2013-05-06 08:17:25 -07:00
commit 0e49ec93f9
11 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -286,7 +286,7 @@ print '</tr>'."\n";
$var=!$var;
print '<tr '.$bc[$var].'>'."\n";
print '<td style="padding:5px;">'.$langs->trans('DelayForSubmitCP').'</td>'."\n";
print '<td style="padding:5px;"><input class="flat" type="text" name="delayForRequest" value="'.$cp->getConfCP('delayForRequest').'" size="2" /> '.$langs->trans('Jours').'</td>'."\n";
print '<td style="padding:5px;"><input class="flat" type="text" name="delayForRequest" value="'.$cp->getConfCP('delayForRequest').'" size="2" /> '.$langs->trans('DurationDays').'</td>'."\n";
print '</tr>'."\n";
$var=!$var;
@ -304,13 +304,13 @@ print '</tr>'."\n";
$var=!$var;
print '<tr '.$bc[$var].'>'."\n";
print '<td style="padding:5px;">'.$langs->trans('nbHolidayEveryMonthCP').'</td>'."\n";
print '<td style="padding:5px;"><input class="flat" type="text" name="nbHolidayEveryMonth" value="'.$cp->getConfCP('nbHolidayEveryMonth').'" size="5"/> '.$langs->trans('Jours').'</td>'."\n";
print '<td style="padding:5px;"><input class="flat" type="text" name="nbHolidayEveryMonth" value="'.$cp->getConfCP('nbHolidayEveryMonth').'" size="5"/> '.$langs->trans('DurationDays').'</td>'."\n";
print '</tr>'."\n";
$var=!$var;
print '<tr '.$bc[$var].'>'."\n";
print '<td style="padding:5px;">'.$langs->trans('nbHolidayDeductedCP').'</td>'."\n";
print '<td style="padding:5px;"><input class="flat" type="text" name="nbHolidayDeducted" value="'.$cp->getConfCP('nbHolidayDeducted').'" size="2"/> '.$langs->trans('Jours').'</td>'."\n";
print '<td style="padding:5px;"><input class="flat" type="text" name="nbHolidayDeducted" value="'.$cp->getConfCP('nbHolidayDeducted').'" size="2"/> '.$langs->trans('DurationDays').'</td>'."\n";
print '</tr>'."\n";
print '</tbody>'."\n";
@ -367,7 +367,7 @@ if($cp_events == 1) {
print '<tr '.$bc[$var].'>'."\n";
print '<td><input class="flat" type="text" size="40" name="optName['.$infos_event['rowid'].']" value="'.$infos_event['name'].'" /></td>'."\n";
print '<td><input class="flat" type="text" size="2" name="optValue['.$infos_event['rowid'].']" value="'.$infos_event['value'].'" /> '.$langs->trans('Jours').'</td>'."\n";
print '<td><input class="flat" type="text" size="2" name="optValue['.$infos_event['rowid'].']" value="'.$infos_event['value'].'" /> '.$langs->trans('DurationDays').'</td>'."\n";
print '<td><input type="submit" class="button" name="update_event['.$infos_event['rowid'].']" value="'.dol_escape_htmltag($langs->trans("Save")).'"/></td>'."\n";
print '<td width="20px" align="right"><input type="image" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/delete.png" name="delete_event['.$infos_event['rowid'].']" style="border:0;"/></td>'."\n";
print '</tr>';
@ -400,7 +400,7 @@ print '</tr>';
print '<tr class="pair">';
print '<td><input class="flat" type="text" size="40" name="optName" value="'.(is_array($optName)?'':$optName).'" /></td>'."\n";
print '<td><input class="flat" type="text" size="2" name="optValue" value="'.(is_array($optValue)?'':$optValue).'" /> '.$langs->trans('Jours').'</td>'."\n";
print '<td><input class="flat" type="text" size="2" name="optValue" value="'.(is_array($optValue)?'':$optValue).'" /> '.$langs->trans('DurationDays').'</td>'."\n";
print '<td><input type="submit" class="button" name="button" value="'.$langs->trans('CreateEventCP').'" /></td>'."\n";
print '</tr>'."\n";

1
htdocs/holiday/define_holiday.php
View File

@ -117,6 +117,7 @@ elseif($action == 'add_event')
dol_htmloutput_mesg($message);
}
$langs->load('users');
$var=true;
$i = 0;

4
htdocs/holiday/index.php
View File

@ -262,6 +262,7 @@ print_liste_field_titre($langs->trans("DateDebCP"),$_SERVER["PHP_SELF"],"cp.date
print_liste_field_titre($langs->trans("DateFinCP"),$_SERVER["PHP_SELF"],"cp.date_fin","",'','align="center"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Duration"));
print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"cp.statut","",'','align="center"',$sortfield,$sortorder);
print '<td></td>';
print "</tr>\n";
// FILTRES
@ -320,6 +321,9 @@ print '<td>&nbsp;</td>';
// STATUT
print '<td class="liste_titre" width="70px;" align="center">';
$holiday->selectStatutCP($search_statut);
print '</td>';
// ACTION
print '<td>';
print '<input type="image" class="liste_titre" name="button_search" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/search.png" alt="'.$langs->trans('Search').'">';
print "</td></tr>\n";

2
htdocs/holiday/month_report.php
View File

@ -105,6 +105,8 @@ if($num == '0') {
} else {
$langs->load('users');
while ($holiday = $db->fetch_array($result))
{
$user = new User($db);

2
htdocs/holiday/view_log.php
View File

@ -39,6 +39,8 @@ if(!$user->rights->holiday->view_log) accessforbidden();
* View
*/
$langs->load('users');
llxHeader(array(),$langs->trans('CPTitreMenu'));

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

@ -128,7 +128,6 @@ DeleteEventOptionCP=Изтриване
UpdateEventOptionCP=Актуализация
ErrorMailNotSend=Възникна грешка при изпращане на електронна поща:
NoCPforMonth=Не оставяйте този месец.
Jours=ден
nbJours=Брой дни
TitleAdminCP=Конфигурация на празници
Permission20001=/ Промяна на всички искания празници

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

@ -129,7 +129,6 @@ DeleteEventOptionCP=Eliminar
UpdateEventOptionCP=Actualitzar
ErrorMailNotSend=S'ha produït un error en l'enviament del correu electrònic:
NoCPforMonth=Sense vacances aquest mes.
Jours=dies
nbJours=Número de dies
TitleAdminCP=Configuració de les vacances

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

@ -129,7 +129,6 @@ DeleteEventOptionCP=Delete
UpdateEventOptionCP=Update
ErrorMailNotSend=An error occurred while sending email:
NoCPforMonth=No leave this month.
Jours=days
nbJours=Number days
TitleAdminCP=Configuration of Holidays

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

@ -129,7 +129,6 @@ DeleteEventOptionCP=Eliminar
UpdateEventOptionCP=Actualizar
ErrorMailNotSend=Se ha producido un error en el envío del e-mail :
NoCPforMonth=Sin vacaciones este mes.
Jours=días
nbJours=Número de días
TitleAdminCP=Configuración de las vacaciones

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

@ -127,7 +127,6 @@ DeleteEventOptionCP=Supprimer
UpdateEventOptionCP=Mettre à jour
ErrorMailNotSend=Une erreur est survenue lors de l'envoi du mail :
NoCPforMonth=Aucun congé ce mois-ci.
Jours=jours
nbJours=Nombre jours
TitleAdminCP=Configuration des Congés

1
htdocs/langs/tr_TR/holiday.lang
View File

@ -126,7 +126,6 @@ DeleteEventOptionCP=Sil
UpdateEventOptionCP=Güncelle
ErrorMailNotSend=Eposta gönderilirken bir hata oluştu:
NoCPforMonth=Bu ay hiç izin yok.
Jours=gün
nbJours=Gün sayısı
TitleAdminCP=Tatillerin Yapılandırması
Permission20001=Bütün tatil isteklerini Oku / Değiştir