diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php index e07848404a7..527cac25891 100644 --- a/htdocs/projet/activity/index.php +++ b/htdocs/projet/activity/index.php @@ -132,16 +132,16 @@ $morehtml .= ajax_combobox("search_project_user", array(), 0, 0, 'resolve', '-1' $morehtml .= ''; if ($mine) { - $tooltiphelp = $langs->trans("MyTasksDesc"); + $htmltooltip = $langs->trans("MyTasksDesc"); } else { if ($user->hasRight('projet', 'all', 'lire') && !$socid) { - $tooltiphelp = $langs->trans("TasksDesc"); + $htmltooltip = $langs->trans("TasksDesc"); } else { - $tooltiphelp = $langs->trans("TasksPublicDesc"); + $htmltooltip = $langs->trans("TasksPublicDesc"); } } -print_barre_liste($form->textwithpicto($title, $tooltiphelp), 0, $_SERVER["PHP_SELF"], '', '', '', '', 0, -1, 'projecttask', 0, $morehtml); +print_barre_liste($form->textwithpicto($title, $htmltooltip), 0, $_SERVER["PHP_SELF"], '', '', '', '', 0, -1, 'projecttask', 0, $morehtml); print '
'; diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php index 77eda021f11..c606b0d14f1 100644 --- a/htdocs/projet/list.php +++ b/htdocs/projet/list.php @@ -137,6 +137,7 @@ if (GETPOSTISSET('formfilteraction')) { $searchCategoryCustomerOperator = getDolGlobalString('MAIN_SEARCH_CAT_OR_BY_DEFAULT'); } $searchCategoryCustomerList = GETPOST('search_category_customer_list', 'array'); +$search_omitChildren = 0; if (getDolGlobalInt('PROJECT_ENABLE_SUB_PROJECT')) { $search_omitChildren = GETPOST('search_omitChildren', 'alpha') == 'on' ? 1 : 0; } @@ -264,10 +265,10 @@ $arrayfields['c.assigned'] = array('label' => "AssignedTo", 'checked' => 1, 'pos $arrayfields['opp_weighted_amount'] = array('label' => 'OpportunityWeightedAmountShort', 'checked' => 0, 'enabled' => (!getDolGlobalString('PROJECT_USE_OPPORTUNITIES') ? 0 : 1), 'position' => 106); $arrayfields['u.login'] = array('label' => "Author", 'checked' => -1, 'position' => 165); // Force some fields according to search_usage filter... -if (GETPOST('search_usage_opportunity')) { - //$arrayfields['p.usage_opportunity']['visible'] = 1; // Not require, filter on search_opp_status is enough - //$arrayfields['p.usage_opportunity']['checked'] = 1; // Not require, filter on search_opp_status is enough -} +//if (GETPOST('search_usage_opportunity')) { +//$arrayfields['p.usage_opportunity']['visible'] = 1; // Not required, filter on search_opp_status is enough +//$arrayfields['p.usage_opportunity']['checked'] = 1; // Not required, filter on search_opp_status is enough +//} if (GETPOST('search_usage_event_organization')) { $arrayfields['p.fk_opp_status']['enabled'] = 0; $arrayfields['p.opp_amount']['enabled'] = 0; @@ -293,8 +294,8 @@ $arrayfields = dol_sort_array($arrayfields, 'position'); // TODO Move this into a inc file $groupbyvalues = array(); $groupofcollpasedvalues = array(); +$groupbyold = null; if ($mode == 'kanban' && $groupby) { - $groupbyold = null; $groupbyfield = preg_replace('/[a-z]\./', '', $groupby); if (!empty($object->fields[$groupbyfield]['alias'])) { $groupbyfield = $object->fields[$groupbyfield]['alias']; @@ -1165,18 +1166,18 @@ print ''; print ''; // Show description of content -$texthelp = ''; +$htmltooltip = ''; if ($search_project_user == $user->id) { - $texthelp .= $langs->trans("MyProjectsDesc"); + $htmltooltip .= $langs->trans("MyProjectsDesc"); } else { if ($user->hasRight('projet', 'all', 'lire') && !$socid) { - $texthelp .= $langs->trans("ProjectsDesc"); + $htmltooltip .= $langs->trans("ProjectsDesc"); } else { - $texthelp .= $langs->trans("ProjectsPublicDesc"); + $htmltooltip .= $langs->trans("ProjectsPublicDesc"); } } -print_barre_liste($form->textwithpicto($title, $texthelp), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'project', 0, $newcardbutton, '', $limit, 0, 0, 1); +print_barre_liste($form->textwithpicto($title, $htmltooltip), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'project', 0, $newcardbutton, '', $limit, 0, 0, 1); $topicmail = "Information"; @@ -1699,7 +1700,7 @@ while ($i < $imaxinloop) { if (get_class($c) == 'User') { $stringassignedusers .= $c->getNomUrl(-2, '', 0, 0, 24, 1, '', 'valignmiddle'.($ifisrt ? '' : ' notfirst')); } else { - $stringassignedusers .= $c->getNomUrl(-2, '', 0, '', -1, 0, 'valignmiddle'.($ifisrt ? '' : ' notfirst')); + $stringassignedusers .= $c->getNomUrl(-2, '', 0, 0, -1, 0, 'valignmiddle'.($ifisrt ? '' : ' notfirst')); } $ifisrt = 0; } @@ -1712,6 +1713,8 @@ while ($i < $imaxinloop) { print ''; } + $groupbyvalue = 'unset'; + $groupbyfield = 'unsetfield'; if (!empty($groupby)) { if (is_null($groupbyold)) { print '
'; // Start div for all kanban columns