diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php
index 5e9dbf4b47c22bd1e673a9e96cceec89a9e15438..b7770ffbcccdacc8760b1d8358c75175ee42624a 100644
--- a/htdocs/exports/class/export.class.php
+++ b/htdocs/exports/class/export.class.php
@@ -70,19 +70,20 @@ class Export
 
 		dol_syslog("Export::load_arrays user=".$user->id." filter=".$filter);
 
+        $var=true;
+        $i=0;
+
 		//$dir=DOL_DOCUMENT_ROOT."/includes/modules";
 		foreach($conf->file->dol_document_root as $dirroot)
 		{
 			$dir = $dirroot.'/includes/modules';
-			$handle=opendir($dir);
 
 			// Search available exports
 			$handle=@opendir($dir);
 			if (is_resource($handle))
 			{
-				$var=True;
-				$i=0;
-				while (($file = readdir($handle))!==false)
+                // Search module files
+			    while (($file = readdir($handle))!==false)
 				{
 					if (preg_match("/^(mod.*)\.class\.php$/i",$file,$reg))
 					{
@@ -103,9 +104,10 @@ class Export
 
 							if (is_array($module->export_code))
 							{
-								foreach($module->export_code as $r => $value)
+							    foreach($module->export_code as $r => $value)
 								{
-									if ($filter && ($filter != $module->export_code[$r])) continue;
+                                    //print $i.'-'.$filter.'-'.$modulename.'-'.join(',',$module->export_code).'<br>';
+								    if ($filter && ($filter != $module->export_code[$r])) continue;
 
 									// Test si permissions ok \todo tester sur toutes permissions
 									$perm=$module->export_permission[$r][0];
diff --git a/htdocs/imports/class/import.class.php b/htdocs/imports/class/import.class.php
index 1d18487b9a501931edb0003a1c8cf18978b3cf7c..911d81da03397fde43a8f450df4be2edefa4e3ea 100644
--- a/htdocs/imports/class/import.class.php
+++ b/htdocs/imports/class/import.class.php
@@ -63,6 +63,9 @@ class Import
 
 		dol_syslog("Import::load_arrays user=".$user->id." filter=".$filter);
 
+        $var=true;
+        $i=0;
+
 		//$dir=DOL_DOCUMENT_ROOT."/includes/modules";
 		foreach($conf->file->dol_document_root as $dirroot)
 		{
@@ -72,9 +75,7 @@ class Import
 			$handle=@opendir($dir);
 			if (is_resource($handle))
 			{
-				// Recherche des exports disponibles
-				$var=True;
-				$i=0;
+				// Search module files
 				while (($file = readdir($handle))!==false)
 				{
 					if (preg_match("/^(mod.*)\.class\.php/i",$file,$reg))