This commit is contained in:
Laurent Destailleur 2019-04-09 19:36:56 +02:00
parent 861c1b412c
commit 2765cee005
4 changed files with 17 additions and 18 deletions

View File

@ -339,7 +339,7 @@ if (! empty($arrayfields['t.libelle']['checked']))
if (! empty($arrayfields['d.bank']['checked'])) if (! empty($arrayfields['d.bank']['checked']))
{ {
print '<td class="liste_titre">'; print '<td class="liste_titre">';
print $form->select_comptes($search_account, 'search_account', 0, '', 1); $form->select_comptes($search_account, 'search_account', 0, '', 1);
print '</td>'; print '</td>';
} }

View File

@ -87,13 +87,14 @@ $morehtml.='<input type="submit" class="button" name="refresh" value="'.$langs->
print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', '', '', '', 0, -1, 'title_project.png', 0, $morehtml); print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', '', '', '', 0, -1, 'title_project.png', 0, $morehtml);
// Show description of content // Show description of content
print '<div class="opacitymedium">';
if ($mine) print $langs->trans("MyProjectsDesc").'<br><br>'; if ($mine) print $langs->trans("MyProjectsDesc").'<br><br>';
else else
{ {
if (! empty($user->rights->projet->all->lire) && ! $socid) print $langs->trans("ProjectsDesc").'<br><br>'; if (! empty($user->rights->projet->all->lire) && ! $socid) print $langs->trans("ProjectsDesc").'<br><br>';
else print $langs->trans("ProjectsPublicDesc").'<br><br>'; else print $langs->trans("ProjectsPublicDesc").'<br><br>';
} }
print '</div>';
// Get list of ponderated percent for each status // Get list of ponderated percent for each status
$listofoppstatus=array(); $listofopplabel=array(); $listofoppcode=array(); $listofoppstatus=array(); $listofopplabel=array(); $listofoppcode=array();

View File

@ -254,7 +254,6 @@ $formother = new FormOther($db);
$formproject = new FormProjets($db); $formproject = new FormProjets($db);
$title=$langs->trans("Projects"); $title=$langs->trans("Projects");
//if ($search_project_user == $user->id) $title=$langs->trans("MyProjects");
// Get list of project id allowed to user (in a string list separated by coma) // Get list of project id allowed to user (in a string list separated by coma)
@ -467,17 +466,17 @@ print '<input type="hidden" name="page" value="'.$page.'">';
print '<input type="hidden" name="type" value="'.$type.'">'; print '<input type="hidden" name="type" value="'.$type.'">';
print '<input type="hidden" name="contextpage" value="'.$contextpage.'">'; print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_project', 0, $newcardbutton, '', $limit);
// Show description of content // Show description of content
print '<div class="opacitymedium">'; $texthelp='';
if ($search_project_user == $user->id) print $langs->trans("MyProjectsDesc").'<br><br>'; if ($search_project_user == $user->id) $texthelp.=$langs->trans("MyProjectsDesc");
else else
{ {
if ($user->rights->projet->all->lire && ! $socid) print $langs->trans("ProjectsDesc").'<br><br>'; if ($user->rights->projet->all->lire && ! $socid) $texthelp.=$langs->trans("ProjectsDesc");
else print $langs->trans("ProjectsPublicDesc").'<br><br>'; else $texthelp.=$langs->trans("ProjectsPublicDesc");
} }
print '</div>';
print_barre_liste($form->textwithpicto($title, $texthelp), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_project', 0, $newcardbutton, '', $limit);
$topicmail="Information"; $topicmail="Information";
$modelmail="project"; $modelmail="project";

View File

@ -441,17 +441,16 @@ print '<input type="hidden" name="page" value="'.$page.'">';
print '<input type="hidden" name="type" value="'.$type.'">'; print '<input type="hidden" name="type" value="'.$type.'">';
print '<input type="hidden" name="contextpage" value="'.$contextpage.'">'; print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_project', 0, $newcardbutton, '', $limit);
// Show description of content // Show description of content
print '<div class="opacitymedium">'; $texthelp='';
if ($search_task_user == $user->id) print $langs->trans("MyTasksDesc").'<br><br>'; if ($search_task_user == $user->id) $texthelp.=$langs->trans("MyTasksDesc");
else else
{ {
if ($user->rights->projet->all->lire && ! $socid) print $langs->trans("TasksOnProjectsDesc").'<br><br>'; if ($user->rights->projet->all->lire && ! $socid) $texthelp.=$langs->trans("TasksOnProjectsDesc");
else print $langs->trans("TasksOnProjectsPublicDesc").'<br><br>'; else $texthelp.=$langs->trans("TasksOnProjectsPublicDesc");
} }
print '</div>';
print_barre_liste($form->textwithpicto($title, $texthelp), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_project', 0, $newcardbutton, '', $limit);
$topicmail="Information"; $topicmail="Information";
$modelmail="task"; $modelmail="task";
@ -506,7 +505,7 @@ if (! empty($moreforfilter))
if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1); if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
print '<div class="div-table-responsive">'; print '<div class="div-table-responsive">';
print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'" id="tablelines3">'."\n"; print '<table class="tagtable nobottomiftotal liste'.($moreforfilter?" listwithfilterbefore":"").'" id="tablelines3">'."\n";
print '<tr class="liste_titre_filter">'; print '<tr class="liste_titre_filter">';
if (! empty($arrayfields['t.ref']['checked'])) if (! empty($arrayfields['t.ref']['checked']))