From 8fd3d9375ddb955fcdf21c965c4cc642be083ebc Mon Sep 17 00:00:00 2001
From: simnandez <jmenent@2byte.es>
Date: Thu, 21 Feb 2013 14:29:06 +0100
Subject: [PATCH 1/2] Fix: Pagination at bottom not work correctly with filters
 applied

---
 htdocs/product/liste.php | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/htdocs/product/liste.php b/htdocs/product/liste.php
index f5e6581d804..1a7cba82d68 100644
--- a/htdocs/product/liste.php
+++ b/htdocs/product/liste.php
@@ -442,18 +442,12 @@ else
     			$i++;
     		}
 
-    		if ($num > $conf->liste_limit)
-    		{
-    			if ($sref || $snom || $sall || $sbarcode || GETPOST('search'))
-    			{
-    				print_barre_liste('', $page, "liste.php", "&amp;sref=".$sref."&amp;snom=".$snom."&amp;sall=".$sall."&amp;tosell=".$tosell."&amp;tobuy=".$tobuy, $sortfield, $sortorder,'',$num);
-    			}
-    			else
-    			{
-    				print_barre_liste('', $page, "liste.php", "&amp;sref=$sref&amp;snom=$snom&amp;fourn_id=$fourn_id".(isset($type)?"&amp;type=$type":"")."&amp;tosell=".$tosell."&amp;tobuy=".$tobuy, $sortfield, $sortorder,'',$num);
-    			}
-    		}
-
+    		$param="&amp;sref=".$sref.($sbarcode?"&amp;sbarcode=".$sbarcode:"")."&amp;snom=".$snom."&amp;sall=".$sall."&amp;tosell=".$tosell."&amp;tobuy=".$tobuy;
+    		$param.=($fourn_id?"&amp;fourn_id=".$fourn_id:"");
+    		$param.=($search_categ?"&amp;search_categ=".$search_categ:"");
+    		$param.=isset($type)?"&amp;type=".$type:"";
+    		print_barre_liste('', $page, "liste.php", $param, $sortfield, $sortorder,'',$num);
+    		
     		$db->free($resql);
 
     		print "</table>";

From e1683f5f2209ff0eb2432ec790d34860e1a6d5a5 Mon Sep 17 00:00:00 2001
From: simnandez <jmenent@2byte.es>
Date: Fri, 22 Feb 2013 08:57:28 +0100
Subject: [PATCH 2/2] Fix: Pagination at bottom not work correctly with filters
 applied

---
 htdocs/product/liste.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/product/liste.php b/htdocs/product/liste.php
index 1a7cba82d68..bef33a022b1 100644
--- a/htdocs/product/liste.php
+++ b/htdocs/product/liste.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2012      Marcos García        <marcosgdf@gmail.com>
+ * Copyright (C) 2013      Juanjo Menent        <jmenent@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by