diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 0b8185b3854..8e30c65b409 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -5473,7 +5473,7 @@ class Form * @param int $disabled Disable input fields * @param int $fullday When a checkbox with this html name is on, hour and day are set with 00:00 or 23:59 * @param string $addplusone Add a link "+1 hour". Value must be name of another selectDate field. - * @param datetime $adddateof Add a link "Date of invoice" using the following date. See also $labeladddateof for the label used. + * @param datetime $adddateof Add a link "Date of ..." using the following date. See also $labeladddateof for the label used. * @param string $openinghours Specify hour start and hour end for the select ex 8,20 * @param int $stepminutes Specify step for minutes between 1 and 30 * @param string $labeladddateof Label to use for the $adddateof parameter. diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php index db6efca4721..00d70e31c89 100644 --- a/htdocs/projet/activity/perday.php +++ b/htdocs/projet/activity/perday.php @@ -146,6 +146,7 @@ $search_array_options_task = $extrafields->getOptionalsFromPost($object->table_e /* * Actions */ + $parameters = array('id' => $id, 'taskid' => $taskid, 'projectid' => $projectid); $reshook=$hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); @@ -441,9 +442,10 @@ $nav = '".dol_print_date(dol_mktime(0, 0, 0, $month, $day, $year), "day")." \n"; $nav .= ''.img_next($langs->trans("Next"))."\n"; -$nav .= "   (".$langs->trans("Today").")"; -$nav .= '
'.$form->selectDate(-1, '', 0, 0, 2, "addtime", 1, 0).' '; -$nav .= ' '; +//$nav .= "   (".$langs->trans("Today").")"; +$nav .= ' '.$form->selectDate(-1, '', 0, 0, 2, "addtime", 1, 1).' '; +//$nav .= ' '; +$nav .= ' '; $picto = 'calendarweek'; @@ -484,6 +486,7 @@ print ''; dol_fiche_end(); + print '
'.$nav.'
'; // We move this before the assign to components so, the default submit button is not the assign to. print '
'; @@ -497,7 +500,7 @@ print $formcompany->selectTypeContact($object, '', 'type', 'internal', 'rowid', print ''; print '
'; -print '
'; +print '
'; $moreforfilter = ''; diff --git a/htdocs/projet/activity/permonth.php b/htdocs/projet/activity/permonth.php index da0459f9521..3b90d49b48b 100644 --- a/htdocs/projet/activity/permonth.php +++ b/htdocs/projet/activity/permonth.php @@ -368,9 +368,10 @@ $param.=($search_task_label?'&search_task_label='.$search_task_label:''); $nav =''.img_previous($langs->trans("Previous"))."\n"; $nav.=" ".dol_print_date(dol_mktime(0, 0, 0, $month, 1, $year), "%Y").", ".$langs->trans(date('F', mktime(0, 0, 0, $month, 10)))." \n"; $nav.=''.img_next($langs->trans("Next"))."\n"; -$nav.="   (".$langs->trans("Today").")"; -$nav.='
'.$form->select_date(-1, '', 0, 0, 2, "addtime", 1, 0, 1).' '; -$nav.=' '; +//$nav.="   (".$langs->trans("Today").")"; +$nav.=' '.$form->selectDate(-1, '', 0, 0, 2, "addtime", 1, 1).' '; +//$nav.=' '; +$nav .= ' '; $picto='calendarweek'; @@ -408,7 +409,7 @@ print ''; dol_fiche_end(); -print '
'.$nav.'
'; // We move this before the assign to components so, the default submit button is not the assign to. +print '
'.$nav.'
'; // We move this before the assign to components so, the default submit button is not the assign to. print '
'; $titleassigntask = $langs->transnoentities("AssignTaskToMe"); @@ -421,7 +422,7 @@ print $formcompany->selectTypeContact($object, '', 'type', 'internal', 'rowid', print ''; print '
'; -print '
'; +print '
'; $moreforfilter=''; diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php index 3bb024b29f3..81560c44777 100644 --- a/htdocs/projet/activity/perweek.php +++ b/htdocs/projet/activity/perweek.php @@ -459,9 +459,10 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; $nav = ''.img_previous($langs->trans("Previous"))."\n"; $nav .= " ".dol_print_date(dol_mktime(0, 0, 0, $first_month, $first_day, $first_year), "%Y").", ".$langs->trans("WeekShort")." ".$week." \n"; $nav .= ''.img_next($langs->trans("Next"))."\n"; -$nav .= "   (".$langs->trans("Today").")"; -$nav .= '
'.$form->selectDate(-1, '', 0, 0, 2, "addtime", 1, 0).' '; -$nav .= ' '; +//$nav .= "   (".$langs->trans("Today").")"; +$nav .= ' '.$form->selectDate(-1, '', 0, 0, 2, "addtime", 1, 1).' '; +//$nav .= ' '; +$nav .= ' '; $picto = 'calendarweek'; @@ -514,7 +515,7 @@ print $formcompany->selectTypeContact($object, '', 'type', 'internal', 'rowid', print ''; print ''; -print '
'; +print '
'; $startday = dol_mktime(12, 0, 0, $startdayarray['first_month'], $startdayarray['first_day'], $startdayarray['first_year']);