diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index 917c6cebbef..b8e02fcca21 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -3,7 +3,7 @@ * Copyright (C) 2003 Jean-Louis Bergamo * Copyright (C) 2004-2012 Laurent Destailleur * Copyright (C) 2004 Eric Seigne - * Copyright (C) 2005-2011 Regis Houssin + * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2011 Juanjo Menent * * This program is free software; you can redistribute it and/or modify @@ -268,6 +268,7 @@ $h++; dol_fiche_head($head, $mode, $langs->trans("Modules")); +$var=true; if ($mode != 'marketplace') { @@ -286,7 +287,6 @@ if ($mode != 'marketplace') // Show list of modules - $var=true; $oldfamily=''; $familylib=array( diff --git a/htdocs/core/boxes/box_members.php b/htdocs/core/boxes/box_members.php index ab41c8dbacc..c931b6f7d34 100755 --- a/htdocs/core/boxes/box_members.php +++ b/htdocs/core/boxes/box_members.php @@ -1,7 +1,7 @@ * Copyright (C) 2004-2012 Laurent Destailleur - * Copyright (C) 2005-2009 Regis Houssin + * Copyright (C) 2005-2012 Regis Houssin * * 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 @@ -73,7 +73,7 @@ class box_members extends ModeleBoxes if ($user->rights->societe->lire) { - $sql = "SELECT a.rowid, a.nom as lastname, a.prenom as firstname, a.societe, a.fk_soc,"; + $sql = "SELECT a.rowid, a.nom as lastname, a.prenom as firstname, a.societe as company, a.fk_soc,"; $sql.= " a.datec, a.tms, a.statut as status, a.datefin as date_end_subscription,"; $sql.= " t.cotisation"; $sql.= " FROM ".MAIN_DB_PREFIX."adherent as a, ".MAIN_DB_PREFIX."adherent_type as t"; diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php index 5fbc95f8dc5..dd09fd2756a 100644 --- a/htdocs/core/modules/modAccounting.class.php +++ b/htdocs/core/modules/modAccounting.class.php @@ -1,8 +1,9 @@ - * Copyright (C) 2004-2009 Laurent Destailleur - * Copyright (C) 2004 Sebastien Di Cintio - * Copyright (C) 2004 Benoit Mortier +/* Copyright (C) 2003 Rodolphe Quiedeville + * Copyright (C) 2004-2009 Laurent Destailleur + * Copyright (C) 2004 Sebastien Di Cintio + * Copyright (C) 2004 Benoit Mortier + * Copyright (C) 2005-2012 Regis Houssin * * 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 @@ -83,6 +84,7 @@ class modAccounting extends DolibarrModules // Permissions $this->rights = array(); $this->rights_class = 'accounting'; + $r=0; $this->rights[$r][0] = 50401; $this->rights[$r][1] = 'Lire le plan de compte'; @@ -90,6 +92,7 @@ class modAccounting extends DolibarrModules $this->rights[$r][3] = 1; $this->rights[$r][4] = 'plancompte'; $this->rights[$r][5] = 'lire'; + $r++; $this->rights[$r][0] = 50402; $this->rights[$r][1] = 'Creer/modifier un plan de compte'; @@ -97,6 +100,7 @@ class modAccounting extends DolibarrModules $this->rights[$r][3] = 0; $this->rights[$r][4] = 'plancompte'; $this->rights[$r][5] = 'creer'; + $r++; $this->rights[$r][0] = 50403; $this->rights[$r][1] = 'Cloturer plan de compte'; @@ -104,6 +108,7 @@ class modAccounting extends DolibarrModules $this->rights[$r][3] = 0; $this->rights[$r][4] = 'plancompte'; $this->rights[$r][5] = 'cloturer'; + $r++; $this->rights[$r][0] = 50411; $this->rights[$r][1] = 'Lire les mouvements comptables'; @@ -111,6 +116,7 @@ class modAccounting extends DolibarrModules $this->rights[$r][3] = 1; $this->rights[$r][4] = 'mouvements'; $this->rights[$r][5] = 'lire'; + $r++; $this->rights[$r][0] = 50412; $this->rights[$r][1] = 'Creer/modifier/annuler les mouvements comptables'; @@ -118,6 +124,7 @@ class modAccounting extends DolibarrModules $this->rights[$r][3] = 0; $this->rights[$r][4] = 'mouvements'; $this->rights[$r][5] = 'creer'; + $r++; $this->rights[$r][0] = 50415; $this->rights[$r][1] = 'Lire CA, bilans, resultats, journaux, grands livres'; @@ -125,6 +132,7 @@ class modAccounting extends DolibarrModules $this->rights[$r][3] = 0; $this->rights[$r][4] = 'comptarapport'; $this->rights[$r][5] = 'lire'; + $r++; }