Bug 8836 [QA Followup] - Fix koha-qa.pl errors reported

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Trusting the sign off on the other page, I only tested the QA changes

Signed-off-by: Cindy Murdock Ames <cmurdock@ccfls.org>

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

diff --git a/circ/returns.pl b/circ/returns.pl
index 8a17a10..eeb0fe3 100755 (executable)
--- a/circ/returns.pl
+++ b/circ/returns.pl
@@ -217,7 +217,7 @@ if ($dotransfer){
 # An item has been returned to a branch other than the homebranch, and the librarian has chosen to initiate a transfer
     my $transferitem = $query->param('transferitem');
     my $tobranch     = $query->param('tobranch');
-    ModItemTransfer($transferitem, $userenv_branch, $tobranch); 
+    ModItemTransfer($transferitem, $userenv_branch, $tobranch);
 }
 
 if ($canceltransfer){
@@ -276,7 +276,7 @@ if ($barcode) {
         itembarcode      => $biblio->{'barcode'},
         itemtype         => $biblio->{'itemtype'},
         ccode            => $biblio->{'ccode'},
-        itembiblionumber => $biblio->{'biblionumber'},    
+        itembiblionumber => $biblio->{'biblionumber'},
         borrower         => $borrower,
         additional_materials => $biblio->{'materials'},
     );
@@ -305,7 +305,7 @@ if ($barcode) {
                 $template->param( fineborrowernumber => $borrower->{'borrowernumber'} );
             }
         }
-        
+
         if (C4::Context->preference("WaitingNotifyAtCheckin") ) {
             #Check for waiting holds
             my @reserves = GetReservesFromBorrowernumber($borrower->{'borrowernumber'});
@@ -314,7 +314,7 @@ if ($barcode) {
                 if ( $num_res->{'found'} eq 'W' && $num_res->{'branchcode'} eq $userenv_branch) {
                     $waiting_holds++;
                 }
-            } 
+            }
             if ($waiting_holds > 0) {
                 $template->param(
                     waiting_holds       => $waiting_holds,
@@ -600,7 +600,7 @@ $template->param(
     BlockReturnOfWithdrawnItems => C4::Context->preference("BlockReturnOfWithdrawnItems"),
 );
 
-my $itemnumber = GetItemnumberFromBarcode( $query->param('barcode') );
+$itemnumber = GetItemnumberFromBarcode( $query->param('barcode') );
 if ( $itemnumber ) {
    my ( $holdingBranch, $collectionBranch ) = GetCollectionItemBranches( $itemnumber );
     if ( ! ( $holdingBranch eq $collectionBranch ) ) {

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 1f8cdc4..37b8cde 100755 (executable)
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -3417,10 +3417,10 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
 $DBversion = '3.01.00.108';
 if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
        $dbh->do(qq{
-       ALTER TABLE `export_format` ADD `csv_separator` VARCHAR( 2 ) NOT NULL AFTER `marcfields` ,
-       ADD `field_separator` VARCHAR( 2 ) NOT NULL AFTER `csv_separator` ,
-       ADD `subfield_separator` VARCHAR( 2 ) NOT NULL AFTER `field_separator`
-       });
+    ALTER TABLE `export_format` ADD `csv_separator` VARCHAR( 2 ) NOT NULL AFTER `marcfields` ,
+    ADD `field_separator` VARCHAR( 2 ) NOT NULL AFTER `csv_separator` ,
+    ADD `subfield_separator` VARCHAR( 2 ) NOT NULL AFTER `field_separator`
+    });
        print "Upgrade to $DBversion done (added separators for csv export)\n";
     SetVersion ($DBversion);
 }

diff --git a/rotating_collections/addItems.pl b/rotating_collections/addItems.pl
index 9ef4f39..10be5cb 100755 (executable)
--- a/rotating_collections/addItems.pl
+++ b/rotating_collections/addItems.pl
@@ -30,7 +30,7 @@ my $query = new CGI;
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "rotating_collections/addItems.tmpl",
+        template_name   => "rotating_collections/addItems.tt",
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,

diff --git a/rotating_collections/editCollections.pl b/rotating_collections/editCollections.pl
index aa46f44..39e94a5 100755 (executable)
--- a/rotating_collections/editCollections.pl
+++ b/rotating_collections/editCollections.pl
@@ -30,7 +30,7 @@ my $query = new CGI;
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "rotating_collections/editCollections.tmpl",
+        template_name   => "rotating_collections/editCollections.tt",
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,

diff --git a/rotating_collections/rotatingCollections.pl b/rotating_collections/rotatingCollections.pl
index 59bbcdb..a27ce74 100755 (executable)
--- a/rotating_collections/rotatingCollections.pl
+++ b/rotating_collections/rotatingCollections.pl
@@ -29,7 +29,7 @@ my $query = new CGI;
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "rotating_collections/rotatingCollections.tmpl",
+        template_name   => "rotating_collections/rotatingCollections.tt",
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,

diff --git a/rotating_collections/transferCollection.pl b/rotating_collections/transferCollection.pl
index 630c222..6f92356 100755 (executable)
--- a/rotating_collections/transferCollection.pl
+++ b/rotating_collections/transferCollection.pl
@@ -33,7 +33,7 @@ my $toBranch = $query->param('toBranch');
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "rotating_collections/transferCollection.tmpl",
+        template_name   => "rotating_collections/transferCollection.tt",
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,