Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 17:48:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Solve pb in enabling modules

Browse Source
This commit is contained in:
Laurent Destailleur
2008-10-28 20:37:30 +00:00
parent 217c239d94
commit 359dfe26f1
12 changed files with 41 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/includes/modules/DolibarrModules.class.php
View File

@@ -691,11 +691,12 @@ class DolibarrModules
$sql .= "(".$r_id.",'".addslashes($r_desc)."','".$r_modul."','".$r_type."',".$r_def.")"; $sql .= "(".$r_id.",'".addslashes($r_desc)."','".$r_modul."','".$r_type."',".$r_def.")";
} }
dolibarr_syslog("DolibarrModules::insert_permissions sql=".$sql); dolibarr_syslog("DolibarrModules::insert_permissions sql=".$sql, LOG_DEBUG);
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if (! $resql) if (! $resql)
{ {
if ($this->db->errno() != "DB_ERROR_RECORD_ALREADY_EXISTS") { if ($this->db->errno() != "DB_ERROR_RECORD_ALREADY_EXISTS") {
dolibarr_syslog("DolibarrModules::insert_permissions error ".$this->db->lasterror(), LOG_ERR);
$err++; $err++;
} }
} }

10
htdocs/includes/modules/modBanque.class.php
View File

@@ -90,28 +90,28 @@ class modBanque extends DolibarrModules
$r++; $r++;
$this->rights[$r][0] = 112; // id de la permission $this->rights[$r][0] = 112; // id de la permission
$this->rights[$r][1] = 'Cr<EFBFBD>er/modifier montant/supprimer <EFBFBD>criture bancaire'; // libelle de la permission $this->rights[$r][1] = 'Creer/modifier montant/supprimer ecriture bancaire'; // libelle de la permission
$this->rights[$r][2] = 'w'; // type de la permission (d<>pr<70>ci<63> <20> ce jour) $this->rights[$r][2] = 'w'; // type de la permission (d<>pr<70>ci<63> <20> ce jour)
$this->rights[$r][3] = 0; // La permission est-elle une permission par d<>faut $this->rights[$r][3] = 0; // La permission est-elle une permission par d<>faut
$this->rights[$r][4] = 'modifier'; $this->rights[$r][4] = 'modifier';
$r++; $r++;
$this->rights[$r][0] = 113; // id de la permission $this->rights[$r][0] = 113; // id de la permission
$this->rights[$r][1] = 'Configurer les comptes bancaires (cr<EFBFBD>er, g<EFBFBD>rer cat<EFBFBD>gories)'; // libelle de la permission $this->rights[$r][1] = 'Configurer les comptes bancaires (creer, gerer categories)'; // libelle de la permission
$this->rights[$r][2] = 'a'; // type de la permission (d<>pr<70>ci<63> <20> ce jour) $this->rights[$r][2] = 'a'; // type de la permission (d<>pr<70>ci<63> <20> ce jour)
$this->rights[$r][3] = 0; // La permission est-elle une permission par d<>faut $this->rights[$r][3] = 0; // La permission est-elle une permission par d<>faut
$this->rights[$r][4] = 'configurer'; $this->rights[$r][4] = 'configurer';
$r++; $r++;
$this->rights[$r][0] = 114; // id de la permission $this->rights[$r][0] = 114; // id de la permission
$this->rights[$r][1] = 'Rapprocher les <EFBFBD>critures bancaires'; // libelle de la permission $this->rights[$r][1] = 'Rapprocher les ecritures bancaires'; // libelle de la permission
$this->rights[$r][2] = 'w'; // type de la permission (d<>pr<70>ci<63> <20> ce jour) $this->rights[$r][2] = 'w'; // type de la permission (d<>pr<70>ci<63> <20> ce jour)
$this->rights[$r][3] = 0; // La permission est-elle une permission par d<>faut $this->rights[$r][3] = 0; // La permission est-elle une permission par d<>faut
$this->rights[$r][4] = 'consolidate'; $this->rights[$r][4] = 'consolidate';
$r++; $r++;
$this->rights[$r][0] = 115; // id de la permission $this->rights[$r][0] = 115; // id de la permission
$this->rights[$r][1] = 'Exporter transactions et relev<EFBFBD>s'; // libelle de la permission $this->rights[$r][1] = 'Exporter transactions et releves'; // libelle de la permission
$this->rights[$r][2] = 'r'; // type de la permission (d<>pr<70>ci<63> <20> ce jour) $this->rights[$r][2] = 'r'; // type de la permission (d<>pr<70>ci<63> <20> ce jour)
$this->rights[$r][3] = 0; // La permission est-elle une permission par d<>faut $this->rights[$r][3] = 0; // La permission est-elle une permission par d<>faut
$this->rights[$r][4] = 'export'; $this->rights[$r][4] = 'export';
@@ -125,7 +125,7 @@ class modBanque extends DolibarrModules
$r++; $r++;
$this->rights[$r][0] = 117; // id de la permission $this->rights[$r][0] = 117; // id de la permission
$this->rights[$r][1] = 'G<EFBFBD>rer les envois de ch<EFBFBD>ques'; // libelle de la permission $this->rights[$r][1] = 'Gerer les envois de cheques'; // libelle de la permission
$this->rights[$r][2] = 'w'; // type de la permission (d<>pr<70>ci<63> <20> ce jour) $this->rights[$r][2] = 'w'; // type de la permission (d<>pr<70>ci<63> <20> ce jour)
$this->rights[$r][3] = 0; // La permission est-elle une permission par d<>faut $this->rights[$r][3] = 0; // La permission est-elle une permission par d<>faut
$this->rights[$r][4] = 'cheque'; $this->rights[$r][4] = 'cheque';

