diff --git a/htdocs/document.php b/htdocs/document.php
index 9d070c804c6..e99c86d10dd 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -180,7 +180,7 @@ if ($modulepart)
 		{
 			$accessallowed=1;
 		}
-		$original_file=$conf->fournisseur->dir_commande.'/'.$original_file;
+		$original_file=$conf->fournisseur->commande->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."commande_fournisseur WHERE ref='$refname'";
 	}
 
@@ -192,7 +192,7 @@ if ($modulepart)
 		{
 			$accessallowed=1;
 		}
-		$original_file=$conf->fournisseur->dir_facture.'/'.$original_file;
+		$original_file=$conf->fournisseur->facture->dir_output.'/'.$original_file;
 		//$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."facture_fourn WHERE facnumber='$refname'";
 	}
 
@@ -240,7 +240,7 @@ if ($modulepart)
 		{
 			$accessallowed=1;
 		}
-		$original_file=$conf->expedition->dir_bon_expedition.'/'.$original_file;
+		$original_file=$conf->expedition_bon->dir_output.'/'.$original_file;
 		//$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='$refname'";
 	}
 
@@ -252,7 +252,7 @@ if ($modulepart)
 		{
 			$accessallowed=1;
 		}
-		$original_file=$conf->expedition->dir_bon_livraison.'/'.$original_file;
+		$original_file=$conf->livraison_bon->dir_output.'/'.$original_file;
 		//$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='$refname'";
 	}
 
@@ -276,7 +276,7 @@ if ($modulepart)
 		//{
 		$accessallowed=1;
 		//}
-		$original_file=$conf->commercial->dir_actions.'/'.$original_file;
+		$original_file=$conf->actions->dir_output.'/'.$original_file;
 		//$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='$refname'";
 	}
 
@@ -288,7 +288,7 @@ if ($modulepart)
 		//{
 		$accessallowed=1;
 		//}
-		$original_file = $conf->commercial->dir_actions_temp."/".$original_file;
+		$original_file = $conf->actions->dir_temp."/".$original_file;
 		//$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='$refname'";
 	}
 
diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php
index 0895d15cb86..dcf988f56b7 100644
--- a/htdocs/expedition/fiche.php
+++ b/htdocs/expedition/fiche.php
@@ -850,7 +850,7 @@ else
 		if ($conf->expedition_bon->enabled)
 		{
 			$expeditionref = dol_sanitizeFileName($expedition->ref);
-			$filedir = $conf->expedition->dir_bon_expedition . "/" .$expeditionref;
+			$filedir = $conf->expedition_bon->dir_output . "/" .$expeditionref;
 
 			$urlsource = $_SERVER["PHP_SELF"]."?id=".$expedition->id;
 
diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php
index 1f46dae426e..e81a2f46845 100644
--- a/htdocs/fourn/commande/document.php
+++ b/htdocs/fourn/commande/document.php
@@ -76,7 +76,7 @@ if ($commande->fetch($_GET['id'],$_GET['ref']) < 0)
 // Envoi fichier
 if ($_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
 {
-	$upload_dir = $conf->fournisseur->dir_commande . "/" . dol_sanitizeFileName($commande->ref);
+	$upload_dir = $conf->fournisseur->commande->dir_output . "/" . dol_sanitizeFileName($commande->ref);
 	if (! is_dir($upload_dir)) create_exdir($upload_dir);
 
 	if (is_dir($upload_dir))
@@ -98,7 +98,7 @@ if ($_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
 // Delete
 if ($action=='delete')
 {
-	$upload_dir = $conf->fournisseur->dir_commande . "/" . dol_sanitizeFileName($commande->ref);
+	$upload_dir = $conf->fournisseur->commande->dir_output . "/" . dol_sanitizeFileName($commande->ref);
 	$file = $upload_dir . '/' . urldecode($_GET['urlfile']);
 	dol_delete_file($file);
 	$mesg = '<div class="ok">'.$langs->trans("FileWasRemoved").'</div>';
@@ -117,7 +117,7 @@ if ($id > 0 || ! empty($ref))
 {
 	llxHeader();
 
-	$upload_dir = $conf->fournisseur->dir_commande.'/'.dol_sanitizeFileName($commande->ref);
+	$upload_dir = $conf->fournisseur->commande->dir_output.'/'.dol_sanitizeFileName($commande->ref);
 
 	$soc = new Societe($db);
 	$soc->fetch($commande->socid);
diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php
index 8644471fc2b..fccce16b904 100644
--- a/htdocs/fourn/commande/fiche.php
+++ b/htdocs/fourn/commande/fiche.php
@@ -996,9 +996,9 @@ if ($id > 0 || ! empty($ref))
 		 * Documents	generes
 		 */
 		$comfournref = dol_sanitizeFileName($commande->ref);
-		$file =	$conf->fournisseur->dir_commande . '/' . $comfournref .	'/'	. $comfournref . '.pdf';
+		$file =	$conf->fournisseur->commande->dir_output . '/' . $comfournref .	'/'	. $comfournref . '.pdf';
 		$relativepath =	$comfournref.'/'.$comfournref.'.pdf';
-		$filedir = $conf->fournisseur->dir_commande	. '/' .	$comfournref;
+		$filedir = $conf->fournisseur->commande->dir_output	. '/' .	$comfournref;
 		$urlsource=$_SERVER["PHP_SELF"]."?id=".$commande->id;
 		$genallowed=$user->rights->fournisseur->commande->creer;
 		$delallowed=$user->rights->fournisseur->commande->supprimer;
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index 1394d338889..6ab8130bac7 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -69,7 +69,7 @@ if ($_POST['sendit'] && ! empty($conf->global->MAIN_UPLOAD_DOC))
 	$facture = new FactureFournisseur($db);
 	if ($facture->fetch($facid))
     {
-        $upload_dir = $conf->fournisseur->dir_facture.'/'.get_exdir($facture->id,2).$facture->id;
+        $upload_dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($facture->id,2).$facture->id;
 
         if (! is_dir($upload_dir)) create_exdir($upload_dir);
 
@@ -98,7 +98,7 @@ if ($action=='delete')
    	$facture = new FactureFournisseur($db);
 	if ($facture->fetch($facid))
     {
-        $upload_dir = $conf->fournisseur->dir_facture.'/'.get_exdir($facture->id,2).$facture->id;
+        $upload_dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($facture->id,2).$facture->id;
 
         $file = $upload_dir . '/' . urldecode($_GET['urlfile']);
     	dol_delete_file($file);
@@ -120,7 +120,7 @@ if ($facid > 0)
     {
         $facture->fetch_fournisseur();
 
-		$upload_dir = $conf->fournisseur->dir_facture.'/'.get_exdir($facture->id,2).$facture->id;
+		$upload_dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($facture->id,2).$facture->id;
 
 		$head = facturefourn_prepare_head($facture);
 		dol_fiche_head($head, 'documents', $langs->trans('SupplierInvoice'));
diff --git a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php
index b8f2e661dd4..56f2797675d 100644
--- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php
+++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php
@@ -96,7 +96,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition
 		$this->expe = $obj;
 
 		//Verification de la configuration
-		if ($conf->expedition->dir_bon_expedition)
+		if ($conf->expedition_bon->dir_output)
 		{
 			//Creation du Client
 			$soc = new Societe($this->db);
@@ -121,13 +121,13 @@ Class pdf_expedition_merou extends ModelePdfExpedition
 			// Definition de $dir et $file
 			if ($this->expe->specimen)
 			{
-				$dir = $conf->expedition->dir_bon_expedition;
+				$dir = $conf->expedition_bon->dir_output;
 				$file = $dir . "/SPECIMEN.pdf";
 			}
 			else
 			{
 				$expref = dol_sanitizeFileName($this->expe->ref);
-				$dir = $conf->expedition->dir_bon_expedition . "/" . $expref;
+				$dir = $conf->expedition_bon->dir_output . "/" . $expref;
 				$file = $dir . "/" . $expref . ".pdf";
 			}
 
diff --git a/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php b/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php
index c5199fc676a..a23c3052fd4 100644
--- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php
+++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php
@@ -140,20 +140,20 @@ Class pdf_expedition_rouget extends ModelePdfExpedition
 
 		$outputlangs->setPhpLang();
 
-		if ($conf->expedition->dir_bon_expedition)
+		if ($conf->expedition_bon->dir_output)
 		{
 			$this->expe = $obj;
 
 			// D�finition de $dir et $file
 			if ($this->expe->specimen)
 			{
-				$dir = $conf->expedition->dir_bon_expedition;
+				$dir = $conf->expedition_bon->dir_output;
 				$file = $dir . "/SPECIMEN.pdf";
 			}
 			else
 			{
 				$expref = dol_sanitizeFileName($this->expe->ref);
-				$dir = $conf->expedition->dir_bon_expedition . "/" . $expref;
+				$dir = $conf->expedition_bon->dir_output . "/" . $expref;
 				$file = $dir . "/" . $expref . ".pdf";
 			}
 
diff --git a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
index 7078cf89302..fddc69761ce 100644
--- a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
+++ b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
@@ -106,7 +106,7 @@ class pdf_sirocco extends ModelePDFDeliveryOrder
 
 		$outputlangs->setPhpLang();
 
-		if ($conf->expedition->dir_bon_livraison)
+		if ($conf->livraison_bon->dir_output)
 		{
 			// If $delivery is id instead of object
 			if (! is_object($delivery))
@@ -124,7 +124,7 @@ class pdf_sirocco extends ModelePDFDeliveryOrder
 			$nblignes = sizeof($delivery->lignes);
 
 			$deliveryref = dol_sanitizeFileName($delivery->ref);
-			$dir = $conf->expedition->dir_bon_livraison;
+			$dir = $conf->livraison_bon->dir_output;
 			if (! eregi('specimen',$deliveryref)) $dir.= "/" . $deliveryref;
 			$file = $dir . "/" . $deliveryref . ".pdf";
 
diff --git a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php
index 88b96701a95..79910c28a5d 100644
--- a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php
+++ b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php
@@ -127,7 +127,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 
 		$outputlangs->setPhpLang();
 
-		if ($conf->expedition->dir_bon_livraison)
+		if ($conf->livraison_bon->dir_output)
 		{
 			// If $delivery is id instead of object
 			if (! is_object($delivery))
@@ -145,7 +145,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 			$nblignes = sizeof($delivery->lignes);
 
 			$deliveryref = dol_sanitizeFileName($delivery->ref);
-			$dir = $conf->expedition->dir_bon_livraison;
+			$dir = $conf->livraison_bon->dir_output;
 			if (! eregi('specimen',$deliveryref)) $dir.= "/" . $deliveryref;
 			$file = $dir . "/" . $deliveryref . ".pdf";
 
diff --git a/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php b/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php
index 7f99da88684..4495307b55c 100644
--- a/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php
+++ b/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php
@@ -230,7 +230,7 @@ function supplier_order_delete_preview($db, $propalid)
 	$client = new Societe($db);
 	$client->fetch($comfourn->socid);
 
-	if ($conf->fournisseur->dir_commande)
+	if ($conf->fournisseur->commande->dir_output)
 	{
 		$comfournref = dol_sanitizeFileName($comfourn->ref);
 		$dir = $conf->commande->dir_output . "/" . $comfournref ;
diff --git a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php
index 3bf9dccbc1f..c800746ef61 100644
--- a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php
+++ b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2008 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  * Copyright (C) 2007      Franky Van Liedekerke <franky.van.liedekerke@telenet.be>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -22,8 +22,7 @@
 /**
  *	\file       htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php
  *	\ingroup    fournisseur
- *	\brief      Fichier de la classe permettant de g�n�rer les commandes fournisseurs au mod�le Muscadet
- *	\author	    Regis Houssin
+ *	\brief      Fichier de la classe permettant de generer les commandes fournisseurs au modele Muscadet
  *	\version    $Id$
  */
 
@@ -35,14 +34,14 @@ require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
 
 /**
  *	\class      pdf_muscadet
- *	\brief      Classe permettant de g�n�rer les commandes fournisseurs au mod�le Muscadet
+ *	\brief      Classe permettant de generer les commandes fournisseurs au modele Muscadet
  */
 class pdf_muscadet extends ModelePDFSuppliersOrders
 {
 
 	/**
 	 *	\brief      Constructeur
-	 *	\param	    db		Handler acc�s base de donn�e
+	 *	\param	    db		Handler acces base de donnee
 	 */
 	function pdf_muscadet($db)
 	{
@@ -67,8 +66,8 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 
 		$this->option_logo = 1;                    // Affiche logo
 		$this->option_tva = 1;                     // Gere option tva FACTURE_TVAOPTION
-		$this->option_modereg = 1;                 // Affiche mode r�glement
-		$this->option_condreg = 1;                 // Affiche conditions r�glement
+		$this->option_modereg = 1;                 // Affiche mode reglement
+		$this->option_condreg = 1;                 // Affiche conditions reglement
 		$this->option_codeproduitservice = 1;      // Affiche code produit-service
 		$this->option_multilang = 1;               // Dispo en plusieurs langues
 
@@ -77,7 +76,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 
 		// Recupere emmetteur
 		$this->emetteur=$mysoc;
-		if (! $this->emetteur->pays_code) $this->emetteur->pays_code=substr($langs->defaultlang,-2);    // Par defaut, si n'�tait pas d�fini
+		if (! $this->emetteur->pays_code) $this->emetteur->pays_code=substr($langs->defaultlang,-2);    // Par defaut, si n'etait pas defini
 
 		// Defini position des colonnes
 		$this->posxdesc=$this->marge_gauche+1;
@@ -93,8 +92,8 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 	}
 
 	/**
-	 \brief      Renvoi derni�re erreur
-	 \return     string      Derni�re erreur
+	 \brief      Renvoi derniere erreur
+	 \return     string      Derniere erreur
 	 */
 	function pdferror()
 	{
@@ -124,9 +123,9 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 
 		$outputlangs->setPhpLang();
 
-		if ($conf->fournisseur->dir_commande)
+		if ($conf->fournisseur->commande->dir_output)
 		{
-			// D�finition de l'objet $com (pour compatibilite ascendante)
+			// Definition de l'objet $com (pour compatibilite ascendante)
 			if (! is_object($com))
 			{
 				$id = $com;
@@ -135,16 +134,16 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 			}
 			$deja_regle = "";
 
-			// D�finition de $dir et $file
+			// Definition de $dir et $file
 			if ($com->specimen)
 			{
-				$dir = $conf->fournisseur->dir_commande;
+				$dir = $conf->fournisseur->commande->dir_output;
 				$file = $dir . "/SPECIMEN.pdf";
 			}
 			else
 			{
 				$comref = dol_sanitizeFileName($com->ref);
-				$dir = $conf->fournisseur->dir_commande . "/" . $comref;
+				$dir = $conf->fournisseur->commande->dir_output . "/" . $comref;
 				$file = $dir . "/" . $comref . ".pdf";
 			}
 
@@ -168,7 +167,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					$pdf=new FPDI_Protection('P','mm',$this->format);
 					$pdfrights = array('print'); // Ne permet que l'impression du document
 					$pdfuserpass = ''; // Mot de passe pour l'utilisateur final
-					$pdfownerpass = NULL; // Mot de passe du propri�taire, cr�� al�atoirement si pas d�fini
+					$pdfownerpass = NULL; // Mot de passe du proprietaire, cree aleatoirement si pas defini
 					$pdf->SetProtection($pdfrights,$pdfuserpass,$pdfownerpass);
 				}
 				else
@@ -217,7 +216,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				{
 					$tab_top = 88;
 
-					$pdf->SetFont('Arial','', 9);   // Dans boucle pour g�rer multi-page
+					$pdf->SetFont('Arial','', 9);   // Dans boucle pour gerer multi-page
 					$pdf->SetXY ($this->posxdesc-1, $tab_top);
 					$pdf->MultiCell(190, 3, $outputlangs->convToOutputCharset($com->note_public), 0, 'J');
 					$nexY = $pdf->GetY();
@@ -247,11 +246,11 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					// Description de la ligne produit
 					$libelleproduitservice=pdf_getlinedesc($com->lignes[$i],$outputlangs);
 
-					$pdf->SetFont('Arial','', 9);   // Dans boucle pour g�rer multi-page
+					$pdf->SetFont('Arial','', 9);   // Dans boucle pour gerer multi-page
 
 					$pdf->writeHTMLCell(108, 3, $this->posxdesc-1, $curY, $outputlangs->convToOutputCharset($libelleproduitservice), 0, 1);
 
-					$pdf->SetFont('Arial','', 9);   // On repositionne la police par d�faut
+					$pdf->SetFont('Arial','', 9);   // On repositionne la police par defaut
 
 					$nexY = $pdf->GetY();
 
@@ -387,7 +386,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 	}
 
 	/**
-	 *   \brief      Affiche le total � payer
+	 *   \brief      Affiche le total a payer
 	 *   \param      pdf         	Objet PDF
 	 *   \param      object        	Objet order
 	 *   \param      deja_regle  	Montant deja regle
@@ -440,7 +439,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 			$index = 0;
 		}
 
-		// Affichage des totaux de TVA par taux (conform�ment � r�glementation)
+		// Affichage des totaux de TVA par taux (conformement a reglementation)
 		$pdf->SetFillColor(248,248,248);
 
 		foreach( $this->tva as $tvakey => $tvaval )
@@ -524,7 +523,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 	{
 		global $conf;
 
-		// Montants exprim�s en     (en tab_top - 1
+		// Montants exprimes en     (en tab_top - 1
 		$pdf->SetTextColor(0,0,0);
 		$pdf->SetFont('Arial','',8);
 		$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->monnaie));
diff --git a/htdocs/includes/triggers/interface_modNotification_Notification.class.php b/htdocs/includes/triggers/interface_modNotification_Notification.class.php
index 551a2e9c400..8a9b5f07ac4 100644
--- a/htdocs/includes/triggers/interface_modNotification_Notification.class.php
+++ b/htdocs/includes/triggers/interface_modNotification_Notification.class.php
@@ -132,7 +132,7 @@ class InterfaceNotification
 
 			$action_notify = 3;
             $ref = dol_sanitizeFileName($object->ref);
-            $filepdf = $conf->fournisseur->dir_commande . '/' . $ref . '/' . $ref . '.pdf';
+            $filepdf = $conf->fournisseur->commande->dir_output . '/' . $ref . '/' . $ref . '.pdf';
             $mesg = 'La commande fournisseur '.$object->ref." a été validée.\n";
 
             $notify = new Notify($this->db);
diff --git a/htdocs/livraison/fiche.php b/htdocs/livraison/fiche.php
index 91a5471f99e..b6613d389ca 100644
--- a/htdocs/livraison/fiche.php
+++ b/htdocs/livraison/fiche.php
@@ -582,7 +582,7 @@ else
 			 */
 
 			$livraisonref = dol_sanitizeFileName($livraison->ref);
-			$filedir = $conf->expedition->dir_bon_livraison . '/' . $livraisonref;
+			$filedir = $conf->livraison_bon->dir_output . '/' . $livraisonref;
 			$urlsource = $_SERVER["PHP_SELF"]."?id=".$livraison->id;
 
 			$genallowed=$user->rights->expedition->livraison->creer;