lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Menu compta/treso a ne pas activer si module pas actif

Browse Source
This commit is contained in:
Laurent Destailleur 2007-01-03 00:47:56 +00:00
parent 96a85ab951
commit e35b8844a0
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/includes/menus/barre_top/default.php
View File

@ -144,7 +144,8 @@ class MenuTop {
} }
// Compta/tréso (sert pour banque, tva, entités à facturer...) // Compta/tréso (sert pour banque, tva, entités à facturer...)
if ($conf->compta->enabled || $conf->comptaexpert->enabled || $conf->banque->enabled || $conf->caisse->enabled) if ($conf->compta->enabled || $conf->comptaexpert->enabled || $conf->banque->enabled
|| $conf->commande->enabled || $conf->facture->enabled)
{ {
// if ($user->rights->compta->general->lire || $user->rights->comptaexpert->general->lire) // if ($user->rights->compta->general->lire || $user->rights->comptaexpert->general->lire)
// { // {

2
htdocs/includes/menus/barre_top/eldy_backoffice.php
View File

@ -183,7 +183,7 @@ class MenuTop {
} }
// Financial // Financial
if ($conf->compta->enabled || $conf->comptaexpert->enabled || $conf->banque->enabled || $conf->caisse->enabled if ($conf->compta->enabled || $conf->comptaexpert->enabled || $conf->banque->enabled
|| $conf->commande->enabled || $conf->facture->enabled) || $conf->commande->enabled || $conf->facture->enabled)
{ {
$langs->load("compta"); $langs->load("compta");

2
htdocs/includes/menus/barre_top/eldy_frontoffice.php
View File

@ -183,7 +183,7 @@ class MenuTop {
} }
// Financial // Financial
if ($conf->compta->enabled || $conf->comptaexpert->enabled || $conf->banque->enabled || $conf->caisse->enabled if ($conf->compta->enabled || $conf->comptaexpert->enabled || $conf->banque->enabled
|| $conf->commande->enabled || $conf->facture->enabled) || $conf->commande->enabled || $conf->facture->enabled)
{ {
$langs->load("compta"); $langs->load("compta");

15
htdocs/pre.inc.php
View File

@ -32,7 +32,8 @@
require ("./main.inc.php"); require ("./main.inc.php");
$user->getrights(); $user->getrights();
function llxHeader($head = "") { function llxHeader($head = "")
{
global $user, $conf, $langs; global $user, $conf, $langs;
top_menu($head); top_menu($head);
@ -56,7 +57,7 @@ function llxHeader($head = "") {
$menu->add_submenu(DOL_URL_ROOT."/contact/index.php",$langs->trans("Contacts")); $menu->add_submenu(DOL_URL_ROOT."/contact/index.php",$langs->trans("Contacts"));
} }
if ($conf->commercial->enabled && $user->rights->commercial->lire) if ($conf->commercial->enabled && $user->rights->commercial->lire)
{ {
$langs->load("commercial"); $langs->load("commercial");
$menu->add(DOL_URL_ROOT."/comm/index.php",$langs->trans("Commercial")); $menu->add(DOL_URL_ROOT."/comm/index.php",$langs->trans("Commercial"));
@ -71,12 +72,8 @@ function llxHeader($head = "") {
} }
} }
// L'espace compta/tréso doit toujours etre actif car c'est un espace partagé if ($conf->compta->enabled || $conf->comptaexpert->enabled)
// par de nombreux modules (banque, facture, commande à facturer, etc...) indépendemment {
// de l'utilisation de la compta ou non. C'est au sein de cet espace que chaque sous fonction
// est protégé par le droit qui va bien du module concerné.
// if ($conf->compta->enabled || $conf->comptaexpert->enabled)
// {
$langs->load("compta"); $langs->load("compta");
$menu->add(DOL_URL_ROOT."/compta/index.php", $langs->trans("MenuFinancial")); $menu->add(DOL_URL_ROOT."/compta/index.php", $langs->trans("MenuFinancial"));
@ -84,7 +81,7 @@ function llxHeader($head = "") {
$langs->load("bills"); $langs->load("bills");
$menu->add_submenu(DOL_URL_ROOT."/compta/facture.php", $langs->trans("Bills")); $menu->add_submenu(DOL_URL_ROOT."/compta/facture.php", $langs->trans("Bills"));
} }
// } }
if ($conf->fichinter->enabled && $user->rights->ficheinter->lire) if ($conf->fichinter->enabled && $user->rights->ficheinter->lire)
{ {