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

Qual: Suppression du code de 2 variables devenues obsoltes ($user->comm et $user->compta) car remplaces par $user->rights->module->xxx

Browse Source
This commit is contained in:
Laurent Destailleur 2005-01-08 23:41:51 +00:00
parent ae9e738133
commit 8a0ad60f01
3 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/compta/index.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * 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 * 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 \ingroup compta
\brief Page accueil zone comptabilité \brief Page accueil zone comptabilité
\version $Revision$ \version $Revision$
@ -220,7 +219,7 @@ print '</td><td valign="top" width="70%">';
/* /*
* Commandes à facturer * Commandes à facturer
*/ */
if ($user->comm > 0 && $conf->commercial->enabled ) if ($conf->commande->enabled && $user->rights->commande->lire)
{ {
$langs->load("orders"); $langs->load("orders");

11
htdocs/compta/pre.inc.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -21,10 +21,9 @@
* *
*/ */
/*! /** \file htdocs/compta/pre.inc.php
\file htdocs/compta/pre.inc.php \ingroup compta
\ingroup compta \brief Fichier gestionnaire du menu compta
\brief Fichier gestionnaire du menu compta
*/ */
require("../main.inc.php"); 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")); $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"); $langs->load("propal");
$menu->add(DOL_URL_ROOT."/compta/propal.php",$langs->trans("Prop")); $menu->add(DOL_URL_ROOT."/compta/propal.php",$langs->trans("Prop"));

5
htdocs/user.class.php
View File

@ -53,8 +53,6 @@ class User
var $admin; var $admin;
var $login; var $login;
var $pass; var $pass;
var $comm;
var $compta;
var $societe_id; var $societe_id;
var $webcal_login; var $webcal_login;
var $errorstr; var $errorstr;
@ -74,9 +72,6 @@ class User
$this->db = $DB; $this->db = $DB;
$this->id = $id; $this->id = $id;
$this->comm = 1;
$this->compta = 1;
// Preference utilisateur // Preference utilisateur
$this->userpreflimite_liste = 0; $this->userpreflimite_liste = 0;