diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 1a98c33ab02..6f8a7431b0e 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -739,14 +739,13 @@ class BonPrelevement extends CommonObject
 		$sql = "SELECT count(f.rowid) as nb";
 		$sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
 		$sql.= ", ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
-		$sql.= " WHERE f.fk_statut = 1";
+		$sql.= " WHERE f.fk_statut = ".Facture::STATUS_VALIDATED;
 		$sql.= " AND f.entity IN (".getEntity('invoice').")";
 		$sql.= " AND f.rowid = pfd.fk_facture";
-		$sql.= " AND f.paye = 0";
 		$sql.= " AND pfd.traite = 0";
 		$sql.= " AND f.total_ttc > 0";
 
-		dol_syslog(get_class($this)."::SommeAPrelever");
+		dol_syslog(get_class($this)."::NbFactureAPrelever");
 		$resql = $this->db->query($sql);
 
 		if ( $resql )
@@ -759,7 +758,7 @@ class BonPrelevement extends CommonObject
 		}
 		else
 		{
-			$this->error=get_class($this)."::SommeAPrelever Erreur -1 sql=".$this->db->error();
+			$this->error=get_class($this)."::NbFactureAPrelever Erreur -1 sql=".$this->db->error();
 			return -1;
 		}
 	}
diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php
index 8f9df284291..1caf62f1491 100644
--- a/htdocs/compta/prelevement/demandes.php
+++ b/htdocs/compta/prelevement/demandes.php
@@ -35,31 +35,43 @@ $langs->loadLangs(array('banks', 'categories', 'withdrawals', 'companies'));
 
 // Security check
 $socid = GETPOST('socid', 'int');
+$status = GETPOST('status', 'int');
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'prelevement', '', '', 'bons');
 
-// Get supervariables
-$page =  GETPOST('page', 'int');
-$sortorder = GETPOST('sortorder', 'alpha');
-$sortfield = GETPOST('sortfield', 'alpha');
+$contextpage= GETPOST('contextpage', 'aZ')?GETPOST('contextpage', 'aZ'):'myobjectlist';   // To manage different context of search
+$backtopage = GETPOST('backtopage', 'alpha');											// Go back to a dedicated page
+$optioncss  = GETPOST('optioncss', 'aZ');												// Option for the css output (always '' except when 'print')
 
+// Load variable for pagination
 $limit = GETPOST('limit', 'int')?GETPOST('limit', 'int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (! $sortorder) $sortorder="DESC";
 if (! $sortfield) $sortfield="f.ref";
 
+$massactionbutton = '';
+
 
 /*
  * View
  */
 
-llxHeader();
+if (!$status)
+{
+	$title = $langs->trans("RequestStandingOrderToTreat");
+}
+else
+{
+	$title = $langs->trans("RequestStandingOrderTreated");
+}
+
+llxHeader('', $title);
 
 $thirdpartystatic=new Societe($db);
 $invoicestatic=new Facture($db);
@@ -78,95 +90,125 @@ $sql.= " WHERE s.rowid = f.fk_soc";
 $sql.= " AND f.entity IN (".getEntity('invoice').")";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 if ($socid) $sql.= " AND f.fk_soc = ".$socid;
-if (!$statut) $sql.= " AND pfd.traite = 0";
-if ($statut) $sql.= " AND pfd.traite = ".$statut;
+if (!$status) $sql.= " AND pfd.traite = 0";
+if ($status) $sql.= " AND pfd.traite = ".$status;
+$sql.= " AND f.fk_statut = ".Facture::STATUS_VALIDATED;
 $sql.= " AND pfd.fk_facture = f.rowid";
 if (dol_strlen(trim(GETPOST('search_societe', 'alpha'))))
 {
 	$sql.= natural_search("s.nom", 'search_societe');
 }
-$sql.= " ORDER BY $sortfield $sortorder ";
-$sql.= $db->plimit($limit+1, $offset);
+$sql.=$db->order($sortfield, $sortorder);
 
-$resql=$db->query($sql);
-if ($resql)
+
+// Count total nb of records
+$nbtotalofrecords = '';
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-	$num = $db->num_rows($resql);
-	$i = 0;
-
-	if (!$statut)
+	$resql = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($resql);
+	if (($page * $limit) > $nbtotalofrecords)	// if total of record found is smaller than page * limit, goto and load page 0
 	{
-		print_barre_liste($langs->trans("RequestStandingOrderToTreat"), $page, "demandes.php", $urladd, $sortfield, $sortorder, '', $num);
+		$page = 0;
+		$offset = 0;
 	}
-	else
-	{
-		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_liste_field_titre("Bill", $_SERVER["PHP_SELF"]);
-	print_liste_field_titre("Company", $_SERVER["PHP_SELF"]);
-    print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "", "", $param, 'class="right"');
-	print_liste_field_titre("DateRequest", $_SERVER["PHP_SELF"], "", "", $param, 'class="center"');
-	print_liste_field_titre('');
-	print '</tr>';
-
-	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 class="liste_titre"></td>';
-	print '<td class="liste_titre"></td>';
-	// Action column
-	print '<td class="liste_titre" class="middle">';
-	$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
-	print $searchpicto;
-	print '</td>';
-	print '</tr>';
-
-	$users = array();
-
-	while ($i < min($num, $limit))
-	{
-		$obj = $db->fetch_object($resql);
-
-		print '<tr class="oddeven">';
-
-		// Ref facture
-		print '<td>';
-		$invoicestatic->id=$obj->rowid;
-		$invoicestatic->ref=$obj->ref;
-		print $invoicestatic->getNomUrl(1, 'withdraw');
-		print '</td>';
-
-		print '<td>';
-		$thirdpartystatic->id=$obj->socid;
-		$thirdpartystatic->name=$obj->name;
-		print $thirdpartystatic->getNomUrl(1, 'customer');
-		print '</td>';
-
-        print '<td class="right">'.price($obj->total_ttc).'</td>';
-
-        print '<td class="center">'.dol_print_date($db->jdate($obj->date_demande), 'day').'</td>';
-
-        print '<td class="right"></td>';
-
-		print '</tr>';
-		$i++;
-	}
-
-	print "</table><br>";
-
-	print '</form>';
+}
+// if total of record found is smaller than limit, no need to do paging and to restart another select with limits set.
+if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
+{
+	$num = $nbtotalofrecords;
 }
 else
 {
-	dol_print_error($db);
+	$sql.= $db->plimit($limit+1, $offset);
+
+	$resql=$db->query($sql);
+	if (! $resql)
+	{
+		dol_print_error($db);
+		exit;
+	}
+
+	$num = $db->num_rows($resql);
 }
 
