From 67b2646dcceb15629098809ee980f025e68fa9c9 Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Tue, 24 Oct 2017 05:35:46 +0200 Subject: [PATCH] Update balance export --- htdocs/accountancy/bookkeeping/balance.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php index 382d0697b6a..0dea177f00e 100644 --- a/htdocs/accountancy/bookkeeping/balance.php +++ b/htdocs/accountancy/bookkeeping/balance.php @@ -1,7 +1,7 @@ - * Copyright (C) 2016 Florian Henry - * Copyright (C) 2016 Alexandre Spangaro +/* Copyright (C) 2016 Olivier Geffroy + * Copyright (C) 2016 Florian Henry + * Copyright (C) 2016-2017 Alexandre Spangaro * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -125,9 +125,8 @@ if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x', if ($action == 'export_csv') { $sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV; - if ($conf->global->ACCOUNTING_EXPORT_MODELCSV == AccountancyExport::$EXPORT_TYPE_CEGID) $sep = ";"; // For CEGID, we force separator. - $journal = 'bookkepping'; + $journal = 'balance'; include DOL_DOCUMENT_ROOT . '/accountancy/tpl/export_journal.tpl.php'; @@ -138,10 +137,11 @@ if ($action == 'export_csv') { foreach ($object->lines as $line) { print length_accountg($line->numero_compte) . $sep; - print $line->debit . $sep; - print $line->credit . $sep; - print $line->debit . $sep; - print $line->credit - $line->debit . $sep; + print $object->get_compte_desc($line->numero_compte) . $sep; + print price($line->debit) . $sep; + print price($line->credit) . $sep; + print price($line->debit) . $sep; + print price($line->credit - $line->debit) . $sep; print "\n"; } }