Fix: Generated doc in wrong dir

Dolibarr · Mar 7, 2011 · 5741b19 · 5741b19
1 parent f07557f
commit 5741b19
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
@@ -70,7 +70,7 @@
 	if ($facture->fetch($facid))
 	{
         $ref=dol_sanitizeFileName($facture->ref);
-        $upload_dir = $conf->fournisseur->facture->dir_output.'/'.$ref;
+        $upload_dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($facture->id,2).$ref;
 
 		if (create_exdir($upload_dir) >= 0)
 		{
@@ -108,7 +108,7 @@
 	if ($facture->fetch($facid))
 	{
         $ref=dol_sanitizeFileName($facture->ref);
-        $upload_dir = $conf->fournisseur->facture->dir_output.'/'.$ref;
+        $upload_dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($facture->id,2).$ref;
 
 		$file = $upload_dir . '/' . $_GET['urlfile'];	// Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
 		dol_delete_file($file);
@@ -133,7 +133,7 @@
 		$facture->fetch_thirdparty();
 
         $ref=dol_sanitizeFileName($facture->ref);
-        $upload_dir = $conf->fournisseur->facture->dir_output.'/'.$ref;
+        $upload_dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($facture->id,2).$ref;
 
 		$head = facturefourn_prepare_head($facture);
 		dol_fiche_head($head, 'documents', $langs->trans('SupplierInvoice'), 0, 'bill');

diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
@@ -1795,8 +1795,8 @@
                  */
 
                 $ref=dol_sanitizeFileName($fac->ref);
-                $subdir = $ref;
-                $filedir = $conf->fournisseur->facture->dir_output.'/'.$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;

diff --git 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 @@ function write_file($object,$outputlangs='')
 			else
 			{
 				$objectref = dol_sanitizeFileName($object->ref);
-                $dir = $conf->fournisseur->facture->dir_output.'/'.$objectref;
+                $dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($object->id,2).$objectref;
 				$file = $dir . "/" . $objectref . ".pdf";
 			}