From 5a39b1b3a2d846e02ebf7d00ccfa8f1c35fcfb79 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Sat, 11 Jun 2016 14:32:05 +0100
Subject: [PATCH] Bug 16594: Fix obvious QA issues from bug 11371
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 64efee0b5cc975b3b80db1841321355eeb39fb48)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
---
 reports/orders_by_fund.pl | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/reports/orders_by_fund.pl b/reports/orders_by_fund.pl
index ce00d72341..469b2c2c8d 100755
--- a/reports/orders_by_fund.pl
+++ b/reports/orders_by_fund.pl
@@ -25,17 +25,16 @@ This script displays all orders associated to a selected budget.
 
 =cut
 
-use strict;
-use warnings;
 use Modern::Perl;
 
-use CGI;
+use CGI qw( -utf8 );
 use C4::Auth;
 use C4::Output;
 use C4::Budgets;
 use C4::Biblio;
 use C4::Reports;
 use C4::Acquisition; #GetBasket()
+use Koha::DateUtils;
 
 my $query = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -110,8 +109,8 @@ if ( $get_orders ) {
         $order->{'total_ecost'} = $order->{'quantity'} * $order->{'ecost'};
 
         # Format the dates and currencies correctly
-        $order->{'datereceived'} = Koha::DateUtils::output_pref(Koha::DateUtils::dt_from_string($order->{'datereceived'}));
-        $order->{'entrydate'} = Koha::DateUtils::output_pref(Koha::DateUtils::dt_from_string($order->{'entrydate'}));
+        $order->{'datereceived'} = output_pref(dt_from_string($order->{'datereceived'}));
+        $order->{'entrydate'} = output_pref(dt_from_string($order->{'entrydate'}));
         $total_quantity += $order->{'quantity'};
         $total_rrp += $order->{'total_rrp'};
         $total_ecost += $order->{'total_ecost'};
@@ -137,8 +136,9 @@ if ( $get_orders ) {
         my $sep = $params->{"sep"};
         $sep = "\t" if ($sep eq 'tabulation');
 
+        # TODO Use Text::CSV to generate the CSV file
         print $query->header(
-           -type       => 'application/vnd.sun.xml.calc',
+           -type       => 'text/csv',
            -encoding    => 'utf-8',
            -attachment => "$basename.csv",
            -name       => "$basename.csv"
-- 
2.39.5