From ea0964d1ebaba35685c215afe0cc11cdf8a52390 Mon Sep 17 00:00:00 2001 From: BENKE Charles Date: Tue, 10 Mar 2015 17:17:02 +0100 Subject: [PATCH 1/6] Update export.class.php add specific choice of prefix for export (usefull with many dolibarr exporting data) --- htdocs/exports/class/export.class.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php index d332592da6d..9ff540a92f2 100644 --- a/htdocs/exports/class/export.class.php +++ b/htdocs/exports/class/export.class.php @@ -524,7 +524,10 @@ class Export if ($resql) { //$this->array_export_label[$indice] - $filename="export_".$datatoexport; + if ($conf->global->EXPORT_PREFIX) + $filename=$conf->global->EXPORT_PREFIX_SPEC."_".$datatoexport; + else + $filename="export_".$datatoexport; $filename.='.'.$objmodel->getDriverExtension(); $dirname=$conf->export->dir_temp.'/'.$user->id; From bf86693dcb05f0e41c819c67df6399c71ec7f3f0 Mon Sep 17 00:00:00 2001 From: BENKE Charles Date: Tue, 10 Mar 2015 21:47:39 +0100 Subject: [PATCH 2/6] Update sellsjournal.php --- htdocs/accountancy/journal/sellsjournal.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php index b3ca7ceae98..c0251291964 100644 --- a/htdocs/accountancy/journal/sellsjournal.php +++ b/htdocs/accountancy/journal/sellsjournal.php @@ -271,7 +271,11 @@ if ($action == 'export_csv') $sell_journal = $conf->global->ACCOUNTING_SELL_JOURNAL; header('Content-Type: text/csv'); - header('Content-Disposition: attachment;filename=journal_ventes.csv'); + if ($conf->global->EXPORT_PREFIX) + $filename=$conf->global->EXPORT_PREFIX_SPEC."_"."journal_ventes.csv"; + else + $filename="journal_ventes.csv"; + header('Content-Disposition: attachment;filename='.$filename); $companystatic = new Client($db); From f91127c92a335b9b281f86b8ed2753239ec616fc Mon Sep 17 00:00:00 2001 From: BENKE Charles Date: Tue, 10 Mar 2015 21:48:47 +0100 Subject: [PATCH 3/6] Update purchasesjournal.php --- htdocs/accountancy/journal/purchasesjournal.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php index 905296358f0..521a1c6a74c 100644 --- a/htdocs/accountancy/journal/purchasesjournal.php +++ b/htdocs/accountancy/journal/purchasesjournal.php @@ -249,7 +249,11 @@ if ($action == 'export_csv') $purchase_journal = $conf->global->ACCOUNTING_PURCHASE_JOURNAL; header('Content-Type: text/csv'); - header('Content-Disposition: attachment;filename=journal_achats.csv'); + if ($conf->global->EXPORT_PREFIX) + $filename=$conf->global->EXPORT_PREFIX_SPEC."_"."journal_achats.csv"; + else + $filename="journal_achats.csv"; + header('Content-Disposition: attachment;filename='.$filename); if ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 2) // Model Cegid Expert Export { From f88646d954664e48a2c2a59b9be3451286268384 Mon Sep 17 00:00:00 2001 From: BENKE Charles Date: Wed, 11 Mar 2015 10:22:37 +0100 Subject: [PATCH 4/6] Update export.class.php --- htdocs/exports/class/export.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php index 9ff540a92f2..707b38e1ef7 100644 --- a/htdocs/exports/class/export.class.php +++ b/htdocs/exports/class/export.class.php @@ -524,7 +524,7 @@ class Export if ($resql) { //$this->array_export_label[$indice] - if ($conf->global->EXPORT_PREFIX) + if ($conf->global->EXPORT_PREFIX_SPEC) $filename=$conf->global->EXPORT_PREFIX_SPEC."_".$datatoexport; else $filename="export_".$datatoexport; From 9fc83ca011c47be0540989bc6c7160d116d532bc Mon Sep 17 00:00:00 2001 From: BENKE Charles Date: Wed, 11 Mar 2015 10:23:13 +0100 Subject: [PATCH 5/6] Update sellsjournal.php --- htdocs/accountancy/journal/sellsjournal.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php index c0251291964..7605d54825c 100644 --- a/htdocs/accountancy/journal/sellsjournal.php +++ b/htdocs/accountancy/journal/sellsjournal.php @@ -271,7 +271,7 @@ if ($action == 'export_csv') $sell_journal = $conf->global->ACCOUNTING_SELL_JOURNAL; header('Content-Type: text/csv'); - if ($conf->global->EXPORT_PREFIX) + if ($conf->global->EXPORT_PREFIX_SPEC) $filename=$conf->global->EXPORT_PREFIX_SPEC."_"."journal_ventes.csv"; else $filename="journal_ventes.csv"; From e7ed8ce95b6d1754e1c04eaeae2b3499fe801022 Mon Sep 17 00:00:00 2001 From: BENKE Charles Date: Wed, 11 Mar 2015 10:23:33 +0100 Subject: [PATCH 6/6] Update purchasesjournal.php --- htdocs/accountancy/journal/purchasesjournal.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php index 521a1c6a74c..6d89e8f17a2 100644 --- a/htdocs/accountancy/journal/purchasesjournal.php +++ b/htdocs/accountancy/journal/purchasesjournal.php @@ -249,7 +249,7 @@ if ($action == 'export_csv') $purchase_journal = $conf->global->ACCOUNTING_PURCHASE_JOURNAL; header('Content-Type: text/csv'); - if ($conf->global->EXPORT_PREFIX) + if ($conf->global->EXPORT_PREFIX_SPEC) $filename=$conf->global->EXPORT_PREFIX_SPEC."_"."journal_achats.csv"; else $filename="journal_achats.csv";