# Copyright 2008-2009 BibLibre SARL
# This file is part of Koha.
#
-# 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 2 of the License, or (at your option) any later
-# version.
+# 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.
+# 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.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
#script to administer the aqbudgets0 table
#written 20/02/2002 by paul.poulain@free.fr
# This software is placed under the gnu General Public License, v2 (http://www.gnu.org/licenses/gpl.html)
-use strict;
-#use warnings; FIXME - Bug 2505
-use CGI;
+use Modern::Perl;
+use CGI qw ( -utf8 );
use List::Util qw/min/;
use Date::Calc qw/Delta_YMD Easter_Sunday Today Decode_Date_EU/;
use Date::Manip qw/ ParseDate UnixDate DateCalc/;
-use C4::Dates qw/format_date format_date_in_iso/;
-use Number::Format qw(format_price);
use Text::CSV_XS;
use C4::Acquisition;
use C4::Output;
use C4::Koha;
use C4::Auth;
-use C4::Input;
use C4::Debug;
+use Koha::Acquisition::Currencies;
-my $input = new CGI;
+our $input = new CGI;
#### $input
my $dbh = C4::Context->dbh;
my ( $template, $borrowernumber, $cookie, $staff_flags ) = get_template_and_user(
- { template_name => "admin/aqplan.tmpl",
+ { template_name => "admin/aqplan.tt",
query => $input,
type => "intranet",
authnotrequired => 0,
# IF PERIOD_ID IS DEFINED, GET THE PERIOD - ELSE GET THE ACTIVE PERIOD BY DEFAULT
my $period = GetBudgetPeriod($budget_period_id);
my $count = GetPeriodsCount();
-my $cur = GetCurrency;
-$template->param( symbol => $cur->{symbol},
- currency => $cur->{currency}
- );
+my $active_currency = Koha::Acquisition::Currencies->get_active;
+if ( $active_currency ) {
+ $template->param( symbol => $active_currency->symbol,
+ currency => $active_currency->currency,
+ );
+}
$template->param( period_button_only => 1 ) if $count == 0;
# authcats_loop populates the YUI planning button
my $auth_cats_loop = GetBudgetAuthCats($budget_period_id);
-my $budget_period_id = $period->{'budget_period_id'};
+$budget_period_id = $period->{'budget_period_id'};
my $budget_period_startdate = $period->{'budget_period_startdate'};
my $budget_period_enddate = $period->{'budget_period_enddate'};
my $budget_period_locked = $period->{'budget_period_locked'};
# ------- get periods stuff ------------------
-my $borrower_id = $template->{VARS}->{'USER_INFO'}[0]->{'borrowernumber'};
-my $borrower_branchcode = $template->{VARS}->{'USER_INFO'}[0]->{'branchcode'};
-my $periods;
+my $borrower_branchcode = my $branch_code = C4::Context->userenv->{'branch'};
+
my $authcat = $input->param('authcat');
-my $show_active = $input->param('show_active');
+my $show_active = $input->param('show_active') // 0;
my $show_actual = $input->param('show_actual');
my $show_percent = $input->param('show_percent');
-my $output = $input->param("output");
-my $basename = $input->param("basename");
-my $del = $input->param("sep");
+my $output = $input->param("output") // q{};
+our $basename = $input->param("basename");
+our $del = $input->param("sep");
my $show_mine = $input->param('show_mine') ;
-my @hide_cols = $input->param('hide_cols');
-
-my $cur_format = C4::Context->preference("CurrencyFormat");
-my $num;
-
-if ( $cur_format eq 'FR' ) {
- $num = new Number::Format(
- 'decimal_fill' => '2',
- 'decimal_point' => ',',
- 'int_curr_symbol' => '',
- 'mon_thousands_sep' => ' ',
- 'thousands_sep' => ' ',
- 'mon_decimal_point' => ','
- );
-} else { # US by default..
- $num = new Number::Format(
- 'int_curr_symbol' => '',
- 'mon_thousands_sep' => ',',
- 'mon_decimal_point' => '.'
- );
-}
+my @hide_cols = $input->multi_param('hide_cols');
if ( $budget_period_locked == 1 && not defined $show_actual ) {
$show_actual = 1;
$authcat = 'Asort1' if not defined $authcat; # defaults to Asort if no authcat given
my $budget_id = $input->param('budget_id');
-my $op = $input->param("op");
+my $op = $input->param("op") // q{};
-my $budget_branchcode;
-
-my $budgets_ref = GetBudgetHierarchy( $budget_period_id, $show_mine?$template->{VARS}->{'USER_INFO'}[0]->{'branchcode'}:'', $show_mine?$template->{VARS}->{'USER_INFO'}[0]->{'borrowernumber'}:'' );
+my $budgets_ref = GetBudgetHierarchy(
+ $budget_period_id,
+ $show_mine ? $borrower_branchcode : '',
+ $show_mine ? $borrowernumber : ''
+);
# build categories list
my $sth = $dbh->prepare("select distinct category from authorised_values where category like 'A%' ");
push( @category_list, 'MONTHS' );
push( @category_list, 'ITEMTYPES' );
push( @category_list, 'BRANCHES' );
-push( @category_list, $$_{'authcat'} ) foreach @$auth_cats_loop;
+push( @category_list, $_ ) foreach @$auth_cats_loop;
#reorder the list
@category_list = sort { $a cmp $b } @category_list;
-my $tab_list = CGI::scrolling_list(
- -name => 'authcat',
- -id => 'authcat',
- -values => \@category_list,
- -default => $authcat,
- -size => 1,
- -tabindex => '',
- -multiple => 0,
-);
-$template->param( authcat_dropbox => $tab_list );
+$template->param( authcat_dropbox => {
+ values => \@category_list,
+ default => $authcat,
+ });
my @budgets = @$budgets_ref;
-my $CGISort;
my @authvals;
my %labels;
-my @names = $input->param();
+my @names = $input->multi_param();
# ------------------------------------------------------------
if ( $op eq 'save' ) {
#get budgets
my %seen;
@buds = grep { !$seen{$_}++ } @buds;
@auth_values = grep { !$seen{$_}++ } @auth_values;
- my @budget_ids;
my @budget_lines;
foreach my $budget (@buds) {
$sth->finish;
@authvals = sort { $a <=> $b } @authvals;
}
-elsif ( $authcat eq 'MONTHS' ) {
+elsif ( $authcat eq 'MONTHS' && $budget_period_startdate && $budget_period_enddate ) {
# build months
my @start_date = UnixDate( $budget_period_startdate, ( '%Y', '%m', '%d' ) );
#calc number of months between
my $months = ( $Dy * 12 ) + $Dm;
- my $start_month = @start_date[1];
+ my $start_month = $start_date[1];
my $end_month = ( $Dy * 12 ) + $Dm;
for my $mth ( 0 ... $months ) {
# ------------------------------------------------------------
# DEFAULT DISPLAY BEGINS
-my $CGIextChoice = CGI::scrolling_list(
- -name => 'MIME',
- -id => 'MIME',
- -values => ['CSV'], # FIXME translation
- -size => 1,
- -multiple => 0
-);
-
-my @dels = ( C4::Context->preference("delimiter") );
-my $CGIsepChoice = CGI::scrolling_list(
- -name => 'sep',
- -id => 'sep',
- -values => \@dels,
- -size => 1,
- -multiple => 0
-);
+my $CGIextChoice = ( 'CSV' ); # FIXME translation
+my $CGIsepChoice = ( C4::Context->preference("delimiter") );
my ( @budget_lines, %cell_hash );
if ( $period->{budget_period_locked} == 1 ) {
$budget_lock = 1;
} elsif ( $budget->{budget_permission} == 1 ) {
- $budget_lock = 1 if $borrower_id != $budget->{'budget_owner_id'};
+ $budget_lock = 1 if $borrowernumber != $budget->{'budget_owner_id'};
} elsif ( $budget->{budget_permission} == 2 ) {
$budget_lock = 1 if $borrower_branchcode ne $budget->{budget_branchcode};
}
or $authcat eq 'BRANCHES'
or $authcat eq 'MONTHS' ) {
- # but skip budgets that dont match the current auth-category
+ # but skip budgets that don't match the current auth-category
next if ( $budget->{'sort1_authcat'} ne $authcat
&& $budget->{'sort2_authcat'} ne $authcat );
}
);
my ( $actual, $estimated, $display ) = GetBudgetsPlanCell( \%cell, $period, $budget );
- $cell{actual_amount} = sprintf( "%.2f", $actual );
- $cell{estimated_amount} = sprintf( "%.2f", $estimated );
+ $cell{actual_amount} = sprintf( "%.2f", $actual // 0 );
+ $cell{estimated_amount} = sprintf( "%.2f", $estimated // 0 );
$cell{display} = $authvals_row[$i]{display};
$cell{colnum} = $i;
%budget_line = (
lines => \@cells_line,
- budget_name_indent => $budget->{budget_name_indent},
- budget_amount_formatted => $num->format_price( $budget->{budget_amount} ),
+ budget_name => $budget->{budget_name},
budget_amount => $budget->{budget_amount},
budget_alloc => $budget->{budget_alloc},
budget_act_remain => sprintf( "%.2f", $budget_act_remain ),
show_actual => $show_actual,
show_percent => $show_percent,
show_mine => $show_mine,
- cur_format => $cur_format,
CGIextChoice => $CGIextChoice,
CGIsepChoice => $CGIsepChoice,
authvals => \@authvals_row,
- hide_cols_loop => \@hide_cols
+ hide_cols_loop => \@hide_cols,
);
output_html_with_http_headers $input, $cookie, $template->output;
print "$str\n";
foreach my $row (@$results) {
- $row->{'budget_name_indent'} =~ s/ / /g;
- my @col = ( $row->{'budget_name_indent'}, $row->{'budget_amount'} );
+ my @col = ( $row->{'budget_name'}, $row->{'budget_amount'} );
my $l = $row->{'lines'};
foreach my $line (@$l) {
push @col, $line->{'estimated_amount'};
projects / koha.git / blobdiff