lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix accountancy export

Browse Source
This commit is contained in:
florian HENRY 2016-05-16 17:05:34 +02:00
parent b8d452596c
commit f8ac6c96e0
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/accountancy/bookkeeping/list.php
View File

@ -237,15 +237,11 @@ if ($action == 'export_csv') {
else else
{ {
$accountancyexport = new AccountancyExport($db); $accountancyexport = new AccountancyExport($db);
AccountancyExport::downloadFile();
$accountancyexport->export($object->lines); $accountancyexport->export($object->lines);
if (!empty($accountancyexport->errors)) { if (!empty($accountancyexport->errors)) {
setEventMessages('', $accountancyexport->errors, 'errors'); setEventMessages('', $accountancyexport->errors, 'errors');
} }
else { exit;
Header("Location: list.php");
exit;
}
} }
} }

5
htdocs/accountancy/class/accountancyexport.class.php
View File

@ -113,6 +113,8 @@ class AccountancyExport
public function export(&$TData) { public function export(&$TData) {
global $conf, $langs; global $conf, $langs;
self::downloadFile();
switch ($conf->global->ACCOUNTING_EXPORT_MODELCSV) { switch ($conf->global->ACCOUNTING_EXPORT_MODELCSV) {
case self::$EXPORT_TYPE_NORMAL : case self::$EXPORT_TYPE_NORMAL :
$this->exportNormal($TData); $this->exportNormal($TData);
@ -140,8 +142,7 @@ class AccountancyExport
break; break;
} }
if (empty($this->errors))
self::downloadFile();
} }
/** /**