From eb224e43a5d67d3656f547da822704e802a04b4d Mon Sep 17 00:00:00 2001 From: atm-quentin Date: Thu, 24 May 2018 10:41:24 +0200 Subject: [PATCH] FIX missing filters during ordering --- htdocs/comm/propal/list.php | 1 + htdocs/commande/list.php | 7 +++++++ htdocs/compta/facture/list.php | 3 +++ htdocs/expedition/list.php | 6 ++++++ 4 files changed, 17 insertions(+) diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index 480ad7f4fda..72491e90e3e 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -384,6 +384,7 @@ if ($resql) if ($search_zip) $param.='&search_zip='.urlencode($search_zip); if ($socid > 0) $param.='&socid='.urlencode($socid); if ($optioncss != '') $param.='&optioncss='.urlencode($optioncss); + if ($search_product_category != '') $param.='&search_product_category='.$search_product_category; // Add $param from extra fields foreach ($search_array_options as $key => $val) diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index 86a5f463840..6284e53aa5c 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -627,6 +627,13 @@ if ($resql) if ($show_files) $param.='&show_files=' .$show_files; if ($optioncss != '') $param.='&optioncss='.$optioncss; if ($billed != '') $param.='&billed='.$billed; + if ($search_town != '')$param .= '&search_town='.$search_town; + if ($search_zip != '')$param .= '&search_zip='.$search_zip; + if ($search_state != '')$param .= '&search_state='.$search_state; + if ($search_country != '')$param .= '&search_country='.$search_country; + if ($search_type_thirdparty != '')$param .= '&search_type_thirdparty='.$search_type_thirdparty; + if ($search_product_category != '')$param .= '&search_product_category='.$search_product_category; + // Add $param from extra fields foreach ($search_array_options as $key => $val) { diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php index d7f9384399f..994f1d93569 100644 --- a/htdocs/compta/facture/list.php +++ b/htdocs/compta/facture/list.php @@ -563,6 +563,9 @@ if ($resql) if ($show_files) $param.='&show_files=' .$show_files; if ($option) $param.="&option=".$option; if ($optioncss != '') $param.='&optioncss='.$optioncss; + if ($search_town)$param .= '&search_town='.urlencode($search_town); + if ($search_zip)$param .= '&search_zip='.urlencode($search_zip); + // Add $param from extra fields foreach ($search_array_options as $key => $val) { diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php index 1a712b66650..819d4337788 100644 --- a/htdocs/expedition/list.php +++ b/htdocs/expedition/list.php @@ -51,6 +51,7 @@ $search_type_thirdparty=GETPOST("search_type_thirdparty",'int'); $search_billed=GETPOST("search_billed",'int'); $sall = GETPOST('sall', 'alphanohtml'); $optioncss = GETPOST('optioncss','alpha'); +$search_ref_customer=GETPOST("search_ref_customer"); $limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit; $sortfield = GETPOST('sortfield','alpha'); @@ -141,6 +142,7 @@ if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x', $search_billed=''; $viewstatut=''; $search_array_options=array(); + $search_ref_customer=''; } if (empty($reshook)) @@ -267,6 +269,10 @@ if ($resql) if ($search_ref_liv) $param.= "&search_ref_liv=".$search_ref_liv; if ($search_company) $param.= "&search_company=".$search_company; if ($optioncss != '') $param.='&optioncss='.$optioncss; + if ($search_town)$param .= '&search_town='.urlencode($search_town); + if ($search_zip)$param .= '&search_zip='.urlencode($search_zip); + if ($search_ref_customer)$param .= '&search_ref_customer='.$search_ref_customer; + if ($viewstatut != '')$param .= '&viewstatut='.$viewstatut; // Add $param from extra fields foreach ($search_array_options as $key => $val) {