-
-
Reports
+
+
Reports
Guided reports
-
-
-
Reports dictionary
-
+
-
Statistics wizards
-
+
Reports dictionary
+
+
+
Statistics wizards
+
[% IF UseKohaPlugins %]
Report Plugins
@@ -51,23 +51,24 @@
-
-
Inactive
-
-
-
Other
-
+
+
+
Inactive
+
+
+
Other
+
diff --git a/reports/orders_by_fund.pl b/reports/orders_by_fund.pl
new file mode 100755
index 0000000000..ce00d72341
--- /dev/null
+++ b/reports/orders_by_fund.pl
@@ -0,0 +1,216 @@
+#!/usr/bin/perl
+
+# This file is part of Koha.
+#
+# Author : Frédérick Capovilla, 2011 - SYS-TECH
+# Modified by : Élyse Morin, 2012 - Libéo
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 3 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+# Suite 330, Boston, MA 02111-1307 USA
+
+
+=head1 orders_by_budget
+
+This script displays all orders associated to a selected budget.
+
+=cut
+
+use strict;
+use warnings;
+use Modern::Perl;
+
+use CGI;
+use C4::Auth;
+use C4::Output;
+use C4::Budgets;
+use C4::Biblio;
+use C4::Reports;
+use C4::Acquisition; #GetBasket()
+
+my $query = new CGI;
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+ {
+ template_name => "reports/orders_by_budget.tt",
+ query => $query,
+ type => "intranet",
+ authnotrequired => 0,
+ flagsrequired => { reports => '*' },
+ debug => 1,
+ }
+);
+
+my $params = $query->Vars;
+my $get_orders = $params->{'get_orders'};
+
+if ( $get_orders ) {
+ my $budgetfilter = $params->{'budgetfilter'} || undef;
+ my $total_quantity = 0;
+ my $total_rrp = 0;
+ my $total_ecost = 0;
+ my %budget_name;
+
+ # Fetch the orders
+ my @orders;
+ unless($budgetfilter) {
+ # If no budget filter was selected, get the orders of all budgets
+ my @budgets = C4::Budgets::GetBudgetsReport();
+ foreach my $budget (@budgets) {
+ push(@orders, $budget);
+ $budget_name{$budget->{'budget_id'}} = $budget->{'budget_name'};
+ }
+ }
+ else {
+ if ($budgetfilter eq 'activebudgets') {
+ # If all active budgets's option was selected, get the orders of all active budgets
+ my @active_budgets = C4::Budgets::GetBudgetsReport(1);
+ foreach my $active_budget (@active_budgets)
+ {
+ push(@orders, $active_budget);
+ $budget_name{$active_budget->{'budget_id'}} = $active_budget->{'budget_name'};
+ }
+ }
+ else {
+ # A budget filter was selected, only get the orders for the selected budget
+ my @filtered_budgets = C4::Budgets::GetBudgetReport($budgetfilter);
+ foreach my $budget (@filtered_budgets)
+ {
+ push(@orders, $budget);
+ $budget_name{$budget->{'budget_id'}} = $budget->{'budget_name'};
+ }
+ if ($filtered_budgets[0]) {
+ $template->param(
+ current_budget_name => $filtered_budgets[0]->{'budget_name'},
+ );
+ }
+ }
+ }
+
+ # Format the order's informations
+ foreach my $order (@orders) {
+ # Get the title of the ordered item
+ 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'};
+
+ $order->{'total_rrp'} = $order->{'quantity'} * $order->{'rrp'};
+ $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'}));
+ $total_quantity += $order->{'quantity'};
+ $total_rrp += $order->{'total_rrp'};
+ $total_ecost += $order->{'total_ecost'};
+
+ # Get the budget's name
+ $order->{'budget_name'} = $budget_name{$order->{'budget_id'}};
+ }
+
+ # If we are outputting to screen, output to the template.
+ if($params->{"output"} eq 'screen') {
+ $template->param(
+ total => scalar @orders,
+ ordersloop => \@orders,
+ get_orders => $get_orders,
+ total_quantity => $total_quantity,
+ total_rrp => $total_rrp,
+ total_ecost => $total_ecost,
+ );
+ }
+ # If we are outputting to a file, create it and exit.
+ else {
+ my $basename = $params->{"basename"};
+ my $sep = $params->{"sep"};
+ $sep = "\t" if ($sep eq 'tabulation');
+
+ print $query->header(
+ -type => 'application/vnd.sun.xml.calc',
+ -encoding => 'utf-8',
+ -attachment => "$basename.csv",
+ -name => "$basename.csv"
+ );
+
+ #binmode STDOUT, ":encoding(UTF-8)";
+
+ # Surrounds a string with double-quotes and escape the double-quotes inside
+ sub _surround {
+ my $string = shift || "";
+ $string =~ s/"/""/g;
+ return "\"$string\"";
+ }
+ my @rows;
+ foreach my $order (@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'}));
+ push(@row, _surround($order->{'currency'}));
+ push(@row, _surround($order->{'listprice'}));
+ push(@row, _surround($order->{'rrp'}));
+ push(@row, _surround($order->{'ecost'}));
+ push(@row, _surround($order->{'quantity'}));
+ push(@row, _surround($order->{'total_rrp'}));
+ push(@row, _surround($order->{'total_ecost'}));
+ push(@row, _surround($order->{'entrydate'}));
+ push(@row, _surround($order->{'datereceived'}));
+ push(@row, _surround($order->{'order_internalnote'}));
+ push(@row, _surround($order->{'order_vendornote'}));
+ push(@rows, \@row);
+ }
+
+ my @totalrow;
+ for(1..9){push(@totalrow, "")};
+ push(@totalrow, _surround($total_quantity));
+ push(@totalrow, _surround($total_rrp));
+ push(@totalrow, _surround($total_ecost));
+
+ my $csvTemplate = C4::Templates::gettemplate('reports/csv/orders_by_budget.tt', 'intranet', $query);
+ $csvTemplate->param(sep => $sep, rows => \@rows, totalrow => \@totalrow);
+ print $csvTemplate->output;
+
+ exit(0);
+ }
+}
+else {
+ # Set file export choices
+ my @outputFormats = ('CSV');
+ my @CSVdelimiters =(',','#',qw(; tabulation \\ /));
+
+ # getting all budgets
+ my $budgets = GetBudgetHierarchy;
+ my $budgetloop = [];
+ foreach my $budget (@{$budgets}) {
+ push @{$budgetloop},{
+ value => $budget->{budget_id},
+ description => $budget->{budget_name},
+ period => $budget->{budget_period_description},
+ active => $budget->{budget_period_active},
+ };
+ }
+ @{$budgetloop} =sort { uc( $a->{description}) cmp uc( $b->{description}) } @{$budgetloop};
+ $template->param( budgetsloop => \@{$budgetloop},
+ outputFormatloop => \@outputFormats,
+ delimiterloop => \@CSVdelimiters,
+ delimiterPreference => C4::Context->preference('delimiter')
+ );
+}
+
+# writing the template
+output_html_with_http_headers $query, $cookie, $template->output;
diff --git a/t/db_dependent/Acquisition.t b/t/db_dependent/Acquisition.t
index cd3f12573b..6063f09664 100755
--- a/t/db_dependent/Acquisition.t
+++ b/t/db_dependent/Acquisition.t
@@ -19,7 +19,7 @@ use Modern::Perl;
use POSIX qw(strftime);
-use Test::More tests => 87;
+use Test::More tests => 91;
use Koha::Database;
BEGIN {
@@ -147,10 +147,18 @@ ok(
);
ok( $basket = GetBasket($basketno), "GetBasket($basketno) returns $basket" );
+my $bpid=AddBudgetPeriod({
+ budget_period_startdate => '2008-01-01'
+ , budget_period_enddate => '2008-12-31'
+ , budget_period_active => 1
+ , budget_period_description => "MAPERI"
+});
+
my $budgetid = C4::Budgets::AddBudget(
{
budget_code => "budget_code_test_getordersbybib",
budget_name => "budget_name_test_getordersbybib",
+ budget_period_id => $bpid,
}
);
my $budget = C4::Budgets::GetBudget($budgetid);
@@ -934,3 +942,15 @@ ok((not defined GetBiblio($order4->{biblionumber})), "biblio does not exist anym
# End of tests for DelOrder
$schema->storage->txn_rollback();
+# Budget reports
+#my @report = GetBudgetReport(1);
+#ok(@report >= 1, "GetBudgetReport OK");
+
+my $all_count = scalar GetBudgetsReport();
+ok($all_count >= 1, "GetBudgetReport OK");
+
+my $active_count = scalar GetBudgetsReport(1);
+ok($active_count >= 1 , "GetBudgetsReport(1) OK");
+
+ok($all_count == scalar GetBudgetsReport(), "GetBudgetReport returns inactive budget period acquisitions.");
+ok($active_count >= scalar GetBudgetsReport(1), "GetBudgetReport doesn't return inactive budget period acquisitions.");
diff --git a/t/db_dependent/Budgets.t b/t/db_dependent/Budgets.t
index 0f59b8bb84..70fedbcbac 100755
--- a/t/db_dependent/Budgets.t
+++ b/t/db_dependent/Budgets.t
@@ -1,6 +1,6 @@
+#!/usr/bin/perl
use Modern::Perl;
-use Test::More tests => 130;
-
+use Test::More tests => 133;
BEGIN {
use_ok('C4::Budgets')
}
@@ -468,6 +468,15 @@ for my $budget (@$budget_hierarchy_cloned) {
is( $number_of_budgets_not_reset, 0,
'CloneBudgetPeriod has reset all budgets (funds)' );
+#GetBudgetsByActivity
+my $result=C4::Budgets::GetBudgetsByActivity(1);
+isnt( $result, undef ,'GetBudgetsByActivity return correct value with parameter 1');
+$result=C4::Budgets::GetBudgetsByActivity(0);
+ isnt( $result, undef ,'GetBudgetsByActivity return correct value with parameter 0');
+$result=C4::Budgets::GetBudgetsByActivity();
+ is( $result, 0 , 'GetBudgetsByActivity return 0 with none parameter or other 0 or 1' );
+DelBudget($budget_id);
+DelBudgetPeriod($bpid);
# CloneBudgetPeriod with param amount_change_*
$budget_period_id_cloned = C4::Budgets::CloneBudgetPeriod(