diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index fb293568b29..1891cd1b0e8 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -73,7 +73,7 @@ if ($action == 'specimen')
 
 	// Search template files
 	$file=''; $classname=''; $filefound=0;
-	$dirmodels=array_merge(array('/'),$conf->models_modules);
+	$dirmodels=array_merge(array('/'),$conf->commande_modules);
 	foreach($dirmodels as $reldir)
 	{
 	    $file=dol_buildpath($reldir."core/modules/commande/doc/pdf_".$modele.".modules.php",0);
@@ -251,14 +251,11 @@ print "</tr>\n";
 
 clearstatcache();
 
-// Check if there is external models to do asked by plugins
-if (is_array($conf->models_modules) && ! empty($conf->models_modules)) {
-	$conf->file->dol_document_root = array_merge($conf->file->dol_document_root,$conf->models_modules);
-}
+$dirmodels=array_merge(array('/'),$conf->commande_modules);
 
-foreach ($conf->file->dol_document_root as $dirroot)
+foreach ($dirmodels as $reldir)
 {
-	$dir = $dirroot . "/core/modules/commande/";
+	$dir = dol_buildpath($reldir."core/modules/commande/");
 
 	if (is_dir($dir))
 	{
@@ -387,17 +384,14 @@ print "</tr>\n";
 
 clearstatcache();
 
-// Check if there is external models to do asked by plugins
-if (is_array($conf->models_modules) && ! empty($conf->models_modules)) {
-	$conf->file->dol_document_root = array_merge($conf->file->dol_document_root,$conf->models_modules);
-}
+$dirmodels=array_merge(array('/'),$conf->commande_modules);
 
 $var=true;
-foreach ($conf->file->dol_document_root as $dirroot)
+foreach ($dirmodels as $reldir)
 {
     foreach (array('','/doc') as $valdir)
     {
-        $dir = $dirroot . "/core/modules/commande".$valdir;
+    	$dir = dol_buildpath($reldir."core/modules/commande".$valdir);
 
         if (is_dir($dir))
         {
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 52ce7236c45..5dd173a0706 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -72,7 +72,7 @@ if ($action == 'specimen')
 
 	// Search template files
 	$file=''; $classname=''; $filefound=0;
-	$dirmodels=array_merge(array('/'),$conf->models_modules);
+	$dirmodels=array_merge(array('/'),$conf->facture_modules);
 	foreach($dirmodels as $reldir)
 	{
 	    $file=dol_buildpath($reldir."core/modules/facture/doc/pdf_".$modele.".modules.php",0);
@@ -291,6 +291,8 @@ if ($action == 'setforcedate')
  * View
  */
 
+$dirmodels=array_merge(array('/'),$conf->facture_modules);
+
 llxHeader("",$langs->trans("BillsSetup"),'EN:Invoice_Configuration|FR:Configuration_module_facture|ES:ConfiguracionFactura');
 
 $form=new Form($db);
@@ -318,21 +320,16 @@ print '</tr>'."\n";
 
 clearstatcache();
 
-// Check if there is external models to do asked by plugins
-if (is_array($conf->models_modules) && ! empty($conf->models_modules)) {
-	$conf->file->dol_document_root = array_merge($conf->file->dol_document_root,$conf->models_modules);
-}
-
-$var=true;
-foreach ($conf->file->dol_document_root as $dirroot)
+foreach ($dirmodels as $reldir)
 {
-    $dir = $dirroot . "/core/modules/facture/";
-
+	$dir = dol_buildpath($reldir."core/modules/facture/");
     if (is_dir($dir))
     {
         $handle = opendir($dir);
         if (is_resource($handle))
         {
+        	$var=true;
+
             while (($file = readdir($handle))!==false)
             {
                 if (! is_dir($dir.$file) || (substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS'))
@@ -488,17 +485,12 @@ print "</tr>\n";
 
 clearstatcache();
 
-// Check if there is external models to do asked by plugins
-if (is_array($conf->models_modules) && ! empty($conf->models_modules)) {
-	$conf->file->dol_document_root = array_merge($conf->file->dol_document_root,$conf->models_modules);
-}
-
 $var=true;
-foreach ($conf->file->dol_document_root as $dirroot)
+foreach ($dirmodels as $reldir)
 {
     foreach (array('','/doc') as $valdir)
     {
-        $dir = $dirroot . "/core/modules/facture".$valdir;
+    	$dir = dol_buildpath($reldir."core/modules/facture".$valdir);
 
         if (is_dir($dir))
         {
diff --git a/htdocs/admin/propale.php b/htdocs/admin/propale.php
index 8ae0e25777b..b85c4a0a289 100644
--- a/htdocs/admin/propale.php
+++ b/htdocs/admin/propale.php
@@ -71,10 +71,10 @@ if ($action == 'specimen')
 
 	// Search template files
 	$file=''; $classname=''; $filefound=0;
-	$dirmodels=array_merge(array('/'),$conf->models_modules);
+	$dirmodels=array_merge(array('/'),$conf->propale_modules);
 	foreach($dirmodels as $reldir)
 	{
-	    $file=dol_buildpath($reldir."core/modules/propale/doc/pdf_".$modele.".modules.php",0);
+	    $file=dol_buildpath($reldir."core/modules/propale/doc/pdf_".$modele.".modules.php");
 		if (file_exists($file))
 		{
 			$filefound=1;
@@ -283,14 +283,11 @@ print '</tr>'."\n";
 
 clearstatcache();
 
-// Check if there is external models to do asked by plugins
-if (is_array($conf->models_modules) && ! empty($conf->models_modules)) {
-	$conf->file->dol_document_root = array_merge($conf->file->dol_document_root,$conf->models_modules);
-}
+$dirmodels=array_merge(array('/'),$conf->propale_modules);
 
-foreach ($conf->file->dol_document_root as $dirroot)
+foreach ($dirmodels as $reldir)
 {
-	$dir = $dirroot . "/core/modules/propale/";
+	$dir = dol_buildpath($reldir."core/modules/propale/");
 
 	if (is_dir($dir))
 	{
@@ -419,17 +416,14 @@ print "</tr>\n";
 
 clearstatcache();
 
-// Check if there is external models to do asked by plugins
-if (is_array($conf->models_modules) && ! empty($conf->models_modules)) {
-	$conf->file->dol_document_root = array_merge($conf->file->dol_document_root,$conf->models_modules);
-}
+$dirmodels=array_merge(array('/'),$conf->propale_modules);
 
 $var=true;
-foreach ($conf->file->dol_document_root as $dirroot)
+foreach ($dirmodels as $reldir)
 {
     foreach (array('','/doc') as $valdir)
     {
-        $dir = $dirroot . "/core/modules/propale".$valdir;
+    	$dir = dol_buildpath($reldir."core/modules/propale".$valdir);
 
         if (is_dir($dir))
         {
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index c1afa69bb53..8504eced7ed 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -53,17 +53,20 @@ class Conf
 
 	public $modules					= array();	// List of activated modules
 
+	public $sms_engine_modules		= array();
+	// TODO Remove all thoose tabs with one generic
 	public $css_modules				= array();
 	public $tabs_modules			= array();
 	public $triggers_modules		= array();
 	public $menus_modules			= array();
 	public $hooks_modules			= array();
-	public $models_modules			= array();
 	public $login_modules			= array();
-	public $sms_engine_modules		= array();
 	public $barcode_modules			= array();
 	public $substitutions_modules	= array();
 	public $societe_modules	        = array();
+	public $facture_modules			= array();
+	public $commande_modules		= array();
+	public $propale_modules			= array();
 
 	var $logbuffer					= array();
 
@@ -166,7 +169,9 @@ class Conf
 							$arrValue = @unserialize($value);
 							if (is_array($arrValue) && ! empty($arrValue)) $value = $arrValue;
 							else if (in_array($partname,array('login','menus','triggers'))) $value = '/'.$modulename.'/core/'.$partname.'/';
+							else if (in_array($partname,array('facture','commande','propale'))) $value = '/'.$modulename.'/';
 							else if ($value == 1) $value = '/'.$modulename.'/core/modules/'.$partname.'/';
+							//print 'xxx'.$varname.' '.$value.'<br>';
 							$this->$varname = array_merge($this->$varname, array($modulename => $value));
 						}
                         // If this is a module constant (must be at end)
diff --git a/htdocs/core/modules/commande/modules_commande.php b/htdocs/core/modules/commande/modules_commande.php
index a940e86561b..bae7627d343 100644
--- a/htdocs/core/modules/commande/modules_commande.php
+++ b/htdocs/core/modules/commande/modules_commande.php
@@ -183,7 +183,7 @@ function commande_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0
 
 	// Search template files
 	$file=''; $classname=''; $filefound=0;
-	$dirmodels=array_merge(array('/'),$conf->models_modules);
+	$dirmodels=array_merge(array('/'),$conf->commande_modules);
 	foreach($dirmodels as $reldir)
 	{
     	foreach(array('doc','pdf') as $prefix)
diff --git a/htdocs/core/modules/facture/modules_facture.php b/htdocs/core/modules/facture/modules_facture.php
index b722292ef11..b600fc127d6 100644
--- a/htdocs/core/modules/facture/modules_facture.php
+++ b/htdocs/core/modules/facture/modules_facture.php
@@ -181,7 +181,7 @@ function facture_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0,
 
 	// Search template files
 	$file=''; $classname=''; $filefound=0;
-	$dirmodels=array_merge(array('/'),$conf->models_modules);
+	$dirmodels=array_merge(array('/'),$conf->facture_modules);
 	foreach($dirmodels as $reldir)
 	{
     	foreach(array('doc','pdf') as $prefix)
diff --git a/htdocs/core/modules/propale/modules_propale.php b/htdocs/core/modules/propale/modules_propale.php
index 01e163478ad..a144834899d 100644
--- a/htdocs/core/modules/propale/modules_propale.php
+++ b/htdocs/core/modules/propale/modules_propale.php
@@ -184,7 +184,7 @@ function propale_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0,
 
 	// Search template files
 	$file=''; $classname=''; $filefound=0;
-	$dirmodels=array_merge(array('/'),$conf->models_modules);
+	$dirmodels=array_merge(array('/'),$conf->propale_modules);
 	foreach($dirmodels as $reldir)
 	{
     	foreach(array('doc','pdf') as $prefix)