diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index 8e394bc2ee0..1e6bcfffeb7 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -233,8 +233,8 @@ $tabcond[8] = $conf->societe->enabled; $tabcond[9] = true; $tabcond[10]= true; $tabcond[11]= true; -$tabcond[12]= $conf->facture->enabled||$conf->fournisseur->enabled; -$tabcond[13]= $conf->facture->enabled||$conf->fournisseur->enabled; +$tabcond[12]= $conf->commande->enabled||$conf->propale->enabled||$conf->facture->enabled||$conf->fournisseur->enabled; +$tabcond[13]= $conf->commande->enabled||$conf->propale->enabled||$conf->facture->enabled||$conf->fournisseur->enabled; $tabcond[14]= $conf->product->enabled&&$conf->ecotax->enabled; $tabcond[15]= true; $tabcond[16]= $conf->societe->enabled; @@ -737,7 +737,7 @@ if ($_GET["id"]) else { /* - * Affichage de la liste des dictionnaires + * Show list of dictionnary to show */ $var=true; @@ -745,19 +745,35 @@ else print ''; print ''; //print ''; - print ''; + print ''; print ''; print ''; foreach ($taborder as $i) { - if ($tabname[$i] && ! $tabcond[$i]) continue; // If dictionnary and condition not true + if ($tabname[$i] && empty($tabcond[$i])) continue; if ($i) { $var=!$var; $value=$tabname[$i]; - print ''; + print ''; + print ''; + print ''; $lastlineisempty=false; } else @@ -765,7 +781,7 @@ else if (! $lastlineisempty) { $var=!$var; - print ''; + print ''; $lastlineisempty=true; } }
'.$langs->trans("Module").''.$langs->trans("Dictionnary").''.$langs->trans("Dictionnary").''.$langs->trans("Table").'
'.$tablib[$i].''.$tabname[$i].'
'; + if (! empty($tabcond[$i])) + { + print ''.$tablib[$i].''; + } + else + { + print $tablib[$i]; + } + print ''; + /*if (empty($tabcond[$i])) + { + print info_admin($langs->trans("DictionnaryDisabledSinceNoModuleNeedIt"),1); + }*/ + print ''.$tabname[$i].'