[ bug #512 ] Filter system not working in banks > account > transactions

This commit is contained in:
Laurent Destailleur 2012-08-26 19:23:08 +02:00
parent 85bec2230e
commit a18187620e

View File

@ -49,6 +49,7 @@ $fieldtype = (! empty($ref) ? 'ref' :'rowid');
if ($user->societe_id) $socid=$user->societe_id; if ($user->societe_id) $socid=$user->societe_id;
$result=restrictedArea($user,'banque',$fieldvalue,'bank_account','','',$fieldtype); $result=restrictedArea($user,'banque',$fieldvalue,'bank_account','','',$fieldtype);
$paiementtype=GETPOST('paiementtype','alpha',3);
$req_nb=GETPOST("req_nb",'',3); $req_nb=GETPOST("req_nb",'',3);
$thirdparty=GETPOST("thirdparty",'',3); $thirdparty=GETPOST("thirdparty",'',3);
$vline=GETPOST("vline"); $vline=GETPOST("vline");
@ -204,10 +205,10 @@ if ($id > 0 || ! empty($ref))
$param.='&thirdparty='.urlencode($thirdparty); $param.='&thirdparty='.urlencode($thirdparty);
$mode_search = 1; $mode_search = 1;
} }
if (GETPOST("paiementtype")) if ($paiementtype)
{ {
$sql_rech.=" AND b.fk_type = '".$db->escape(GETPOST("paiementtype"))."'"; $sql_rech.=" AND b.fk_type = '".$db->escape($paiementtype)."'";
$param.='&paiementtype='.urlencode(GETPOST("paiementtype")); $param.='&paiementtype='.urlencode($paiementtype);
$mode_search = 1; $mode_search = 1;
} }
@ -290,6 +291,7 @@ if ($id > 0 || ! empty($ref))
if ($limitsql > $viewline) $navig.='<a href="account.php?'.$param.'&amp;page='.($page+1).'">'.img_previous().'</a>'; if ($limitsql > $viewline) $navig.='<a href="account.php?'.$param.'&amp;page='.($page+1).'">'.img_previous().'</a>';
$navig.= $langs->trans("Page")." "; // ' Page '; $navig.= $langs->trans("Page")." "; // ' Page ';
$navig.='<input type="text" name="negpage" size="1" class="flat" value="'.($totalPages-$page).'">'; $navig.='<input type="text" name="negpage" size="1" class="flat" value="'.($totalPages-$page).'">';
$navig.='<input type="hidden" name="paiementtype" value="'.$paiementtype.'">';
$navig.='<input type="hidden" name="req_nb" value="'.$req_nb.'">'; $navig.='<input type="hidden" name="req_nb" value="'.$req_nb.'">';
$navig.='<input type="hidden" name="req_desc" value="'.GETPOST("req_desc").'">'; $navig.='<input type="hidden" name="req_desc" value="'.GETPOST("req_desc").'">';
$navig.='<input type="hidden" name="req_debit" value="'.GETPOST("req_debit").'">'; $navig.='<input type="hidden" name="req_debit" value="'.GETPOST("req_debit").'">';
@ -402,7 +404,7 @@ if ($id > 0 || ! empty($ref))
print '<td>'; print '<td>';
//$filtertype=array('TIP'=>'TIP','PRE'=>'PRE',...) //$filtertype=array('TIP'=>'TIP','PRE'=>'PRE',...)
$filtertype=''; $filtertype='';
print $form->select_types_paiements($_REQUEST['paiementtype'],'paiementtype',$filtertype,2,1,1,8); print $form->select_types_paiements($paiementtype,'paiementtype',$filtertype,2,1,1,8);
print '</td>'; print '</td>';
print '<td><input type="text" class="flat" name="req_nb" value="'.$req_nb.'" size="2"></td>'; print '<td><input type="text" class="flat" name="req_nb" value="'.$req_nb.'" size="2"></td>';
print '<td><input type="text" class="flat" name="req_desc" value="'.GETPOST("req_desc").'" size="24"></td>'; print '<td><input type="text" class="flat" name="req_desc" value="'.GETPOST("req_desc").'" size="24"></td>';