gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Kyle M Hall 2014-10-15 10:46:28 -04:00 committed by Tomas Cohen Arazi
parent d14a0cf5be
commit 4aa0e21f86
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
circ/returns.pl
View File

@ -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 ) ) {

8
installer/data/mysql/updatedatabase.pl
View File

@ -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);
}

2
rotating_collections/addItems.pl
View File

@ -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,

2
rotating_collections/editCollections.pl
View File

@ -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,

2
rotating_collections/rotatingCollections.pl
View File

@ -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,

2
rotating_collections/transferCollection.pl
View File

@ -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,