From 3ffd4432df399314f7287b4a657c64df8da7982d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 30 Oct 2014 11:43:57 +0100 Subject: [PATCH] New: Add permissions to read all trips and expenses. --- ChangeLog | 1 + htdocs/core/modules/modDeplacement.class.php | 14 ++++++++++---- htdocs/langs/en_US/admin.lang | 9 +++++---- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 62311d4bef1..38a9d704f8e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ English Dolibarr ChangeLog ***** ChangeLog for 3.7 compared to 3.6.* ***** For users: +- New: Add permissions to read all trips and expenses. - New: Can filter on date into tab "Referring object" of a project. - New: Module notification has been enhanced: EMail use now language of target contact. diff --git a/htdocs/core/modules/modDeplacement.class.php b/htdocs/core/modules/modDeplacement.class.php index 24536bc5a68..75d3ab328c8 100644 --- a/htdocs/core/modules/modDeplacement.class.php +++ b/htdocs/core/modules/modDeplacement.class.php @@ -78,25 +78,31 @@ class modDeplacement extends DolibarrModules $this->rights_class = 'deplacement'; $this->rights[1][0] = 171; - $this->rights[1][1] = 'Lire les deplacements'; + $this->rights[1][1] = 'Lire ses notes de frais et deplacements et celles de sa hierarchy'; $this->rights[1][2] = 'r'; $this->rights[1][3] = 1; $this->rights[1][4] = 'lire'; $this->rights[2][0] = 172; - $this->rights[2][1] = 'Creer/modifier les deplacements'; + $this->rights[2][1] = 'Creer/modifier une note de frais et deplacements'; $this->rights[2][2] = 'w'; $this->rights[2][3] = 0; $this->rights[2][4] = 'creer'; $this->rights[3][0] = 173; - $this->rights[3][1] = 'Supprimer les deplacements'; + $this->rights[3][1] = 'Supprimer les notes de frais et deplacements'; $this->rights[3][2] = 'd'; $this->rights[3][3] = 0; $this->rights[3][4] = 'supprimer'; + $this->rights[3][0] = 174; + $this->rights[3][1] = 'Lire toutes les notes de frais'; + $this->rights[3][2] = 'd'; + $this->rights[3][3] = 0; + $this->rights[3][4] = 'readall'; + $this->rights[6][0] = 178; - $this->rights[6][1] = 'Exporter les deplacements'; + $this->rights[6][1] = 'Exporter les notes de frais et deplacements'; $this->rights[6][2] = 'd'; $this->rights[6][3] = 0; $this->rights[6][4] = 'export'; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 34f31092bfc..de373163008 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -611,10 +611,11 @@ Permission162=Create/modify contracts Permission163=Activate a service of a contract Permission164=Disable a service of a contract Permission165=Delete contracts -Permission171=Read trips -Permission172=Create/modify trips -Permission173=Delete trips -Permission178=Export trips +Permission171=Read trips and expenses (own and his subordinates) +Permission172=Create/modify trips and expenses +Permission173=Delete trips and expenses +Permission174=Read all trips and expenses +Permission178=Export trips and expenses Permission180=Read suppliers Permission181=Read supplier orders Permission182=Create/modify supplier orders