diff --git a/htdocs/includes/modules/DolibarrModules.class.php b/htdocs/includes/modules/DolibarrModules.class.php index c2ae26dcb2a..c437f797569 100644 --- a/htdocs/includes/modules/DolibarrModules.class.php +++ b/htdocs/includes/modules/DolibarrModules.class.php @@ -894,6 +894,7 @@ class DolibarrModules $this->error=$this->db->lasterror(); dol_syslog("DolibarrModules::insert_permissions error ".$this->error, LOG_ERR); $err++; + break; } } } diff --git a/htdocs/includes/modules/modAdherent.class.php b/htdocs/includes/modules/modAdherent.class.php index 74d238dea11..66d2c3e69e4 100644 --- a/htdocs/includes/modules/modAdherent.class.php +++ b/htdocs/includes/modules/modAdherent.class.php @@ -121,50 +121,42 @@ class modAdherent extends DolibarrModules $r++; $this->rights[$r][0] = 71; - $this->rights[$r][1] = 'Lire les fiche adherents'; + $this->rights[$r][1] = 'Read members\' card'; $this->rights[$r][2] = 'r'; $this->rights[$r][3] = 1; $this->rights[$r][4] = 'lire'; $r++; $this->rights[$r][0] = 72; - $this->rights[$r][1] = 'Creer/modifier tous les adherents'; + $this->rights[$r][1] = 'Create/modify members (need also user module permissions if member linked to a user)'; $this->rights[$r][2] = 'w'; $this->rights[$r][3] = 0; $this->rights[$r][4] = 'creer'; - $r++; - $this->rights[$r][0] = 73; - $this->rights[$r][1] = 'Creer/modifier ses propres infos adherents'; - $this->rights[$r][2] = 'w'; - $this->rights[$r][3] = 0; - $this->rights[$r][4] = 'self'; - $this->rights[$r][5] = 'creer'; - $r++; $this->rights[$r][0] = 74; - $this->rights[$r][1] = 'Supprimer les adherents'; + $this->rights[$r][1] = 'Remove members'; $this->rights[$r][2] = 'd'; $this->rights[$r][3] = 0; $this->rights[$r][4] = 'supprimer'; $r++; $this->rights[$r][0] = 76; - $this->rights[$r][1] = 'Exporter les adherents'; + $this->rights[$r][1] = 'Export members'; $this->rights[$r][2] = 'r'; $this->rights[$r][3] = 0; $this->rights[$r][4] = 'export'; $r++; $this->rights[$r][0] = 75; - $this->rights[$r][1] = 'Configurer les types et attributs des adherents'; + $this->rights[$r][1] = 'Setup types and attributes of members'; $this->rights[$r][2] = 'w'; $this->rights[$r][3] = 0; $this->rights[$r][4] = 'configurer'; $r++; $this->rights[$r][0] = 78; - $this->rights[$r][1] = 'Lire les cotisations'; + $this->rights[$r][1] = 'Read subscriptions'; $this->rights[$r][2] = 'r'; $this->rights[$r][3] = 1; $this->rights[$r][4] = 'cotisation'; @@ -172,7 +164,7 @@ class modAdherent extends DolibarrModules $r++; $this->rights[$r][0] = 79; - $this->rights[$r][1] = 'Creer/modifier/supprimer les cotisations'; + $this->rights[$r][1] = 'Create/modify/remove subscriptions'; $this->rights[$r][2] = 'w'; $this->rights[$r][3] = 0; $this->rights[$r][4] = 'cotisation'; diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index c4173a201d8..8dccb65da70 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -373,7 +373,7 @@ Permission71 = Consulter les fiches adhérents Permission72 = Créer/modifier les adhérents Permission74 = Supprimer les adhérents Permission75 = Configurer les types et attributs des adhérents -Permission76 = Exporter les données +Permission76 = Exporter les adhérents Permission78 = Consulter les cotisations Permission79 = Créer/modifier les cotisations Permission81 = Consulter les commandes clients