Fix: Bug when metafile is on

Dolibarr · Sep 19, 2012 · d1cfe2e · d1cfe2e
1 parent 1347ecf
commit d1cfe2e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
@@ -843,16 +843,16 @@ function dol_delete_preview($object)
 {
 	global $langs,$conf;
 
-    $element = $object->element;
+	// Define parent dir of elements
+	$element = $object->element;
 
     if ($object->element == 'order_supplier')		$dir = $conf->fournisseur->dir_output.'/commande';
     elseif ($object->element == 'invoice_supplier')	$dir = $conf->fournisseur->dir_output.'/facture';
     elseif ($object->element == 'project')			$dir = $conf->projet->dir_output;
     elseif ($object->element == 'shipping')			$dir = $conf->expedition->dir_output.'/sending';
     elseif ($object->element == 'delivery')			$dir = $conf->expedition->dir_output.'/receipt';
     elseif ($object->element == 'fichinter')		$dir = $conf->ficheinter->dir_output;
-    else
-    	$dir = $conf->$element->dir_output;
+    else $dir=empty($conf->$element->dir_output)?'':$conf->$element->dir_output;
 
     if (empty($dir)) return 'ErrorObjectNoSupportedByFunction';
 
@@ -901,11 +901,18 @@ function dol_meta_create($object)
 {
 	global $conf;
 
-	if (empty($conf->global->MAIN_DOC_CREATE_METAFILE)) return 0;
+	if (empty($conf->global->MAIN_DOC_CREATE_METAFILE)) return 0;	// By default, no metafile.
 
 	// Define parent dir of elements
 	$element=$object->element;
-	$dir=empty($conf->$element->dir_output)?'':$conf->$element->dir_output;
+
+	if ($object->element == 'order_supplier')		$dir = $conf->fournisseur->dir_output.'/commande';
+	elseif ($object->element == 'invoice_supplier')	$dir = $conf->fournisseur->dir_output.'/facture';
+	elseif ($object->element == 'project')			$dir = $conf->projet->dir_output;
+	elseif ($object->element == 'shipping')			$dir = $conf->expedition->dir_output.'/sending';
+	elseif ($object->element == 'delivery')			$dir = $conf->expedition->dir_output.'/receipt';
+	elseif ($object->element == 'fichinter')		$dir = $conf->ficheinter->dir_output;
+	else $dir=empty($conf->$element->dir_output)?'':$conf->$element->dir_output;
 
 	if ($dir)
 	{

diff --git a/test/phpunit/BuildDocTest.php b/test/phpunit/BuildDocTest.php
@@ -302,8 +302,7 @@ public function testProjectBuild()
         $user=$this->savuser;
         $langs=$this->savlangs;
         $db=$this->savdb;
-
-        $conf->project->dir_output.='/temp';
+        $conf->projet->dir_output.='/temp';
         $localobject=new Project($this->savdb);
         $localobject->initAsSpecimen();