Fix: La fonction filtre des contacts et societes s'accorde bien avec la fonction tri.
This commit is contained in:
parent
80698aa6fb
commit
98a1125eec
@ -151,6 +151,11 @@ if ($result)
|
|||||||
|
|
||||||
print '<table class="noborder" width="100%">';
|
print '<table class="noborder" width="100%">';
|
||||||
|
|
||||||
|
if ($contactname)
|
||||||
|
{
|
||||||
|
print $langs->trans("Filter")." (".$langs->trans("Lastname")." ".$langs->trans("or")." ".$langs->trans("Firstname")."): $contactname";
|
||||||
|
}
|
||||||
|
|
||||||
// Ligne des titres
|
// Ligne des titres
|
||||||
print '<tr class="liste_titre">';
|
print '<tr class="liste_titre">';
|
||||||
print_liste_field_titre($langs->trans("Lastname"),"index.php","p.name", $begin, "&view=$view&search_nom=$search_nom&search_prenom=$search_prenom&search_societe=$search_societe&search_email=$search_email", "", $sortfield);
|
print_liste_field_titre($langs->trans("Lastname"),"index.php","p.name", $begin, "&view=$view&search_nom=$search_nom&search_prenom=$search_prenom&search_societe=$search_societe&search_email=$search_email", "", $sortfield);
|
||||||
|
|||||||
@ -140,8 +140,8 @@ if ($search_ville) {
|
|||||||
|
|
||||||
if ($socname)
|
if ($socname)
|
||||||
{
|
{
|
||||||
$title_filtre .= "'$socname'";
|
|
||||||
$sql .= " AND s.nom like '%".$socname."%'";
|
$sql .= " AND s.nom like '%".$socname."%'";
|
||||||
|
$search_nom=$socname;
|
||||||
}
|
}
|
||||||
|
|
||||||
$sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit+1, $offset);
|
$sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit+1, $offset);
|
||||||
@ -156,6 +156,7 @@ if ($result)
|
|||||||
|
|
||||||
print_barre_liste($title, $page, "societe.php",$params,$sortfield,$sortorder,'',$num);
|
print_barre_liste($title, $page, "societe.php",$params,$sortfield,$sortorder,'',$num);
|
||||||
|
|
||||||
|
// Lignes des titres
|
||||||
print '<table class="noborder" width="100%">';
|
print '<table class="noborder" width="100%">';
|
||||||
print '<tr class="liste_titre">';
|
print '<tr class="liste_titre">';
|
||||||
print_liste_field_titre($langs->trans("Company"),"societe.php","s.nom", $params,"&search_nom=$search_nom&search_ville=$search_ville","",$sortfield);
|
print_liste_field_titre($langs->trans("Company"),"societe.php","s.nom", $params,"&search_nom=$search_nom&search_ville=$search_ville","",$sortfield);
|
||||||
@ -163,6 +164,7 @@ if ($result)
|
|||||||
print '<td colspan="2" align="center"> </td>';
|
print '<td colspan="2" align="center"> </td>';
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
|
|
||||||
|
// Lignes des champs de filtre
|
||||||
print '<form method="post" action="societe.php">';
|
print '<form method="post" action="societe.php">';
|
||||||
print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
|
print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
|
||||||
print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
|
print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user