Merge fixes and removing warnings

diff --git a/C4/Budgets.pm b/C4/Budgets.pm
index 24c4a90..760482a 100644 (file)
--- a/C4/Budgets.pm
+++ b/C4/Budgets.pm
@@ -235,7 +235,7 @@ sub GetBudgetsPlanCell {
     $actual = $sth->fetchrow_array;
 
     # get the estimated amount
-    my $sth = $dbh->prepare( qq|
+    $sth = $dbh->prepare( qq|
 
         SELECT estimated_amount AS estimated, display FROM aqbudgets_planning
             WHERE budget_period_id = ? AND
@@ -517,8 +517,8 @@ sub GetBudgetHierarchy {
        }
 
        # look for top parents 1st
-       my @sort;
-       my ($i, $depth_count) = 0;
+       my (@sort, $depth_count);
+       ($i, $depth_count) = 0;
        while (1) {
                my $children = 0;
                foreach my $r (@res) {
@@ -568,7 +568,7 @@ sub GetBudgetHierarchy {
         $moo =~ s/\ /\&nbsp\;/g;
         $r->{'budget_code_indent'} =  $moo;
 
-        my $moo = $r->{'budget_name_indent'};
+        $moo = $r->{'budget_name_indent'};
         $moo =~ s/\ /\&nbsp\;/g;
         $r->{'budget_name_indent'} = $moo;
 
@@ -635,7 +635,6 @@ get a specific budget
 sub GetBudget {
     my ( $budget_id ) = @_;
     my $dbh = C4::Context->dbh;
-    my $query;
     my $query = "
         SELECT *
         FROM   aqbudgets

diff --git a/C4/Record.pm b/C4/Record.pm
index a892c5c..127d521 100644 (file)
--- a/C4/Record.pm
+++ b/C4/Record.pm
@@ -374,13 +374,13 @@ sub marc2csv {
                my $sth = $dbh->prepare($query);
                $sth->execute($fieldtag, $subfieldtag);
                my @results = $sth->fetchrow_array();
-               push @marcfieldsheaders, @results[0];
+               push @marcfieldsheaders, $results[0];
            } else {
                my $query = "SELECT liblibrarian FROM marc_tag_structure WHERE tagfield=?";
                my $sth = $dbh->prepare($query);
                $sth->execute($_);
                my @results = $sth->fetchrow_array();
-               push @marcfieldsheaders, @results[0];
+               push @marcfieldsheaders, $results[0];
            }
        }
        $csv->combine(@marcfieldsheaders);

diff --git a/acqui/acqui-home.pl b/acqui/acqui-home.pl
index b46287f..a6d44c3 100755 (executable)
--- a/acqui/acqui-home.pl
+++ b/acqui/acqui-home.pl
@@ -74,7 +74,6 @@ my $count = scalar @results;
 my $branchname = GetBranchName($homebranch);
 
 #my $count = scalar @results;
-my $count;
 my $classlist   = '';
 my $total       = 0;
 my $totspent    = 0;
@@ -89,26 +88,9 @@ my @rates = GetCurrencies();
 $count = scalar @rates;
 
 my $active_currency = GetCurrency;
-my $num = new Number::Format(-int_curr_symbol => '',
-                             -decimal_digits => "2" );
-my @loop_currency = ();
-for ( my $i = 0 ; $i < $count ; $i++ ) {
-    my %line;
-    $line{currency}        = $rates[$i]->{'currency'} ;
-    $line{currency_symbol} = $rates[$i]->{'symbol'};
-    $line{rate}            = sprintf ( '%.2f',  $rates[$i]->{'rate'} );
-    push @loop_currency, \%line;
-}
-
-# suggestions
-my $status           = $query->param('status') || "ASKED";
-my $suggestion       = CountSuggestion($status);
-my $suggestions_loop = &SearchSuggestion( {STATUS=> $status} );
-# ---------------------------------------------------
-# number format
-my $cur_format = C4::Context->preference("CurrencyFormat");
 my $num;
 
+my $cur_format = C4::Context->preference("CurrencyFormat");
 if ( $cur_format eq 'FR' ) {
     $num = new Number::Format(
         'decimal_fill'      => '2',
@@ -126,15 +108,29 @@ if ( $cur_format eq 'FR' ) {
     );
 }
 
+my @loop_currency = ();
+for ( my $i = 0 ; $i < $count ; $i++ ) {
+    my %line;
+    $line{currency}        = $rates[$i]->{'currency'} ;
+    $line{currency_symbol} = $rates[$i]->{'symbol'};
+    $line{rate}            = sprintf ( '%.2f',  $rates[$i]->{'rate'} );
+    push @loop_currency, \%line;
+}
+
+# suggestions
+my $status           = $query->param('status') || "ASKED";
+my $suggestion       = CountSuggestion($status);
+my $suggestions_loop = &SearchSuggestion( {STATUS=> $status} );
+# ---------------------------------------------------
+# number format
 my $period            = GetBudgetPeriod;
 my $budget_period_id  = $period->{budget_period_id};
 my $budget_branchcode = $period->{budget_branchcode};
 my $moo               = GetBudgetHierarchy('',$homebranch, $template->{param_map}->{'USER_INFO'}[0]->{'borrowernumber'} );
-my @results           = @$moo;
+@results           = @$moo;
 my $period_total      = 0;
 my $toggle            = 0;
 my @loop;
-my ( $total, $totspent, $totcomtd, $totavail );
 
 foreach my $result (@results) {
     # only get top-level budgets for display

diff --git a/acqui/addorderiso2709.pl b/acqui/addorderiso2709.pl
index 7ca6746..baf3d00 100755 (executable)
--- a/acqui/addorderiso2709.pl
+++ b/acqui/addorderiso2709.pl
@@ -208,11 +208,11 @@ if ($op eq ""){
                                 $found = 1;
                             }
                         }
-                        push @{$item->{tags}}, @tags[$i];
-                        push @{$item->{subfields}}, @subfields[$i];
-                        push @{$item->{field_values}}, @field_values[$i];
-                        push @{$item->{ind_tag}}, @ind_tag[$i];
-                        push @{$item->{indicator}}, @indicator[$i];
+                        push @{$item->{tags}}, $tags[$i];
+                        push @{$item->{subfields}}, $subfields[$i];
+                        push @{$item->{field_values}}, $field_values[$i];
+                        push @{$item->{ind_tag}}, $ind_tag[$i];
+                        push @{$item->{indicator}}, $indicator[$i];
                         $item->{itemid} = $itemid;
                         if (! $found){
                              push @items, $item;

diff --git a/cataloguing/moveitem.pl b/cataloguing/moveitem.pl
index 586ae36..0f842ca 100755 (executable)
--- a/cataloguing/moveitem.pl
+++ b/cataloguing/moveitem.pl
@@ -82,7 +82,7 @@ if ($barcode && $biblionumber) {
                                        my $orderitem = {
                                                ordernumber => $order->{'ordernumber'},
                                                itemnumber => $itemnumber,
-                                               newitemnumber => $newitemnumber,
+                                               newitemnumber => $itemnumber,
                                        };
                                        ModOrderItem($orderitem);
                                }

diff --git a/installer/data/mysql/atomicupdate/0001-bug_2929-permit_to_define_fine_days_in_issuing_rules.pl b/installer/data/mysql/atomicupdate/0001-bug_2929-permit_to_define_fine_days_in_issuing_rules.pl
index dfe3b6b..94a2006 100755 (executable)
--- a/installer/data/mysql/atomicupdate/0001-bug_2929-permit_to_define_fine_days_in_issuing_rules.pl
+++ b/installer/data/mysql/atomicupdate/0001-bug_2929-permit_to_define_fine_days_in_issuing_rules.pl
@@ -8,7 +8,7 @@ $dbh->do("ALTER TABLE issuingrules ADD
                COLUMN `renewalsallowed` smallint(6) default NULL, 
                COLUMN `reservesallowed` smallint(6) default NULL,
                ");
-$sth = $dbh->prepare("SELECT itemtype, renewalsallowed FROM itemtypes");
+my $sth = $dbh->prepare("SELECT itemtype, renewalsallowed FROM itemtypes");
 $sth->execute();
 
 my $sthupd = $dbh->prepare("UPDATE issuingrules SET renewalsallowed = ? WHERE itemtype = ?");