diff --git a/htdocs/compta/paiement/cheque/fiche.php b/htdocs/compta/paiement/cheque/fiche.php index c56bdb35eec..03bbb1ff511 100644 --- a/htdocs/compta/paiement/cheque/fiche.php +++ b/htdocs/compta/paiement/cheque/fiche.php @@ -454,7 +454,7 @@ if ($_GET['action'] != 'new') { if ($remisecheque->statut == 1) { - $dir = DOL_DATA_ROOT.'/compta/bordereau/'.get_exdir($remisecheque->number); + $dir = $conf->comptabilite->dir_output.'/bordereau/'.get_exdir($remisecheque->number); $gen = array('blochet'=>'blochet'); $formfile->show_documents("remisecheque","",$dir,$_SERVER["PHP_SELF"].'?id='.$remisecheque->id,$gen,1); } diff --git a/htdocs/document.php b/htdocs/document.php index c296f361886..36af47f2a4d 100644 --- a/htdocs/document.php +++ b/htdocs/document.php @@ -360,7 +360,7 @@ if ($modulepart) $accessallowed=1; } - $original_file=DOL_DATA_ROOT.'/compta/bordereau/'.get_exdir(basename($original_file,".pdf")).$original_file; + $original_file=$conf->comptabilite->dir_output.'/bordereau/'.get_exdir(basename($original_file,".pdf")).$original_file; $sqlprotectagainstexternals = ''; } diff --git a/htdocs/includes/modules/modComptabilite.class.php b/htdocs/includes/modules/modComptabilite.class.php index 468848b11ab..38e62cfbf24 100644 --- a/htdocs/includes/modules/modComptabilite.class.php +++ b/htdocs/includes/modules/modComptabilite.class.php @@ -76,23 +76,11 @@ class modComptabilite extends DolibarrModules $this->const = array(); // Data directories to create when module is enabled - $this->dirs = array(); - $r=0; - - $this->dirs[$r][0] = "output"; - $this->dirs[$r][1] = "/compta"; - - $r++; - $this->dirs[$r][0] = "temp"; - $this->dirs[$r][1] = "/compta/temp"; - - $r++; - $this->dirs[$r][0] = "rapport"; - $this->dirs[$r][1] = "/compta/rapport"; - - $r++; - $this->dirs[$r][0] = "export"; - $this->dirs[$r][1] = "/compta/export"; + $this->dirs = array("/comptabilite/temp", + "/comptabilite/rapport", + "/comptabilite/export", + "/comptabilite/bordereau" + ); // Boites $this->boxes = array();