diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php
index 78806f9a4ad..0f94564f081 100644
--- a/htdocs/commande/stats/index.php
+++ b/htdocs/commande/stats/index.php
@@ -65,7 +65,7 @@ if ($mode == 'customer')
if ($mode == 'supplier')
{
$title=$langs->trans("OrdersStatisticsSuppliers");
- $dir=$conf->fournisseur->commande->dir_temp;
+ $dir=$conf->fournisseur->dir_output.'/commande/temp';
}
print_fiche_titre($title, $mesg);
diff --git a/htdocs/commande/stats/month.php b/htdocs/commande/stats/month.php
index 023b1b9ce8f..4f326be916a 100644
--- a/htdocs/commande/stats/month.php
+++ b/htdocs/commande/stats/month.php
@@ -60,7 +60,7 @@ if ($mode == 'customer')
if ($mode == 'supplier')
{
$title=$langs->trans("OrdersStatisticsSuppliers");
- $dir=$conf->fournisseur->dir_temp;
+ $dir=$conf->fournisseur->dir_output.'/commande/temp';
}
$mesg = ''.img_previous().' ';
diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index 7b3e4926ca5..52d781d3e7e 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -59,7 +59,7 @@ if ($mode == 'customer')
if ($mode == 'supplier')
{
$title=$langs->trans("BillsStatisticsSuppliers");
- $dir=$conf->fournisseur->facture->dir_temp;
+ $dir=$conf->fournisseur->dir_output.'/facture/temp';
}
print_fiche_titre($title, $mesg);
diff --git a/htdocs/compta/facture/stats/month.php b/htdocs/compta/facture/stats/month.php
index 822d697a163..5cff757c251 100644
--- a/htdocs/compta/facture/stats/month.php
+++ b/htdocs/compta/facture/stats/month.php
@@ -58,7 +58,7 @@ if ($mode == 'customer')
if ($mode == 'supplier')
{
$title=$langs->trans("BillsStatisticsSuppliers");
- $dir=$conf->fournisseur->facture->dir_temp;
+ $dir=$conf->fournisseur->dir_output.'/facture/temp';
}
$mesg = ''.img_previous().' ';
diff --git a/htdocs/document.php b/htdocs/document.php
index 5711af3fbab..85a7de0a3ff 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -188,7 +188,7 @@ if ($modulepart)
{
$accessallowed=1;
}
- $original_file=$conf->fournisseur->commande->dir_output.'/'.$original_file;
+ $original_file=$conf->fournisseur->dir_output.'/commande/'.$original_file;
$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."commande_fournisseur WHERE ref='$refname'";
}
@@ -200,7 +200,7 @@ if ($modulepart)
{
$accessallowed=1;
}
- $original_file=$conf->fournisseur->facture->dir_output.'/'.$original_file;
+ $original_file=$conf->fournisseur->dir_output.'/facture/'.$original_file;
//$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."facture_fourn WHERE facnumber='$refname'";
}
diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php
index e81a2f46845..dc98bc8efff 100644
--- a/htdocs/fourn/commande/document.php
+++ b/htdocs/fourn/commande/document.php
@@ -76,7 +76,7 @@ if ($commande->fetch($_GET['id'],$_GET['ref']) < 0)
// Envoi fichier
if ($_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
{
- $upload_dir = $conf->fournisseur->commande->dir_output . "/" . dol_sanitizeFileName($commande->ref);
+ $upload_dir = $conf->fournisseur->dir_output . "/commande/" . dol_sanitizeFileName($commande->ref);
if (! is_dir($upload_dir)) create_exdir($upload_dir);
if (is_dir($upload_dir))
@@ -98,7 +98,7 @@ if ($_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
// Delete
if ($action=='delete')
{
- $upload_dir = $conf->fournisseur->commande->dir_output . "/" . dol_sanitizeFileName($commande->ref);
+ $upload_dir = $conf->fournisseur->dir_output . "/commande/" . dol_sanitizeFileName($commande->ref);
$file = $upload_dir . '/' . urldecode($_GET['urlfile']);
dol_delete_file($file);
$mesg = ''.$langs->trans("FileWasRemoved").'
';
@@ -117,7 +117,7 @@ if ($id > 0 || ! empty($ref))
{
llxHeader();
- $upload_dir = $conf->fournisseur->commande->dir_output.'/'.dol_sanitizeFileName($commande->ref);
+ $upload_dir = $conf->fournisseur->dir_output.'/commande/'.dol_sanitizeFileName($commande->ref);
$soc = new Societe($db);
$soc->fetch($commande->socid);
diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php
index a22d835ef66..1c35593de5d 100644
--- a/htdocs/fourn/commande/fiche.php
+++ b/htdocs/fourn/commande/fiche.php
@@ -1006,9 +1006,9 @@ if ($id > 0 || ! empty($ref))
* Documents generes
*/
$comfournref = dol_sanitizeFileName($commande->ref);
- $file = $conf->fournisseur->commande->dir_output . '/' . $comfournref . '/' . $comfournref . '.pdf';
+ $file = $conf->fournisseur->dir_output . '/commande/' . $comfournref . '/' . $comfournref . '.pdf';
$relativepath = $comfournref.'/'.$comfournref.'.pdf';
- $filedir = $conf->fournisseur->commande->dir_output . '/' . $comfournref;
+ $filedir = $conf->fournisseur->dir_output . '/commande/' . $comfournref;
$urlsource=$_SERVER["PHP_SELF"]."?id=".$commande->id;
$genallowed=$user->rights->fournisseur->commande->creer;
$delallowed=$user->rights->fournisseur->commande->supprimer;
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index 6ab8130bac7..2c35be09675 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -22,7 +22,7 @@
/**
\file htdocs/fourn/facture/document.php
\ingroup facture, fournisseur
- \brief Page de gestion des documents attachées à une facture fournisseur
+ \brief Page de gestion des documents attachees a une facture fournisseur
\version $Id$
*/
@@ -69,7 +69,7 @@ if ($_POST['sendit'] && ! empty($conf->global->MAIN_UPLOAD_DOC))
$facture = new FactureFournisseur($db);
if ($facture->fetch($facid))
{
- $upload_dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($facture->id,2).$facture->id;
+ $upload_dir = $conf->fournisseur->dir_output.'/facture/'.get_exdir($facture->id,2).$facture->id;
if (! is_dir($upload_dir)) create_exdir($upload_dir);
@@ -82,7 +82,7 @@ if ($_POST['sendit'] && ! empty($conf->global->MAIN_UPLOAD_DOC))
}
else
{
- // Echec transfert (fichier dépassant la limite ?)
+ // Echec transfert (fichier depassant la limite ?)
$mesg = ''.$langs->trans('ErrorFileNotUploaded').'
';
// print_r($_FILES);
}
@@ -98,7 +98,7 @@ if ($action=='delete')
$facture = new FactureFournisseur($db);
if ($facture->fetch($facid))
{
- $upload_dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($facture->id,2).$facture->id;
+ $upload_dir = $conf->fournisseur->dir_output.'/facture/'.get_exdir($facture->id,2).$facture->id;
$file = $upload_dir . '/' . urldecode($_GET['urlfile']);
dol_delete_file($file);
@@ -120,7 +120,7 @@ if ($facid > 0)
{
$facture->fetch_fournisseur();
- $upload_dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($facture->id,2).$facture->id;
+ $upload_dir = $conf->fournisseur->dir_output.'/facture/'.get_exdir($facture->id,2).$facture->id;
$head = facturefourn_prepare_head($facture);
dol_fiche_head($head, 'documents', $langs->trans('SupplierInvoice'));
@@ -145,7 +145,7 @@ if ($facid > 0)
print '| '.$langs->trans("RefSupplier").' | '.$facture->ref_supplier.' | ';
print "
\n";
- // Société
+ // Societe
print '| '.$langs->trans('Company').' | '.$facture->fournisseur->getNomUrl(1).' |
';
print '| '.$langs->trans('NbOfAttachedFiles').' | '.sizeof($filearray).' |
';
diff --git a/htdocs/includes/modules/modFournisseur.class.php b/htdocs/includes/modules/modFournisseur.class.php
index d6b08b43ae3..785a1e97f20 100644
--- a/htdocs/includes/modules/modFournisseur.class.php
+++ b/htdocs/includes/modules/modFournisseur.class.php
@@ -61,41 +61,12 @@ class modFournisseur extends DolibarrModules
$this->picto='company';
// Data directories to create when module is enabled
- // TODO Replace with simple directories
- $this->dirs = array();
- $r=0;
-
- $this->dirs[$r][0] = "output";
- $this->dirs[$r][1] = "/fournisseur";
-
- $r++;
- $this->dirs[$r][0] = "temp";
- $this->dirs[$r][1] = "/fournisseur/temp";
-
- $r++;
- $this->dirs[$r][0] = "output";
- $this->dirs[$r][1] = "/fournisseur/commande";
- $this->dirs[$r][2] = 1;
- $this->dirs[$r][3] = "commande";
-
- $r++;
- $this->dirs[$r][0] = "temp";
- $this->dirs[$r][1] = "/fournisseur/commande/temp";
- $this->dirs[$r][2] = 1;
- $this->dirs[$r][3] = "commande";
-
- $r++;
- $this->dirs[$r][0] = "output";
- $this->dirs[$r][1] = "/fournisseur/facture";
- $this->dirs[$r][2] = 1;
- $this->dirs[$r][3] = "facture";
-
- $r++;
- $this->dirs[$r][0] = "temp";
- $this->dirs[$r][1] = "/fournisseur/facture/temp";
- $this->dirs[$r][2] = 1;
- $this->dirs[$r][3] = "facture";
-
+ $this->dirs = array("/fournisseur/temp",
+ "/fournisseur/commande",
+ "/fournisseur/commande/temp",
+ "/fournisseur/facture",
+ "/fournisseur/facture/temp"
+ );
// Dependances
$this->depends = array("modSociete");
diff --git a/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php b/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php
index 4495307b55c..08ba4835d61 100644
--- a/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php
+++ b/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php
@@ -230,7 +230,7 @@ function supplier_order_delete_preview($db, $propalid)
$client = new Societe($db);
$client->fetch($comfourn->socid);
- if ($conf->fournisseur->commande->dir_output)
+ if ($conf->fournisseur->dir_output.'/commande')
{
$comfournref = dol_sanitizeFileName($comfourn->ref);
$dir = $conf->commande->dir_output . "/" . $comfournref ;
diff --git a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php
index 6fbd9d50ef0..17539d07f9b 100644
--- a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php
+++ b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php
@@ -121,7 +121,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
$outputlangs->load("products");
$outputlangs->load("orders");
- if ($conf->fournisseur->commande->dir_output)
+ if ($conf->fournisseur->dir_output.'/commande')
{
// Definition de l'objet $com (pour compatibilite ascendante)
if (! is_object($com))
@@ -135,13 +135,13 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
// Definition de $dir et $file
if ($com->specimen)
{
- $dir = $conf->fournisseur->commande->dir_output;
+ $dir = $conf->fournisseur->dir_output.'/commande';
$file = $dir . "/SPECIMEN.pdf";
}
else
{
$comref = dol_sanitizeFileName($com->ref);
- $dir = $conf->fournisseur->commande->dir_output . "/" . $comref;
+ $dir = $conf->fournisseur->dir_output . "/commande/" . $comref;
$file = $dir . "/" . $comref . ".pdf";
}
diff --git a/htdocs/includes/triggers/interface_modNotification_Notification.class.php b/htdocs/includes/triggers/interface_modNotification_Notification.class.php
index 249afcf21e5..f12a6c996a4 100644
--- a/htdocs/includes/triggers/interface_modNotification_Notification.class.php
+++ b/htdocs/includes/triggers/interface_modNotification_Notification.class.php
@@ -132,7 +132,7 @@ class InterfaceNotification
$action_notify = 'NOTIFY_VAL_ORDER_SUPPLIER';
$ref = dol_sanitizeFileName($object->ref);
- $filepdf = $conf->fournisseur->commande->dir_output . '/' . $ref . '/' . $ref . '.pdf';
+ $filepdf = $conf->fournisseur->dir_output . '/commande/' . $ref . '/' . $ref . '.pdf';
$mesg = 'La commande fournisseur '.$object->ref." a été validée.\n";
$notify = new Notify($this->db);
diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php
index 8cd00368dbb..16b6efda199 100644
--- a/htdocs/viewimage.php
+++ b/htdocs/viewimage.php
@@ -163,7 +163,7 @@ if ($modulepart)
{
$accessallowed=1;
}
- $original_file=$conf->fournisseur->commande->dir_temp.'/'.$original_file;
+ $original_file=$conf->fournisseur->dir_output.'/commande/temp/'.$original_file;
}
// Wrapping pour les images des stats factures
@@ -183,7 +183,7 @@ if ($modulepart)
{
$accessallowed=1;
}
- $original_file=$conf->fournisseur->facture->dir_temp.'/'.$original_file;
+ $original_file=$conf->fournisseur->dir_output.'/facture/temp/'.$original_file;
}
// Wrapping pour les images des stats expeditions