X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=admin%2Faqbudgetperiods.pl;h=0a05a5539bfaeb1fba8df5e2c7ce9964c51f66ea;hb=refs%2Fheads%2Fkoha_ffzg;hp=5f34dc235e3b9afed5a4e5f010c1871fd3481936;hpb=bc50735e3a8fe6ff2242810636ae5176e2c62296;p=koha.git diff --git a/admin/aqbudgetperiods.pl b/admin/aqbudgetperiods.pl index 5f34dc235e..0a05a5539b 100755 --- a/admin/aqbudgetperiods.pl +++ b/admin/aqbudgetperiods.pl @@ -5,18 +5,18 @@ # # 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 . =head1 admin/aqbudgetperiods.pl @@ -44,13 +44,12 @@ script to administer the budget periods table =cut -## modules -use strict; -#use warnings; FIXME - Bug 2505 -use Number::Format qw(format_price); -use CGI; +use Modern::Perl; + +use CGI qw ( -utf8 ); use List::Util qw/min/; -use C4::Dates qw/format_date format_date_in_iso/; +use Koha::DateUtils; +use Koha::Database; use C4::Koha; use C4::Context; use C4::Auth; @@ -58,60 +57,46 @@ use C4::Output; use C4::Acquisition; use C4::Budgets; use C4::Debug; -use C4::SQLHelper; +use Koha::Acquisition::Currencies; my $dbh = C4::Context->dbh; my $input = new CGI; -my $searchfield = $input->param('searchfield'); +my $searchfield = $input->param('searchfield') // ''; my $budget_period_id = $input->param('budget_period_id'); my $op = $input->param('op')||"else"; - -my $budget_period_hashref= $input->Vars; #my $sort1_authcat = $input->param('sort1_authcat'); #my $sort2_authcat = $input->param('sort2_authcat'); -my $activepagesize = 20; -my $inactivepagesize = 20; +# get only the columns of aqbudgetperiods in budget_period_hashref +my @columns = Koha::Database->new()->schema->source('Aqbudgetperiod')->columns; +my $budget_period_hashref = { map { join(' ',@columns) =~ /$_/ ? ( $_ => scalar $input->param($_) ) : () } keys( %{$input->Vars()} ) } ; +$budget_period_hashref->{budget_period_startdate} = dt_from_string( scalar $input->param('budget_period_startdate') ); +$budget_period_hashref->{budget_period_enddate} = dt_from_string( scalar $input->param('budget_period_enddate') ); + $searchfield =~ s/\,//g; my ($template, $borrowernumber, $cookie, $staff_flags ) = get_template_and_user( - { template_name => "admin/aqbudgetperiods.tmpl", - query => $input, - type => "intranet", - authnotrequired => 0, - flagsrequired => { acquisition => 'period_manage' }, - debug => 1, - } + { + template_name => "admin/aqbudgetperiods.tt", + query => $input, + type => "intranet", + authnotrequired => 0, + flagsrequired => { acquisition => 'period_manage' }, + debug => 1, + } ); -my $cur = GetCurrency(); -$template->param( symbol => $cur->{symbol}, - currency => $cur->{currency} - ); -my $cur_format = C4::Context->preference("CurrencyFormat"); -my $num; - -if ( $cur_format eq 'US' ) { - $num = new Number::Format( - 'int_curr_symbol' => '', - 'mon_thousands_sep' => ',', - 'mon_decimal_point' => '.' - ); -} elsif ( $cur_format eq 'FR' ) { - $num = new Number::Format( - 'decimal_fill' => '2', - 'decimal_point' => ',', - 'int_curr_symbol' => '', - 'mon_thousands_sep' => ' ', - 'thousands_sep' => ' ', - 'mon_decimal_point' => ',' - ); +# This is used in incbudgets-active-currency.inc +my $active_currency = Koha::Acquisition::Currencies->get_active; +if ( $active_currency ) { + $template->param( symbol => $active_currency->symbol, + currency => $active_currency->currency + ); } - # ADD OR MODIFY A BUDGET PERIOD - BUILD SCREEN if ( $op eq 'add_form' ) { ## add or modify a budget period (preparation) @@ -121,25 +106,16 @@ if ( $op eq 'add_form' ) { my $budgetperiod_hash=GetBudgetPeriod($budget_period_id); # get dropboxes - my $editnum = new Number::Format( - 'int_curr_symbol' => '', - 'thousands_sep' => '', - 'mon_thousands_sep' => '', - 'mon_decimal_point' => '.' - ); - - $$budgetperiod_hash{budget_period_total}= $editnum->format_price($$budgetperiod_hash{'budget_period_total'}); $template->param( %$budgetperiod_hash ); } # IF-MOD - $template->param( DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),); } elsif ( $op eq 'add_validate' ) { ## add or modify a budget period (confirmation) - ## update budget period data + ## update budget period data if ( $budget_period_id ne '' ) { $$budget_period_hashref{$_}||=0 for qw(budget_period_active budget_period_locked); my $status=ModBudgetPeriod($budget_period_hashref); @@ -153,91 +129,133 @@ elsif ( $op eq 'add_validate' ) { #-------------------------------------------------- elsif ( $op eq 'delete_confirm' ) { ## delete a budget period (preparation) - my $dbh = C4::Context->dbh; - ## $total = number of records linked to the record that must be deleted + my $funds = GetBudgets({ budget_period_id => $budget_period_id }); + my $fund_count = scalar @$funds; + if ( $fund_count > 0 ) { + $template->param( funds_exist => 1 ); + } + + #$total = number of records linked to the record that must be deleted my $total = 0; my $data = GetBudgetPeriod( $budget_period_id); - - $$data{'budget_period_total'}=$num->format_price( $data->{'budget_period_total'}); $template->param( - %$data + %$data ); } elsif ( $op eq 'delete_confirmed' ) { -## delete the budget period record - - my $data = GetBudgetPeriod( $budget_period_id); - DelBudgetPeriod($budget_period_id); + ## confirm no funds have been added to budget + my $funds = GetBudgets({ budget_period_id => $budget_period_id }); + my $fund_count = scalar @$funds; + if ( $fund_count > 0 ) { + $template->param( failed_delete_funds_exist => 1 ); + } else { + ## delete the budget period record + my $data = GetBudgetPeriod( $budget_period_id); + DelBudgetPeriod($budget_period_id); + } $op='else'; } # display the form for duplicating elsif ( $op eq 'duplicate_form'){ + my $budgetperiod = GetBudgetPeriod($budget_period_id, $input); $template->param( - DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), 'duplicate_form' => '1', 'budget_period_id' => $budget_period_id, + 'budgetperiod' => $budgetperiod, ); } # handle the actual duplication elsif ( $op eq 'duplicate_budget' ){ die "please specify a budget period id\n" if( !defined $budget_period_id || $budget_period_id eq '' ); - my $startdate = $input->param('budget_period_startdate'); - my $enddate = $input->param('budget_period_enddate'); - my $data = GetBudgetPeriod( $budget_period_id); - - $data->{'budget_period_startdate'} = $startdate; - $data->{'budget_period_enddate'} = $enddate; - delete $data->{'budget_period_id'}; - my $new_budget_period_id = C4::SQLHelper::InsertInTable('aqbudgetperiods', $data); - - my $tree = GetBudgetHierarchy( $budget_period_id ); - - # hash mapping old ids to new - my %old_new; - # hash mapping old parent ids to list of new children ids - # only store a child here if the parents old id isnt in the old_new map - # when the parent is found, this map will be used, and then the entry removed and their id placed in old_new - my %parent_children; - - for my $entry( @$tree ){ - die "serious errors, parent period $budget_period_id doesnt match child ", $entry->{'budget_period_id'}, "\n" if( $entry->{'budget_period_id'} != $budget_period_id ); - my $orphan = 0; # set to 1 if we need to make an entry in parent_children - my $old_id = delete $entry->{'budget_id'}; - my $parent_id = delete $entry->{'budget_parent_id'}; - $entry->{'budget_period_id'} = $new_budget_period_id; - - if( !defined $parent_id ){ - } elsif( defined $parent_id && $parent_id eq '' ){ - } elsif( defined $old_new{$parent_id} ){ - # set parent id now - $entry->{'budget_parent_id'} = $old_new{$parent_id}; - } else { - # make an entry in parent_children - $parent_children{$parent_id} = [] unless defined $parent_children{$parent_id}; - $orphan = 1; + my $budget_period_startdate = dt_from_string scalar $input->param('budget_period_startdate'); + my $budget_period_enddate = dt_from_string scalar $input->param('budget_period_enddate'); + my $budget_period_description = $input->param('budget_period_description'); + my $amount_change_percentage = $input->param('amount_change_percentage'); + my $amount_change_round_increment = $input->param('amount_change_round_increment'); + my $mark_original_budget_as_inactive = $input->param('mark_original_budget_as_inactive'); + my $reset_all_budgets = $input->param('reset_all_budgets'); + + my $new_budget_period_id = C4::Budgets::CloneBudgetPeriod( + { + budget_period_id => $budget_period_id, + budget_period_startdate => $budget_period_startdate, + budget_period_enddate => $budget_period_enddate, + budget_period_description => $budget_period_description, + amount_change_percentage => $amount_change_percentage, + amount_change_round_increment => $amount_change_round_increment, + mark_original_budget_as_inactive => $mark_original_budget_as_inactive, + reset_all_budgets => $reset_all_budgets, } + ); - # write it to db - my $new_id = C4::SQLHelper::InsertInTable('aqbudgets', $entry); - $old_new{$old_id} = $new_id; - push @{$parent_children{$parent_id}}, $new_id if $orphan; + # display the list of budgets + $op = 'else'; +} + +elsif ( $op eq 'close_form' ) { + + my $budget_period = GetBudgetPeriod($budget_period_id); + + my $active_budget_periods = + C4::Budgets::GetBudgetPeriods( { budget_period_active => 1 } ); + + # Remove the budget period from the list + $active_budget_periods = + [ map { ( $_->{budget_period_id} == $budget_period_id ) ? () : $_ } + @$active_budget_periods ]; + + my $budgets_to_move = GetBudgetHierarchy($budget_period_id); - # deal with any children - if( defined $parent_children{$old_id} ){ - # tell my children my new id - for my $child ( @{$parent_children{$old_id}} ){ - C4::SQLHelper::UpdateInTable('aqcudgets', [ 'budget_id' => $child, 'budget_parent_id' => $new_id ]); + my $number_of_unreceived_orders = 0; + for my $budget (@$budgets_to_move) { + + # We want to move funds from this budget + my $unreceived_orders = C4::Acquisition::SearchOrders( + { + budget_id => $budget->{budget_id}, + pending => 1, } - delete $parent_children{$old_id}; - } + ); + $budget->{unreceived_orders} = $unreceived_orders; + $number_of_unreceived_orders += scalar(@$unreceived_orders); } - # display the list of budgets - $op = 'else'; + $template->param( + close_form => 1, + budget_period_id => $budget_period_id, + budget_period_description => + $budget_period->{budget_period_description}, + budget_periods => $active_budget_periods, + budgets_to_move => $budgets_to_move, + number_of_unreceived_orders => $number_of_unreceived_orders, + ); +} + +elsif ( $op eq 'close_confirmed' ) { + my $to_budget_period_id = $input->param('to_budget_period_id'); + my $move_remaining_unspent = $input->param('move_remaining_unspent'); + my $report = C4::Budgets::MoveOrders( + { + from_budget_period_id => $budget_period_id, + to_budget_period_id => $to_budget_period_id, + move_remaining_unspent => $move_remaining_unspent, + } + ); + + my $from_budget_period = GetBudgetPeriod($budget_period_id); + my $to_budget_period = GetBudgetPeriod($to_budget_period_id); + $template->param( + closed => 1, + budget_period_id => $from_budget_period->{budget_period_id}, + budget_period_description => $from_budget_period->{budget_period_description}, + from_budget_period => $from_budget_period, + to_budget_period => $to_budget_period, + report => $report, + ); } # DEFAULT - DISPLAY AQPERIODS TABLE @@ -248,50 +266,40 @@ my $activepage = $input->param('apage') || 1; my $inactivepage = $input->param('ipage') || 1; # Get active budget periods my $results = GetBudgetPeriods( - {budget_period_active => 1}, - [{budget_period_description => 0}] + { budget_period_active => 1 }, + { -asc => 'budget_period_description' }, ); -my $first = ( $activepage - 1 ) * $activepagesize; -my $last = min( $first + $activepagesize - 1, scalar @{$results} - 1, ); + my @period_active_loop; -foreach my $result ( @{$results}[ $first .. $last ] ) { +foreach my $result ( @{$results} ) { my $budgetperiod = $result; - $budgetperiod->{'budget_period_total'} = $num->format_price( $budgetperiod->{'budget_period_total'} ); $budgetperiod->{budget_active} = 1; + my $funds = GetBudgets({ budget_period_id => $budgetperiod->{budget_period_id} }); + $budgetperiod->{count} = scalar @$funds; push( @period_active_loop, $budgetperiod ); } -my $url = "aqbudgetperiods.pl"; -$url .= "?ipage=$inactivepage" if($inactivepage != 1); -my $active_pagination_bar = pagination_bar ($url, getnbpages( scalar(@$results), $activepagesize), $activepage, "apage"); # Get inactive budget periods $results = GetBudgetPeriods( - {budget_period_active => 0}, - [{budget_period_enddate => 1}] + { budget_period_active => 0 }, + { -desc => 'budget_period_enddate' }, ); -$first = ( $inactivepage - 1 ) * $inactivepagesize; -$last = min( $first + $inactivepagesize - 1, scalar @{$results} - 1, ); my @period_inactive_loop; -foreach my $result ( @{$results}[ $first .. $last ] ) { +foreach my $result ( @{$results} ) { my $budgetperiod = $result; - $budgetperiod->{'budget_period_total'} = $num->format_price( $budgetperiod->{'budget_period_total'} ); $budgetperiod->{budget_active} = 1; + my $funds = GetBudgets({ budget_period_id => $budgetperiod->{budget_period_id} }); + $budgetperiod->{count} = scalar @$funds; push( @period_inactive_loop, $budgetperiod ); } -$url = "aqbudgetperiods.pl?tab=2"; -$url .= "&apage=$activepage" if($activepage != 1); -my $inactive_pagination_bar = pagination_bar ($url, getnbpages( scalar(@$results), $inactivepagesize), $inactivepage, "ipage"); my $tab = $input->param('tab') ? $input->param('tab') - 1 : 0; $template->param( period_active_loop => \@period_active_loop, period_inactive_loop => \@period_inactive_loop, - active_pagination_bar => $active_pagination_bar, - inactive_pagination_bar => $inactive_pagination_bar, tab => $tab, - dateformat => C4::Context->preference('dateformat'), ); $template->param($op=>1);