diff --git a/htdocs/compta/commande/pre.inc.php b/htdocs/compta/commande/pre.inc.php index 662aec5c341cea3a678a725707942dffd4d6484f..fcb935f725e763ac99076d82e738fabbb4b9c7f3 100644 --- a/htdocs/compta/commande/pre.inc.php +++ b/htdocs/compta/commande/pre.inc.php @@ -102,12 +102,12 @@ function llxHeader($head = "", $title="", $help_url='') $menu->add(DOL_URL_ROOT."/compta/deplacement/", "D�placement"); } - if (($conf->compta->enabled || $conf->comptaexpert->enabled) && $conf->compta->tva && $user->societe_id == 0) + if ($conf->tax->enabled && $conf->compta->tva && $user->societe_id == 0) { $menu->add(DOL_URL_ROOT."/compta/tva/index.php",$langs->trans("VAT")); } - if ($conf->compta->enabled || $conf->comptaexpert->enabled) + if ($conf->tax->enabled) { $menu->add(DOL_URL_ROOT."/compta/charges/index.php",$langs->trans("Charges")); } @@ -127,12 +127,18 @@ function llxHeader($head = "", $title="", $help_url='') $menu->add(DOL_URL_ROOT."/compta/prelevement/",$langs->trans("StandingOrders")); } - $menu->add(DOL_URL_ROOT."/compta/ventilation/",$langs->trans("Ventilation")); - - if ($user->rights->compta->ventilation->parametrer) + if ($conf->compta->enabled) { - $menu->add(DOL_URL_ROOT."/compta/param/",$langs->trans("Param")); - } + if ($user->rights->compta->ventilation->creer) + { + $menu->add(DOL_URL_ROOT."/compta/ventilation/",$langs->trans("Ventilation")); + } + + if ($user->rights->compta->ventilation->parametrer) + { + $menu->add(DOL_URL_ROOT."/compta/param/",$langs->trans("Param")); + } + } left_menu($menu->liste, $help_url); diff --git a/htdocs/compta/pre.inc.php b/htdocs/compta/pre.inc.php index 747ab8ca2bf9e00af2c807c08e11ed04eaae3189..436e7e3db8934c84151462d87998993be99987c3 100644 --- a/htdocs/compta/pre.inc.php +++ b/htdocs/compta/pre.inc.php @@ -99,12 +99,12 @@ function llxHeader($head = "", $title="", $help_url='') $menu->add(DOL_URL_ROOT."/compta/deplacement/", $langs->trans("Trips")); } - if (($conf->compta->enabled || $conf->comptaexpert->enabled) && $conf->compta->tva && $user->societe_id == 0) + if ($conf->tax->enabled && $conf->compta->tva && $user->societe_id == 0) { $menu->add(DOL_URL_ROOT."/compta/tva/index.php",$langs->trans("VAT")); } - if ($conf->compta->enabled || $conf->comptaexpert->enabled) + if ($conf->tax->enabled) { $menu->add(DOL_URL_ROOT."/compta/charges/index.php",$langs->trans("Charges")); } @@ -124,13 +124,18 @@ function llxHeader($head = "", $title="", $help_url='') $menu->add(DOL_URL_ROOT."/compta/prelevement/",$langs->trans("StandingOrders")); } - $menu->add(DOL_URL_ROOT."/compta/ventilation/",$langs->trans("Ventilation")); - - if ($user->rights->compta->ventilation->parametrer) + if ($conf->compta->enabled) { - $menu->add(DOL_URL_ROOT."/compta/param/",$langs->trans("Param")); - } - + if ($user->rights->compta->ventilation->parametrer) + { + $menu->add(DOL_URL_ROOT."/compta/ventilation/",$langs->trans("Ventilation")); + } + + if ($user->rights->compta->ventilation->parametrer) + { + $menu->add(DOL_URL_ROOT."/compta/param/",$langs->trans("Param")); + } + } left_menu($menu->liste, $help_url); }