diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index 11c3e3bb673..f57352d2cd3 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.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,7 @@ * */ -/*! - \file htdocs/compta/index.php +/** \file htdocs/compta/index.php \ingroup compta \brief Page accueil zone comptabilité \version $Revision$ @@ -220,7 +219,7 @@ print ''; /* * Commandes ŕ facturer */ -if ($user->comm > 0 && $conf->commercial->enabled ) +if ($conf->commande->enabled && $user->rights->commande->lire) { $langs->load("orders"); diff --git a/htdocs/compta/pre.inc.php b/htdocs/compta/pre.inc.php index c032c746890..c59d07de9c3 100644 --- a/htdocs/compta/pre.inc.php +++ b/htdocs/compta/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/pre.inc.php + \ingroup compta + \brief Fichier gestionnaire du menu compta */ require("../main.inc.php"); @@ -43,7 +42,7 @@ function llxHeader($head = "", $title="", $help_url='') $menu->add(DOL_URL_ROOT."/compta/clients.php", $langs->trans("Customers")); - if ($user->comm > 0 && $conf->commercial->enabled && $conf->propal->enabled) + if ($conf->propal->enabled) { $langs->load("propal"); $menu->add(DOL_URL_ROOT."/compta/propal.php",$langs->trans("Prop")); diff --git a/htdocs/user.class.php b/htdocs/user.class.php index 314e170a1ab..f6a857588b6 100644 --- a/htdocs/user.class.php +++ b/htdocs/user.class.php @@ -53,8 +53,6 @@ class User var $admin; var $login; var $pass; - var $comm; - var $compta; var $societe_id; var $webcal_login; var $errorstr; @@ -74,9 +72,6 @@ class User $this->db = $DB; $this->id = $id; - $this->comm = 1; - $this->compta = 1; - // Preference utilisateur $this->userpreflimite_liste = 0;