diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
index 63923d6a3ce..47a6ee8ba74 100644
--- a/htdocs/compta/paiement/cheque/list.php
+++ b/htdocs/compta/paiement/cheque/list.php
@@ -130,7 +130,7 @@ if ($resql)
// Lignes des champs de filtre
print '
';
// Ref
print '| ';
- print '';
+ print '';
print ' | ';
// Label
print ' | ';
@@ -182,7 +182,7 @@ if ($resql)
print ' | ';
// Amount
print '';
- print '';
+ print '';
print ' | ';
print ' | ';
print '';
diff --git a/htdocs/compta/tva/reglement.php b/htdocs/compta/tva/reglement.php
index 9bb4337782e..8babbd58f7d 100644
--- a/htdocs/compta/tva/reglement.php
+++ b/htdocs/compta/tva/reglement.php
@@ -35,6 +35,9 @@ $socid = isset($_GET["socid"])?$_GET["socid"]:'';
if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'tax', '', '', 'charges');
+$search_ref = GETPOST('search_ref','int');
+$search_label = GETPOST('search_label','alpha');
+$search_amount = GETPOST('search_amount','alpha');
$sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha');
$page = GETPOST("page",'int');
@@ -63,6 +66,14 @@ else
$typeid=$_REQUEST['typeid'];
}
+if (GETPOST("button_removefilter"))
+{
+ $search_ref="";
+ $search_label="";
+ $search_amount="";
+ $typeid="";
+}
+
/*
* View
*/
@@ -76,8 +87,9 @@ $sql = "SELECT t.rowid, t.amount, t.label, t.datev as dm, t.fk_typepayment as ty
$sql.= " FROM ".MAIN_DB_PREFIX."tva as t";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pst ON t.fk_typepayment = pst.id";
$sql.= " WHERE t.entity = ".$conf->entity;
-if (GETPOST("search_label")) $sql.=" AND t.label LIKE '%".$db->escape(GETPOST("search_label"))."%'";
-if (GETPOST("search_amount")) $sql.=" AND t.amount = ".price2num(GETPOST("search_amount"));
+if ($search_ref) $sql.=" AND t.rowid=".$search_ref;
+if ($search_label) $sql.=" AND t.label LIKE '%".$db->escape($search_label)."%'";
+if ($search_amount) $sql.=" AND t.amount='".$db->escape(price2num(trim($search_amount)))."'";
if ($filtre) {
$filtre=str_replace(":","=",$filtre);
$sql .= " AND ".$filtre;
@@ -106,27 +118,26 @@ if ($result)
print '';
print '';
- print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"t.rowid","",$param,"",$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"t.label","",$param,'align="left"',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("DatePayment"),$_SERVER["PHP_SELF"],"dm","",$param,'align="left"',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"type","",$param,'align="left"',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("PayedByThisPayment"),$_SERVER["PHP_SELF"],"t.amount","",$param,'align="right"',$sortfield,$sortorder);
- print_liste_field_titre("");
+ print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"t.rowid","",$param,"",$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"t.label","",$param,'align="left"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("DatePayment"),$_SERVER["PHP_SELF"],"dm","",$param,'align="left"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"type","",$param,'align="left"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("PayedByThisPayment"),$_SERVER["PHP_SELF"],"t.amount","",$param,'align="right"',$sortfield,$sortorder);
+ print_liste_field_titre("");
print " \n";
print '';
- print '| | ';
- print ' | ';
+ print ' | ';
+ print ' | ';
print ' | ';
// Type
print '';
$form->select_types_paiements($typeid,'typeid','',0,0,1,16);
print ' | ';
- print ' | ';
- print '';
- print '';
- print ' | ';
- print " \n";
+ print ' | ';
+ print '';
+ print '';
+ print " | \n";
while ($i < min($num,$limit))
{
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 33691cb7942..3c94003ee4a 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -543,11 +543,11 @@ if (empty($action))
// Lines for filters fields
print '';
print '| ';
- print '';
+ print '';
print ' | ';
print ' | ';
print '';
- print '';
+ print '';
print ' | ';
print '';
$form->select_types_paiements($search_paymenttype,'search_paymenttype','',2,1,1);
@@ -556,7 +556,7 @@ if (empty($action))
$form->select_comptes($search_account,'search_account',0,'',1);
print ' | ';
print '';
- print '';
+ print '';
print '';
print '';
print ' | ';
|