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

Update Configurable Export

Browse Source
This commit is contained in:
Alexandre SPANGARO 2023-04-29 08:06:17 +02:00
parent 61228c6a3c
commit 49ce12f3da
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1219,21 +1219,23 @@ class AccountancyExport
/** /**
* Export format : Configurable CSV * Export format : Configurable CSV
* *
* @param array $objectLines data * @param array $objectLines data
* @return void * @param resource $exportFile [=null] File resource to export or print if null
* @return void
*/ */
public function exportConfigurable($objectLines) public function exportConfigurable($objectLines, $exportFile = null)
{ {
global $conf; global $conf;
$separator = $this->separator; $separator = $this->separator;
foreach ($objectLines as $line) { foreach ($objectLines as $line) {
$date_document = dol_print_date($line->doc_date, $conf->global->ACCOUNTING_EXPORT_DATE);
$tab = array(); $tab = array();
// export configurable // export configurable
$date = dol_print_date($line->doc_date, $conf->global->ACCOUNTING_EXPORT_DATE);
$tab[] = $line->piece_num; $tab[] = $line->piece_num;
$tab[] = $date; $tab[] = $date_document;
$tab[] = $line->doc_ref; $tab[] = $line->doc_ref;
$tab[] = preg_match('/'.$separator.'/', $line->label_operation) ? "'".$line->label_operation."'" : $line->label_operation; $tab[] = preg_match('/'.$separator.'/', $line->label_operation) ? "'".$line->label_operation."'" : $line->label_operation;
$tab[] = length_accountg($line->numero_compte); $tab[] = length_accountg($line->numero_compte);
@ -1243,7 +1245,12 @@ class AccountancyExport
$tab[] = price2num($line->debit - $line->credit); $tab[] = price2num($line->debit - $line->credit);
$tab[] = $line->code_journal; $tab[] = $line->code_journal;
print implode($separator, $tab).$this->end_line; $output = implode($separator, $tab).$this->end_line;
if ($exportFile) {
fwrite($exportFile, $output);
} else {
print $output;
}
} }
} }