diff --git a/ChangeLog b/ChangeLog index 08b90003fc4..0aca5b9581f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ $Id$ ***** ChangeLog for 3.1 compared to 3.0 ***** For users: +- New: Can filter of payment type in bank transaction list. - New: Status is visible into user list. - New: Support BSB code for bank account in australia. - New: Can set date of payment for autocreate invoice/payment when diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index 961a4c44e8e..c4515e0bc5c 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -214,6 +214,12 @@ if ($account || $_GET["ref"]) $param.='&thirdparty='.urlencode($_REQUEST["thirdparty"]); $mode_search = 1; } + if ($_REQUEST["paiementtype"]) + { + $sql_rech.=" AND b.fk_type = '".$db->escape($_REQUEST["paiementtype"])."'"; + $param.='&paiementtype='.urlencode($_REQUEST["paiementtype"]); + $mode_search = 1; + } $sql = "SELECT count(*) as nb"; $sql.= " FROM ".MAIN_DB_PREFIX."bank_account as ba"; @@ -415,7 +421,12 @@ if ($account || $_GET["ref"]) print ''; print ''; - print ' '; + print ' '; + print ''; + //$filtertype=array('TIP'=>'TIP','PRE'=>'PRE',...) + $filtertype=''; + print $html->select_types_paiements($_REQUEST['paiementtype'],'paiementtype',$filtertype,2,1,1,8); + print ''; print ''; print ''; print ''; diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 27e4389d258..610381ca5f4 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -156,7 +156,7 @@ class Form function textwithtooltip($text,$htmltext,$tooltipon=1,$direction=0,$img='',$extracss='',$notabs=0,$incbefore='') { global $conf; - + if ($incbefore) $text = $incbefore.$text; if (! $htmltext) return $text; @@ -555,10 +555,10 @@ class Form if ($conf->use_javascript_ajax && $conf->global->COMPANY_USE_SEARCH_TO_SELECT && ! $forcecombo) { //$minLength = (is_numeric($conf->global->COMPANY_USE_SEARCH_TO_SELECT)?$conf->global->COMPANY_USE_SEARCH_TO_SELECT:2); - + $out.= ajax_combobox($htmlname); } - + $out.= '