From 0cf37008b03b05b93fb7542ff75053c6b30f141e Mon Sep 17 00:00:00 2001 From: simith Date: Fri, 6 Mar 2015 08:59:13 -0500 Subject: [PATCH] Bug11371 - QA fix http://bugs.koha-community.org/show_bug.cgi?id=11371 Signed-off-by: Nicole Engard --- C4/Budgets.pm | 8 +++-- .../prog/en/modules/reports/orders_by_budget.tt | 32 +++++++++++++++++--- .../prog/en/modules/reports/reports-home.tt | 2 +- reports/{orders_by_budget.pl => orders_by_fund.pl} | 9 +++--- t/db_dependent/Budgets.t | 9 ++---- 5 files changed, 41 insertions(+), 19 deletions(-) rename reports/{orders_by_budget.pl => orders_by_fund.pl} (96%) diff --git a/C4/Budgets.pm b/C4/Budgets.pm index 911d288..6c2cff0 100644 --- a/C4/Budgets.pm +++ b/C4/Budgets.pm @@ -82,7 +82,6 @@ BEGIN { # ----------------------------BUDGETS.PM-----------------------------"; - =head1 FUNCTIONS ABOUT BUDGETS =cut @@ -463,6 +462,7 @@ sub GetBudgetPeriod { } # ------------------------------------------------------------------- + =head2 GetBudgetPeriodDescription $description = GetBudgetPeriodDescription($budget_id); @@ -474,6 +474,7 @@ sub GetBudgetPeriod { Description is fetched from aqbudgetperiods, id is compared aqbudgets. (INNER JOIN on budget_period_id) =cut + sub GetBudgetPeriodDescription { my ($budget_id) = @_; my $dbh = C4::Context->dbh; @@ -638,6 +639,7 @@ sub DelBudget { # ------------------------------------------------------------------- + =head2 GetBudget &GetBudget($budget_id); @@ -750,6 +752,7 @@ sub GetBudgetsByActivity { return @results; } # -------------------------------------------------------------------- + =head2 GetBudgetsReport &GetBudgetsReport( [$activity] ); @@ -1151,7 +1154,6 @@ sub ConvertCurrency { return ( $price / $cur ); } - =head2 CloneBudgetPeriod my $new_budget_period_id = CloneBudgetPeriod({ @@ -1383,4 +1385,4 @@ __END__ Koha Development Team -=cut +=cut \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt index c2e1089..88371b9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt @@ -6,7 +6,14 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'cat-search.inc' %] - + +[% INCLUDE 'datatables.inc' %] + +
@@ -29,10 +36,12 @@ [% END %]
- [% IF ( ordersloop ) %] + [% IF ( ordersloop ) %]
+ + @@ -46,6 +55,8 @@ + + [% FOREACH ordersloo IN ordersloop %] [% UNLESS ( loop.odd ) %] @@ -56,6 +67,7 @@ + [% END %] - + + + +
Fund BasketBasket Name Basket By Title CurrencyDate Received Notes
[% ordersloo.basketno |html %] [% ordersloo.basketname |html %] [% ordersloo.authorisedbyname %] [% ordersloo.title |html %] @@ -72,12 +84,15 @@ [% ordersloo.notes |html %]
TOTAL[% total_quantity %][% total_rrp %][% total_ecost %]
TOTAL[% total_quantity %][% total_rrp %][% total_ecost %]
[% END %] [% ELSE %] -
+
Filters
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt index e19178b..05f7f8d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt @@ -61,7 +61,7 @@

Other

  • Items lost
  • -
  • Orders by fund
  • +
  • Orders by fund
  • Catalog by itemtype
  • Average loan time
  • Koha database schema
  • diff --git a/reports/orders_by_budget.pl b/reports/orders_by_fund.pl similarity index 96% rename from reports/orders_by_budget.pl rename to reports/orders_by_fund.pl index e31bb2d..a8fc2a7 100755 --- a/reports/orders_by_budget.pl +++ b/reports/orders_by_fund.pl @@ -35,7 +35,6 @@ use C4::Budgets; use C4::Biblio; use C4::Reports; use C4::Dates qw/format_date/; -use C4::SQLHelper qw<:all>; use C4::Acquisition; #GetBasket() @@ -103,6 +102,7 @@ if ( $get_orders ) { my $biblio = C4::Biblio::GetBiblio($order->{'biblionumber'}); my $basket = C4::Acquisition::GetBasket($order->{'basketno'}); + $order->{'basketname'} = $basket->{'basketname'}; $order->{'authorisedbyname'} = $basket->{'authorisedbyname'}; $order->{'title'} = $biblio->{'title'} || $order->{'biblionumber'}; @@ -164,6 +164,7 @@ if ( $get_orders ) { my @row; push(@row, _surround($order->{'budget_name'})); push(@row, _surround($order->{'basketno'})); + push(@row, _surround($order->{'basketname'})); push(@row, _surround($order->{'authorisedbyname'})); push(@row, _surround($order->{'biblionumber'})); push(@row, _surround($order->{'title'})); @@ -196,7 +197,7 @@ if ( $get_orders ) { else { # Set file export choices my @outputFormats = ('CSV'); - my @CSVdelimiters = qw(; tabulation , \\ / #); + my @CSVdelimiters =(',','#',qw(; tabulation \\ /)); # getting all budgets # active budgets @@ -222,10 +223,10 @@ else { ); push @budgetsloop, \%row; } - $template->param( budgetsloop => \@budgetsloop, outputFormatloop => \@outputFormats, - delimiterloop => \@CSVdelimiters + delimiterloop => \@CSVdelimiters, + delimiterPreference => C4::Context->preference('delimiter') ); } diff --git a/t/db_dependent/Budgets.t b/t/db_dependent/Budgets.t index e5800a4..aae15ac 100755 --- a/t/db_dependent/Budgets.t +++ b/t/db_dependent/Budgets.t @@ -1,3 +1,4 @@ +#!/usr/bin/perl use Modern::Perl; use Test::More tests => 120; @@ -432,23 +433,20 @@ ok($bpid=AddBudgetPeriod( { budget_period_startdate =>'01-01-2008' , budget_period_enddate =>'31-12-2008' , budget_period_description =>"MAPERI" - , budget_period_active =>1 - , budget_description =>"MAPERI"}), + , budget_period_active =>1}), "AddBudgetPeriod returned $bpid"); } elsif (C4::Context->preference('dateformat') eq "us"){ ok($bpid=AddBudgetPeriod( { budget_period_startdate =>'01-01-2008' , budget_period_enddate =>'12-31-2008' , budget_period_description =>"MAPERI" - , budget_period_active =>1 - , budget_description =>"MAPERI"}), + , budget_period_active =>1}), "AddBudgetPeriod returned $bpid"); } else{ ok($bpid=AddBudgetPeriod( {budget_period_startdate=>'2008-01-01' ,budget_period_enddate =>'2008-12-31' - ,budget_description =>"MAPERI" ,budget_period_active =>1 ,budget_period_description =>"MAPERI" }), @@ -497,7 +495,6 @@ ok($second_budget_id=AddBudget( budget_amount => "500.00", budget_name => "Art", budget_notes => "This is a note", - budget_description=> "Art", budget_active => 1, budget_period_id => $bpid, } -- 1.7.9.5