16
htdocs/includes/modules/modBarcode.class.php
View File

@@ -19,15 +19,15 @@
*/ */
/** /**
\defgroup barcode Module code barre * \defgroup barcode Module code barre
\brief Module pour gerer les codes barres * \brief Module pour gerer les codes barres
\version $Id$ * \version $Id$
*/ */
/** /**
\file htdocs/includes/modules/modBarcode.class.php * \file htdocs/includes/modules/modBarcode.class.php
\ingroup barcode,produit * \ingroup barcode,produit
\brief Fichier de description et activation du module Barcode * \brief Fichier de description et activation du module Barcode
*/ */
include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
@@ -42,7 +42,7 @@ class modBarcode extends DolibarrModules
/** /**
* \brief Constructeur. Definit les noms, constantes et boites * \brief Constructeur. Definit les noms, constantes et boites
* \param DB handler d'acc<EFBFBD>s base * \param DB handler d'acces base
*/ */
function modBarcode($DB) function modBarcode($DB)
{ {
@@ -85,7 +85,7 @@ class modBarcode extends DolibarrModules
$this->rights[1][4] = 'lire'; $this->rights[1][4] = 'lire';
$this->rights[2][0] = 301; // id de la permission $this->rights[2][0] = 301; // id de la permission
$this->rights[2][1] = 'Cr<EFBFBD>er/modifier les codes barres'; // libelle de la permission $this->rights[2][1] = 'Creer/modifier les codes barres'; // libelle de la permission
$this->rights[2][2] = 'w'; // type de la permission (d<>pr<70>ci<63> <20> ce jour) $this->rights[2][2] = 'w'; // type de la permission (d<>pr<70>ci<63> <20> ce jour)
$this->rights[2][3] = 0; // La permission est-elle une permission par d<>faut $this->rights[2][3] = 0; // La permission est-elle une permission par d<>faut
$this->rights[2][4] = 'creer'; $this->rights[2][4] = 'creer';

11
htdocs/includes/modules/modCategorie.class.php
View File

@@ -15,13 +15,12 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
*/ */
/** /**
\defgroup category Module categorie \defgroup category Module categorie
\brief Module pour g<>rer les cat<61>gories \brief Module pour g<>rer les cat<61>gories
\version $Id$
*/ */
/** /**
@@ -79,28 +78,28 @@ class modCategorie extends DolibarrModules
$r=0; $r=0;
$this->rights[$r][0] = 241; // id de la permission $this->rights[$r][0] = 241; // id de la permission
$this->rights[$r][1] = 'Lire les cat<EFBFBD>gories'; // libelle de la permission $this->rights[$r][1] = 'Lire les categories'; // libelle de la permission
$this->rights[$r][2] = 'r'; // type de la permission (d<>pr<70>ci<63> <20> ce jour) $this->rights[$r][2] = 'r'; // type de la permission (d<>pr<70>ci<63> <20> ce jour)
$this->rights[$r][3] = 1; // La permission est-elle une permission par d<>faut $this->rights[$r][3] = 1; // La permission est-elle une permission par d<>faut
$this->rights[$r][4] = 'lire'; $this->rights[$r][4] = 'lire';
$r++; $r++;
$this->rights[$r][0] = 242; // id de la permission $this->rights[$r][0] = 242; // id de la permission
$this->rights[$r][1] = 'Cr<EFBFBD>er/modifier les cat<EFBFBD>gories'; // libelle de la permission $this->rights[$r][1] = 'Creer/modifier les categories'; // libelle de la permission
$this->rights[$r][2] = 'w'; // type de la permission (d<>pr<70>ci<63> <20> ce jour) $this->rights[$r][2] = 'w'; // type de la permission (d<>pr<70>ci<63> <20> ce jour)
$this->rights[$r][3] = 0; // La permission est-elle une permission par d<>faut $this->rights[$r][3] = 0; // La permission est-elle une permission par d<>faut
$this->rights[$r][4] = 'creer'; $this->rights[$r][4] = 'creer';
$r++; $r++;
$this->rights[$r][0] = 243; // id de la permission $this->rights[$r][0] = 243; // id de la permission
$this->rights[$r][1] = 'Supprimer les cat<EFBFBD>gories'; // libelle de la permission $this->rights[$r][1] = 'Supprimer les categories'; // libelle de la permission
$this->rights[$r][2] = 'd'; // type de la permission (d<>pr<70>ci<63> <20> ce jour) $this->rights[$r][2] = 'd'; // type de la permission (d<>pr<70>ci<63> <20> ce jour)
$this->rights[$r][3] = 0; // La permission est-elle une permission par d<>faut $this->rights[$r][3] = 0; // La permission est-elle une permission par d<>faut
$this->rights[$r][4] = 'supprimer'; $this->rights[$r][4] = 'supprimer';
$r++; $r++;
$this->rights[$r][0] = 244; // id de la permission $this->rights[$r][0] = 244; // id de la permission
$this->rights[$r][1] = 'Voir le contenu des cat<EFBFBD>gories cach<EFBFBD>es'; // libelle de la permission $this->rights[$r][1] = 'Voir le contenu des categories cachees'; // libelle de la permission
$this->rights[$r][2] = 'r'; // type de la permission (d<>pr<70>ci<63> <20> ce jour) $this->rights[$r][2] = 'r'; // type de la permission (d<>pr<70>ci<63> <20> ce jour)
$this->rights[$r][3] = 1; // La permission est-elle une permission par d<>faut $this->rights[$r][3] = 1; // La permission est-elle une permission par d<>faut
$this->rights[$r][4] = 'voir'; $this->rights[$r][4] = 'voir';

4
htdocs/includes/modules/modComptabilite.class.php
View File

@@ -92,7 +92,7 @@ class modComptabilite extends DolibarrModules
$r++; $r++;
$this->rights[$r][0] = 95; $this->rights[$r][0] = 95;
$this->rights[$r][1] = 'Lire CA, bilans, r<EFBFBD>sultats'; $this->rights[$r][1] = 'Lire CA, bilans, resultats';
$this->rights[$r][2] = 'r'; $this->rights[$r][2] = 'r';
$this->rights[$r][3] = 1; $this->rights[$r][3] = 1;
$this->rights[$r][4] = 'resultat'; $this->rights[$r][4] = 'resultat';
@@ -100,7 +100,7 @@ class modComptabilite extends DolibarrModules
$r++; $r++;
$this->rights[$r][0] = 96; $this->rights[$r][0] = 96;
$this->rights[$r][1] = 'Param<EFBFBD>trer la ventilation'; $this->rights[$r][1] = 'Parametrer la ventilation';
$this->rights[$r][2] = 'r'; $this->rights[$r][2] = 'r';
$this->rights[$r][3] = 0; $this->rights[$r][3] = 0;
$this->rights[$r][4] = 'ventilation'; $this->rights[$r][4] = 'ventilation';

5
htdocs/includes/modules/modDon.class.php
View File

@@ -15,13 +15,12 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
*/ */
/** /**
\defgroup don Module don \defgroup don Module don
\brief Module pour g<>rer le suivi des dons \brief Module pour g<>rer le suivi des dons
\version $Id$
*/ */
/** /**
@@ -90,7 +89,7 @@ class modDon extends DolibarrModules
$this->rights[1][4] = 'lire'; $this->rights[1][4] = 'lire';
$this->rights[2][0] = 701; $this->rights[2][0] = 701;
$this->rights[2][1] = 'Cr<EFBFBD>er/modifier les dons'; $this->rights[2][1] = 'Creer/modifier les dons';
$this->rights[2][2] = 'w'; $this->rights[2][2] = 'w';
$this->rights[2][3] = 0; $this->rights[2][3] = 0;
$this->rights[2][4] = 'creer'; $this->rights[2][4] = 'creer';

6
htdocs/includes/modules/modDroitPret.class.php
View File

@@ -77,18 +77,16 @@ class modDroitPret extends DolibarrModules
$this->rights_class = 'droitpret'; $this->rights_class = 'droitpret';
$this->rights[1][0] = 2200; $this->rights[1][0] = 2200;
$this->rights[1][1] = 'Lire les droits de pr<EFBFBD>ts'; $this->rights[1][1] = 'Lire les droits de prets';
$this->rights[1][2] = 'r'; $this->rights[1][2] = 'r';
$this->rights[1][3] = 1; $this->rights[1][3] = 1;
$this->rights[1][4] = 'lire'; $this->rights[1][4] = 'lire';
$this->rights[2][0] = 2201; $this->rights[2][0] = 2201;
$this->rights[2][1] = 'Cr<EFBFBD>er/modifier les droits de pr<EFBFBD>ts'; $this->rights[2][1] = 'Creer/modifier les droits de prets';
$this->rights[2][2] = 'w'; $this->rights[2][2] = 'w';
$this->rights[2][3] = 0; $this->rights[2][3] = 0;
$this->rights[2][4] = 'creer'; $this->rights[2][4] = 'creer';
} }

7
htdocs/includes/modules/modExport.class.php
View File

@@ -14,12 +14,11 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
*/ */
/** \defgroup export Module export /** \defgroup export Module export
\brief Module g<>n<EFBFBD>rique pour r<>aliser des exports de donn<6E>es en base * \brief Module g<>n<EFBFBD>rique pour r<>aliser des exports de donn<6E>es en base
* \version $Id$
*/ */
/** /**
@@ -85,7 +84,7 @@ class modExport extends DolibarrModules
$this->rights[1][4] = 'lire'; $this->rights[1][4] = 'lire';
$this->rights[2][0] = 1202; $this->rights[2][0] = 1202;
$this->rights[2][1] = 'Cr<EFBFBD>er/modifier un export'; $this->rights[2][1] = 'Creer/modifier un export';
$this->rights[2][2] = 'w'; $this->rights[2][2] = 'w';
$this->rights[2][3] = 0; $this->rights[2][3] = 0;
$this->rights[2][4] = 'creer'; $this->rights[2][4] = 'creer';

2
htdocs/includes/modules/modFacture.class.php
View File

@@ -157,7 +157,7 @@ class modFacture extends DolibarrModules
$r++; $r++;
$this->rights[$r][0] = 1321; $this->rights[$r][0] = 1321;
$this->rights[$r][1] = 'Exporter les factures clients, attributs et r<EFBFBD>glements'; $this->rights[$r][1] = 'Exporter les factures clients, attributs et reglements';
$this->rights[$r][2] = 'r'; $this->rights[$r][2] = 'r';
$this->rights[$r][3] = 0; $this->rights[$r][3] = 0;
$this->rights[$r][4] = 'facture'; $this->rights[$r][4] = 'facture';

7
htdocs/includes/modules/modImport.class.php
View File

@@ -1,5 +1,5 @@
<?php <?php
/* Copyright (C) 2005-2007 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2005-2008 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2007 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2007 Regis Houssin <regis@dolibarr.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@@ -15,12 +15,11 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
*/ */
/** \defgroup import Module Import /** \defgroup import Module Import
\brief Module g<>n<EFBFBD>rique pour r<>aliser des imports de donn<6E>es en base \brief Module g<>n<EFBFBD>rique pour r<>aliser des imports de donn<6E>es en base
\version $Id$
*/ */
/** /**
@@ -86,7 +85,7 @@ class modImport extends DolibarrModules
$this->rights[1][4] = 'lire'; $this->rights[1][4] = 'lire';
$this->rights[2][0] = 1402; $this->rights[2][0] = 1402;
$this->rights[2][1] = 'Cr<EFBFBD>er/modifier un import'; $this->rights[2][1] = 'Creer/modifier un import';
$this->rights[2][2] = 'w'; $this->rights[2][2] = 'w';
$this->rights[2][3] = 0; $this->rights[2][3] = 0;
$this->rights[2][4] = 'creer'; $this->rights[2][4] = 'creer';

2
htdocs/includes/modules/modProduit.class.php
View File

@@ -105,7 +105,7 @@ class modProduit extends DolibarrModules
$r++; $r++;
$this->rights[$r][0] = 32; // id de la permission $this->rights[$r][0] = 32; // id de la permission
$this->rights[$r][1] = 'Cr<EFBFBD>er modifier les produits/services'; // libelle de la permission $this->rights[$r][1] = 'Creer modifier les produits/services'; // libelle de la permission
$this->rights[$r][2] = 'w'; // type de la permission (d<>pr<70>ci<63> <20> ce jour) $this->rights[$r][2] = 'w'; // type de la permission (d<>pr<70>ci<63> <20> ce jour)
$this->rights[$r][3] = 0; // La permission est-elle une permission par d<>faut $this->rights[$r][3] = 0; // La permission est-elle une permission par d<>faut
$this->rights[$r][4] = 'creer'; $this->rights[$r][4] = 'creer';

11
htdocs/includes/modules/modProjet.class.php
View File

@@ -17,17 +17,16 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
*/ */
/** \defgroup projet Module projet /** \defgroup projet Module projet
\brief Module pour inclure le detail par projets dans les autres modules * \brief Module pour inclure le detail par projets dans les autres modules
* \version $Id$
*/ */
/** \file htdocs/includes/modules/modProjet.class.php /** \file htdocs/includes/modules/modProjet.class.php
\ingroup projet * \ingroup projet
\brief Fichier de description et activation du module Projet * \brief Fichier de description et activation du module Projet
*/ */
include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
@@ -81,7 +80,7 @@ class modProjet extends DolibarrModules
$this->rights[1][4] = 'lire'; $this->rights[1][4] = 'lire';
$this->rights[2][0] = 42; // id de la permission $this->rights[2][0] = 42; // id de la permission
$this->rights[2][1] = 'Cr<EFBFBD>er modifier les projets'; // libelle de la permission $this->rights[2][1] = 'Creer/modifier les projets'; // libelle de la permission
$this->rights[2][2] = 'w'; // type de la permission (d<>pr<70>ci<63> <20> ce jour) $this->rights[2][2] = 'w'; // type de la permission (d<>pr<70>ci<63> <20> ce jour)
$this->rights[2][3] = 0; // La permission est-elle une permission par d<>faut $this->rights[2][3] = 0; // La permission est-elle une permission par d<>faut
$this->rights[2][4] = 'creer'; $this->rights[2][4] = 'creer';