Koha-community/Koha
15
7
Fork 0
Code Issues Releases Wiki Activity

Bug 16594: Fix obvious QA issues from bug 11371

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
This commit is contained in:
Jonathan Druart 2016-06-11 14:32:05 +01:00 committed by Kyle M Hall
parent d4394d88ea
commit 64efee0b5c
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
reports/orders_by_fund.pl
View file

@ -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"