X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=admin%2Faqbudgetperiods.pl;h=0a05a5539bfaeb1fba8df5e2c7ce9964c51f66ea;hb=refs%2Fheads%2Fkoha_ffzg;hp=9084540712bd62774c3fa0267b77b8acb95206e8;hpb=4bdc80312017732dfa6d21671382cdc89ef4e0ad;p=koha.git

diff --git a/admin/aqbudgetperiods.pl b/admin/aqbudgetperiods.pl
index 9084540712..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 <http://www.gnu.org/licenses>.
 
 =head1 admin/aqbudgetperiods.pl
 
@@ -46,8 +46,7 @@ script to administer the budget periods table
 
 use Modern::Perl;
 
-use Number::Format qw(format_price);
-use CGI;
+use CGI qw ( -utf8 );
 use List::Util qw/min/;
 use Koha::DateUtils;
 use Koha::Database;
@@ -58,6 +57,7 @@ use C4::Output;
 use C4::Acquisition;
 use C4::Budgets;
 use C4::Debug;
+use Koha::Acquisition::Currencies;
 
 my $dbh = C4::Context->dbh;
 
@@ -71,12 +71,10 @@ my $op                   = $input->param('op')||"else";
 
 # 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) =~ /$_/ ? ( $_ => $input->param($_) )  : () } keys( %{$input->Vars()} ) } ;
-$budget_period_hashref->{budget_period_startdate} = dt_from_string( $input->param('budget_period_startdate') );
-$budget_period_hashref->{budget_period_enddate}   = dt_from_string( $input->param('budget_period_enddate') );
+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') );
 
-my $activepagesize = 20;
-my $inactivepagesize = 20;
 $searchfield =~ s/\,//g;
 
 my ($template, $borrowernumber, $cookie, $staff_flags ) = get_template_and_user(
@@ -92,10 +90,12 @@ my ($template, $borrowernumber, $cookie, $staff_flags ) = get_template_and_user(
 
 
 # This is used in incbudgets-active-currency.inc
-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
+                   );
+}
 
 # ADD OR MODIFY A BUDGET PERIOD - BUILD SCREEN
 if ( $op eq 'add_form' ) {
@@ -106,14 +106,6 @@ 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
         );
@@ -137,21 +129,31 @@ 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);
-
     $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';
 }
 
@@ -169,9 +171,11 @@ elsif ( $op eq 'duplicate_form'){
 elsif ( $op eq 'duplicate_budget' ){
     die "please specify a budget period id\n" if( !defined $budget_period_id || $budget_period_id eq '' );
 
-    my $budget_period_startdate = dt_from_string $input->param('budget_period_startdate');
-    my $budget_period_enddate   = dt_from_string $input->param('budget_period_enddate');
+    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');
 
@@ -181,6 +185,8 @@ elsif ( $op eq 'duplicate_budget' ){
             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,
         }
@@ -204,8 +210,6 @@ elsif ( $op eq 'close_form' ) {
 
     my $budgets_to_move = GetBudgetHierarchy($budget_period_id);
 
-    # C4::Context->userenv->{branchcode}, $show_mine ? $borrower_id : '')
-
     my $number_of_unreceived_orders = 0;
     for my $budget (@$budgets_to_move) {
 
@@ -265,18 +269,16 @@ my $results = GetBudgetPeriods(
     { 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_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(
@@ -284,24 +286,19 @@ $results = GetBudgetPeriods(
     { -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_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,
 );