diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index 1f010e054f9..d90757b91cd 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -52,7 +52,6 @@ if ($negpage) if ($page > $_GET["nbpage"]) $page = $_GET["nbpage"]; } - $mesg=''; @@ -138,7 +137,6 @@ if ($account > 0) $sql = "SELECT rowid, label"; $sql.= " FROM ".MAIN_DB_PREFIX."bank_categ"; $sql.= " ORDER BY label"; - $result = $db->query($sql); if ($result) { @@ -156,32 +154,33 @@ if ($account > 0) $db->free($result); } - /* - * - * - */ - - // Definition de sql_rech - $sql_rech=""; + + // Definition de sql_rech et param + $param=''; + $sql_rech=''; $mode_search = 0; - if ($_POST["req_desc"]) + if ($_REQUEST["req_desc"]) { - $sql_rech .= " AND b.label like '%".strtolower($_POST["req_desc"])."%'"; + $sql_rech.= " AND b.label like '%".$_REQUEST["req_desc"]."%'"; + $param.='&req_desc='.urlencode($_REQUEST["req_desc"]); $mode_search = 1; } - if ($_POST["req_debit"]) + if ($_REQUEST["req_debit"]) { - $sql_rech.=" AND amount = -".$_POST["req_debit"]; + $sql_rech.=" AND amount = -".$_REQUEST["req_debit"]; + $param.='&req_debit='.urlencode($_REQUEST["req_debit"]); $mode_search = 1; } - if ($_POST["req_credit"]) + if ($_REQUEST["req_credit"]) { - $sql_rech.=" AND amount = ".$_POST["req_credit"]; + $sql_rech.=" AND amount = ".$_REQUEST["req_credit"]; + $param.='&req_credit='.urlencode($_REQUEST["req_credit"]); $mode_search = 1; } - if ($_POST["thirdparty"]) + if ($_REQUEST["thirdparty"]) { - $sql_rech.=" AND (IFNULL(s.nom,'bidon') like '%".$_POST["thirdparty"]."%')"; + $sql_rech.=" AND (IFNULL(s.nom,'') like '%".$_REQUEST["thirdparty"]."%')"; + $param.='&thirdparty='.urlencode($_REQUEST["thirdparty"]); $mode_search = 1; } @@ -217,7 +216,7 @@ if ($account > 0) dolibarr_print_error($db); } - if ($page > 0 && $mode_search == 0) + if ($page > 0) { $limitsql = $nbline - ($page * $viewline); if ($limitsql < $viewline) @@ -250,16 +249,20 @@ if ($account > 0) $nbpage=floor($total_lines/$viewline)+($total_lines % $viewline > 0?1:0); // Nombre de page total if ($limitsql > $viewline) { - $navig.=''.img_previous().''; + $navig.=''.img_previous().''; } $navig.= ' Page '; $navig.=''; + $navig.=''; + $navig.=''; + $navig.=''; + $navig.=''; $navig.=''; $navig.=''; $navig.='/'.$nbpage.' '; if ($total_lines > $limitsql ) { - $navig.= ''.img_next().''; + $navig.= ''.img_next().''; } $navig.=''; @@ -286,7 +289,7 @@ if ($account > 0) // Formulaire de saisie d'une opération hors factures if ($user->rights->banque->modifier && $_GET["action"]=='addline') { - print '