From 882060cd4b635b3159fd1fe7be4bbf45af7a0f9c Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Wed, 17 Jun 2015 19:20:16 +0200 Subject: [PATCH] New : new parameter (choice_cat) for the sub_menu see wiki --- include/adm.inc.php | 31 ++++++++++++++++++----------- include/bank.inc.php | 25 +++++++++++++++++------- include/customer.inc.php | 42 +++++++++++++++++++++++++--------------- include/dossier.inc.php | 4 ++-- include/manager.inc.php | 25 +++++++++++++++++------- include/modele.inc.php | 2 +- include/supplier.inc.php | 23 +++++++++++++++------- 7 files changed, 101 insertions(+), 51 deletions(-) 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")
- ' . "Exercice " . $g_user->get_exercice() . ''; - echo dossier::hidden(); - $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=' . FICHE_TYPE_CLIENT . - ' order by fd_label ', 1); - $sel_card->selected = (isset($_GET['cat'])) ? $_GET['cat'] : -1; - $sel_card->javascript = ' onchange="submit(this);"'; - echo _('Catégorie :') . $sel_card->input(); - $nooperation = new ICheckBox('noop'); - $nooperation->selected = (isset($_GET['noop'])) ? true : false; + ' . "Exercice " . $g_user->get_exercice() . ''; + $a=(isset($_GET['query']))?$_GET['query']:""; + printf (_('Recherche').' ', + $a); + $choice_cat=HtmlInput::default_value_request("choice_cat", 1); - echo _('Inclure les clients sans opération :') . $nooperation->input(); - ?> + 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='.FICHE_TYPE_CLIENT. + ' order by fd_label ',1); + $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 clients sans opération :') . $nooperation->input(); + ?>
diff --git a/include/dossier.inc.php b/include/dossier.inc.php index 2f2bd2368..47ed42825 100644 --- a/include/dossier.inc.php +++ b/include/dossier.inc.php @@ -328,8 +328,8 @@ if ( $sa == 'remove' ) $sql="delete from ac_dossier where dos_id=$1"; $cn->exec_sql($sql,array($_REQUEST['d'])); print '

'; - printf (_("Le dossier %s est effacé"),h($name))."

"; - echo HtmlInput::button_anchor('Retour','?action=dossier_mgt'); + printf (_("Le dossier %s est effacé").'',h($name)); + echo HtmlInput::button_anchor(_('Retour'),'?action=dossier_mgt'); } ?>
diff --git a/include/manager.inc.php b/include/manager.inc.php index 2064b710f..9da8b330d 100644 --- a/include/manager.inc.php +++ b/include/manager.inc.php @@ -76,13 +76,24 @@ if ($low_action == "list") echo dossier::hidden(); $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=' . FICHE_TYPE_EMPL . - ' order by fd_label ', 1); - $sel_card->selected = (isset($_GET['cat'])) ? $_GET['cat'] : -1; - $sel_card->javascript = ' onchange="submit(this);"'; - echo _('Catégorie :') . $sel_card->input(); + 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=' . FICHE_TYPE_EMPL . + ' order by fd_label ', 1); + $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 employés sans opération :') . $nooperation->input(); diff --git a/include/modele.inc.php b/include/modele.inc.php index 4ceefc065..baa6affc7 100644 --- a/include/modele.inc.php +++ b/include/modele.inc.php @@ -383,7 +383,7 @@ if ($sa == 'list') $sql = "delete from modeledef where mod_id=$1"; $cn->exec_sql($sql, array($_REQUEST['m'])); print '

'; - printf (_("Le modèle %s est effacé"),$name )."

"; + printf (_("Le modèle %s est effacé")."",$name ); echo HtmlInput::button_anchor(_('Retour'), '?action=modele_mgt'); } echo '
'; diff --git a/include/supplier.inc.php b/include/supplier.inc.php index 0dc5a652a..ab8d8c936 100644 --- a/include/supplier.inc.php +++ b/include/supplier.inc.php @@ -78,13 +78,22 @@ 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='.FICHE_TYPE_FOURNISSEUR. - ' order by fd_label ',1); - $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='.FICHE_TYPE_FOURNISSEUR. + ' order by fd_label ',1); + $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 fournisseurs sans opération :').$nooperation->input();