diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php index 905296358f0..6d89e8f17a2 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_SPEC) + $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 { diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php index b3ca7ceae98..7605d54825c 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_SPEC) + $filename=$conf->global->EXPORT_PREFIX_SPEC."_"."journal_ventes.csv"; + else + $filename="journal_ventes.csv"; + header('Content-Disposition: attachment;filename='.$filename); $companystatic = new Client($db); diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php index 33c4b415f0b..fd360ab35bf 100644 --- a/htdocs/exports/class/export.class.php +++ b/htdocs/exports/class/export.class.php @@ -540,7 +540,10 @@ class Export if ($resql) { //$this->array_export_label[$indice] - $filename="export_".$datatoexport; + if ($conf->global->EXPORT_PREFIX_SPEC) + $filename=$conf->global->EXPORT_PREFIX_SPEC."_".$datatoexport; + else + $filename="export_".$datatoexport; $filename.='.'.$objmodel->getDriverExtension(); $dirname=$conf->export->dir_temp.'/'.$user->id;