diff --git a/include/adm.inc.php b/include/adm.inc.php index 77a96975d..f708eda34 100644 --- a/include/adm.inc.php +++ b/include/adm.inc.php @@ -74,17 +74,26 @@ if ( $low_action == "list" ) ' . "Exercice " . $g_user->get_exercice() . ''; echo dossier::hidden(); - $a=(isset($_GET['query']))?$_GET['query']:""; - printf (_('Recherche').' ', - $a); - echo HtmlInput::request_to_hidden(array('ac')); - $sel_card=new ISelect('cat'); - $sel_card->value=$cn->make_array('select fd_id, fd_label from fiche_def '. - ' where frd_id=$1 '. - ' order by fd_label ',1,array(FICHE_TYPE_ADM_TAX)); - $sel_card->selected=(isset($_GET['cat']))?$_GET['cat']:-1; - $sel_card->javascript=' onchange="submit(this);"'; - echo _('Catégorie :').$sel_card->input(); + $a=(isset($_GET['query']))?$_GET['query']:""; + printf (_('Recherche').' ', + $a); + echo HtmlInput::request_to_hidden(array('ac')); + $choice_cat=HtmlInput::default_value_request("choice_cat", 1); + if ( $choice_cat == 1 ) + { + $sel_card=new ISelect('cat'); + $sel_card->value=$cn->make_array('select fd_id, fd_label from fiche_def '. + ' where frd_id=$1 '. + ' order by fd_label ',1,array(FICHE_TYPE_ADM_TAX)); + $sel_card->selected=(isset($_GET['cat']))?$_GET['cat']:-1; + $sel_card->javascript=' onchange="submit(this);"'; + echo _('Catégorie :').$sel_card->input(); + } else + { + $cat=HtmlInput::default_value_request('cat', ''); + echo HtmlInput::hidden("cat",$cat); + echo HtmlInput::hidden('choice_cat', 0); + } ?> diff --git a/include/bank.inc.php b/include/bank.inc.php index d199762d6..051a1f658 100644 --- a/include/bank.inc.php +++ b/include/bank.inc.php @@ -73,13 +73,24 @@ if ( $low_action == "list" ) $a=(isset($_GET['query']))?$_GET['query']:""; printf (_('Recherche').' ', $a); - $sel_card=new ISelect('cat'); - $sel_card->value=$cn->make_array('select fd_id, fd_label from fiche_def '. - ' where frd_id=$1'. - ' order by fd_label ',1,array(FICHE_TYPE_FIN)); - $sel_card->selected=(isset($_GET['cat']))?$_GET['cat']:-1; - $sel_card->javascript=' onchange="submit(this);"'; - echo _('Catégorie :').$sel_card->input(); + $choice_cat=HtmlInput::default_value_request("choice_cat", 1); + + if ( $choice_cat == 1 ) + { + $sel_card=new ISelect('cat'); + $sel_card->value=$cn->make_array('select fd_id, fd_label from fiche_def '. + ' where frd_id=$1'. + ' order by fd_label ',1,array(FICHE_TYPE_FIN)); + $sel_card->selected=(isset($_GET['cat']))?$_GET['cat']:-1; + $sel_card->javascript=' onchange="submit(this);"'; + echo _('Catégorie :').$sel_card->input(); + } + else + { + $cat=HtmlInput::default_value_request('cat', ''); + echo HtmlInput::hidden("cat", $cat); + echo HtmlInput::hidden('choice_cat', 0); + } $nooperation=new ICheckBox('noop'); $nooperation->selected=(isset($_GET['noop']))?true:false; echo _('Inclure les banques sans opération :').$nooperation->input(); diff --git a/include/customer.inc.php b/include/customer.inc.php index 8b7978140..9b8c54eb4 100644 --- a/include/customer.inc.php +++ b/include/customer.inc.php @@ -68,23 +68,33 @@ if ($low_action == "list")