+
+
+$newcardbutton = '<a href="'.DOL_URL_ROOT.'/compta/prelevement/index.php">'.$langs->trans("Back").'</a>';
+
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_generic', 0, $newcardbutton, '', $limit);
+
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+print '<input type="hidden" name="action" value="list">';
+print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
+print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+
+
+print '<table class="liste" width="100%">';
+
+print '<tr class="liste_titre">';
+print_liste_field_titre("Bill", $_SERVER["PHP_SELF"]);
+print_liste_field_titre("Company", $_SERVER["PHP_SELF"]);
+print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "", "", $param, 'class="right"');
+print_liste_field_titre("DateRequest", $_SERVER["PHP_SELF"], "", "", $param, 'class="center"');
+print_liste_field_titre('');
+print '</tr>';
+
+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 class="liste_titre"></td>';
+print '<td class="liste_titre"></td>';
+// Action column
+print '<td class="liste_titre" class="middle">';
+$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
+print $searchpicto;
+print '</td>';
+print '</tr>';
+
+$users = array();
+
+$i = 0;
+while ($i < min($num, $limit))
+{
+	$obj = $db->fetch_object($resql);
+	if (empty($obj)) break;		// Should not happen
+
+	print '<tr class="oddeven">';
+
+	// Ref facture
+	print '<td>';
+	$invoicestatic->id=$obj->rowid;
+	$invoicestatic->ref=$obj->ref;
+	print $invoicestatic->getNomUrl(1, 'withdraw');
+	print '</td>';
+
+	print '<td>';
+	$thirdpartystatic->id=$obj->socid;
+	$thirdpartystatic->name=$obj->name;
+	print $thirdpartystatic->getNomUrl(1, 'customer');
+	print '</td>';
+
+	print '<td class="right">'.price($obj->total_ttc).'</td>';
+
+	print '<td class="center">'.dol_print_date($db->jdate($obj->date_demande), 'day').'</td>';
+
+	print '<td class="right"></td>';
+
+	print '</tr>';
+	$i++;
+}
+
+print "</table><br>";
+
+print '</form>';
+
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php
index 1be716f8f61..44db7dd2625 100644
--- a/htdocs/compta/prelevement/index.php
+++ b/htdocs/compta/prelevement/index.php
@@ -71,6 +71,7 @@ $thirdpartystatic=new Societe($db);
 $invoicestatic=new Facture($db);
 $bprev = new BonPrelevement($db);
 
+
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").'</th></tr>';
 
@@ -100,6 +101,8 @@ if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX
 $sql.= " , ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
 $sql.= " WHERE s.rowid = f.fk_soc";
 $sql.= " AND f.entity IN (".getEntity('invoice').")";
+$sql.= " AND f.total_ttc > 0";
+$sql.= " AND f.fk_statut = ".Facture::STATUS_VALIDATED;
 $sql.= " AND pfd.traite = 0 AND pfd.fk_facture = f.rowid";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 if ($socid) $sql.= " AND f.fk_soc = ".$socid;