diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php index 4cba7720ee04c552d45d3722584e91ebdf2ae138..dc7c4cb3d79f6801efdbcc818bd7a5caa79276a6 100644 --- a/htdocs/admin/agenda_xcal.php +++ b/htdocs/admin/agenda_xcal.php @@ -49,7 +49,7 @@ if ($actionsave) $i+=dolibarr_set_const($db,'MAIN_AGENDA_EXPORT_PAST_DELAY',trim(GETPOST('MAIN_AGENDA_EXPORT_PAST_DELAY','alpha')),'chaine',0,'',$conf->entity); $i+=dolibarr_set_const($db,'MAIN_AGENDA_EXPORT_CACHE',trim(GETPOST('MAIN_AGENDA_EXPORT_CACHE','alpha')),'chaine',0,'',$conf->entity); $i+=dolibarr_set_const($db,'AGENDA_EXPORT_FIX_TZ',trim(GETPOST('AGENDA_EXPORT_FIX_TZ','alpha')),'chaine',0,'',$conf->entity); - + if ($i >= 4) { $db->commit(); @@ -174,7 +174,6 @@ $message=$langs->trans("AgendaUrlOptions1",$user->login,$user->login).'<br>'; $message.=$langs->trans("AgendaUrlOptions2",$user->login,$user->login).'<br>'; $message.=$langs->trans("AgendaUrlOptions3",$user->login,$user->login).'<br>'; $message.=$langs->trans("AgendaUrlOptions4",$user->login,$user->login).'<br>'; -$message.=$langs->trans("AgendaUrlOptions5",$user->login,$user->login); print info_admin($message); if (! empty($conf->use_javascript_ajax)) diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php index bb55e57f86b06516baec3cfb180c901f243236f6..08aacfca14e9013fa078d5c06705272d25e09c92 100644 --- a/htdocs/core/lib/agenda.lib.php +++ b/htdocs/core/lib/agenda.lib.php @@ -78,12 +78,12 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh print $form->select_dolusers($filtert, 'usertodo', 1, '', ! $canedit); print '</td></tr>'; - print '<tr>'; + /*print '<tr>'; print '<td class="nowrap">'; print $langs->trans("or") . ' ' . $langs->trans("ActionsDoneBy"); print ' </td><td class="nowrap maxwidthonsmartphone">'; print $form->select_dolusers($filterd, 'userdone', 1, '', ! $canedit); - print '</td></tr>'; + print '</td></tr>';*/ include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php'; $formactions=new FormActions($db);