From 33f14e1bd891a92b67a2e2d7da96d7232e6daaa7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 8 Jan 2005 23:50:04 +0000 Subject: [PATCH] =?UTF-8?q?Qual:=20Suppression=20du=20code=20de=202=20vari?= =?UTF-8?q?ables=20devenues=20obsol=E8tes=20($user->comm=20et=20$user->com?= =?UTF-8?q?pta)=20car=20remplac=E9es=20par=20$user->rights->module->xxx=20?= =?UTF-8?q?Doc:=20Documentation=20doxygen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/compta/export/pre.inc.php | 14 ++++---------- htdocs/compta/param/comptes/fiche.php | 8 ++++---- htdocs/compta/param/comptes/pre.inc.php | 14 ++++---------- htdocs/compta/param/pre.inc.php | 14 ++++---------- htdocs/compta/pre.inc.php | 8 -------- htdocs/compta/resultat/bilan.php | 6 ++++++ htdocs/compta/ventilation/pre.inc.php | 7 +------ 7 files changed, 23 insertions(+), 48 deletions(-) diff --git a/htdocs/compta/export/pre.inc.php b/htdocs/compta/export/pre.inc.php index a6e31fb4509..d6cde3c3e88 100644 --- a/htdocs/compta/export/pre.inc.php +++ b/htdocs/compta/export/pre.inc.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004 Laurent Destailleur + * Copyright (C) 2004-2005 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,10 +21,9 @@ * */ -/*! - \file htdocs/compta/pre.inc.php - \ingroup compta - \brief Fichier gestionnaire du menu compta +/** \file htdocs/compta/export/pre.inc.php + \ingroup compta + \brief Fichier gestionnaire du menu export compta */ require("../../main.inc.php"); @@ -47,11 +46,6 @@ function llxHeader($head = "", $title="", $help_url='') $menu->add(DOL_URL_ROOT."/compta/export/",$langs->trans("Export")); $menu->add_submenu(DOL_URL_ROOT."/compta/export/liste.php",$langs->trans("Liste")); - if (! $user->compta) - { - $menu->clear(); - $menu->add(DOL_URL_ROOT."/",$langs->trans("Home")); - } left_menu($menu->liste, $help_url); } diff --git a/htdocs/compta/param/comptes/fiche.php b/htdocs/compta/param/comptes/fiche.php index 4ce53a73fb1..7ddb9d9cf34 100644 --- a/htdocs/compta/param/comptes/fiche.php +++ b/htdocs/compta/param/comptes/fiche.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004 Laurent Destailleur + * Copyright (C) 2004-2005 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,8 +21,8 @@ * */ -/*! - \file htdocs/product/fiche.php +/** + \file htdocs/compta/param/comptes/fiche.php \ingroup product \brief Page de la fiche produit \version $Revision$ @@ -34,7 +34,7 @@ $langs->load("products"); $mesg = ''; -if (!$user->compta) +if (! $user->rights->compta->resultat->lire) { accessforbidden(); } diff --git a/htdocs/compta/param/comptes/pre.inc.php b/htdocs/compta/param/comptes/pre.inc.php index d46426a0ceb..0d3e8d9b9ff 100644 --- a/htdocs/compta/param/comptes/pre.inc.php +++ b/htdocs/compta/param/comptes/pre.inc.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004 Laurent Destailleur + * Copyright (C) 2004-2005 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,10 +21,9 @@ * */ -/*! - \file htdocs/compta/prama/pre.inc.php - \ingroup compta - \brief Fichier gestionnaire du menu paramétrage de la compta +/** \file htdocs/compta/param/pre.inc.php + \ingroup compta + \brief Fichier gestionnaire du menu paramétrage de la compta */ require("../../../main.inc.php"); @@ -47,11 +46,6 @@ function llxHeader($head = "", $title="", $help_url='') $menu->add_submenu(DOL_URL_ROOT."/compta/param/comptes/liste.php","Liste"); $menu->add_submenu(DOL_URL_ROOT."/compta/param/comptes/fiche.php?action=create","Nouveau"); - if (! $user->compta) - { - $menu->clear(); - $menu->add(DOL_URL_ROOT."/",$langs->trans("Home")); - } left_menu($menu->liste, $help_url); } diff --git a/htdocs/compta/param/pre.inc.php b/htdocs/compta/param/pre.inc.php index b579e16bd56..b75c374d111 100644 --- a/htdocs/compta/param/pre.inc.php +++ b/htdocs/compta/param/pre.inc.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004 Laurent Destailleur + * Copyright (C) 2004-2005 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,10 +21,9 @@ * */ -/** - \file htdocs/compta/param/pre.inc.php - \ingroup compta - \brief Fichier gestionnaire du menu paramétrage de la compta +/** \file htdocs/compta/param/pre.inc.php + \ingroup compta + \brief Fichier gestionnaire du menu paramétrage de la compta */ require("../../main.inc.php"); @@ -43,11 +42,6 @@ function llxHeader($head = "", $title="", $help_url='') $menu->add_submenu(DOL_URL_ROOT."/compta/param/comptes/liste.php","Comptes généraux"); - if (! $user->compta) - { - $menu->clear(); - $menu->add(DOL_URL_ROOT."/",$langs->trans("Home")); - } left_menu($menu->liste, $help_url); } diff --git a/htdocs/compta/pre.inc.php b/htdocs/compta/pre.inc.php index c59d07de9c3..06ac62c2699 100644 --- a/htdocs/compta/pre.inc.php +++ b/htdocs/compta/pre.inc.php @@ -122,15 +122,7 @@ function llxHeader($head = "", $title="", $help_url='') if ($user->rights->compta->ventilation->param) $menu->add(DOL_URL_ROOT."/compta/param/",$langs->trans("Param")); - if (! $user->compta) - { - $menu->clear(); - $menu->add(DOL_URL_ROOT."/",$langs->trans("Home")); - } - /* - * - */ left_menu($menu->liste, $help_url); } diff --git a/htdocs/compta/resultat/bilan.php b/htdocs/compta/resultat/bilan.php index ca885ab0ad6..3e03032fc58 100644 --- a/htdocs/compta/resultat/bilan.php +++ b/htdocs/compta/resultat/bilan.php @@ -19,6 +19,12 @@ * $Source$ * */ + +/** \file htdocs/compta/resultat/pre.inc.php + \ingroup compta + \brief Fichier gestionnaire du menu paramétrage de la compta +*/ + require("./pre.inc.php"); require("../../tva.class.php"); require("../../chargesociales.class.php"); diff --git a/htdocs/compta/ventilation/pre.inc.php b/htdocs/compta/ventilation/pre.inc.php index b4503ac9220..be6e47e2882 100644 --- a/htdocs/compta/ventilation/pre.inc.php +++ b/htdocs/compta/ventilation/pre.inc.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004 Laurent Destailleur + * Copyright (C) 2004-2005 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -48,11 +48,6 @@ function llxHeader($head = "", $title="", $help_url='') $menu->add(DOL_URL_ROOT."/compta/export/",$langs->trans("Export")); - if (! $user->compta) - { - $menu->clear(); - $menu->add(DOL_URL_ROOT."/",$langs->trans("Home")); - } left_menu($menu->liste, $help_url); }