diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 7414ab93fb7..d74e92c288e 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -128,7 +128,7 @@ class FormFile
 	/**
 	 *      Show the box with list of available documents for object
 	 *      @param      modulepart          propal, facture, facture_fourn, ...
-	 *      @param      filename            Sub dir to scan (Example: '9/9', 'FA9999'). Use '' if filedir already complete)
+	 *      @param      filename            Sub dir to scan (Example: '0/1/10', 'FA/DD/MM/YY/9999'). Use '' if filedir already complete)
 	 *      @param      filedir             Dir to scan
 	 *      @param      urlsource           Url of origin page (for return)
 	 *      @param      genallowed          Generation is allowed (1/0 or array of formats)
@@ -161,7 +161,7 @@ class FormFile
 			$forcenomultilang=0;
 		}
 
-		$filename = dol_sanitizeFileName($filename);
+		//$filename = dol_sanitizeFileName($filename);    //Must be sanitized before calling show_documents
 		$headershown=0;
 		$showempty=0;
 		$i=0;
@@ -405,8 +405,8 @@ class FormFile
 			$relativepath=$file["name"];								// Cas general
 			if ($filename) $relativepath=$filename."/".$file["name"];	// Cas propal, facture...
 			// Autre cas
-			if ($modulepart == 'donation')   { $relativepath = get_exdir($filename,2).$file["name"]; }
-			if ($modulepart == 'export')     { $relativepath = $file["name"]; }
+			if ($modulepart == 'donation')            { $relativepath = get_exdir($filename,2).$file["name"]; }
+			if ($modulepart == 'export')              { $relativepath = $file["name"]; }
 
 			if (!$iconPDF) print "<tr ".$bc[$var].">";
 
diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
index 5367038da1e..69a92b7798c 100644
--- a/htdocs/fourn/facture/fiche.php
+++ b/htdocs/fourn/facture/fiche.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Christophe Combelles <ccomb@free.fr>
  * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.fr>
  * Copyright (C) 2005-2011 Regis Houssin         <regis@dolibarr.fr>
@@ -1827,16 +1827,15 @@ else
                  * Documents generes
                  */
 
-                $facfournref=dol_sanitizeFileName($fac->ref);
-                $file=$conf->fournisseur->dir_output.'/facture/'. $facfournref .	'/'	. $facfournref . '.pdf';
-                $relativepath =	$facfournref.'/'.$facfournref.'.pdf';
-                $filedir = $conf->fournisseur->dir_output	. '/facture/' .	$facfournref;
+                $ref=dol_sanitizeFileName($fac->ref);
+                $subdir = get_exdir($fac->id,2).$ref;
+                $filedir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($fac->id,2).$ref;
                 $urlsource=$_SERVER['PHP_SELF'].'?facid='.$fac->id;
                 $genallowed=$user->rights->fournisseur->facture->creer;
                 $delallowed=$user->rights->fournisseur->facture->supprimer;
 
                 print '<br>';
-                $somethingshown=$formfile->show_documents('facture_fournisseur',$facfournref,$filedir,$urlsource,$genallowed,$delallowed,$fac->modelpdf);
+                $somethingshown=$formfile->show_documents('facture_fournisseur',$subdir,$filedir,$urlsource,$genallowed,$delallowed,$fac->modelpdf);
 
                 $object=$fac;
 
@@ -1873,7 +1872,7 @@ else
         if ($_GET['action'] == 'presend')
         {
             $ref = dol_sanitizeFileName($fac->ref);
-            $file = $conf->fournisseur->facture->dir_output . '/' . $ref . '/' . $ref . '.pdf';
+            $file = $conf->fournisseur->facture->dir_output.'/'.get_exdir($fac->id,2).$ref.'.pdf';
 
             print '<br>';
             print_titre($langs->trans('SendBillByMail'));
diff --git a/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php
index 54beac89d02..1bbd6612ca7 100755
--- a/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php
+++ b/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php
@@ -133,7 +133,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 			else
 			{
 				$objectref = dol_sanitizeFileName($object->ref);
-				$dir = $conf->fournisseur->dir_output . "/facture/" . $objectref;
+                $dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($object->id,2).$objectref;
 				$file = $dir . "/" . $objectref . ".pdf";
 			}