diff --git a/dev/skeletons/modMyModule.class.php b/dev/skeletons/modMyModule.class.php
index 29bfb516dd4..07bed0c044e 100644
--- a/dev/skeletons/modMyModule.class.php
+++ b/dev/skeletons/modMyModule.class.php
@@ -69,8 +69,13 @@ class modMyModule extends DolibarrModules
 
 		// Data directories to create when module is enabled.
 		$this->dirs = array();
-		//$this->dirs[0] = DOL_DATA_ROOT.'/mymodule;
-        //$this->dirs[1] = DOL_DATA_ROOT.'/mymodule/temp;
+		$r=0;
+			
+		//$this->dirs[$r][0] = "mymodule";
+    //$this->dirs[$r][1] = "/mymodule";
+    //$r++;
+		//$this->dirs[$r][0] = "temp";
+    //$this->dirs[$r][1] = "/mymodule/temp";
 
 		// Relative path to module style sheet if exists. Example: '/mymodule/mycss.css'.
 		$this->style_sheet = '';
@@ -110,10 +115,10 @@ class modMyModule extends DolibarrModules
 
 		// Add here list of php file(s) stored in includes/boxes that contains class to show a box.
 		// Example:
-        //$this->boxes[$r][1] = "myboxa.php";
-    	//$r++;
-        //$this->boxes[$r][1] = "myboxb.php";
-    	//$r++;
+    //$this->boxes[$r][1] = "myboxa.php";
+    //$r++;
+    //$this->boxes[$r][1] = "myboxb.php";
+    //$r++;
 
 
 		// Permissions
diff --git a/htdocs/core/conf.class.php b/htdocs/core/conf.class.php
index f204ba6d902..761b000b770 100644
--- a/htdocs/core/conf.class.php
+++ b/htdocs/core/conf.class.php
@@ -168,9 +168,6 @@ class Conf
 		$this->livraison_bon->dir_temp  =DOL_DATA_ROOT."/expedition/receipt/temp";
 
 		// Module societe
-		$this->societe->dir_output=DOL_DATA_ROOT."/societe";
-		$this->societe->dir_temp  =DOL_DATA_ROOT."/societe/temp";
-		$this->societe->dir_logos =DOL_DATA_ROOT."/societe/logos";
 		if (defined('SOCIETE_OUTPUTDIR') && SOCIETE_OUTPUTDIR) { $this->societe->dir_output=SOCIETE_OUTPUTDIR; }    # Pour passer outre le rep par defaut
 
 		// Module taxes et charges sociales
diff --git a/htdocs/includes/modules/DolibarrModules.class.php b/htdocs/includes/modules/DolibarrModules.class.php
index 608500680c1..430d9dfb402 100644
--- a/htdocs/includes/modules/DolibarrModules.class.php
+++ b/htdocs/includes/modules/DolibarrModules.class.php
@@ -970,7 +970,7 @@ class DolibarrModules
 			{
 				$name = $this->const_name."_DIR_".strtoupper($this->dirs[$key][0]);
 				$dir  = $this->dirs[$key][1];
-				
+
 				$sql = "SELECT count(*)";
 				$sql.= " FROM ".MAIN_DB_PREFIX."const";
 				$sql.= " WHERE name ='".$name."'";
@@ -985,14 +985,14 @@ class DolibarrModules
 					{
 						$sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,type,value,note,visible,entity)";
 						$sql.= " VALUES ('".$name."','chaine','".$dir."','Directory for module ".$this->name."','0',".$conf->entity.")";
-						
+			
 						dol_syslog("DolibarrModules::insert_dir_output sql=".$sql);
 						$resql=$this->db->query($sql);
 						
 						if ($resql)
 						{
 							// On defini l'entite
-							$dir = DOL_DATA_ROOT."/entity_".$conf->entity."/".$dir;
+							$dir = DOL_DATA_ROOT."/entity_".$conf->entity.$dir;
 							
 							if ($dir && ! file_exists($dir))
 							{
diff --git a/htdocs/includes/modules/modSociete.class.php b/htdocs/includes/modules/modSociete.class.php
index 233cf6bd754..84cffc3d235 100644
--- a/htdocs/includes/modules/modSociete.class.php
+++ b/htdocs/includes/modules/modSociete.class.php
@@ -66,8 +66,20 @@ class modSociete extends DolibarrModules
 		$this->config_page_url = array("societe.php");
 		$this->picto='company';
 
-		// Dir
+		// Data directories to create when module is enabled
 		$this->dirs = array();
+		$r=0;
+		
+		$this->dirs[$r][0] = "output";
+		$this->dirs[$r][1] = "/societe";
+		
+		$r++;
+		$this->dirs[$r][0] = "temp";
+		$this->dirs[$r][1] = "/societe/temp";
+		
+		$r++;
+		$this->dirs[$r][0] = "logos";
+		$this->dirs[$r][1] = "/societe/logos";
 
 		// Dependances
 		$this->depends = array();