From 1e06a25231e897ffae98f07cbaa1b1097d450562 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 19 Aug 2006 15:50:48 +0000
Subject: [PATCH] =?UTF-8?q?Qual:=20Tous=20les=20r=E9pertoires=20qui=20serv?=
=?UTF-8?q?ent=20=E0=20g=E9n=E9rer=20des=20donn=E9es=20temporaires=20(grap?=
=?UTF-8?q?h,=20fichiers=20rapports)=20sont=20nomm=E9s=20"nomdumodule/temp?=
=?UTF-8?q?"=20pour=20plus=20de=20clart=E9=20et=20permettre=20fonction=20d?=
=?UTF-8?q?e=20nettoyage=20plus=20tard.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
htdocs/comm/action/document.php | 2 +-
htdocs/comm/action/rapport/index.php | 4 +-
htdocs/comm/action/rapport/rapport.pdf.php | 4 +-
htdocs/comm/mailing/pre.inc.php | 1 +
htdocs/comm/propal/stats/index.php | 6 +--
htdocs/comm/propal/stats/month.php | 14 ++---
htdocs/commande/stats/index.php | 6 +--
htdocs/commande/stats/month.php | 15 +++---
htdocs/compta/bank/graph.php | 10 ++--
htdocs/compta/facture/stats/index.php | 4 +-
htdocs/compta/facture/stats/month.php | 8 +--
htdocs/conf/conf.class.php | 51 ++++++++++---------
htdocs/document.php | 6 +--
htdocs/expedition/stats/month.php | 4 +-
htdocs/exports/export.class.php | 2 +-
htdocs/exports/export.php | 13 +++--
htdocs/exports/index.php | 18 +++++--
htdocs/includes/boxes/box_external_rss.php | 2 +-
.../menus/barre_left/eldy_backoffice.php | 2 +-
htdocs/includes/modules/modCommande.class.php | 2 +-
.../modules/modComptabilite.class.php | 2 +-
htdocs/includes/modules/modExport.class.php | 2 +-
htdocs/includes/modules/modPropale.class.php | 2 +-
htdocs/includes/modules/modTax.class.php | 2 +-
htdocs/includes/modules/modUser.class.php | 8 +--
htdocs/langs/en_US/exports.lang | 6 ++-
htdocs/langs/fr_FR/boxes.lang | 2 +-
htdocs/langs/fr_FR/exports.lang | 8 ++-
htdocs/product/stats/fiche.php | 2 +-
htdocs/viewimage.php | 12 ++---
scripts/banque/graph-solde.php | 14 ++---
31 files changed, 128 insertions(+), 106 deletions(-)
diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index e579e03ccf9..bdb8990ca24 100755
--- a/htdocs/comm/action/document.php
+++ b/htdocs/comm/action/document.php
@@ -41,7 +41,7 @@ $langs->load("other");
$langs->load("bills");
if (isset($_GET["error"])) $error=$_GET["error"];
-$upload_dir = $conf->actionscomm->dir_output.'/'.$_GET['id'];
+$upload_dir = $conf->actions->dir_output.'/'.$_GET['id'];
// S�curit� acc�s client
if ($user->societe_id > 0)
diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php
index 0001ea1a5a6..a3af5495c2b 100644
--- a/htdocs/comm/action/rapport/index.php
+++ b/htdocs/comm/action/rapport/index.php
@@ -115,9 +115,9 @@ if ($resql)
print '<td><a href="index.php?action=builddoc&page='.$page.'&month='.$obj->month.'&year='.$obj->year.'">'.img_file_new().'</a></td>';
- $name = "rapport-action-".$obj->month."-".$obj->year.".pdf";
+ $name = "actions-".$obj->month."-".$obj->year.".pdf";
$relativepath= $name;
- $file = $conf->commercial->dir_output . "/actions/" .$name;
+ $file = $conf->action->dir_temp."/".$name;
if (file_exists($file))
{
diff --git a/htdocs/comm/action/rapport/rapport.pdf.php b/htdocs/comm/action/rapport/rapport.pdf.php
index 42a3abfa950..2d5d485b1be 100644
--- a/htdocs/comm/action/rapport/rapport.pdf.php
+++ b/htdocs/comm/action/rapport/rapport.pdf.php
@@ -68,8 +68,8 @@ class CommActionRapport
{
global $user,$conf,$langs;
- $dir = $conf->commercial->dir_output."/actions";
- $file = $dir . "/rapport-action-".$this->month."-".$this->year.".pdf";
+ $dir = $conf->action->dir_temp."/";
+ $file = $dir . "/actions-".$this->month."-".$this->year.".pdf";
if (! file_exists($dir))
{
diff --git a/htdocs/comm/mailing/pre.inc.php b/htdocs/comm/mailing/pre.inc.php
index 9850353dd76..49d5e2bf8db 100644
--- a/htdocs/comm/mailing/pre.inc.php
+++ b/htdocs/comm/mailing/pre.inc.php
@@ -33,6 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/comm/mailing/mailing.class.php';
$user->getrights();
$langs->load("companies");
$langs->load("mails");
+$langs->load("exports");
function llxHeader($head = "", $title = "")
diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php
index e2d21c2e2c4..c2e03394a4c 100644
--- a/htdocs/comm/propal/stats/index.php
+++ b/htdocs/comm/propal/stats/index.php
@@ -43,16 +43,16 @@ $stats = new PropaleStats($db);
$year = strftime("%Y", time());
$data = $stats->getNbByMonthWithPrevYear($year);
-create_exdir($conf->propal->dir_images);
+create_exdir($conf->propal->dir_temp);
if (!$user->rights->commercial->client->voir || $user->societe_id)
{
- $filename = $conf->propal->dir_images.'/nbpropale2year-'.$user->id.'-'.$year.'.png';
+ $filename = $conf->propal->dir_temp.'/nbpropale2year-'.$user->id.'-'.$year.'.png';
$fileurl = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=nbpropale2year-'.$user->id.'-'.$year.'.png';
}
else
{
- $filename = $conf->propal->dir_images.'/nbpropale2year-'.$year.'.png';
+ $filename = $conf->propal->dir_temp.'/nbpropale2year-'.$year.'.png';
$fileurl = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=nbpropale2year-'.$year.'.png';
}
diff --git a/htdocs/comm/propal/stats/month.php b/htdocs/comm/propal/stats/month.php
index d6ea4618c07..1be2240f2e7 100644
--- a/htdocs/comm/propal/stats/month.php
+++ b/htdocs/comm/propal/stats/month.php
@@ -53,16 +53,16 @@ print_fiche_titre($langs->trans("ProposalsStatistics"), $mesg);
$stats = new PropaleStats($db);
$data = $stats->getNbByMonth($year);
-if (! is_dir($conf->propal->dir_images)) { mkdir($conf->propal->dir_images); }
+create_exdir($conf->propal->dir_temp);
if (!$user->rights->commercial->client->voir || $user->societe_id)
{
- $filename = $conf->propal->dir_images.'/propale-'.$user->id.'-'.$year.'.png';
+ $filename = $conf->propal->dir_temp.'/propale-'.$user->id.'-'.$year.'.png';
$fileurl = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=propale-'.$user->id.'-'.$year.'.png';
}
else
{
- $filename = $conf->propal->dir_images.'/propale'.$year.'.png';
+ $filename = $conf->propal->dir_temp.'/propale'.$year.'.png';
$fileurl = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=propale'.$year.'.png';
}
@@ -92,12 +92,12 @@ for ($i = 1 ; $i < 13 ; $i++)
if (!$user->rights->commercial->client->voir || $user->societe_id)
{
- $filename_amount = $conf->propal->dir_images.'/propaleamount-'.$user->id.'-'.$year.'.png';
+ $filename_amount = $conf->propal->dir_temp.'/propaleamount-'.$user->id.'-'.$year.'.png';
$fileurl_amount = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=propaleamount-'.$user->id.'-'.$year.'.png';
}
else
{
- $filename_amount = $conf->propal->dir_images.'/propaleamount'.$year.'.png';
+ $filename_amount = $conf->propal->dir_temp.'/propaleamount'.$year.'.png';
$fileurl_amount = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=propaleamount'.$year.'.png';
}
@@ -127,12 +127,12 @@ for ($i = 1 ; $i < 13 ; $i++)
if (!$user->rights->commercial->client->voir || $user->societe_id)
{
- $filename_avg = $conf->propal->dir_images.'/propaleaverage-'.$user->id.'-'.$year.'.png';
+ $filename_avg = $conf->propal->dir_temp.'/propaleaverage-'.$user->id.'-'.$year.'.png';
$fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=propaleaverage-'.$user->id.'-'.$year.'.png';
}
else
{
- $filename_avg = $conf->propal->dir_images.'/propaleaverage'.$year.'.png';
+ $filename_avg = $conf->propal->dir_temp.'/propaleaverage'.$year.'.png';
$fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=propaleaverage'.$year.'.png';
}
diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php
index 5fea70181e1..247dff10180 100644
--- a/htdocs/commande/stats/index.php
+++ b/htdocs/commande/stats/index.php
@@ -55,7 +55,7 @@ $year = strftime("%Y", time());
$data = $stats->getNbByMonthWithPrevYear($year);
// Cr�ation r�pertoire pour images g�n�r�es
-$dir=$conf->commande->dir_images;
+$dir=$conf->commande->dir_temp;
if (! file_exists($dir))
{
if (create_exdir($dir) < 0)
@@ -66,12 +66,12 @@ if (! file_exists($dir))
if (!$user->rights->commercial->client->voir || $user->societe_id)
{
- $filename = $conf->commande->dir_images.'/nbcommande2year-'.$user->id.'-'.$year.'.png';
+ $filename = $conf->commande->dir_temp.'/nbcommande2year-'.$user->id.'-'.$year.'.png';
$fileurl = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=nbcommande2year-'.$user->id.'-'.$year.'.png';
}
else
{
- $filename = $conf->commande->dir_images.'/nbcommande2year-'.$year.'.png';
+ $filename = $conf->commande->dir_temp.'/nbcommande2year-'.$year.'.png';
$fileurl = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=nbcommande2year-'.$year.'.png';
}
diff --git a/htdocs/commande/stats/month.php b/htdocs/commande/stats/month.php
index e6bcf73dd57..66d935e63d5 100644
--- a/htdocs/commande/stats/month.php
+++ b/htdocs/commande/stats/month.php
@@ -60,16 +60,17 @@ print_fiche_titre($langs->trans("OrdersStatistics"), $mesg);
$stats = new CommandeStats($db, $socidp);
$data = $stats->getNbByMonth($year);
-if (! is_dir($conf->commande->dir_images)) { mkdir($conf->commande->dir_images); }
+create_exdir($conf->commande->dir_temp);
+
if (!$user->rights->commercial->client->voir || $user->societe_id)
{
- $filename = $conf->commande->dir_images.'/commande-'.$user->id.'-'.$year.'.png';
+ $filename = $conf->commande->dir_temp.'/commande-'.$user->id.'-'.$year.'.png';
$fileurl = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=commande-'.$user->id.'-'.$year.'.png';
}
else
{
- $filename = $conf->commande->dir_images.'/commande'.$year.'.png';
+ $filename = $conf->commande->dir_temp.'/commande'.$year.'.png';
$fileurl = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=commande'.$year.'.png';
}
@@ -99,12 +100,12 @@ for ($i = 1 ; $i < 13 ; $i++)
if (!$user->rights->commercial->client->voir || $user->societe_id)
{
- $filename_amount = $conf->commande->dir_images.'/commandeamount-'.$user->id.'-'.$year.'.png';
+ $filename_amount = $conf->commande->dir_temp.'/commandeamount-'.$user->id.'-'.$year.'.png';
$fileurl_amount = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=commandeamount-'.$user->id.'-'.$year.'.png';
}
else
{
- $filename_amount = $conf->commande->dir_images.'/commandeamount'.$year.'.png';
+ $filename_amount = $conf->commande->dir_temp.'/commandeamount'.$year.'.png';
$fileurl_amount = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=commandeamount'.$year.'.png';
}
@@ -133,12 +134,12 @@ for ($i = 1 ; $i < 13 ; $i++)
if (!$user->rights->commercial->client->voir || $user->societe_id)
{
- $filename_avg = $conf->commande->dir_images.'/commandeaverage-'.$user->id.'-'.$year.'.png';
+ $filename_avg = $conf->commande->dir_temp.'/commandeaverage-'.$user->id.'-'.$year.'.png';
$fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=commandeaverage-'.$user->id.'-'.$year.'.png';
}
else
{
- $filename_avg = $conf->commande->dir_images.'/commandeaverage'.$year.'.png';
+ $filename_avg = $conf->commande->dir_temp.'/commandeaverage'.$year.'.png';
$fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=commandeaverage'.$year.'.png';
}
diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php
index c81444dc4f5..9c665dd7495 100644
--- a/htdocs/compta/bank/graph.php
+++ b/htdocs/compta/bank/graph.php
@@ -51,7 +51,7 @@ if ($account > 0)
$acct->fetch($account);
- create_exdir($conf->banque->dir_images);
+ create_exdir($conf->banque->dir_temp);
// Definition de $width et $height
@@ -146,7 +146,7 @@ if ($account > 0)
}
// Fabrication tableau 1
- $file= $conf->banque->dir_images."/solde.$account.$year.$month.png";
+ $file= $conf->banque->dir_temp."/solde.$account.$year.$month.png";
$title=$langs->trans("Balance").' '.$langs->trans("Month").': '.$month.' '.$langs->trans("Year").': '.$year;
$graph_datas=array();
foreach($datas as $i => $val)
@@ -240,7 +240,7 @@ if ($account > 0)
}
// Fabrication tableau 2
- $file= $conf->banque->dir_images."/solde.$account.$year.png";
+ $file= $conf->banque->dir_temp."/solde.$account.$year.png";
$title=$langs->trans("Balance").' '.$langs->trans("Year").': '.$year;
$graph_datas=array();
foreach($datas as $i => $val)
@@ -317,7 +317,7 @@ if ($account > 0)
}
// Fabrication tableau 3
- $file= $conf->banque->dir_images."/solde.$account.png";
+ $file= $conf->banque->dir_temp."/solde.$account.png";
$title=$langs->trans("Balance");
$graph_datas=array();
foreach($datas as $i => $val)
@@ -394,7 +394,7 @@ if ($account > 0)
}
// Fabrication tableau 4
- $file= $conf->banque->dir_images."/mouvement.$account.$year.png";
+ $file= $conf->banque->dir_temp."/mouvement.$account.$year.png";
$title=$langs->trans("Movements").' '.$langs->trans("Year").': '.$year;
$graph_datas=array();
foreach($data_credit as $i => $val)
diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index 479be22e8ef..c4e2a10122d 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -48,9 +48,9 @@ $stats = new FactureStats($db, $socidp);
$year = strftime("%Y", time());
$data = $stats->getNbByMonthWithPrevYear($year);
-if (! is_dir($conf->facture->dir_images)) { mkdir($conf->facture->dir_images); }
+create_exdir($conf->facture->dir_temp);
-$filename = $conf->facture->dir_images."/nbfacture2year-".$year.".png";
+$filename = $conf->facture->dir_temp."/nbfacture2year-".$year.".png";
$fileurl = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&file=nbfacture2year-'.$year.'.png';
$px = new DolGraph();
diff --git a/htdocs/compta/facture/stats/month.php b/htdocs/compta/facture/stats/month.php
index 0815d242ea7..878605e9316 100644
--- a/htdocs/compta/facture/stats/month.php
+++ b/htdocs/compta/facture/stats/month.php
@@ -54,9 +54,9 @@ print_fiche_titre($langs->trans("BillsStatistics"), $mesg);
$stats = new FactureStats($db, $socidp);
$data = $stats->getNbByMonth($year);
-if (! is_dir($conf->facture->dir_images)) { mkdir($conf->facture->dir_images); }
+create_exdir($conf->facture->dir_temp);
-$filename = $conf->facture->dir_images."/facture".$year.".png";
+$filename = $conf->facture->dir_temp."/facture".$year.".png";
$fileurl = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&file=facture'.$year.'.png';
$px = new DolGraph();
@@ -83,7 +83,7 @@ for ($i = 1 ; $i < 13 ; $i++)
$data[$i-1] = array(ucfirst(substr(strftime("%b",mktime(12,12,12,$i,1,$year)),0,3)), $res[$i]);
}
-$filename_amount = $conf->facture->dir_images."/factureamount".$year.".png";
+$filename_amount = $conf->facture->dir_temp."/factureamount".$year.".png";
$fileurl_amount = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&file=factureamount'.$year.'.png';
$px = new DolGraph();
@@ -110,7 +110,7 @@ for ($i = 1 ; $i < 13 ; $i++)
$data[$i-1] = array(ucfirst(substr(strftime("%b",mktime(12,12,12,$i,1,$year)),0,3)), $res[$i]);
}
-$filename_avg = $conf->facture->dir_images."/factureaverage".$year.".png";
+$filename_avg = $conf->facture->dir_temp."/factureaverage".$year.".png";
$fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&file=factureaverage'.$year.'.png';
$px = new DolGraph();
diff --git a/htdocs/conf/conf.class.php b/htdocs/conf/conf.class.php
index 77f37e6ed12..70ab5763426 100644
--- a/htdocs/conf/conf.class.php
+++ b/htdocs/conf/conf.class.php
@@ -151,61 +151,62 @@ class Conf
// Module commande client
$this->commande->enabled=defined("MAIN_MODULE_COMMANDE")?MAIN_MODULE_COMMANDE:0;
$this->commande->dir_output=DOL_DATA_ROOT."/commande";
- $this->commande->dir_images=DOL_DATA_ROOT."/commande/images";
+ $this->commande->dir_temp =DOL_DATA_ROOT."/commande/temp";
// Module expeditions
$this->expedition->enabled=defined("MAIN_MODULE_EXPEDITION")?MAIN_MODULE_EXPEDITION:0;
// Sous module bons d'expedition
$this->expedition_bon->enabled=defined("MAIN_SUBMODULE_EXPEDITION")?MAIN_SUBMODULE_EXPEDITION:0;
$this->expedition->dir_output=DOL_DATA_ROOT."/expedition";
- $this->expedition->dir_images=DOL_DATA_ROOT."/expedition/images";
+ $this->expedition->dir_temp =DOL_DATA_ROOT."/expedition/temp";
// Sous module bons de livraison
$this->livraison->enabled=defined("MAIN_SUBMODULE_LIVRAISON")?MAIN_SUBMODULE_LIVRAISON:0;
$this->livraison->dir_output=DOL_DATA_ROOT."/livraison";
- $this->livraison->dir_images=DOL_DATA_ROOT."/livraison/images";
+ $this->livraison->dir_temp =DOL_DATA_ROOT."/livraison/temp";
// Module societe
$this->societe->enabled=defined("MAIN_MODULE_SOCIETE")?MAIN_MODULE_SOCIETE:0;
$this->societe->dir_output=DOL_DATA_ROOT."/societe";
- $this->societe->dir_images=DOL_DATA_ROOT."/societe/images";
- $this->societe->dir_logos=DOL_DATA_ROOT."/societe/logos";
+ $this->societe->dir_temp =DOL_DATA_ROOT."/societe/temp";
+ $this->societe->dir_logos =DOL_DATA_ROOT."/societe/logos";
if (defined('SOCIETE_OUTPUTDIR') && SOCIETE_OUTPUTDIR) { $this->societe->dir_output=SOCIETE_OUTPUTDIR; } # Pour passer outre le rep par defaut
// Module commercial
$this->commercial->enabled=defined("MAIN_MODULE_COMMERCIAL")?MAIN_MODULE_COMMERCIAL:0;
- $this->commercial->dir_output=DOL_DATA_ROOT."/rapport";
+ $this->commercial->dir_output=DOL_DATA_ROOT."/comm";
+ $this->commercial->dir_temp =DOL_DATA_ROOT."/comm/temp";
// Module taxes et charges sociales
$this->tax->enabled=defined("MAIN_MODULE_TAX")?MAIN_MODULE_TAX:0;
$this->tax->dir_output=DOL_DATA_ROOT."/taxes";
- $this->tax->dir_images=DOL_DATA_ROOT."/taxes/images";
+ $this->tax->dir_temp =DOL_DATA_ROOT."/taxes/temp";
// Module comptaexpert
$this->comptaexpert->enabled=defined("MAIN_MODULE_COMPTABILITE_EXPERT")?MAIN_MODULE_COMPTABILITE_EXPERT:0;
$this->comptaexpert->dir_output=DOL_DATA_ROOT."/comptaexpert";
- $this->comptaexpert->dir_images=DOL_DATA_ROOT."/comptaexpert/images";
+ $this->comptaexpert->dir_temp =DOL_DATA_ROOT."/comptaexpert/temp";
// Module compta
$this->compta->enabled=defined("MAIN_MODULE_COMPTABILITE")?MAIN_MODULE_COMPTABILITE:0;
$this->compta->dir_output=DOL_DATA_ROOT."/compta";
- $this->compta->dir_images=DOL_DATA_ROOT."/compta/images";
+ $this->compta->dir_temp =DOL_DATA_ROOT."/compta/temp";
// Module banque
$this->banque->enabled=defined("MAIN_MODULE_BANQUE")?MAIN_MODULE_BANQUE:0;
$this->banque->dir_output=DOL_DATA_ROOT."/banque";
- $this->banque->dir_images=DOL_DATA_ROOT."/banque/images";
+ $this->banque->dir_temp =DOL_DATA_ROOT."/banque/temp";
// Module don
$this->don->enabled=defined("MAIN_MODULE_DON")?MAIN_MODULE_DON:0;
$this->don->dir_output=DOL_DATA_ROOT."/dons";
- $this->don->dir_images=DOL_DATA_ROOT."/dons/images";
+ $this->don->dir_temp =DOL_DATA_ROOT."/dons/temp";
// Module syslog
$this->syslog->enabled=defined("MAIN_MODULE_SYSLOG")?MAIN_MODULE_SYSLOG:0;
// Module fournisseur
$this->fournisseur->enabled=defined("MAIN_MODULE_FOURNISSEUR")?MAIN_MODULE_FOURNISSEUR:0;
$this->fournisseur->dir_output=DOL_DATA_ROOT."/fournisseur";
$this->fournisseur->commande->dir_output=DOL_DATA_ROOT."/fournisseur/commande";
- $this->fournisseur->commande->dir_images=DOL_DATA_ROOT."/fournisseur/commande/images";
- $this->fournisseur->facture->dir_output=DOL_DATA_ROOT."/fournisseur/facture";
- $this->fournisseur->facture->dir_images=DOL_DATA_ROOT."/fournisseur/facture/images";
+ $this->fournisseur->commande->dir_temp =DOL_DATA_ROOT."/fournisseur/commande/temp";
+ $this->fournisseur->facture->dir_output =DOL_DATA_ROOT."/fournisseur/facture";
+ $this->fournisseur->facture->dir_temp =DOL_DATA_ROOT."/fournisseur/facture/temp";
// Module ficheinter
$this->fichinter->enabled=defined("MAIN_MODULE_FICHEINTER")?MAIN_MODULE_FICHEINTER:0;
$this->fichinter->dir_output=DOL_DATA_ROOT."/ficheinter";
- $this->fichinter->dir_images=DOL_DATA_ROOT."/ficheinter/images";
+ $this->fichinter->dir_temp =DOL_DATA_ROOT."/ficheinter/temp";
if (defined('FICHEINTER_OUTPUTDIR') && FICHEINTER_OUTPUTDIR) { $this->fichinter->dir_output=FICHEINTER_OUTPUTDIR; } # Pour passer outre le rep par defaut
// Module adherent
$this->adherent->enabled=defined("MAIN_MODULE_ADHERENT")?MAIN_MODULE_ADHERENT:0;
@@ -213,12 +214,12 @@ class Conf
// Module produit
$this->produit->enabled=defined("MAIN_MODULE_PRODUIT")?MAIN_MODULE_PRODUIT:0;
$this->produit->dir_output=DOL_DATA_ROOT."/produit";
- $this->produit->dir_images=DOL_DATA_ROOT."/produit/images";
+ $this->produit->dir_temp =DOL_DATA_ROOT."/produit/temp";
$this->produit->MultiPricesEnabled=defined("PRODUIT_MULTIPRICES")?PRODUIT_MULTIPRICES:0;
// Module service
$this->service->enabled=defined("MAIN_MODULE_SERVICE")?MAIN_MODULE_SERVICE:0;
$this->service->dir_output=DOL_DATA_ROOT."/produit";
- $this->service->dir_images=DOL_DATA_ROOT."/produit/images";
+ $this->service->dir_temp =DOL_DATA_ROOT."/produit/temp";
// Module stock
$this->stock->enabled=defined("MAIN_MODULE_STOCK")?MAIN_MODULE_STOCK:0;
// Module code barre
@@ -242,7 +243,7 @@ class Conf
// Module prelevement
$this->prelevement->enabled=defined("MAIN_MODULE_PRELEVEMENT")?MAIN_MODULE_PRELEVEMENT:0;
$this->prelevement->dir_output=DOL_DATA_ROOT."/prelevement";
- $this->prelevement->dir_images=DOL_DATA_ROOT."/prelevement/images";
+ $this->prelevement->dir_temp =DOL_DATA_ROOT."/prelevement/temp";
// Module webcal
$this->webcal->enabled=defined('MAIN_MODULE_WEBCALENDAR')?MAIN_MODULE_WEBCALENDAR:0;
$this->webcal->db->type=defined('PHPWEBCALENDAR_TYPE')?PHPWEBCALENDAR_TYPE:'mysql';
@@ -253,29 +254,31 @@ class Conf
// Module facture
$this->facture->enabled=defined("MAIN_MODULE_FACTURE")?MAIN_MODULE_FACTURE:0;
$this->facture->dir_output=DOL_DATA_ROOT."/facture";
- $this->facture->dir_images=DOL_DATA_ROOT."/facture/images";
+ $this->facture->dir_temp =DOL_DATA_ROOT."/facture/temp";
if (defined('FAC_OUTPUTDIR') && FAC_OUTPUTDIR) { $this->facture->dir_output=FAC_OUTPUTDIR; } # Pour passer outre le rep par defaut
// Module propal
$this->propal->enabled=defined("MAIN_MODULE_PROPALE")?MAIN_MODULE_PROPALE:0;
if (! defined("PROPALE_NEW_FORM_NB_PRODUCT")) define("PROPALE_NEW_FORM_NB_PRODUCT", 4);
$this->propal->dir_output=DOL_DATA_ROOT."/propale";
- $this->propal->dir_images=DOL_DATA_ROOT."/propale/images";
+ $this->propal->dir_temp =DOL_DATA_ROOT."/propale/temp";
if (defined('PROPALE_OUTPUTDIR') && PROPALE_OUTPUTDIR) { $this->propal->dir_output=PROPALE_OUTPUTDIR; } # Pour passer outre le rep par defaut
// Module telephonie
$this->telephonie->enabled=defined("MAIN_MODULE_TELEPHONIE")?MAIN_MODULE_TELEPHONIE:0;
$this->telephonie->dir_output=DOL_DATA_ROOT."/telephonie";
- $this->telephonie->dir_images=DOL_DATA_ROOT."/telephonie/images";
+ $this->telephonie->dir_temp =DOL_DATA_ROOT."/telephonie/temp";
// Module energie
$this->energie->enabled=defined("MAIN_MODULE_ENERGIE")?MAIN_MODULE_ENERGIE:0;
// Module domaine
$this->domaine->enabled=0;
// Module voyage
$this->voyage->enabled=0;
- // Module actionscomm
- $this->actionscomm->dir_output=DOL_DATA_ROOT."/action";
+ // Module actions
+ $this->actions->dir_output=DOL_DATA_ROOT."/action";
+ $this->actions->dir_temp =DOL_DATA_ROOT."/action/temp";
// Module export
$this->export->enabled=defined("MAIN_MODULE_EXPORT")?MAIN_MODULE_EXPORT:0;
- $this->export->dir_ouput=DOL_DATA_ROOT."/export";
+ $this->export->dir_output=DOL_DATA_ROOT."/export";
+ $this->export->dir_temp =DOL_DATA_ROOT."/export/temp";
// Module ldap
$this->ldap->enabled=defined("MAIN_MODULE_LDAP")?MAIN_MODULE_LDAP:0;
// Module FCKeditor
diff --git a/htdocs/document.php b/htdocs/document.php
index 349845dc0f8..0daba8ff60e 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -209,7 +209,7 @@ if ($modulepart)
//{
$accessallowed=1;
//}
- $original_file=$conf->actionscomm->dir_output.'/'.$original_file;
+ $original_file=$conf->actions->dir_output.'/'.$original_file;
}
// Wrapping pour les actions
@@ -220,7 +220,7 @@ if ($modulepart)
//{
$accessallowed=1;
//}
- $original_file = $conf->commercial->dir_output."/actions/".$original_file;
+ $original_file = $conf->action->dir_temp."/".$original_file;
}
// Wrapping pour les produits et services
@@ -251,7 +251,7 @@ if ($modulepart)
// Aucun test necessaire car on force le rep de doanwload sur
// le rep export qui est propre � l'utilisateur
$accessallowed=1;
- $original_file=$conf->export->dir_output.'/'.$user->id.'/'.$original_file;
+ $original_file=$conf->export->dir_temp.'/'.$user->id.'/'.$original_file;
}
// Wrapping pour l'�diteur wysiwyg
diff --git a/htdocs/expedition/stats/month.php b/htdocs/expedition/stats/month.php
index 6be604527b1..fcb0de14d69 100644
--- a/htdocs/expedition/stats/month.php
+++ b/htdocs/expedition/stats/month.php
@@ -43,9 +43,9 @@ print_fiche_titre('Statistiques expeditions '.$_GET["year"], $mesg);
$stats = new ExpeditionStats($db);
$data = $stats->getNbExpeditionByMonth($_GET["year"]);
-if (! is_dir($conf->expedition->dir_images)) { mkdir($conf->expedition->dir_images); }
+create_exdir($conf->expedition->dir_temp);
-$filename = $conf->expedition->dir_images."/expedition".$year.".png";
+$filename = $conf->expedition->dir_temp."/expedition".$year.".png";
$fileurl = DOL_URL_ROOT.'/viewimage.php?modulepart=expeditionstats&file=expedition'.$year.'.png';
$px = new DolGraph();
diff --git a/htdocs/exports/export.class.php b/htdocs/exports/export.class.php
index a52abec347c..a523a23447d 100644
--- a/htdocs/exports/export.class.php
+++ b/htdocs/exports/export.class.php
@@ -172,7 +172,7 @@ class Export
//$this->array_export_label[$indice]
$filename="export_".$datatoexport;
$filename.='.'.$objmodel->getDriverExtension();
- $dirname=$conf->export->dir_ouput.'/'.$user->id;
+ $dirname=$conf->export->dir_temp.'/'.$user->id;
// Open file
create_exdir($dirname);
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index c9f78eeffe1..ff070a946f6 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -191,6 +191,8 @@ if ($step == 1 || ! $datatoexport)
print '</table>';
print '</table>';
+
+ print '</div>';
}
if ($step == 2 && $datatoexport)
@@ -294,7 +296,7 @@ if ($step == 2 && $datatoexport)
print '<a class="butAction" href="export.php?step=3&datatoexport='.$datatoexport.'">'.$langs->trans("NextStep").'</a>';
}
- print '</div>';
+ print '</div>';
}
if ($step == 3 && $datatoexport)
@@ -403,7 +405,7 @@ if ($step == 3 && $datatoexport)
print '<a class="butAction" href="export.php?step=4&datatoexport='.$datatoexport.'">'.$langs->trans("NextStep").'</a>';
}
- print '</div>';
+ print '</div>';
}
if ($step == 4 && $datatoexport)
@@ -488,20 +490,21 @@ if ($step == 4 && $datatoexport)
$htmlform=new Form($db);
print '<table width="100%"><tr><td width="50%">';
- if (! is_dir($conf->export->dir_ouput)) create_exdir($conf->export->dir_ouput);
+ if (! is_dir($conf->export->dir_temp)) create_exdir($conf->export->dir_temp);
// Affiche liste des documents
// NB: La fonction show_documents rescanne les modules qd genallowed=1
- $htmlform->show_documents('export','',$conf->export->dir_ouput.'/'.$user->id,$_SERVER["PHP_SELF"].'?step=4&datatoexport='.$datatoexport,$liste,1,'csv','',1);
+ $htmlform->show_documents('export','',$conf->export->dir_temp.'/'.$user->id,$_SERVER["PHP_SELF"].'?step=4&datatoexport='.$datatoexport,$liste,1,'csv','',1);
print '</td><td width="50%"> </td></tr>';
print '</table>';
}
+
+print '<br>';
$db->close();
llxFooter('$Date$ - $Revision$');
-
?>
diff --git a/htdocs/exports/index.php b/htdocs/exports/index.php
index 7fc0dcf5a6d..380de439f0a 100644
--- a/htdocs/exports/index.php
+++ b/htdocs/exports/index.php
@@ -46,6 +46,11 @@ llxHeader('',$langs->trans("ExportsArea"));
print_fiche_titre($langs->trans("ExportsArea"));
+print $langs->trans("FormatedExportDesc1").'<br>';
+print $langs->trans("FormatedExportDesc2").' ';
+print $langs->trans("FormatedExportDesc3").'<br>';
+print '<br>';
+
print '<table class="notopnoleftnoright" width="100%">';
print '<tr><td valign="top" width="30%" class="notopnoleft">';
@@ -85,7 +90,7 @@ print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Module").'</td>';
print '<td>'.$langs->trans("ExportableDatas").'</td>';
-print '<td> </td>';
+//print '<td> </td>';
print '</tr>';
$val=true;
if (sizeof($export->array_export_code))
@@ -99,10 +104,15 @@ if (sizeof($export->array_export_code))
print '</td><td>';
$string=$langs->trans($export->array_export_label[$key]);
print ($string!=$export->array_export_label[$key]?$string:$export->array_export_label[$key]);
- print '</td><td width="24">';
- print '<a href="'.DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$export->array_export_code[$key].'&action=cleanselect">'.img_picto($langs->trans("NewExport"),'filenew').'</a>';
- print '</td></tr>';
+ print '</td>';
+// print '<td width="24">';
+// print '<a href="'.DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$export->array_export_code[$key].'&action=cleanselect">'.img_picto($langs->trans("NewExport"),'filenew').'</a>';
+// print '</td>';
+ print '</tr>';
+
}
+
+ print '<tr class="total"><td class="total" colspan="2" align="center"><form action="'.DOL_URL_ROOT.'/exports/export.php?leftmenu=export"><input type="submit" class="button" value="'.$langs->trans("NewExport").'"></form></td></tr>';
}
else
{
diff --git a/htdocs/includes/boxes/box_external_rss.php b/htdocs/includes/boxes/box_external_rss.php
index 1ce89f2cdba..436f52ae17f 100644
--- a/htdocs/includes/boxes/box_external_rss.php
+++ b/htdocs/includes/boxes/box_external_rss.php
@@ -84,7 +84,7 @@ class box_external_rss extends ModeleBoxes {
if ($rss->ERROR)
{
// Affiche warning car il y a eu une erreur
- $title.=" ".img_error($langs->trans("FailedToRefreshDataInfoNotUpToDate",(isset($rss->date)?dolibarr_print_date($rss->date,"%d %b %Y %H:%M"):'unknown date')));
+ $title.=" ".img_error($langs->trans("FailedToRefreshDataInfoNotUpToDate",(isset($rss->date)?dolibarr_print_date($rss->date,"dayhourtext"):'unknown date')));
$this->info_box_head = array('text' => $title,'limit' => 0);
}
else
diff --git a/htdocs/includes/menus/barre_left/eldy_backoffice.php b/htdocs/includes/menus/barre_left/eldy_backoffice.php
index 50c27f8768e..18ec7bbfa3d 100644
--- a/htdocs/includes/menus/barre_left/eldy_backoffice.php
+++ b/htdocs/includes/menus/barre_left/eldy_backoffice.php
@@ -595,7 +595,7 @@ class MenuLeft {
if ($conf->export->enabled)
{
- $newmenu->add_submenu(DOL_URL_ROOT."/exports/index.php?leftmenu=export",$langs->trans("Exports"),0,1);
+ $newmenu->add_submenu(DOL_URL_ROOT."/exports/index.php?leftmenu=export",$langs->trans("FormatedExport"),0,1);
$newmenu->add_submenu(DOL_URL_ROOT."/exports/export.php?leftmenu=export",$langs->trans("NewExport"),1,1);
}
diff --git a/htdocs/includes/modules/modCommande.class.php b/htdocs/includes/modules/modCommande.class.php
index 930715cfb04..fc1523bd36f 100644
--- a/htdocs/includes/modules/modCommande.class.php
+++ b/htdocs/includes/modules/modCommande.class.php
@@ -152,7 +152,7 @@ class modCommande extends DolibarrModules
// Dir
$this->dirs[0] = $conf->commande->dir_output;
- $this->dirs[1] = $conf->commande->dir_images;
+ $this->dirs[1] = $conf->commande->dir_temp;
$sql = array(
"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[0][2]."'",
"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom,type) VALUES('".$this->const[0][2]."','order')"
diff --git a/htdocs/includes/modules/modComptabilite.class.php b/htdocs/includes/modules/modComptabilite.class.php
index 77727f6b7c1..b691269821f 100644
--- a/htdocs/includes/modules/modComptabilite.class.php
+++ b/htdocs/includes/modules/modComptabilite.class.php
@@ -81,7 +81,7 @@ class modComptabilite extends DolibarrModules
$this->dirs[0] = $conf->compta->dir_output;
$this->dirs[1] = $conf->compta->dir_output."/rapport";
$this->dirs[2] = $conf->compta->dir_output."/export";
- $this->dirs[3] = $conf->compta->dir_images;
+ $this->dirs[3] = $conf->compta->dir_temp;
// Boites
$this->boxes = array();
diff --git a/htdocs/includes/modules/modExport.class.php b/htdocs/includes/modules/modExport.class.php
index 7cc45475ca3..e2c84403d34 100644
--- a/htdocs/includes/modules/modExport.class.php
+++ b/htdocs/includes/modules/modExport.class.php
@@ -50,7 +50,7 @@ class modExport extends DolibarrModules
$this->family = "technic";
$this->name = "Exports";
- $this->description = "Permet export des donn�es de la base en fichiers";
+ $this->description = "Permet exports par les utilisateurs, via un assistant, de lot de donn�es personalis�es";
$this->version = 'dolibarr'; // 'experimental' or 'dolibarr' or version
$this->const_name = 'MAIN_MODULE_EXPORT';
$this->special = 0;
diff --git a/htdocs/includes/modules/modPropale.class.php b/htdocs/includes/modules/modPropale.class.php
index c1970a4df91..7cdb346f0c1 100644
--- a/htdocs/includes/modules/modPropale.class.php
+++ b/htdocs/includes/modules/modPropale.class.php
@@ -144,7 +144,7 @@ class modPropale extends DolibarrModules
// R�pertoires
$this->dirs[0] = $conf->propal->dir_output;
- $this->dirs[1] = $conf->propal->dir_images;
+ $this->dirs[1] = $conf->propal->dir_temp;
$sql = array(
"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[0][2]."'",
diff --git a/htdocs/includes/modules/modTax.class.php b/htdocs/includes/modules/modTax.class.php
index df2bf60faf6..65ae6f9c8d2 100644
--- a/htdocs/includes/modules/modTax.class.php
+++ b/htdocs/includes/modules/modTax.class.php
@@ -79,7 +79,7 @@ class modTax extends DolibarrModules
// R�pertoires
$this->dirs = array();
$this->dirs[0] = $conf->tax->dir_output;
- $this->dirs[1] = $conf->tax->dir_images;
+ $this->dirs[1] = $conf->tax->dir_temp;
// Boites
$this->boxes = array();
diff --git a/htdocs/includes/modules/modUser.class.php b/htdocs/includes/modules/modUser.class.php
index c8f7173c2f0..bb800d86549 100644
--- a/htdocs/includes/modules/modUser.class.php
+++ b/htdocs/includes/modules/modUser.class.php
@@ -71,7 +71,7 @@ class modUser extends DolibarrModules
// D�pendances
$this->depends = array();
$this->requiredby = array();
- $this->langfiles = array("users","companies");
+ $this->langfiles = array("main","users","companies");
// Constantes
$this->const = array();
@@ -147,9 +147,9 @@ class modUser extends DolibarrModules
$r++;
$this->export_code[$r]=$this->id.'_'.$r;
$this->export_label[$r]='Liste des utilisateurs Dolibarr et attributs';
- $this->export_fields_array[$r]=array('u.rowid'=>"Id",'u.name'=>"Lastname",'u.firstname'=>"Firstname",'u.code'=>"Code",'u.login'=>"Login",'u.datec'=>"DateCreation",'u.tms'=>"DateLastModification",'u.admin'=>"Admin",'u.fk_socpeople'=>"IdContact",'u.note'=>"Note",'u.datelastlogin'=>'DateLastLogin','u.datepreviouslogin'=>'DatePreviousLogin');
- $this->export_entities_array[$r]=array('u.rowid'=>"user",'u.name'=>"user",'u.firstname'=>"user",'u.code'=>"user",'u.login'=>"user",'u.datec'=>"user",'u.tms'=>"user",'u.admin'=>"user",'u.fk_socpeople'=>"user",'u.note'=>"user",'u.datelastlogin'=>'user','u.datepreviouslogin'=>'user');
- $this->export_alias_array[$r]=array('u.rowid'=>"rowid",'u.name'=>"name",'u.firstname'=>"firstname",'u.code'=>"code",'u.login'=>"login",'u.datec'=>"datecreation",'u.tms'=>"datelastmodification",'u.admin'=>"admin",'u.fk_socpeople'=>"idcontact",'u.note'=>"note",'u.datelastlogin'=>'datelastlogin','u.datepreviouslogin'=>'datepreviouslogin');
+ $this->export_fields_array[$r]=array('u.rowid'=>"Id",'u.code'=>"Code",'u.login'=>"Login",'u.office_phone'=>'Tel','u.office_fax'=>'Fax','u.email'=>'EMail','u.name'=>"Lastname",'u.firstname'=>"Firstname",'u.datec'=>"DateCreation",'u.tms'=>"DateLastModification",'u.admin'=>"Admin",'u.fk_socpeople'=>"IdContact",'u.note'=>"Note",'u.datelastlogin'=>'LastConnexion','u.datepreviouslogin'=>'PreviousConnexion');
+ $this->export_entities_array[$r]=array('u.rowid'=>"user",'u.code'=>"user",'u.login'=>"user",'u.office_phone'=>'user','u.office_fax'=>'user','u.email'=>'user','u.name'=>"user",'u.firstname'=>"user",'u.datec'=>"user",'u.tms'=>"user",'u.admin'=>"user",'u.fk_socpeople'=>"user",'u.note'=>"user",'u.datelastlogin'=>'user','u.datepreviouslogin'=>'user');
+ $this->export_alias_array[$r]=array('u.rowid'=>"rowid",'u.code'=>"code",'u.login'=>"login",'u.office_phone'=>'tel','u.office_fax'=>'fax','u.email'=>'email','u.name'=>"name",'u.firstname'=>"firstname",'u.datec'=>"datecreation",'u.tms'=>"datelastmodification",'u.admin'=>"admin",'u.fk_socpeople'=>"idcontact",'u.note'=>"note",'u.datelastlogin'=>'datelastlogin','u.datepreviouslogin'=>'datepreviouslogin');
$this->export_sql[$r]="select ";
$i=0;
foreach ($this->export_alias_array[$r] as $key => $value)
diff --git a/htdocs/langs/en_US/exports.lang b/htdocs/langs/en_US/exports.lang
index 67121ff821a..3bf5950b2b0 100644
--- a/htdocs/langs/en_US/exports.lang
+++ b/htdocs/langs/en_US/exports.lang
@@ -16,4 +16,8 @@ NowClickToGenerateToBuildExportFile=Now, click on "Generate" to build export fil
AvailableFormats=Formats disponibles
LibraryUsed=Librairie
LibraryVersion=Version
-Step=Step
\ No newline at end of file
+Step=Step
+FormatedExport=Export assistant
+FormatedExportDesc1=This area allows to export personalized data using an assistant to help in process without technical knowledge.
+FormatedExportDesc2=First step is to choose a predefined dataset, then to choose which fields you want in your result files, and which order.
+FormatedExportDesc3=When data to export are selected, you can define output file format you want to export your data to.
diff --git a/htdocs/langs/fr_FR/boxes.lang b/htdocs/langs/fr_FR/boxes.lang
index 35422ca6512..8779a3b24d9 100644
--- a/htdocs/langs/fr_FR/boxes.lang
+++ b/htdocs/langs/fr_FR/boxes.lang
@@ -35,5 +35,5 @@ BoxTitleSalesTurnover=Le chiffre d'affaire r
BoxTitleTotalUnpayedCustomerBills=Impay�s clients
BoxTitleTotalUnpayedSuppliersBills=Impay�s fournisseurs
BoxMyLastBookmarks=Mes %s derniers marque-pages
-FailedToRefreshDataInfoNotUpToDate=Echec du rafraichissement du flux RSS. Les informations datent du %s.
+FailedToRefreshDataInfoNotUpToDate=Echec du rafraichissement du flux RSS. Les informations datent du %s
NoRecordedBookmarks=Pas de bookmarks personnels. Cliquer ici pour en ajouter.
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/exports.lang b/htdocs/langs/fr_FR/exports.lang
index b0398fb2492..4b4d9e9c2c2 100644
--- a/htdocs/langs/fr_FR/exports.lang
+++ b/htdocs/langs/fr_FR/exports.lang
@@ -2,7 +2,7 @@
ExportsArea=Espace exports
NewExport=Nouvel export
ExportableDatas=Lot de donn�es exportables
-SelectExportDataSet=Choisissez le lot de donn�es que vous d�sirez exporter...
+SelectExportDataSet=Choisissez un lot pr�d�fini de donn�es que vous d�sirez exporter...
SelectExportFields=Choisissez les champs � exporter...
ExportableFields=Champs exportables
ExportedFields=Champs � exporter
@@ -16,4 +16,8 @@ NowClickToGenerateToBuildExportFile=Maintenant, cliquez sur "G
AvailableFormats=Formats dispo.
LibraryUsed=Librairie utilis�e
LibraryVersion=Version
-Step=Etape
\ No newline at end of file
+Step=Etape
+FormatedExport=Assistant export
+FormatedExportDesc1=Cet espace permet de r�aliser des exports personalis�s des donn�es via un assistant qui �vite d'avoir des connaissances techniques de Dolibarr.
+FormatedExportDesc2=La premi�re �tape est de choisir un des lots de donn�es pr�d�finis, ensuite de choisir les champs que vous voulez dans votre fichier r�sultat, et dans quel ordre.
+FormatedExportDesc3=Une fois les donn�es s�lectionn�es, il est possible de choisir le format du fichier export g�n�r�.
diff --git a/htdocs/product/stats/fiche.php b/htdocs/product/stats/fiche.php
index 690d3e88721..fe9520a0f60 100644
--- a/htdocs/product/stats/fiche.php
+++ b/htdocs/product/stats/fiche.php
@@ -114,7 +114,7 @@ if ($_GET["id"] || $_GET["ref"])
// Generation des graphs
$WIDTH=380;
$HEIGHT=160;
- $dir = $conf->produit->dir_images;
+ $dir = $conf->produit->dir_temp;
if (! file_exists($dir.'/'.$product->id))
{
if (create_exdir($dir.'/'.$product->id) < 0)
diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php
index cb4c0a2c49e..0396528b3ef 100644
--- a/htdocs/viewimage.php
+++ b/htdocs/viewimage.php
@@ -108,7 +108,7 @@ if ($modulepart)
{
$accessallowed=1;
}
- $original_file=$conf->propal->dir_images.'/'.$original_file;
+ $original_file=$conf->propal->dir_temp.'/'.$original_file;
}
// Wrapping pour les images des stats commandes
@@ -119,7 +119,7 @@ if ($modulepart)
{
$accessallowed=1;
}
- $original_file=$conf->commande->dir_images.'/'.$original_file;
+ $original_file=$conf->commande->dir_temp.'/'.$original_file;
}
// Wrapping pour les images des stats commandes
@@ -130,7 +130,7 @@ if ($modulepart)
{
$accessallowed=1;
}
- $original_file=$conf->facture->dir_images.'/'.$original_file;
+ $original_file=$conf->facture->dir_temp.'/'.$original_file;
}
// Wrapping pour les images des stats expeditions
@@ -141,7 +141,7 @@ if ($modulepart)
{
$accessallowed=1;
}
- $original_file=$conf->expedition->dir_images.'/'.$original_file;
+ $original_file=$conf->expedition->dir_temp.'/'.$original_file;
}
// Wrapping pour les images des stats produits
@@ -152,7 +152,7 @@ if ($modulepart)
{
$accessallowed=1;
}
- $original_file=$conf->produit->dir_images.'/'.$original_file;
+ $original_file=$conf->produit->dir_temp.'/'.$original_file;
}
// Wrapping pour les produits
@@ -197,7 +197,7 @@ if ($modulepart)
if ($modulepart == 'bank')
{
$accessallowed=1;
- $original_file=$conf->banque->dir_images.'/'.$original_file;
+ $original_file=$conf->banque->dir_temp.'/'.$original_file;
}
}
diff --git a/scripts/banque/graph-solde.php b/scripts/banque/graph-solde.php
index b0800150aca..903828d914e 100644
--- a/scripts/banque/graph-solde.php
+++ b/scripts/banque/graph-solde.php
@@ -56,13 +56,9 @@ else
$opt=array('m'=>$argv[1]);
}
-if (!$conf->banque->dir_images)
-{
- $conf->banque->dir_images = DOL_DATA_ROOT."/graph/banque/";
-}
// Cr�e r�pertoire accueil
-create_exdir($conf->banque->dir_images);
+create_exdir($conf->banque->dir_temp);
$datetime = time();
@@ -230,7 +226,7 @@ foreach ($accounts as $account)
// Fabrication tableau 1
- $file= $conf->banque->dir_images."/solde.$account.$year.$month.png";
+ $file= $conf->banque->dir_temp."/solde.$account.$year.$month.png";
$title=$langs->trans("Balance").' '.$langs->trans("Month").': '.$month.' '.$langs->trans("Year").': '.$year;
$graph_datas=array();
foreach($datas as $i => $val)
@@ -325,7 +321,7 @@ foreach ($accounts as $account)
}
// Fabrication tableau 2
- $file= $conf->banque->dir_images."/solde.$account.$year.png";
+ $file= $conf->banque->dir_temp."/solde.$account.$year.png";
$title=$langs->trans("Balance").' '.$langs->trans("Year").': '.$year;
$graph_datas=array();
foreach($datas as $i => $val)
@@ -400,7 +396,7 @@ foreach ($accounts as $account)
}
// Fabrication tableau 3
- $file= $conf->banque->dir_images."/solde.$account.png";
+ $file= $conf->banque->dir_temp."/solde.$account.png";
$title=$langs->trans("Balance");
$graph_datas=array();
foreach($datas as $i => $val)
@@ -480,7 +476,7 @@ foreach ($accounts as $account)
}
// Fabrication tableau 4
- $file= $conf->banque->dir_images."/mouvement.$account.$year.png";
+ $file= $conf->banque->dir_temp."/mouvement.$account.$year.png";
$title=$langs->trans("Movements").' '.$langs->trans("Year").': '.$year;
$graph_datas=array();
foreach($data_credit as $i => $val)
--
GitLab