Fix table format

htdocs/compta/prelevement/demandes.php

@@ -45,6 +45,18 @@ $page =  GETPOST('page','int');
 $sortorder = GETPOST('sortorder','alpha');
 $sortfield = GETPOST('sortfield','alpha');
 
+$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page",'int');
+if ($page == -1) { $page = 0; }
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (! $sortorder) $sortorder="DESC";
+if (! $sortfield) $sortfield="f.facnumber";
+
+
 /*
  * View
  */
@@ -54,17 +66,7 @@ llxHeader();
 $thirdpartystatic=new Societe($db);
 $invoicestatic=new Facture($db);
 
-if ($page == -1) $page = 0 ;
-$offset = $conf->liste_limit * $page ;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
-if (! $sortorder) $sortorder="DESC";
-if (! $sortfield) $sortfield="f.facnumber";
-
-
-/*
- * Liste de demandes
- */
+// List of requests
 
 $sql= "SELECT f.facnumber, f.rowid, f.total_ttc,";
 $sql.= " s.nom as name, s.rowid as socid,";
@@ -83,10 +85,10 @@ if ($statut) $sql.= " AND pfd.traite = ".$statut;
 $sql.= " AND pfd.fk_facture = f.rowid";
 if (dol_strlen(trim(GETPOST('search_societe','alpha'))))
 {
-	$sql.= " AND s.nom LIKE '%".GETPOST('search_societe','alpha')."%'";
+	$sql.= natural_search("s.nom", 'search_societe');
 }
 $sql.= " ORDER BY $sortfield $sortorder ";
-$sql.= $db->plimit($conf->liste_limit+1, $offset);
+$sql.= $db->plimit($limit+1, $offset);
 
 $resql=$db->query($sql);
 if ($resql)
@@ -103,26 +105,35 @@ if ($resql)
 		print_barre_liste($langs->trans("RequestStandingOrderTreated"), $page, "demandes.php", $urladd, $sortfield, $sortorder, '', $num);
 	}
 
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="GET">';
+	
 	print '<table class="liste" width="100%">';
 
 	print '<tr class="liste_titre">';
-	print '<td class="liste_titre">'.$langs->trans("Bill").'</td><td class="liste_titre">'.$langs->trans("Company").'</td>';
-    print '<td class="liste_titre" align="right">'.$langs->trans("Amount").'</td>';
-	print '<td class="liste_titre" align="right">'.$langs->trans("DateRequest").'</td>';
+	print_liste_field_titre($langs->trans("Bill"));
+	print_liste_field_titre($langs->trans("Company"));
+    print_liste_field_titre($langs->trans("Amount"));
+	print_liste_field_titre($langs->trans("DateRequest"));
+	print_liste_field_titre('');
 	print '</tr>';
 
-	print '<form action="'.$_SERVER["PHP_SELF"].'" method="GET">';
+	print '<tr class="liste_titre">';
 	print '<td class="liste_titre"><input type="text" class="flat" name="search_facture" size="12" value="'.dol_escape_htmltag(GETPOST('search_facture','alpha')).'"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat" name="search_societe" size="18" value="'.dol_escape_htmltag(GETPOST('search_societe','alpha')).'"></td>';
-	print '<td colspan="2" class="liste_titre" align="right"><input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" name="button_search" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'"></td>';
+	print '<td class="liste_titre"></td>';
+	print '<td class="liste_titre"></td>';
+	// Action column
+	print '<td class="liste_titre" align="middle">';
+	$searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
+	print $searchpitco;
+	print '</td>';
 	print '</tr>';
-	print '</form>';
 
 	$var = True;
 
 	$users = array();
 
-	while ($i < min($num,$conf->liste_limit))
+	while ($i < min($num,$limit))
 	{
 		$obj = $db->fetch_object($resql);
 		$var=!$var;
@@ -145,12 +156,15 @@ if ($resql)
 
         print '<td align="right">'.dol_print_date($db->jdate($obj->date_demande),'day').'</td>';
 
+        print '<td align="right"></td>';
+        
 		print '</tr>';
 		$i++;
 	}
 
 	print "</table><br>";
 
+	print '</form>';
 }
 else
 {