lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Bug when metafile is on

Browse Source
This commit is contained in:
Laurent Destailleur 2012-09-19 13:30:59 +02:00
parent 1347ecf14e
commit d1cfe2ec54
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
htdocs/core/lib/files.lib.php
View File

@ -843,7 +843,8 @@ function dol_delete_preview($object)
{ {
global $langs,$conf; 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'; 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 == '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 == 'shipping') $dir = $conf->expedition->dir_output.'/sending';
elseif ($object->element == 'delivery') $dir = $conf->expedition->dir_output.'/receipt'; elseif ($object->element == 'delivery') $dir = $conf->expedition->dir_output.'/receipt';
elseif ($object->element == 'fichinter') $dir = $conf->ficheinter->dir_output; elseif ($object->element == 'fichinter') $dir = $conf->ficheinter->dir_output;
else else $dir=empty($conf->$element->dir_output)?'':$conf->$element->dir_output;
$dir = $conf->$element->dir_output;
if (empty($dir)) return 'ErrorObjectNoSupportedByFunction'; if (empty($dir)) return 'ErrorObjectNoSupportedByFunction';
@ -901,11 +901,18 @@ function dol_meta_create($object)
{ {
global $conf; 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 // Define parent dir of elements
$element=$object->element; $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) if ($dir)
{ {

3
test/phpunit/BuildDocTest.php
View File

@ -302,8 +302,7 @@ class BuildDocTest extends PHPUnit_Framework_TestCase
$user=$this->savuser; $user=$this->savuser;
$langs=$this->savlangs; $langs=$this->savlangs;
$db=$this->savdb; $db=$this->savdb;
$conf->projet->dir_output.='/temp';
$conf->project->dir_output.='/temp';
$localobject=new Project($this->savdb); $localobject=new Project($this->savdb);
$localobject->initAsSpecimen(); $localobject->initAsSpecimen();