From 910d83d6e3a3569d9c67f8c17d891d39441e01ba Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Sun, 15 Apr 2018 07:49:54 +0200 Subject: [PATCH] Fix export balance --- htdocs/accountancy/bookkeeping/balance.php | 7 +++---- htdocs/accountancy/tpl/export_journal.tpl.php | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php index da0dfda2510..b62b092e3da 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-2017 Alexandre Spangaro +/* Copyright (C) 2016 Olivier Geffroy + * Copyright (C) 2016 Florian Henry + * Copyright (C) 2016-2018 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 @@ -152,7 +152,6 @@ if ($action == 'export_csv') { 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"; } diff --git a/htdocs/accountancy/tpl/export_journal.tpl.php b/htdocs/accountancy/tpl/export_journal.tpl.php index 95ac52f2884..773f7a7ff68 100644 --- a/htdocs/accountancy/tpl/export_journal.tpl.php +++ b/htdocs/accountancy/tpl/export_journal.tpl.php @@ -28,7 +28,7 @@ $prefix = $conf->global->ACCOUNTING_EXPORT_PREFIX_SPEC; $format = $conf->global->ACCOUNTING_EXPORT_FORMAT; $nodateexport = $conf->global->ACCOUNTING_EXPORT_NO_DATE_IN_FILENAME; -$date_export = "_" . dol_print_date($now, '%Y%m%d%H%M%S'); +$date_export = "_" . dol_print_date(dol_now(), '%Y%m%d%H%M%S'); header('Content-Type: text/csv');