From f8256703ee7b3b6322954adfacb4e9a82bfd4e08 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 27 Jul 2006 11:01:44 +0000 Subject: [PATCH] =?UTF-8?q?New:=20Les=20fonctions=20de=20saisie/consultati?= =?UTF-8?q?on=20des=20charges=20sociales=20et=20impots=20sont=20mis=20dans?= =?UTF-8?q?=20un=20module=20=E0=20part=20nomm=E9=20'Taxes=20et=20charges?= =?UTF-8?q?=20sociales'.=20En=20effet=20ces=20fonctions=20ne=20sont=20pas?= =?UTF-8?q?=20des=20fonctions=20de=20compta=20pure=20mais=20des=20fonction?= =?UTF-8?q?s=20de=20tr=E9soreries.=20Ceci=20afin=20d'avoir=20une=20meilleu?= =?UTF-8?q?r=20ind=E9pendance=20du=20module=20compta.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/compta/resultat/clientfourn.php | 3 ++- .../menus/barre_left/eldy_backoffice.php | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php index 37976a18a26..85ebbcb1e4f 100644 --- a/htdocs/compta/resultat/clientfourn.php +++ b/htdocs/compta/resultat/clientfourn.php @@ -33,7 +33,8 @@ require_once("../../chargesociales.class.php"); $langs->load("bills"); $user->getrights('compta'); -if (!$user->rights->compta->resultat->lire) +$user->getrights('facture'); +if (!$user->rights->facture->lire) accessforbidden(); $year=$_GET["year"]; diff --git a/htdocs/includes/menus/barre_left/eldy_backoffice.php b/htdocs/includes/menus/barre_left/eldy_backoffice.php index 3134953a52f..33f817e44d3 100644 --- a/htdocs/includes/menus/barre_left/eldy_backoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_backoffice.php @@ -420,18 +420,19 @@ class MenuLeft { } // Rapports - if ($conf->compta->enabled || $conf->comptaexpert->enabled) - { + $comptaenabled=($conf->compta->enabled || $conf->comptaexpert->enabled); +// if ($conf->compta->enabled || $conf->comptaexpert->enabled) +// { // Bilan, résultats - $newmenu->add(DOL_URL_ROOT."/compta/resultat/index.php?leftmenu=ca&mainmenu=accountancy",$langs->trans("Reportings"),0,$user->rights->compta->resultat->lire); + $newmenu->add(DOL_URL_ROOT."/compta/resultat/index.php?leftmenu=ca&mainmenu=accountancy",$langs->trans("Reportings"),0,$user->rights->compta->resultat->lire||!$comptaenabled); - if ($leftmenu=="ca") $newmenu->add(DOL_URL_ROOT."/compta/resultat/index.php?leftmenu=ca","Résultat / Exercice",1,$user->rights->compta->resultat->lire); - if ($leftmenu=="ca") $newmenu->add_submenu(DOL_URL_ROOT."/compta/resultat/clientfourn.php?leftmenu=ca",$langs->trans("ByCompanies"),2,$user->rights->compta->resultat->lire); + if ($leftmenu=="ca") $newmenu->add(DOL_URL_ROOT."/compta/resultat/index.php?leftmenu=ca","Résultat / Exercice",1,$user->rights->compta->resultat->lire||!$comptaenabled); + if ($leftmenu=="ca") $newmenu->add_submenu(DOL_URL_ROOT."/compta/resultat/clientfourn.php?leftmenu=ca",$langs->trans("ByCompanies"),2,$user->rights->compta->resultat->lire||!$comptaenabled); /* On verra ca avec module compabilité if ($leftmenu=="ca") $newmenu->add_submenu(DOL_URL_ROOT."/compta/resultat/compteres.php?leftmenu=ca","Compte de résultat",2,$user->rights->compta->resultat->lire); if ($leftmenu=="ca") $newmenu->add_submenu(DOL_URL_ROOT."/compta/resultat/bilan.php?leftmenu=ca","Bilan",2,$user->rights->compta->resultat->lire); */ - if ($leftmenu=="ca") $newmenu->add(DOL_URL_ROOT."/compta/stats/index.php?leftmenu=ca","Chiffre d'affaire",1,$user->rights->compta->resultat->lire); + if ($leftmenu=="ca") $newmenu->add(DOL_URL_ROOT."/compta/stats/index.php?leftmenu=ca","Chiffre d'affaire",1,$user->rights->compta->resultat->lire||!$comptaenabled); /* if ($leftmenu=="ca") $newmenu->add_submenu(DOL_URL_ROOT."/compta/stats/cumul.php?leftmenu=ca","Cumulé",2,$user->rights->compta->resultat->lire); @@ -441,9 +442,9 @@ class MenuLeft { } if ($leftmenu=="ca") $newmenu->add_submenu(DOL_URL_ROOT."/compta/stats/exercices.php?leftmenu=ca",$langs->trans("Evolution"),2,$user->rights->compta->resultat->lire); */ - if ($leftmenu=="ca") $newmenu->add_submenu(DOL_URL_ROOT."/compta/stats/casoc.php?leftmenu=ca",$langs->trans("ByCompanies"),2,$user->rights->compta->resultat->lire); - if ($leftmenu=="ca") $newmenu->add_submenu(DOL_URL_ROOT."/compta/stats/cabyuser.php?leftmenu=ca",$langs->trans("ByUsers"),2,$user->rights->compta->resultat->lire); - } + if ($leftmenu=="ca") $newmenu->add_submenu(DOL_URL_ROOT."/compta/stats/casoc.php?leftmenu=ca",$langs->trans("ByCompanies"),2,$user->rights->compta->resultat->lire||!$comptaenabled); + if ($leftmenu=="ca") $newmenu->add_submenu(DOL_URL_ROOT."/compta/stats/cabyuser.php?leftmenu=ca",$langs->trans("ByUsers"),2,$user->rights->compta->resultat->lire||!$comptaenabled); +// } }