From 9da0164d90252ae26238f6b83812637a2f05a0d2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 7 Feb 2016 15:50:48 +0100
Subject: [PATCH] Uniformize code for lists
---
dev/skeletons/skeleton_list.php | 6 ++---
htdocs/accountancy/bookkeeping/listbyyear.php | 9 ++++---
htdocs/accountancy/customer/lines.php | 8 +++---
htdocs/accountancy/supplier/lines.php | 8 +++---
htdocs/adherents/cotisations.php | 10 +++++---
htdocs/adherents/list.php | 12 ++++-----
htdocs/adherents/type.php | 16 ------------
htdocs/commande/list.php | 8 +++---
htdocs/commande/orderstoinvoice.php | 10 ++++----
htdocs/compta/bank/account.php | 8 +++---
htdocs/compta/bank/search.php | 15 +++++------
htdocs/compta/deplacement/list.php | 8 +++---
htdocs/compta/facture/list.php | 8 +++---
htdocs/compta/facture/mergepdftool.php | 14 +++--------
htdocs/compta/paiement/cheque/list.php | 8 +++---
htdocs/compta/paiement/list.php | 7 +++---
htdocs/compta/prelevement/list.php | 15 ++++++-----
htdocs/compta/salaries/index.php | 9 ++++---
htdocs/compta/sociales/index.php | 9 ++++---
htdocs/compta/tva/reglement.php | 9 ++++---
htdocs/contrat/list.php | 11 ++++----
htdocs/contrat/services.php | 8 +++---
htdocs/core/class/html.form.class.php | 19 ++++++++++++++
htdocs/don/list.php | 11 +++++---
htdocs/expedition/list.php | 8 +++---
htdocs/expensereport/list.php | 8 +++---
htdocs/fichinter/list.php | 8 +++---
htdocs/fourn/commande/list.php | 8 +++---
htdocs/fourn/commande/orderstoinvoice.php | 6 +++--
htdocs/fourn/facture/impayees.php | 10 +++++---
htdocs/fourn/facture/list.php | 7 +++---
htdocs/fourn/facture/paiement.php | 9 ++++---
htdocs/holiday/list.php | 6 ++---
htdocs/loan/calc.php | 25 ++++++++++++-------
htdocs/opensurvey/list.php | 4 +--
.../product/canvas/product/tpl/list.tpl.php | 12 ++++-----
.../product/canvas/service/tpl/list.tpl.php | 12 ++++-----
htdocs/product/list.php | 8 +++---
htdocs/product/price.php | 9 +++----
htdocs/product/reassort.php | 8 +++---
htdocs/product/reassortlot.php | 8 +++---
htdocs/product/stock/list.php | 8 +++---
htdocs/product/stock/replenish.php | 10 ++++----
htdocs/projet/list.php | 8 +++---
htdocs/projet/tasks/list.php | 4 +--
htdocs/societe/consumption.php | 4 +--
htdocs/societe/list.php | 12 ++++-----
htdocs/societe/price.php | 3 ++-
htdocs/user/hierarchy.php | 5 ++--
htdocs/user/index.php | 8 +++---
50 files changed, 256 insertions(+), 208 deletions(-)
diff --git a/dev/skeletons/skeleton_list.php b/dev/skeletons/skeleton_list.php
index 834e0b07e2f..80e3e38f438 100644
--- a/dev/skeletons/skeleton_list.php
+++ b/dev/skeletons/skeleton_list.php
@@ -352,9 +352,9 @@ if ($resql)
}*/
// Action column
print '<td class="liste_titre" align="right">';
- print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
- print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
- print '</td>';
+ $searchpitco=$form->showFilterAndCheckAddButtons(0);
+ print $searchpitco;
+ print '</td>';
print '</tr>'."\n";
diff --git a/htdocs/accountancy/bookkeeping/listbyyear.php b/htdocs/accountancy/bookkeeping/listbyyear.php
index d04edae3bf2..e9751e0f12e 100644
--- a/htdocs/accountancy/bookkeeping/listbyyear.php
+++ b/htdocs/accountancy/bookkeeping/listbyyear.php
@@ -208,9 +208,10 @@ print_liste_field_titre($langs->trans("Credit"), $_SERVER['PHP_SELF'], "t.credit
print_liste_field_titre($langs->trans("Amount"), $_SERVER['PHP_SELF'], "t.montant", "", $options, "", $sortfield, $sortorder);
print_liste_field_titre($langs->trans("Sens"), $_SERVER['PHP_SELF'], "t.sens", "", $options, "", $sortfield, $sortorder);
print_liste_field_titre($langs->trans("Codejournal"), $_SERVER['PHP_SELF'], "t.code_journal", "", $options, "", $sortfield, $sortorder);
-print '<th class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="' . img_picto($langs->trans("Search"), 'search.png', '', '', 1) . '" value="' . dol_escape_htmltag($langs->trans("Search")) . '" title="' . dol_escape_htmltag($langs->trans("Search")) . '">';
-print '<input type="image" class="liste_titre" name="button_removefilter" src="' . img_picto($langs->trans("Search"), 'searchclear.png', '', '', 1) . '" value="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '" title="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '"></td>';
+print '<td class="liste_titre" align="right">';
+print '</td>';
print "</tr>\n";
+
print '<tr class="liste_titre">';
print '<td class="liste_titre">';
@@ -258,7 +259,9 @@ print '<td class="liste_titre">';
print '<input type="text" size=3 class="flat" name="search_code_journal" value="' . $search_code_journal . '"/>';
print '</td>';
-print '<td class="liste_titre">';
+print '<td class="liste_titre" align="right">';
+$searchpitco=$form->showFilterAndCheckAddButtons(0);
+print $searchpitco;
print '</td>';
print "</tr>\n";
diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index 0d5dbc35668..7b4d597fc12 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -246,9 +246,11 @@ if ($result) {
print '<td class="liste_titre" align="center"><input type="text" class="flat" size="5" name="search_vat" value="' . $search_vat . '">%</td>';
print '<td class="liste_titre" align="center"><input type="text" class="flat" size="15" name="search_account" value="' . $search_account . '"></td>';
print '<td class="liste_titre" colspan="2"> </td>';
- print '<td class="liste_titre" align="center"><input type="image" class="liste_titre" name="button_search" src="' . img_picto($langs->trans("Search"), 'search.png', '', '', 1) . '" value="' . dol_escape_htmltag($langs->trans("Search")) . '" title="' . dol_escape_htmltag($langs->trans("Search")) . '">';
- print '<input type="image" class="liste_titre" name="button_removefilter" src="' . img_picto($langs->trans("Search"), 'searchclear.png', '', '', 1) . '" value="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '" title="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '">';
- print "</td></tr>\n";
+ print '<td class="liste_titre" align="right">';
+ $searchpitco=$form->showFilterAndCheckAddButtons(0);
+ print $searchpitco;
+ print '</td>';
+ print "</tr>\n";
$facture_static = new Facture($db);
$product_static = new Product($db);
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index 6736c6a30d6..788eaa32e88 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -220,9 +220,11 @@ if ($result) {
print '<td class="liste_titre" align="center"><input type="text" class="flat" size="5" name="search_vat" value="' . $search_vat . '">%</td>';
print '<td class="liste_titre" align="center"><input type="text" class="flat" size="15" name="search_account" value="' . $search_account . '"></td>';
print '<td class="liste_titre" colspan="2"> </td>';
- print '<td class="liste_titre" align="center"><input type="image" class="liste_titre" name="button_search" src="' . img_picto($langs->trans("Search"), 'search.png', '', '', 1) . '" value="' . dol_escape_htmltag($langs->trans("Search")) . '" title="' . dol_escape_htmltag($langs->trans("Search")) . '">';
- print '<input type="image" class="liste_titre" name="button_removefilter" src="' . img_picto($langs->trans("Search"), 'searchclear.png', '', '', 1) . '" value="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '" title="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '">';
- print "</td></tr>\n";
+ print '<td class="liste_titre" align="right">';
+ $searchpitco=$form->showFilterAndCheckAddButtons(0);
+ print $searchpitco;
+ print '</td>';
+ print "</tr>\n";
$facturefournisseur_static = new FactureFournisseur($db);
$product_static = new Product($db);
diff --git a/htdocs/adherents/cotisations.php b/htdocs/adherents/cotisations.php
index cc8e39d32ca..7ff98ceb503 100644
--- a/htdocs/adherents/cotisations.php
+++ b/htdocs/adherents/cotisations.php
@@ -196,11 +196,13 @@ if ($result)
print '<td align="right" class="liste_titre">';
print '<input class="flat" type="text" name="search_amount" value="'.$search_amount.'" size="4">';
- print '</td><td align="right" class="liste_titre" width="60px">';
- print '<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")).'">';
- print ' ';
- print '<input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" name="button_removefilter" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
print '</td>';
+
+ // Action column
+ print '<td class="liste_titre" colspan="2" align="right">';
+ $searchpitco=$form->showFilterAndCheckAddButtons(0);
+ print $searchpitco;
+ print '</td>';
print "</tr>\n";
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index dc7266603ca..b19c6b2e35d 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -240,7 +240,7 @@ if ($resql)
print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"d.statut,d.datefin",$param,"","",$sortfield,$sortorder);
print_liste_field_titre($langs->trans("EndSubscription"),$_SERVER["PHP_SELF"],"d.datefin",$param,"",'align="center"',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"",$param,"",'width="60" align="center"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans(""),$_SERVER["PHP_SELF"],"",$param,"",'width="60" align="center"',$sortfield,$sortorder);
print "</tr>\n";
// Line for filters fields
@@ -272,11 +272,11 @@ if ($resql)
// Status
print '<td class="liste_titre"> </td>';
- print '<td align="right" colspan="2" class="liste_titre">';
- print '<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")).'">';
- print ' ';
- print '<input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" name="button_removefilter" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
- print '</td>';
+ // Action column
+ print '<td class="liste_titre" colspan="2" align="right">';
+ $searchpitco=$form->showFilterAndCheckAddButtons(0);
+ print $searchpitco;
+ print '</td>';
print "</tr>\n";
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index e2fc32f3bcb..f46b6d0268c 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -210,22 +210,6 @@ if (! $rowid && $action != 'create' && $action != 'edit')
{
dol_print_error($db);
}
-
- //dol_fiche_end();
-
- /*
- * Hotbar
- */
- print '<div class="tabsAction">';
-
- // New type
- if ($user->rights->adherent->configurer)
- {
- print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=create">'.$langs->trans("NewType").'</a></div>';
- }
-
- print "</div>";
-
}
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 8e5e73fd6fc..5a112e60861 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -378,9 +378,11 @@ if ($resql)
print '<td align="center">';
print $form->selectyesno('billed', $billed, 1, 0, 1);
print '</td>';
- print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
- print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
- print "</td></tr>\n";
+ print '<td class="liste_titre" align="right">';
+ $searchpitco=$form->showFilterAndCheckAddButtons(0);
+ print $searchpitco;
+ print '</td>';
+ print "</tr>\n";
$var=true;
$total=0;
diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php
index 79f18ad26ab..aeafb1ee67b 100644
--- a/htdocs/commande/orderstoinvoice.php
+++ b/htdocs/commande/orderstoinvoice.php
@@ -604,10 +604,11 @@ if (($action != 'create' && $action != 'add') || ($action == 'create' && $error)
//REF
print '<input class="flat" size="10" type="text" name="sref" value="'.$sref.'">';
print '</td>';
- //print '<td class="liste_titre">';
+
print '<td class="liste_titre" align="left">';
print '<input class="flat" type="text" size="10" name="sref_client" value="'.$sref_client.'">';
-
+ print '</td>';
+
//DATE ORDER
print '<td class="liste_titre" align="center">';
print $period;
@@ -619,15 +620,14 @@ if (($action != 'create' && $action != 'add') || ($action == 'create' && $error)
print '</td>';
//SEARCH BUTTON
- print '</td><td align="right" class="liste_titre">';
+ print '<td align="right" class="liste_titre">';
print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
//ALL/NONE
- print '<td class="liste_titre" align="center">';
if ($conf->use_javascript_ajax) print '<a href="#" id="checkall">'.$langs->trans("All").'</a> / <a href="#" id="checknone">'.$langs->trans("None").'</a>';
print '</td>';
- print '</td></tr>';
+ print '</tr>';
print '</form>';
print '<form name="orders2invoice" action="orderstoinvoice.php" method="GET">';
diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php
index d6f8652d31c..0973ece78d3 100644
--- a/htdocs/compta/bank/account.php
+++ b/htdocs/compta/bank/account.php
@@ -555,10 +555,10 @@ if ($id > 0 || ! empty($ref))
print '<td align="right"><input type="text" class="flat" name="req_debit" value="'.$req_debit.'" size="4"></td>';
print '<td align="right"><input type="text" class="flat" name="req_credit" value="'.$req_credit.'" size="4"></td>';
print '<td align="center"> </td>';
- print '<td class="liste_titre" align="right">';
- print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
- print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
- print '</td>';
+ print '<td class="liste_titre" align="right">';
+ $searchpitco=$form->showFilterAndCheckAddButtons(0);
+ print $searchpitco;
+ print '</td>';
print "</tr>\n";
diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php
index 81a1a493892..f5231a87ef8 100644
--- a/htdocs/compta/bank/search.php
+++ b/htdocs/compta/bank/search.php
@@ -178,7 +178,9 @@ if ($resql)
print '<form method="post" action="search.php" name="search_form">'."\n";
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
-
+ print '<input type="hidden" name="action" value="search">';
+ if (! empty($_REQUEST['bid'])) print '<input type="hidden" name="bid" value="'.$_REQUEST["bid"].'">';
+
$moreforfilter = '';
$moreforfilter.='<div class="divsearchfield">';
@@ -227,12 +229,11 @@ if ($resql)
print '<td class="liste_titre" align="right">';
print '<input type="text" class="flat" name="credit" size="4" value="'.$credit.'">';
print '</td>';
- print '<td class="liste_titre" align="right">';
- print '<input type="hidden" name="action" value="search">';
- if (! empty($_REQUEST['bid'])) print '<input type="hidden" name="bid" value="'.$_REQUEST["bid"].'">';
- print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
- print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
- print "</td></tr>\n";
+ print '<td class="liste_titre" align="right">';
+ $searchpitco=$form->showFilterAndCheckAddButtons(0);
+ print $searchpitco;
+ print '</td>';
+ print "</tr>\n";
// Loop on each record
$total_debit=0;
diff --git a/htdocs/compta/deplacement/list.php b/htdocs/compta/deplacement/list.php
index a5684891ca8..497de98fa72 100644
--- a/htdocs/compta/deplacement/list.php
+++ b/htdocs/compta/deplacement/list.php
@@ -164,9 +164,11 @@ if ($resql)
print '<td class="liste_titre" align="right">';
// print '<input class="flat" size="10" type="text" name="search_amount" value="'.$search_amount.'">';
print '</td>';
- print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
- print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
- print "</td></tr>\n";
+ print '<td class="liste_titre" align="right">';
+ $searchpitco=$form->showFilterAndCheckAddButtons(0);
+ print $searchpitco;
+ print '</td>';
+ print "</tr>\n";
$var=true;
while ($i < min($num,$limit))
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index a680886827a..1c32462b884 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -783,9 +783,11 @@ if ($resql)
$liststatus=array('0'=>$langs->trans("BillShortStatusDraft"), '1'=>$langs->trans("BillShortStatusNotPaid"), '2'=>$langs->trans("BillShortStatusPaid"), '3'=>$langs->trans("BillShortStatusCanceled"));
print $form->selectarray('search_status', $liststatus, $search_status, 1);
print '</td>';
- print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
- print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
- print "</td></tr>\n";
+ print '<td class="liste_titre" align="right">';
+ $searchpitco=$form->showFilterAndCheckAddButtons(0);
+ print $searchpitco;
+ print '</td>';
+ print "</tr>\n";
if ($num > 0)
{
diff --git a/htdocs/compta/facture/mergepdftool.php b/htdocs/compta/facture/mergepdftool.php
index cff600d3a57..19c1d083018 100644
--- a/htdocs/compta/facture/mergepdftool.php
+++ b/htdocs/compta/facture/mergepdftool.php
@@ -814,17 +814,7 @@ if ($resql)
print_liste_field_titre($langs->trans("Received"),$_SERVER["PHP_SELF"],"am","",$param,'align="right"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Rest"),$_SERVER["PHP_SELF"],"","",$param,'align="right"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"fk_statut,paye,am","",$param,'align="right"',$sortfield,$sortorder);
-
- $searchpitco='<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
- $searchpitco.='<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Reset"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
- if (empty($mode))
- {
- print_liste_field_titre($searchpitco,$_SERVER["PHP_SELF"],"","",$param,'align="center"',$sortfield,$sortorder);
- }
- else
- {
- print_liste_field_titre($searchpitco,$_SERVER["PHP_SELF"],"","",$param,'align="center"',$sortfield,$sortorder);
- }
+ print_liste_field_titre('',$_SERVER["PHP_SELF"],"","",$param,'align="center"',$sortfield,$sortorder);
print "</tr>\n";
// Lignes des champs de filtre
@@ -858,6 +848,8 @@ if ($resql)
print $form->selectarray('filtre', $liststatus, $filter, 1);
print '</td>';
print '<td class="liste_titre" align="center">';
+ $searchpitco=$form->showFilterAndCheckAddButtons(0);
+ print $searchpitco;
if (empty($mode))
{
if ($conf->use_javascript_ajax) print '<a href="#" id="checkall">'.$langs->trans("All").'</a> / <a href="#" id="checknone">'.$langs->trans("None").'</a>';
diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
index 5e404a76242..2b3a7153793 100644
--- a/htdocs/compta/paiement/cheque/list.php
+++ b/htdocs/compta/paiement/cheque/list.php
@@ -151,9 +151,11 @@ if ($resql)
print '<td class="liste_titre" align="right">';
print '<input class="flat" type="text" size="6" name="search_amount" value="'.$search_amount.'">';
print '</td>';
- print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
- print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
- print "</td></tr>\n";
+ print '<td class="liste_titre" align="right">';
+ $searchpitco=$form->showFilterAndCheckAddButtons(0);
+ print $searchpitco;
+ print '</td>';
+ print "</tr>\n";
if ($num > 0)
{
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index 8ad94817699..33576328786 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -257,9 +257,10 @@ if ($resql)
print '</td>';
print '<td align="right">';
print '<input class="flat" type="text" size="4" name="search_amount" value="'.$search_amount.'">';
- print '</td><td align="right">';
- print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
- print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+ print '</td>';
+ print '<td class="liste_titre" align="right">';
+ $searchpitco=$form->showFilterAndCheckAddButtons(0);
+ print $searchpitco;
print '</td>';
if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
{
diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php
index d0c6792a785..e7cef1a50ad 100644
--- a/htdocs/compta/prelevement/list.php
+++ b/htdocs/compta/prelevement/list.php
@@ -114,6 +114,7 @@ if ($result)
print_barre_liste($langs->trans("WithdrawalsLines"), $page, $_SERVER["PHP_SELF"], $urladd, $sortfield, $sortorder, '', $num);
print"\n<!-- debut table -->\n";
+ print '<form action="'.$_SERVER["PHP_SELF"].'" method="GET">';
print '<table class="liste" width="100%">';
print '<tr class="liste_titre">';
@@ -126,8 +127,7 @@ if ($result)
print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"pl.amount","","",'align="right"');
print_liste_field_titre('');
print "</tr>\n";
-
- 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_line" value="'. dol_escape_htmltag($search_line).'" size="6"></td>';
print '<td class="liste_titre"><input type="text" class="flat" name="search_bon" value="'. dol_escape_htmltag($search_bon).'" size="8"></td>';
@@ -137,10 +137,10 @@ if ($result)
print '<td class="liste_titre"> </td>';
print '<td class="liste_titre"> </td>';
print '<td class="liste_titre" align="right">';
- print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
- print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
- print '</td>';
- print '</form>';
+ $searchpitco=$form->showFilterAndCheckAddButtons(0);
+ print $searchpitco;
+ print '</td>';
+ print '</tr>';
$var=True;
@@ -185,6 +185,9 @@ if ($result)
$i++;
}
print "</table>";
+
+ print '</form>';
+
$db->free($result);
}
else
diff --git a/htdocs/compta/salaries/index.php b/htdocs/compta/salaries/index.php
index 52f1938a857..18554f30de8 100644
--- a/htdocs/compta/salaries/index.php
+++ b/htdocs/compta/salaries/index.php
@@ -167,9 +167,12 @@ if ($result)
print '</td>';
// Amount
print '<td class="liste_titre" align="right"><input name="search_amount" class="flat" type="text" size="8" value="'.$search_amount.'"></td>';
- print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
- print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
- print "</td></tr>\n";
+
+ print '<td class="liste_titre" align="right">';
+ $searchpitco=$form->showFilterAndCheckAddButtons(0);
+ print $searchpitco;
+ print '</td>';
+ print "</tr>\n";
while ($i < min($num,$limit))
{
diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php
index 63c156609c8..2dbb3fd22d7 100644
--- a/htdocs/compta/sociales/index.php
+++ b/htdocs/compta/sociales/index.php
@@ -193,9 +193,12 @@ if ($resql)
print '<td class="liste_titre"> </td>';
// Status
print '<td class="liste_titre"> </td>';
- print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
- print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
- print "</td></tr>\n";
+
+ print '<td class="liste_titre" align="right">';
+ $searchpitco=$form->showFilterAndCheckAddButtons(0);
+ print $searchpitco;
+ print '</td>';
+ print "</tr>\n";
while ($i < min($num,$limit))
{
diff --git a/htdocs/compta/tva/reglement.php b/htdocs/compta/tva/reglement.php
index 91140bb97ca..3dee569b0ff 100644
--- a/htdocs/compta/tva/reglement.php
+++ b/htdocs/compta/tva/reglement.php
@@ -162,9 +162,12 @@ if ($result)
$form->select_types_paiements($typeid,'typeid','',0,0,1,16);
print '</td>';
print '<td class="liste_titre" align="right"><input name="search_amount" class="flat" type="text" size="8" value="'.$search_amount.'"></td>';
- print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
- print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
- print "</td></tr>\n";
+
+ print '<td class="liste_titre" align="right">';
+ $searchpitco=$form->showFilterAndCheckAddButtons(0);
+ print $searchpitco;
+ print '</td>';
+ print "</tr>\n";
while ($i < min($num,$limit))
{
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 040a623fe98..f9e7351ed87 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -254,11 +254,12 @@ if ($resql)
print '<input type="text" class="flat" size="8" name="search_name" value="'.dol_escape_htmltag($search_name).'">';
print '</td>';
print '<td class="liste_titre"> </td>';
- //print '<td class="liste_titre"> </td>';
- print '<td class="liste_titre" colspan="5"></td>';
- print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
- print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
- print "</td></tr>\n";
+ print '<td class="liste_titre" colspan="5" align="right"></td>';
+ print '<td>';
+ $searchpitco=$form->showFilterAndCheckAddButtons(0);
+ print $searchpitco;
+ print '</td>';
+ print "</tr>\n";
$var=true;
while ($i < min($num,$limit))
diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php
index b7b257ca07a..2f1c3697058 100644
--- a/htdocs/contrat/services.php
+++ b/htdocs/contrat/services.php
@@ -238,9 +238,11 @@ if ($resql)
);
print $form->selectarray('search_status',$arrayofstatus,(strstr($search_status, ',')?-1:$search_status),1);
print '</td>';
- print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
- print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
- print "</td></tr>\n";
+ print '<td class="liste_titre" align="right">';
+ $searchpitco=$form->showFilterAndCheckAddButtons(0);
+ print $searchpitco;
+ print '</td>';
+ print "</tr>\n";
$contractstatic=new Contrat($db);
$productstatic=new Product($db);
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index e60883c7149..aac6d0714f2 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5676,5 +5676,24 @@ class Form
return $out;
}
+ /**
+ * Return HTML to show the search and clear seach button
+ *
+ * @param int $addcheckuncheckall Add the check all uncheck al button
+ * @return string
+ */
+ function showFilterAndCheckAddButtons($addcheckuncheckall=0)
+ {
+ global $langs;
+
+ $out='';
+ $out.='<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+ if ($addcheckuncheckall)
+ {
+
+ }
+ $out.='<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+ return $out;
+ }
}
diff --git a/htdocs/don/list.php b/htdocs/don/list.php
index 83e1db184a5..372e60b5f96 100644
--- a/htdocs/don/list.php
+++ b/htdocs/don/list.php
@@ -111,7 +111,7 @@ if (trim($search_name) != '')
{
$sql .= natural_search(array('d.lastname', 'd.firstname'), $search_name);
}
-if ($search_amount) $sql.=" AND d.amount='".$db->escape(price2num(trim($search_amount)))."'";
+if ($search_amount) $sql.= natural_search(array('d.amount'), price2num(trim($search_amount)), 1);
$sql.= $db->order($sortfield,$sortorder);
$sql.= $db->plimit($limit+1, $offset);
@@ -188,9 +188,12 @@ if ($resql)
print '</td>';
}
print '<td class="liste_titre" align="right"><input name="search_amount" class="flat" type="text" size="8" value="'.$search_amount.'"></td>';
- print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
- print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
- print "</td></tr>\n";
+
+ print '<td class="liste_titre" align="right">';
+ $searchpitco=$form->showFilterAndCheckAddButtons(0);
+ print $searchpitco;
+ print '</td>';
+ print "</tr>\n";
$var=True;
while ($i < min($num,$limit))
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 4d1764ad0cf..c8dd6445ae2 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -189,12 +189,10 @@ if ($resql)
print '<td align="right">';
print $form->selectarray('viewstatut', array('0'=>$langs->trans('StatusSendingDraftShort'),'1'=>$langs->trans('StatusSendingValidatedShort'),'2'=>$langs->trans('StatusSendingProcessedShort')),$viewstatut,1);
print '</td>';
- // Search
- print '<td class="liste_titre" align="right">';
- print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
- print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+ print '<td class="liste_titre" align="right">';
+ $searchpitco=$form->showFilterAndCheckAddButtons(0);
+ print $searchpitco;
print '</td>';
-
print "</tr>\n";
$var=True;
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index efa6572dd10..b7f5be64455 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -265,10 +265,10 @@ if ($resql)
select_expensereport_statut($search_status,'search_status',1,1);
print '</td>';
- print '<td class="liste_titre" align="right">';
- print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
- print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
- print '</td>';
+ print '<td class="liste_titre" align="right">';
+ $searchpitco=$form->showFilterAndCheckAddButtons(0);
+ print $searchpitco;
+ print '</td>';
print "</tr>\n";
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 74edaf72099..cf40a285996 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -196,9 +196,11 @@ if ($result)
$liststatus=$interventionstatic->statuts_short;
print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 1);
print '</td>';
- print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
- print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
- print "</td></tr>\n";
+ print '<td class="liste_titre" align="right">';
+ $searchpitco=$form->showFilterAndCheckAddButtons(0);
+ print $searchpitco;
+ print '</td>';
+ print "</tr>\n";
$companystatic=new Societe($db);
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index a3e0d8c9c33..3f4aee09bcd 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -269,9 +269,11 @@ if ($resql)
print '<td align="center">';
print $form->selectyesno('billed', $billed, 1, 0, 1);
print '</td>';
- print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
- print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
- print "</td></tr>\n";
+ print '<td class="liste_titre" align="right">';
+ $searchpitco=$form->showFilterAndCheckAddButtons(0);
+ print $searchpitco;
+ print '</td>';
+ print "</tr>\n";
$var=true;
diff --git a/htdocs/fourn/commande/orderstoinvoice.php b/htdocs/fourn/commande/orderstoinvoice.php
index d0502ed927a..3f75bca3a35 100644
--- a/htdocs/fourn/commande/orderstoinvoice.php
+++ b/htdocs/fourn/commande/orderstoinvoice.php
@@ -500,7 +500,8 @@ if (($action != 'create' && $action != 'add') && !$error) {
// print '<td class="liste_titre">';
print '<td class="liste_titre" align="left">';
print '<input class="flat" type="text" size="10" name="sref_client" value="' . $sref_client . '">';
-
+ print '</td>';
+
// DATE ORDER
print '<td class="liste_titre" align="center">';
print $period;
@@ -512,8 +513,9 @@ if (($action != 'create' && $action != 'add') && !$error) {
print '</td>';
// SEARCH BUTTON
- print '</td><td align="right" class="liste_titre">';
+ print '<td align="right" class="liste_titre">';
print '<input type="image" class="liste_titre" name="button_search" src="' . img_picto($langs->trans("Search"), 'search.png', '', '', 1) . '" value="' . dol_escape_htmltag($langs->trans("Search")) . '" title="' . dol_escape_htmltag($langs->trans("Search")) . '">';
+ print '</td>';
// ALL/NONE
print '<td class="liste_titre" align="center">';
diff --git a/htdocs/fourn/facture/impayees.php b/htdocs/fourn/facture/impayees.php
index ccb6671ba3a..a5ea3b88286 100644
--- a/htdocs/fourn/facture/impayees.php
+++ b/htdocs/fourn/facture/impayees.php
@@ -214,10 +214,12 @@ if ($user->rights->fournisseur->facture->lire)
print '<input class="flat" type="text" size="8" name="search_amount_no_tax" value="'.$search_amount_no_tax.'">';
print '</td><td class="liste_titre" align="right">';
print '<input class="flat" type="text" size="8" name="search_amount_all_tax" value="'.$search_amount_all_tax.'">';
- print '</td><td class="liste_titre" colspan="2" align="right">';
- print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
- print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
- print "</td></tr>\n";
+ print '</td>';
+ print '<td class="liste_titre" align="right">';
+ $searchpitco=$form->showFilterAndCheckAddButtons(0);
+ print $searchpitco;
+ print '</td>';
+ print "</tr>\n";
if ($num > 0)
{
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 6731c70d328..3c238a2f6f8 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -332,10 +332,11 @@ if ($resql)
print '</td><td class="liste_titre" align="right">';
$liststatus=array('0'=>$langs->trans("Draft"),'1'=>$langs->trans("Unpaid"), '2'=>$langs->trans("Paid"));
print $form->selectarray('filtre', $liststatus, $search_status, 1);
- print '</td><td class="liste_titre" align="right">';
- print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
- print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
print '</td>';
+ print '<td class="liste_titre" align="right">';
+ $searchpitco=$form->showFilterAndCheckAddButtons(0);
+ print $searchpitco;
+ print '</td>';
print "</tr>\n";
$facturestatic=new FactureFournisseur($db);
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 36f3fc2ffb3..3753001cf23 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -564,10 +564,11 @@ if (empty($action))
print '</td>';
print '<td align="right">';
print '<input class="flat" type="text" size="4" name="search_amount" value="'.$search_amount.'">';
- print '</td><td align="right">';
- print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
- print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
- print '</td>';
+ print '</td>';
+ print '<td class="liste_titre" align="right">';
+ $searchpitco=$form->showFilterAndCheckAddButtons(0);
+ print $searchpitco;
+ print '</td>';
print "</tr>\n";
while ($i < min($num,$limit))
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index a92945ce502..3e74c7e14f5 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -368,9 +368,9 @@ $holiday->selectStatutCP($search_statut);
print '</td>';
// ACTION
-print '<td align="right">';
-print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+print '<td class="liste_titre" align="right">';
+$searchpitco=$form->showFilterAndCheckAddButtons(0);
+print $searchpitco;
print '</td>';
print "</tr>\n";
diff --git a/htdocs/loan/calc.php b/htdocs/loan/calc.php
index e73b5e0f255..681d0721f0a 100644
--- a/htdocs/loan/calc.php
+++ b/htdocs/loan/calc.php
@@ -115,6 +115,8 @@ if (! empty($errors)) {
$form_complete = false;
}
+
+
/*
* View
*/
@@ -125,31 +127,34 @@ print load_fiche_titre($langs->trans("LoanCalc"));
print $langs->trans('LoanCalcDesc');
print '<form method="GET" name="information" action="'.$_SERVER['PHP_SELF'].'">';
-print '<input type="hidden" name="form_complete" value="1">';
-print '<table cellpadding="2" cellspacing="0" border="0" width="100%">';
+print '<input type="hidden" name="form_complete" value="1"><br>';
+
+dol_fiche_head('');
+
+print '<table class="noborder centpercent">';
//print '<tr>';
//print '<td align="right"><img src="/images/clear.gif" width="225" height="1" border="0" alt=""></td>';
//print '<td align="smalltext" width="100%"><img src="/images/clear.gif" width="250" height="1" border="0" alt=""></td>';
//print '</tr>';
-print '<tr bgcolor="#cccccc">';
+print '<tr>';
print '<td align="center" colspan="2"><b>'.$langs->trans('PurchaseFinanceInfo').'</b></td>';
print '</tr>';
-print '<tr bgcolor="#eeeeee">';
+print '<tr>';
print '<td align="right">'.$langs->trans('SalePriceOfAsset').':</td>';
print '<td><input type="text" size="10" name="sale_price" value="'.$sale_price.'"> '.$langs->trans("Currency".$conf->currency).'</td>';print '</tr>';
-print '<tr bgcolor="#eeeeee">';
+print '<tr>';
print '<td align="right">'.$langs->trans('PercentageDown').':</td>';
print '<td><input type="text" size="5" name="down_percent" value="'.$down_percent.'">%</td>';
print '</tr>';
-print '<tr bgcolor="#eeeeee">';
+print '<tr>';
print '<td align="right">'.$langs->trans('LengthOfMortgage').':</td>';
print '<td><input type="text" size="3" name="year_term" value="'.$year_term.'">years</td>';
print '</tr>';
-print '<tr bgcolor="#eeeeee">';
+print '<tr>';
print '<td align="right">'.$langs->trans('AnnualInterestRate').':</td>';
print '<td><input type="text" size="5" name="annual_interest_percent" value="'.$annual_interest_percent.'">%</td>';
print '</tr>';
-print '<tr bgcolor="#eeeeee">';
+print '<tr>';
print '<td align="right">'.$langs->trans('ExplainCalculations').':</td>';
if (! empty($show_progress))
@@ -164,7 +169,9 @@ else
print '</tr>';
print '</table>';
-print '<br><center><input class="button" type="submit" value="'.$langs->trans("Calculate").'"> ';
+dol_fiche_end();
+
+print '<center><input class="button" type="submit" value="'.$langs->trans("Calculate").'"> ';
print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'"></center>';
// If the form has already been calculated, the $down_payment
diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php
index d152364929d..b440b5ee43e 100644
--- a/htdocs/opensurvey/list.php
+++ b/htdocs/opensurvey/list.php
@@ -108,8 +108,8 @@ print '<td></td>';
$arraystatus=array(''=>' ','expired'=>$langs->trans("Expired"),'opened'=>$langs->trans("Opened"));
print '<td align="center">'. $form->selectarray('status', $arraystatus, $status).'</td>';
print '<td class="liste_titre" align="right">';
-print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+$searchpitco=$form->showFilterAndCheckAddButtons(0);
+print $searchpitco;
print '</td>';
print '</tr>'."\n";
diff --git a/htdocs/product/canvas/product/tpl/list.tpl.php b/htdocs/product/canvas/product/tpl/list.tpl.php
index c5e372cfad0..e57fd5adfab 100644
--- a/htdocs/product/canvas/product/tpl/list.tpl.php
+++ b/htdocs/product/canvas/product/tpl/list.tpl.php
@@ -69,12 +69,12 @@
if ($searchfield['enabled']) {
if ($searchfield['search']) { ?>
<td class="liste_titre" align="<?php echo $searchfield['align']; ?>"><input class="flat" type="text" name="s<?php echo $searchfield['alias']; ?>" value=""></td>
- <?php } else if ($key == $num) { ?>
- <td class="liste_titre" align="right">
- <input type="image" class="liste_titre" name="button_search" src="<?php echo DOL_URL_ROOT; ?>/theme/<?php echo $conf->theme; ?>/img/search.png" alt="<?php echo $langs->trans('Search'); ?>">
- <input type="image" class="liste_titre" name="button_removefilter" src="<?php echo DOL_URL_ROOT; ?>/theme/<?php echo $conf->theme; ?>/img/searchclear.png" alt="<?php echo $langs->trans('RemoveFilter'); ?>">
- </td>
- <?php } else { ?>
+ <?php } else if ($key == $num) {
+ print '<td class="liste_titre" align="right">';
+ $searchpitco=$form->showFilterAndCheckAddButtons(0);
+ print $searchpitco;
+ print '</td>';
+ } else { ?>
<td class="liste_titre"> </td>
<?php } } } ?>
</tr>
diff --git a/htdocs/product/canvas/service/tpl/list.tpl.php b/htdocs/product/canvas/service/tpl/list.tpl.php
index fe860c1bf73..4fc875e15bf 100644
--- a/htdocs/product/canvas/service/tpl/list.tpl.php
+++ b/htdocs/product/canvas/service/tpl/list.tpl.php
@@ -69,12 +69,12 @@
if ($searchfield['enabled']) {
if ($searchfield['search']) { ?>
<td class="liste_titre" align="<?php echo $searchfield['align']; ?>"><input class="flat" type="text" name="s<?php echo $searchfield['alias']; ?>" value=""></td>
- <?php } else if ($key == $num) { ?>
- <td class="liste_titre" align="right">
- <input type="image" class="liste_titre" name="button_search" src="<?php echo DOL_URL_ROOT; ?>/theme/<?php echo $conf->theme; ?>/img/search.png" alt="<?php echo $langs->trans('Search'); ?>">
- <input type="image" class="liste_titre" name="button_removefilter" src="<?php echo DOL_URL_ROOT; ?>/theme/<?php echo $conf->theme; ?>/img/searchclear.png" alt="<?php echo $langs->trans('RemoveFilter'); ?>">
- </td>
- <?php } else { ?>
+ <?php } else if ($key == $num) {
+ print '<td class="liste_titre" align="right">';
+ $searchpitco=$form->showFilterAndCheckAddButtons(0);
+ print $searchpitco;
+ print '</td>';
+ } else { ?>
<td class="liste_titre"> </td>
<?php } } } ?>
</tr>
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 6451f8bdde5..088f7e73c66 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -548,10 +548,10 @@ else
print $form->selectarray('tobuy', array('0'=>$langs->trans('ProductStatusNotOnBuyShort'),'1'=>$langs->trans('ProductStatusOnBuyShort')),$tobuy,1);
print '</td>';
}
- print '<td class="liste_titre nowrap" align="right">';
- print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
- print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("RemoveFilter"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
- print '</td>';
+ print '<td class="liste_titre" align="right">';
+ $searchpitco=$form->showFilterAndCheckAddButtons(0);
+ print $searchpitco;
+ print '</td>';
print '</tr>';
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 1f635a96262..b8c9222fab6 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -1459,11 +1459,10 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
print '<td><input type="text" class="flat" name="search_soc" value="' . $search_soc . '" size="20"></td>';
print '<td colspan="8"> </td>';
// Print the search button
- print '<td class="liste_titre" align="right">';
- print '<input class="liste_titre" name="button_search" type="image" src="' . DOL_URL_ROOT . '/theme/' . $conf->theme . '/img/search.png" value="' . dol_escape_htmltag($langs->trans("Search")) . '" title="' . dol_escape_htmltag($langs->trans("Search")) . '">';
- print ' ';
- print '<input class="liste_titre" name="button_removefilter" type="image" src="' . DOL_URL_ROOT . '/theme/' . $conf->theme . '/img/searchclear.png" value="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '" title="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '">';
- print '</td>';
+ print '<td class="liste_titre" align="right">';
+ $searchpitco=$form->showFilterAndCheckAddButtons(0);
+ print $searchpitco;
+ print '</td>';
print '</tr>';
}
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index b8a52024dfc..27f85cd90ab 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -279,10 +279,10 @@ if ($resql)
print '<td class="liste_titre"> </td>';
print '<td class="liste_titre"> </td>';
print '<td class="liste_titre"> </td>';
- print '<td class="liste_titre" align="right">';
- print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" alt="'.$langs->trans("Search").'">';
- print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" alt="'.$langs->trans("RemoveFilter").'">';
- print '</td>';
+ print '<td class="liste_titre" align="right">';
+ $searchpitco=$form->showFilterAndCheckAddButtons(0);
+ print $searchpitco;
+ print '</td>';
print '</tr>';
$product_static=new Product($db);
diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php
index 87d6d4e46eb..3b77f9c5ba7 100644
--- a/htdocs/product/reassortlot.php
+++ b/htdocs/product/reassortlot.php
@@ -292,10 +292,10 @@ if ($resql)
print '<td class="liste_titre"> </td>';
print '<td class="liste_titre"> </td>';
print '<td class="liste_titre"> </td>';
- print '<td class="liste_titre" align="right">';
- print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" alt="'.$langs->trans("Search").'">';
- print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" alt="'.$langs->trans("RemoveFilter").'">';
- print '</td>';
+ print '<td class="liste_titre" align="right">';
+ $searchpitco=$form->showFilterAndCheckAddButtons(0);
+ print $searchpitco;
+ print '</td>';
print '</tr>';
$product_static=new Product($db);
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index 6d487de21e3..bebfc87b528 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -153,10 +153,10 @@ if ($result)
print $form->selectarray('search_status', $warehouse->statuts, $search_status, 1, 0, 0, '', 1);
print '</td>';
- print '<td class="liste_titre nowrap" align="right">';
- print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
- print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("RemoveFilter"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
- print '</td>';
+ print '<td class="liste_titre" align="right">';
+ $searchpitco=$form->showFilterAndCheckAddButtons(0);
+ print $searchpitco;
+ print '</td>';
print '</tr>';
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index 94629a3e821..d29ee366bb0 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -468,11 +468,11 @@ print '<td class="liste_titre"> </td>'.
'<td class="liste_titre" align="right"> </td>'.
'<td class="liste_titre" align="right">' . $langs->trans('AlertOnly') . ' <input type="checkbox" id="salert" name="salert" ' . (!empty($alertchecked)?$alertchecked:'') . '></td>'.
'<td class="liste_titre" align="right"> </td>'.
- '<td class="liste_titre"> </td>'.
- '<td class="liste_titre" align="right">'.
- '<input class="liste_titre" name="button_search" type="image" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">'.
- '<input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" name="button_removefilter" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">'.
- '</td>';
+ '<td class="liste_titre"> </td>';
+ print '<td class="liste_titre" align="right">';
+ $searchpitco=$form->showFilterAndCheckAddButtons(0);
+ print $searchpitco;
+ print '</td>';
print '</tr>';
$prod = new Product($db);
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 6153d3b81ce..75dca94540b 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -516,10 +516,10 @@ if ($resql)
print '</td>';
}
// Action column
- print '<td class="liste_titre" align="right">';
- print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
- print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
- print '</td>';
+ print '<td class="liste_titre" align="right">';
+ $searchpitco=$form->showFilterAndCheckAddButtons(0);
+ print $searchpitco;
+ print '</td>';
print '</tr>'."\n";
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index e140ee2f672..98bbff88483 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -504,8 +504,8 @@ if ($resql)
}
// Action column
print '<td class="liste_titre" align="right">';
- print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
- print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+ $searchpitco=$form->showFilterAndCheckAddButtons(0);
+ print $searchpitco;
print '</td>';
print '</tr>';
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 0c5e6646889..4f1f9fb05d6 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -348,8 +348,8 @@ print '<td class="liste_titre" align="left">';
print '<input class="flat" type="text" name="sprod_fulldescr" size="15" value="'.dol_escape_htmltag($sprod_fulldescr).'">';
print '</td>';
print '<td class="liste_titre" align="right">';
-print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("resetFilters")).'" title="'.dol_escape_htmltag($langs->trans("resetFilters")).'">';
+$searchpitco=$form->showFilterAndCheckAddButtons(0);
+print $searchpitco;
print '</td>';
print '</tr>';
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index d8e22b3974d..7cfc07918fd 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -718,7 +718,8 @@ if ($resql)
// Type (customer/prospect/supplier)
print '<td class="liste_titre maxwidthonsmartphone" align="middle">';
- print '<select class="flat" name="search_type">';
+ if ($type != '') print '<input type="hidden" name="type" value="'.$type.'">';
+ print '<select class="flat" name="search_type">';
print '<option value="-1"'.($search_type==''?' selected':'').'> </option>';
if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print '<option value="1,3"'.($search_type=='1,3'?' selected':'').'>'.$langs->trans('Customer').'</option>';
if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print '<option value="2,3"'.($search_type=='2,3'?' selected':'').'>'.$langs->trans('Prospect').'</option>';
@@ -803,11 +804,10 @@ if ($resql)
print '</td>';
}
// Action column
- print '<td class="liste_titre" align="right">';
- if ($type != '') print '<input type="hidden" name="type" value="'.$type.'">';
- print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
- print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
- print '</td>';
+ print '<td class="liste_titre" align="right">';
+ $searchpitco=$form->showFilterAndCheckAddButtons(0);
+ print $searchpitco;
+ print '</td>';
print "</tr>\n";
diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index 589c102c8a3..7ac093ca7dd 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -509,7 +509,8 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
print '<td colspan="8"> </td>';
// Print the search button
print '<td class="liste_titre" align="right">';
- print '<input class="liste_titre" name="button_search" type="image" src="' . DOL_URL_ROOT . '/theme/' . $conf->theme . '/img/search.png" value="' . dol_escape_htmltag($langs->trans("Search")) . '" title="' . dol_escape_htmltag($langs->trans("Search")) . '">';
+ $searchpitco=$form->showFilterAndCheckAddButtons(0);
+ print $searchpitco;
print '</td>';
print '</tr>';
diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php
index 8ac96a336f4..66d725b3204 100644
--- a/htdocs/user/hierarchy.php
+++ b/htdocs/user/hierarchy.php
@@ -152,8 +152,9 @@ print '<td> </td>';
print '<td align="right">';
print $form->selectarray('search_statut', array('-1'=>'','1'=>$langs->trans('Enabled')),$search_statut);
print '</td>';
-print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+print '<td class="liste_titre" align="right">';
+$searchpitco=$form->showFilterAndCheckAddButtons(0);
+print $searchpitco;
print '</td>';
print '</tr>';
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index d0ac0aaa66d..f0fa04327cd 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -395,10 +395,10 @@ if ($result)
print '</td>';
}
// Action column
- print '<td class="liste_titre" align="right">';
- print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
- print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
- print '</td>';
+ print '<td class="liste_titre" align="right">';
+ $searchpitco=$form->showFilterAndCheckAddButtons(0);
+ print $searchpitco;
+ print '</td>';
print "</tr>\n";
--
GitLab