[ bug #512 ] Filter system not working in banks > account > transactions
Conflicts: htdocs/compta/bank/account.php
This commit is contained in:
parent
fe76902342
commit
e121ab8c86
@ -48,6 +48,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");
|
||||||
@ -203,10 +204,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;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -289,6 +290,7 @@ if ($id > 0 || ! empty($ref))
|
|||||||
if ($limitsql > $viewline) $navig.='<a href="account.php?'.$param.'&page='.($page+1).'">'.img_previous().'</a>';
|
if ($limitsql > $viewline) $navig.='<a href="account.php?'.$param.'&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="'.($nbpage-$page).'">';
|
$navig.='<input type="text" name="negpage" size="1" class="flat" value="'.($nbpage-$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").'">';
|
||||||
@ -401,7 +403,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>';
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user