From d1cfe2ec544c8352af04972bfa0bd94d87709335 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 19 Sep 2012 13:30:59 +0200 Subject: [PATCH] Fix: Bug when metafile is on --- htdocs/core/lib/files.lib.php | 17 ++++++++++++----- test/phpunit/BuildDocTest.php | 3 +-- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php index 31fc5073fbe..6f3303add9e 100644 --- a/htdocs/core/lib/files.lib.php +++ b/htdocs/core/lib/files.lib.php @@ -843,7 +843,8 @@ 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'; @@ -851,8 +852,7 @@ function dol_delete_preview($object) 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 index 671646be826..4a09b6942b6 100644 --- a/test/phpunit/BuildDocTest.php +++ b/test/phpunit/BuildDocTest.php @@ -302,8 +302,7 @@ class BuildDocTest extends PHPUnit_Framework_TestCase $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();