Merge pull request #1637 from aspangaro/develop

Salaries :: Missing key language & typo

htdocs/core/modules/modSalaries.class.php

@@ -74,10 +74,10 @@ class modSalaries extends DolibarrModules
 		$this->conflictwith = array();
 		$this->langfiles = array("salaries");
 
-		// Constantes
+		// Constants
 		$this->const = array();
 
-		// Boites
+		// Boxes
 		$this->boxes = array();
 
 		// Permissions
@@ -151,7 +151,7 @@ class modSalaries extends DolibarrModules
 	{
 		global $conf;
 
-		// Nettoyage avant activation
+		// Clean before activation
 		$this->remove($options);
 
 		$sql = array();

htdocs/langs/en_US/admin.lang

@@ -683,6 +683,10 @@ Permission401=Read discounts
 Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
+Permission510=Read Salaries
+Permission512=Create/modify salaries
+Permission514=Delete salaries
+Permission517=Export salaries
 Permission531=Read services
 Permission532=Create/modify services
 Permission534=Delete services