diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index ece88d094ff..69ede4995a3 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -30,6 +30,7 @@ require_once("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); $filtera = isset($_REQUEST["userasked"])?$_REQUEST["userasked"]:(isset($_REQUEST["filtera"])?$_REQUEST["filtera"]:''); $filtert = isset($_REQUEST["usertodo"])?$_REQUEST["usertodo"]:(isset($_REQUEST["filtert"])?$_REQUEST["filtert"]:''); @@ -162,7 +163,7 @@ $param.='&year='.$year.'&month='.$month.($day?'&day='.$day:''); print_fiche_titre($title,$nav); // Filters -if ($canedit) +if ($canedit || $conf->projet->enabled) { print '
'; print ''; @@ -174,37 +175,47 @@ if ($canedit) print ''; print ''; print ''; - print ''; - print ''; - print ''; - print ''; + if ($canedit) + { + $rowspan=3; + if ($conf->projet->enabled) $rowspan++; + print ''; + print ''; + print ''; + print ''; - print ''; - print ''; - - print ''; - print ''; + print ''; + print ''; + print ''; + print ''; + } + if ($conf->projet->enabled) + { + print ''; + print ''; + } print '
'; - //print ' '; - print $langs->trans("ActionsAskedBy"); - print ''; - print $form->select_users($filtera,'userasked',1,'',!$canedit); - print ''; - print img_picto($langs->trans("ViewList"),'object_list').' '; - print '
'; - print '
'; - print img_picto($langs->trans("ViewCal"),'object_calendar').' '; - print '
'; + print $langs->trans("ActionsAskedBy"); + print ''; + print $form->select_users($filtera,'userasked',1,'',!$canedit); + print ''; + print img_picto($langs->trans("ViewList"),'object_list').' '; + print '
'; + print '
'; + print img_picto($langs->trans("ViewCal"),'object_calendar').' '; + print '
'; - //print ' '; - print $langs->trans("ActionsToDoBy"); - print ''; - print $form->select_users($filtert,'usertodo',1,'',!$canedit); - print '
'; - //print ' '; - print $langs->trans("ActionsDoneBy"); - print ''; - print $form->select_users($filterd,'userdone',1,'',!$canedit); - print '
'; + print $langs->trans("ActionsToDoBy"); + print ''; + print $form->select_users($filtert,'usertodo',1,'',!$canedit); + print '
'; + print $langs->trans("ActionsDoneBy"); + print ''; + print $form->select_users($filterd,'userdone',1,'',!$canedit); + print '
'; + print $langs->trans("Project"); + print ''; + select_projects($socid,$_REQUEST["projectid"],'projectid'); + print '
'; print '

'; }