bug 2473: correct display of items.content

[koha_fer] / admin / aqbookfund.pl

diff --git a/admin/aqbookfund.pl b/admin/aqbookfund.pl
index 32ec8f8..d5673c8 100755 (executable)
--- a/admin/aqbookfund.pl
+++ b/admin/aqbookfund.pl
@@ -52,14 +52,15 @@ C<op> can be equal to:
 
 use strict;
 use CGI;
-use C4::Branch; # GetBranches
 use List::Util qw/min/;
+use C4::Branch; # GetBranches
 use C4::Auth;
 use C4::Koha;
 use C4::Context;
 use C4::Bookfund;
 use C4::Output;
-use C4::Date;
+use C4::Dates;
+use C4::Debug;
 
 # use Smart::Comments;
 
@@ -167,34 +168,22 @@ elsif ($op eq 'add_validate') {
 #-----############# MOD_VALIDATE ##################################
 # called by add_form, used to insert/modify data in DB
 elsif ($op eq 'mod_validate') {
-### mod ddddddddddddddddd
-
-       my $bookfundid = uc $input->param('bookfundid');
-        my $bookfundname = $input->param('bookfundname');
-        my $branchcode = $input->param('branchcode') || undef;
-        my $current_branch = $input->param('current_branch') || undef;
-
-warn "$bookfundid, $bookfundname, $branchcode";
-
-    my $number = Countbookfund($bookfundid,$branchcodeid);
-### $number
-
+       my $bookfundid  = uc $input->param('bookfundid');
+       my $bookfundname   = $input->param('bookfundname');
+       my $branchcode     = $input->param('branchcode'    ) || undef;
+       my $current_branch = $input->param('current_branch') || undef;
+       $debug and warn "$bookfundid, $bookfundname, $branchcode";
 
+       my $number = Countbookfund($bookfundid,$branchcodeid);
     if ($number < 2)  {
-         warn "name :$bookfundname branch:$branchcode";
+         $debug and warn "name :$bookfundname branch:$branchcode";
         ModBookFund($bookfundname,$bookfundid,$current_branch, $branchcode);
     }
    $input->redirect('aqbookfund.pl');
-# END $OP eq ADD_VALIDATE
 }
 
-
-
-
-
 #-----############# DELETE_CONFIRM ##################################
 # called by default form, used to confirm deletion of data in DB
-
 elsif ($op eq 'delete_confirm') {
     my $data = GetBookFund($bookfundid,$branchcodeid);
        $template->param(bookfundid => $bookfundid);
@@ -202,7 +191,6 @@ elsif ($op eq 'delete_confirm') {
        $template->param(branchcode => $data->{'branchcode'});
 } # END $OP eq DELETE_CONFIRM
 
-
 #-----############# DELETE_CONFIRMED ##################################
 # called by delete_confirm, used to effectively confirm deletion of data in DB
 elsif ($op eq 'delete_confirmed') {
@@ -210,7 +198,6 @@ elsif ($op eq 'delete_confirmed') {
 
 }# END $OP eq DELETE_CONFIRMED
 
-
 #-----############# DEFAULT ##################################
 else { # DEFAULT
     my ($query, $sth);
@@ -224,17 +211,15 @@ else { # DEFAULT
             code => $branchcode,
             name => $branches->{$branchcode}->{branchname},
         };
-
         if (defined $input->param('filter_branchcode')
             and $input->param('filter_branchcode') eq $branchcode) {
             $row->{selected} = 1;
         }
-
         push @branchloop, $row;
     }
 
     my @bookfundids_loop;
-    my $sth = GetBookFundsId();
+    $sth = GetBookFundsId();
 
     while (my $row = $sth->fetchrow_hashref) {
         if (defined $input->param('filter_bookfundid') and $input->param('filter_bookfundid') eq $row->{bookfundid}){
@@ -259,7 +244,7 @@ else { # DEFAULT
 
     # does the book funds have budgets?
     my @loop_id;
-    my $sth = GetBookFundsId();
+    $sth = GetBookFundsId();
     while (my $row = $sth->fetchrow){
         push @loop_id, $row;
     }