Attachment #55346 for bug #15758

View | Details | Raw Unified | Return to bug 15758
Collapse All | Expand All

Lines 301-309 sub GetBasketAsCSV { Link Here

(-)a/C4/Acquisition.pm (-6 / +14 lines)
301	notes => $order->{'order_vendornote'},	301	notes => $order->{'order_vendornote'},
302	quantity => $order->{'quantity'},	302	quantity => $order->{'quantity'},
303	rrp => $order->{'rrp'},	303	rrp => $order->{'rrp'},
304	deliveryplace => C4::Branch::GetBranchName( $basket->{'deliveryplace'} ),
305	billingplace => C4::Branch::GetBranchName( $basket->{'billingplace'} ),
306	};	304	};
		305	for my $place ( qw( deliveryplace billingplace ) ) {
		306	if ( my $library = Koha::Libraries->find( $row->{deliveryplace} ) ) {
		307	$row->{$place} = $library->branchname
		308	}
		309	}
307	foreach(qw(	310	foreach(qw(
308	contractname author title publishercode collectiontitle notes	311	contractname author title publishercode collectiontitle notes
309	deliveryplace billingplace	312	deliveryplace billingplace
Lines 374-384 sub GetBasketGroupAsCSV { Link Here
374	booksellerpostal => $bookseller->{postal},	377	booksellerpostal => $bookseller->{postal},
375	contractnumber => $contract->{contractnumber},	378	contractnumber => $contract->{contractnumber},
376	contractname => $contract->{contractname},	379	contractname => $contract->{contractname},
377	basketgroupdeliveryplace => C4::Branch::GetBranchName( $basketgroup->{deliveryplace} ),	380	basketgroupdeliveryplace => $basketgroup->{deliveryplace},
378	basketgroupbillingplace => C4::Branch::GetBranchName( $basketgroup->{billingplace} ),	381	basketgroupbillingplace => $basketgroup->{billingplace},
379	basketdeliveryplace => C4::Branch::GetBranchName( $basket->{deliveryplace} ),	382	basketdeliveryplace => $basket->{deliveryplace},
380	basketbillingplace => C4::Branch::GetBranchName( $basket->{billingplace} ),	383	basketbillingplace => $basket->{billingplace},
381	};	384	};
		385	for my $place (qw( basketgroupdeliveryplace basketgroupbillingplace basketdeliveryplace basketbillingplace )) {
		386	if ( my $library = Koha::Libraries->find( $row->{deliveryplace} ) ) {
		387	$row->{$place} = $library->branchname;
		388	}
		389	}
382	foreach(qw(	390	foreach(qw(
383	basketname author title publishercode collectiontitle notes	391	basketname author title publishercode collectiontitle notes
384	booksellername bookselleraddress booksellerpostal contractname	392	booksellername bookselleraddress booksellerpostal contractname




use Koha;
use Koha::Caches;
use Koha::AuthUtils qw(get_script_name hash_password);
use Koha::Libraries;
use Koha::LibraryCategories;
use Koha::Libraries;
use POSIX qw/strftime/;

                    # if they specify at login, use that
                    if ( $query->param('branch') ) {
                        $branchcode = $query->param('branch');
                        $branchname = Koha::Libraries->find($branchcode)->branchname;
                    }
                    my $branches = GetBranches();
                    if ( C4::Context->boolean_preference('IndependentBranches') && C4::Context->boolean_preference('Autolocation') ) {

                # if they specify at login, use that
                if ( $query->param('branch') ) {
                    $branchcode = $query->param('branch');
                    $branchname = Koha::Libraries->find($branchcode)->branchname;
                }
                my $branches = GetBranches();
                my @branchesloop;

Lines 42-47 use Koha::Caches; Link Here

(-)a/C4/Biblio.pm (-1 / +2 lines)
42	use Koha::Authority::Types;	42	use Koha::Authority::Types;
43	use Koha::Acquisition::Currencies;	43	use Koha::Acquisition::Currencies;
44	use Koha::SearchEngine;	44	use Koha::SearchEngine;
		45	use Koha::Libraries;
45		46
46	use vars qw(@ISA @EXPORT);	47	use vars qw(@ISA @EXPORT);
47	use vars qw($debug $cgi_debug);	48	use vars qw($debug $cgi_debug);
Lines 1698-1704 sub GetAuthorisedValueDesc { Link Here
1698		1699
1699	#---- branch	1700	#---- branch
1700	if ( $tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) {	1701	if ( $tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) {
1701	return C4::Branch::GetBranchName($value);	1702	return Koha::Libraries->find($value)->branchname;
1702	}	1703	}
1703		1704
1704	#---- itemtypes	1705	#---- itemtypes




BEGIN {
	@ISA    = qw(Exporter);
	@EXPORT = qw(
		&GetBranchName
		&GetBranch
		&GetBranches
		&GetBranchesLoop

    return \@loop;
}

=head2 GetBranchName

=cut

sub GetBranchName {
    my ($branchcode) = @_;
    my $dbh = C4::Context->dbh;
    my $sth;
    $sth = $dbh->prepare("Select branchname from branches where branchcode=?");
    $sth->execute($branchcode);
    my $branchname = $sth->fetchrow_array;
    return ($branchname);
}

=head2 GetBranch

$branch = GetBranch( $query, $branches );




                $issuingimpossible{ITEMNOTSAMEBRANCH} = 1;
                $issuingimpossible{'itemhomebranch'} = $item->{C4::Context->preference("HomeOrHoldingBranch")};
            }
            $needsconfirmation{BORRNOTSAMEBRANCH} = $borrower->{'branchcode'}
              if ( $borrower->{'branchcode'} ne $userenv->{branch} );
        }
    }

            my $resbor = $res->{'borrowernumber'};
            if ( $resbor ne $borrower->{'borrowernumber'} ) {
                my ( $resborrower ) = C4::Members::GetMember( borrowernumber => $resbor );
                my $branchname = GetBranchName( $res->{'branchcode'} );
                if ( $restype eq "Waiting" )
                {
                    # The item is on reserve and waiting, but has been

                    $needsconfirmation{'ressurname'} = $resborrower->{'surname'};
                    $needsconfirmation{'rescardnumber'} = $resborrower->{'cardnumber'};
                    $needsconfirmation{'resborrowernumber'} = $resborrower->{'borrowernumber'};
                    $needsconfirmation{'resbranchcode'} = $res->{branchcode};
                    $needsconfirmation{'reswaitingdate'} = $res->{'waitingdate'};
                }
                elsif ( $restype eq "Reserved" ) {

                    $needsconfirmation{'ressurname'} = $resborrower->{'surname'};
                    $needsconfirmation{'rescardnumber'} = $resborrower->{'cardnumber'};
                    $needsconfirmation{'resborrowernumber'} = $resborrower->{'borrowernumber'};
                    $needsconfirmation{'resbranchcode'} = $res->{branchcode};
                    $needsconfirmation{'resreservedate'} = $res->{'reservedate'};
                }
            }

Lines 36-41 use DateTime; Link Here

(-)a/C4/ILSDI/Services.pm (-7 / +16 lines)
36	use C4::Auth;	36	use C4::Auth;
37	use C4::Members::Attributes qw(GetBorrowerAttributes);	37	use C4::Members::Attributes qw(GetBorrowerAttributes);
38		38
		39	use Koha::Libraries;
		40
39	=head1 NAME	41	=head1 NAME
40		42
41	C4::ILS-DI::Services - ILS-DI Services	43	C4::ILS-DI::Services - ILS-DI Services
Lines 220-227 sub GetRecords { Link Here
220	delete $item->{'more_subfields_xml'};	222	delete $item->{'more_subfields_xml'};
221		223
222	# Display branch names instead of branch codes	224	# Display branch names instead of branch codes
223	$item->{'homebranchname'} = GetBranchName( $item->{'homebranch'} );	225	my $home_library = Koha::Libraries->find( $item->{homebranch} );
224	$item->{'holdingbranchname'} = GetBranchName( $item->{'holdingbranch'} );	226	my $holding_library = Koha::Libraries->find( $item->{holdingbranch} );
		227	$item->{'homebranchname'} = $home_library ? $home_library->branchname : '';
		228	$item->{'holdingbranchname'} = $holding_library ? $holding_library->branchname : '';
225	}	229	}
226		230
227	# Hashref building...	231	# Hashref building...
Lines 366-372 sub GetPatronInfo { Link Here
366		370
367	# Cleaning the borrower hashref	371	# Cleaning the borrower hashref
368	$borrower->{'charges'} = $borrower->{'flags'}->{'CHARGES'}->{'amount'};	372	$borrower->{'charges'} = $borrower->{'flags'}->{'CHARGES'}->{'amount'};
369	$borrower->{'branchname'} = GetBranchName( $borrower->{'branchcode'} );	373	my $library = Koha::Libraries->find( $borrower->{branchcode} );
		374	$borrower->{'branchname'} = $library ? $library->branchname : '';
370	delete $borrower->{'flags'};	375	delete $borrower->{'flags'};
371	delete $borrower->{'userid'};	376	delete $borrower->{'userid'};
372	delete $borrower->{'password'};	377	delete $borrower->{'password'};
Lines 406-412 sub GetPatronInfo { Link Here
406		411
407	# Get additional informations	412	# Get additional informations
408	my $item = GetBiblioFromItemNumber( $reserve->{'itemnumber'}, undef );	413	my $item = GetBiblioFromItemNumber( $reserve->{'itemnumber'}, undef );
409	my $branchname = GetBranchName( $reserve->{'branchcode'} );	414	my $library = Koha::Libraries->find( $reserve->{branchcode} );
		415	my $branchname = $library ? $library->branchname : '';
410		416
411	# Remove unwanted fields	417	# Remove unwanted fields
412	delete $item->{'marc'};	418	delete $item->{'marc'};
Lines 640-646 sub HoldTitle { Link Here
640	# Hashref building	646	# Hashref building
641	my $out;	647	my $out;
642	$out->{'title'} = $title;	648	$out->{'title'} = $title;
643	$out->{'pickup_location'} = GetBranchName($branch);	649	my $library = Koha::Libraries->find( $branch );
		650	$out->{'pickup_location'} = $library ? $library->branchname : '';
644		651
645	# TODO $out->{'date_available'} = '';	652	# TODO $out->{'date_available'} = '';
646		653
Lines 716-722 sub HoldItem { Link Here
716		723
717	# Hashref building	724	# Hashref building
718	my $out;	725	my $out;
719	$out->{'pickup_location'} = GetBranchName($branch);	726	my $library = Koha::Libraries->find( $branch );
		727	$out->{'pickup_location'} = $library ? $library->branchname : '';
720		728
721	# TODO $out->{'date_available'} = '';	729	# TODO $out->{'date_available'} = '';
722		730
Lines 772-778 sub _availability { Link Here
772	}	780	}
773		781
774	my $biblionumber = $item->{'biblioitemnumber'};	782	my $biblionumber = $item->{'biblioitemnumber'};
775	my $location = GetBranchName( $item->{'holdingbranch'} );	783	my $library = Koha::Libraries->find( $item->{holdingbranch} );
		784	my $location = $library ? $library->branchname : '';
776		785
777	if ( $item->{'notforloan'} ) {	786	if ( $item->{'notforloan'} ) {
778	return ( $biblionumber, 'not available', 'Not for loan', $location );	787	return ( $biblionumber, 'not available', 'Not for loan', $location );




use Koha::Items;
use Koha::SearchEngine;
use Koha::SearchEngine::Search;
use Koha::Libraries;

use vars qw(@ISA @EXPORT);



    # check for valid home branch
    if (exists $item_ref->{'homebranch'} and defined $item_ref->{'homebranch'}) {
        my $home_library = Koha::Libraries->find( $item_ref->{homebranch} );
        unless (defined $home_library) {
            # relies on fact that branches.branchname is a non-NULL column,
            # so GetBranchName returns undef only if branch does not exist
            $errors{'invalid_homebranch'} = $item_ref->{'homebranch'};
        }
    }

    # check for valid holding branch
    if (exists $item_ref->{'holdingbranch'} and defined $item_ref->{'holdingbranch'}) {
        my $holding_library = Koha::Libraries->find( $item_ref->{holdingbranch} );
        unless (defined $holding_library) {
            # relies on fact that branches.branchname is a non-NULL column,
            # so GetBranchName returns undef only if branch does not exist
            $errors{'invalid_holdingbranch'} = $item_ref->{'holdingbranch'};
        }
    }

Lines 97-105 sub _get_label_item { Link Here

(-)a/C4/Labels/Label.pm (-3 / +4 lines)
97	$data->{'itype'} = $data1->{'description'};	97	$data->{'itype'} = $data1->{'description'};
98	# add *_description fields	98	# add *_description fields
99	if ($data->{'homebranch'} \|\| $data->{'holdingbranch'}){	99	if ($data->{'homebranch'} \|\| $data->{'holdingbranch'}){
100	require C4::Branch;	100	require Koha::Libraries;
101	$data->{'homebranch_description'} = C4::Branch::GetBranchName($data->{'homebranch'}) if $data->{'homebranch'};	101	# FIXME Is this used??
102	$data->{'holdingbranch_description'} = C4::Branch::GetBranchName($data->{'holdingbranch'}) if $data->{'holdingbranch'};	102	$data->{'homebranch_description'} = Koha::Libraries->find($data->{'homebranch'})->branchname if $data->{'homebranch'};
		103	$data->{'holdingbranch_description'} = Koha::Libraries->find($data->{'holdingbranch'})->branchname if $data->{'holdingbranch'};
103	}	104	}
104	$data->{'ccode_description'} = C4::Biblio::GetAuthorisedValueDesc('','', $data->{'ccode'} ,'','','CCODE', 1) if $data->{'ccode'};	105	$data->{'ccode_description'} = C4::Biblio::GetAuthorisedValueDesc('','', $data->{'ccode'} ,'','','CCODE', 1) if $data->{'ccode'};
105	$data->{'location_description'} = C4::Biblio::GetAuthorisedValueDesc('','', $data->{'location'} ,'','','LOC', 1) if $data->{'location'};	106	$data->{'location_description'} = C4::Biblio::GetAuthorisedValueDesc('','', $data->{'location'} ,'','','LOC', 1) if $data->{'location'};




use C4::Koha;
use C4::Members;
use C4::Reserves;
use C4::Branch qw(GetBranchName);
use C4::Items qw( GetBarcodeFromItemnumber GetItemnumbersForBiblio);
use C4::Auth qw(checkpw);

use Koha::Libraries;

our $kp;    # koha patron


sub library_name {
    my $self = shift;
    unless ($self->{library_name}) {
        my $library = Koha::Libraries->find( $self->{branchcode} );
        $self->{library_name} = $library ? $library->branchname : '';
    }
    return $self->{library_name};
}




use C4::Biblio;    # GetMarcFromKohaField, GetBiblioData
use C4::Koha;      # getFacets
use Koha::DateUtils;
use Koha::Libraries;
use Lingua::Stem;
use C4::Search::PazPar2;
use XML::Simple;

            $limit_cgi  .= "&limit=" . uri_escape_utf8($this_limit);
            if ($this_limit =~ /^branch:(.+)/) {
                my $branchcode = $1;
                my $library = Koha::Libraries->find( $branchcode );
                if (defined $library) {
                    $limit_desc .= " branch:" . $library->branchname;
                } else {
                    $limit_desc .= " $this_limit";
                }




    }
);

my $user = GetMember( 'borrowernumber' => $loggedinuser );
my $branchname = GetBranchName($user->{branchcode});

my $status           = $query->param('status') || "ASKED";
my $suggestions_count       = CountSuggestion($status);


foreach my $budget ( @{$budget_arr} ) {
    next unless (CanUserUseBudget($loggedinuser, $budget, $userflags));

    $budget->{'budget_branchname'} =
      GetBranchName( $budget->{'budget_branchcode'} );

    my $member = GetMember( borrowernumber => $budget->{budget_owner_id} );
    if ($member) {
        $budget->{budget_owner_firstname} = $member->{'firstname'};

$template->param(
    type          => 'intranet',
    loop_budget   => \@budget_loop,
    branchname    => $branchname,
    total         => $total,
    totspent      => $totspent,
    totordered    => $totordered,





    if ($basket->{basketgroupid}){
        $basketgroup = GetBasketgroup($basket->{basketgroupid});
        $basketgroup->{deliveryplacename} = C4::Branch::GetBranchName( $basketgroup->{deliveryplace} );
        $basketgroup->{billingplacename} = C4::Branch::GetBranchName( $basketgroup->{billingplace} );
    }
    my $borrower= GetMember('borrowernumber' => $loggedinuser);
    my $budgets = GetBudgetHierarchy;

        basketno             => $basketno,
        basket               => $basket,
        basketname           => $basket->{'basketname'},
        basketbranchcode     => $basket->{branch},
        basketnote           => $basket->{note},
        basketbooksellernote => $basket->{booksellernote},
        basketcontractno     => $basket->{contractnumber},

        closedate            => $basket->{closedate},
        estimateddeliverydate=> $estimateddeliverydate,
        is_standing          => $basket->{is_standing},
        deliveryplace        => $basket->{deliveryplace},
        billingplace         => $basket->{billingplace},
        active               => $bookseller->{'active'},
        booksellerid         => $bookseller->{'id'},
        name                 => $bookseller->{'name'},




    my @items;
    foreach (@itemnumbers) {
        my $item = GetItem($_);
        if($item->{homebranch}) {
            $item->{homebranchname} = GetBranchName($item->{homebranch});
        }
        if($item->{holdingbranch}) {
            $item->{holdingbranchname} = GetBranchName($item->{holdingbranch});
        }
        if(my $code = GetAuthValCode("items.notforloan", $fw)) {
            $item->{notforloan} = GetKohaAuthorisedValueLib($code, $item->{notforloan});
        }




use warnings;
use utf8;

use C4::Branch qw(GetBranchName);

use Koha::Number::Price;
use Koha::DateUtils;
use Koha::Libraries;

    my $number = 3;
    for my $basket (@$baskets){
        my $page = $pdf->page();
        my $billing_library = Koha::Libraries->find( $basket->{billingplace} );
        my $delivery_library = Koha::Libraries->find( $basket->{deliveryplace} );

        # print basket header (box)
        my $box = $page->gfx;
        $box->rectxy(($width - 10)/mm, ($height - 5)/mm, 10/mm, ($height - 25)/mm);

        $text->text("Order no. ".$basketgroup->{'id'}.". Basket no. ".$basket->{basketno}.". ".$basket->{booksellernote});
        $text->translate(20/mm,  ($height-20)/mm);
        $text->font( $pdf->corefont("Times", -encoding => "utf8"), 4/mm );
        $text->text( ( $billing_library ? "Billing at " . $billing_library->branchname : "" )
            . ( $billing_library and $delivery_library ? " and " : "" )
            . ( $delivery_library ? "delivery at " . $delivery_library->branchname : "" )
        );

        my $pdftable = new PDF::Table();




use warnings;
use utf8;

use C4::Branch qw(GetBranchName);

use Koha::Number::Price;
use Koha::DateUtils;
use Koha::Libraries;

    my $number = 3;
    for my $basket (@$baskets){
        my $page = $pdf->page();
        my $billing_library = Koha::Libraries->find( $basket->{billingplace} );
        my $delivery_library = Koha::Libraries->find( $basket->{deliveryplace} );

        # print basket header (box)
        my $box = $page->gfx;

        $text->text("Commande N°".$basketgroup->{'id'}.". Panier N° ".$basket->{basketno}.". ".$basket->{booksellernote});
        $text->translate(20/mm,  ($height-20)/mm);
        $text->font( $pdf->corefont("Times", -encoding => "utf8"), 4/mm );
        $text->text( ( $billing_library ? "Facturation à " . $billing_library->branchname : "" )
            . ( $billing_library and $delivery_library ? " et " : "" )
            . ( $delivery_library ? "livraison à " . $delivery_library->branchname : "" )
        );

        my $pdftable = new PDF::Table();




	$branchcode = $input->param('branchcode');
}

my $branchname = GetBranchName($branchcode);

# Getting the branches for user selection
my $branches = GetBranches();
my @branch_loop;

		$row_data{ code }         = $code;
		$row_data{ toBranch }     = $toBranch;
		$row_data{ isChecked }    = $isChecked;	
		$row_data{ toBranchname } = GetBranchName($toBranch);	
		push( @to_branch_loop, \%row_data );
	}


		branch_loop => \@branch_loop,
		branchcode_loop => \@branchcode_loop,
		branchcode => $branchcode,
		branchname => $branchname,
        limitType => $limitType,
		);





use C4::Auth;
use C4::Koha;
use C4::Debug;
use C4::Branch; # GetBranchesLoop

my $input = new CGI;
my $dbh = C4::Context->dbh;

my $branchloop = GetBranchesLoop;

$template->param(frombranch     => $frombranch)                if ($frombranch);
$template->param(frombranchname => GetBranchName($frombranch)) if ($frombranch);
$template->param(tobranch       => $tobranch)                  if ($tobranch);
$template->param(tobranchname   => GetBranchName($tobranch))   if ($tobranch);

$template->param(branchloop => $branchloop);


Lines 161-167 foreach my $subscription (@subscriptions) { Link Here

(-)a/catalogue/detail.pl (-1 lines)
161	$cell{missinglist} = $subscription->{missinglist};	161	$cell{missinglist} = $subscription->{missinglist};
162	$cell{librariannote} = $subscription->{librariannote};	162	$cell{librariannote} = $subscription->{librariannote};
163	$cell{branchcode} = $subscription->{branchcode};	163	$cell{branchcode} = $subscription->{branchcode};
164	$cell{branchname} = GetBranchName($subscription->{branchcode});
165	$cell{hasalert} = $subscription->{hasalert};	164	$cell{hasalert} = $subscription->{hasalert};
166	$cell{callnumber} = $subscription->{callnumber};	165	$cell{callnumber} = $subscription->{callnumber};
167	$cell{closed} = $subscription->{closed};	166	$cell{closed} = $subscription->{closed};





use C4::Auth;
use C4::Biblio;
use C4::Branch;
use C4::Items;
use C4::Koha;
use C4::Output;
use Koha::Libraries;

my $cgi = new CGI;


    $item = GetItem($itemnumber);

    if($item->{homebranch}) {
        $item->{homebranchname} = Koha::Libraries->find($item->{homebranch})->branchname;
    }

    if($item->{holdingbranch}) {
        $item->{holdingbranchname} = Koha::Libraries->find($item->{holdingbranch})->branchname;
    }

    if(my $code = GetAuthValCode("items.notforloan", $fw)) {

Lines 178-185 foreach my $item (@items){ Link Here

(-)a/catalogue/moredetail.pl (-2 lines)
178	$item->{'nomod'}=1;	178	$item->{'nomod'}=1;
179	}	179	}
180	}	180	}
181	$item->{'homebranchname'} = GetBranchName($item->{'homebranch'});
182	$item->{'holdingbranchname'} = GetBranchName($item->{'holdingbranch'});
183	if ($item->{'datedue'}) {	181	if ($item->{'datedue'}) {
184	$item->{'issue'}= 1;	182	$item->{'issue'}= 1;
185	} else {	183	} else {

Lines 125-131 foreach my $num (@getoverdues) { Link Here

(-)a/circ/branchoverdues.pl (-1 / +1 lines)
125	$overdueforbranch{'borrowerfirstname'} = $num->{'firstname'};	125	$overdueforbranch{'borrowerfirstname'} = $num->{'firstname'};
126	$overdueforbranch{'borrowerphone'} = $num->{'phone'};	126	$overdueforbranch{'borrowerphone'} = $num->{'phone'};
127	$overdueforbranch{'borroweremail'} = $num->{'email'};	127	$overdueforbranch{'borroweremail'} = $num->{'email'};
128	$overdueforbranch{'homebranch'} = GetBranchName($num->{'homebranch'});	128	$overdueforbranch{'homebranch'} = $num->{'homebranch'};
129	$overdueforbranch{'itemcallnumber'} = $num->{'itemcallnumber'};	129	$overdueforbranch{'itemcallnumber'} = $num->{'itemcallnumber'};
130	$overdueforbranch{'borrowernumber'} = $num->{'borrowernumber'};	130	$overdueforbranch{'borrowernumber'} = $num->{'borrowernumber'};
131	$overdueforbranch{'itemnumber'} = $num->{'itemnumber'};	131	$overdueforbranch{'itemnumber'} = $num->{'itemnumber'};

Lines 628-634 $template->param( Link Here

(-)a/circ/circulation.pl (-1 lines)
628	borrowernumber => $borrowernumber,	628	borrowernumber => $borrowernumber,
629	categoryname => $borrower->{'description'},	629	categoryname => $borrower->{'description'},
630	branch => $branch,	630	branch => $branch,
631	branchname => GetBranchName($borrower->{'branchcode'}),
632	was_renewed => scalar $query->param('was_renewed') ? 1 : 0,	631	was_renewed => scalar $query->param('was_renewed') ? 1 : 0,
633	expiry => $borrower->{'dateexpiry'},	632	expiry => $borrower->{'dateexpiry'},
634	roadtype => $roadtype,	633	roadtype => $roadtype,




use C4::Items;
use C4::Members;
use C4::Members::Messaging;
use C4::Branch; # GetBranches
use C4::Koha;   # FIXME : is it still useful ?
use C4::RotatingCollections;
use Koha::DateUtils;

            itemnumber     => $iteminfo->{'itemnumber'},
            itembiblionumber => $iteminfo->{'biblionumber'},
            iteminfo       => $iteminfo->{'author'},
            tobranchname   => GetBranchName($messages->{'transfert'}),
            name           => $name,
            borrowernumber => $borrowernumber,
            borcnum        => $borr->{'cardnumber'},

        if ( ! ( $holdingBranch eq $collectionBranch ) ) {
            $template->param(
              collectionItemNeedsTransferred => 1,
              collectionBranchName => GetBranchName($collectionBranch),
              collectionBranch => $collectionBranch,
              itemnumber => $itemnumber,
            );

Lines 28-33 use C4::Print; # GetPrinters Link Here

(-)a/circ/selectbranchprinter.pl (-1 / +3 lines)
28	use C4::Koha;	28	use C4::Koha;
29	use C4::Branch; # GetBranches GetBranchesLoop	29	use C4::Branch; # GetBranches GetBranchesLoop
30		30
		31	use Koha::Libraries;
		32
31	# this will be the script that chooses branch and printer settings....	33	# this will be the script that chooses branch and printer settings....
32		34
33	my $query = CGI->new();	35	my $query = CGI->new();
Lines 58-64 my @updated; Link Here
58	# $session lddines here are doing the updating	60	# $session lddines here are doing the updating
59	if ($branch and $branches->{$branch}) {	61	if ($branch and $branches->{$branch}) {
60	if (! $userenv_branch or $userenv_branch ne $branch ) {	62	if (! $userenv_branch or $userenv_branch ne $branch ) {
61	my $branchname = GetBranchName($branch);	63	my $branchname = Koha::Libraries->find($branch)->branchname;
62	$template->param(LoginBranchname => $branchname); # update template for new branch	64	$template->param(LoginBranchname => $branchname); # update template for new branch
63	$template->param(LoginBranchcode => $branch); # update template for new branch	65	$template->param(LoginBranchcode => $branch); # update template for new branch
64	$session->param('branchname', $branchname); # update sesssion in DB	66	$session->param('branchname', $branchname); # update sesssion in DB




use CGI qw ( -utf8 );
use C4::Context;
use C4::Output;
use C4::Branch; # GetBranchName
use C4::Auth;
use C4::Circulation;
use C4::Members;

    $getreserv{'subtitle'}       = GetRecordValue('subtitle', GetMarcBiblio($gettitle->{'biblionumber'}), GetFrameworkCode($gettitle->{'biblionumber'}));
    $getreserv{'biblionumber'}   = $gettitle->{'biblionumber'};
    $getreserv{'barcode'}        = $gettitle->{'barcode'};
    $getreserv{'branchname'}     = GetBranchName($gettitle->{'homebranch'});
    $getreserv{'homebranch'}     = $gettitle->{'homebranch'};
    $getreserv{'holdingbranch'}  = $gettitle->{'holdingbranch'};
    $getreserv{'itemcallnumber'} = $gettitle->{'itemcallnumber'};

        my $iteminfo = GetBiblioFromItemNumber($item);
        if ( $messages->{'transfert'} ) {
            $res{messagetransfert} = $messages->{'transfert'};
            $res{branchcode}       = $messages->{'transfert'};
        }

        $res{message}             = 1;

Lines 59-65 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc (-1 / +1 lines)
59	[% END %]	59	[% END %]
60	[% END %][% END %]	60	[% END %][% END %]
61	<li class="patroncategory">Category: [% categoryname %] ([% categorycode %])</li>	61	<li class="patroncategory">Category: [% categoryname %] ([% categorycode %])</li>
62	<li class="patronlibrary">Home library: [% IF ( branchname ) %][% branchname %][% ELSE %][% branch %][% END %]</li>	62	<li class="patronlibrary">Home library: [% Branches.GetName( branchcode ) %]</li>
63	</ul></div>	63	</ul></div>
64	<div id="menu">	64	<div id="menu">
65	<ul>	65	<ul>

Lines 1-4 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt (-2 / +3 lines)
1	[% USE Price %]	1	[% USE Price %]
		2	[% USE Branches %]
2	[% INCLUDE 'doc-head-open.inc' %]	3	[% INCLUDE 'doc-head-open.inc' %]
3	<title>Koha &rsaquo; Acquisitions</title>	4	<title>Koha &rsaquo; Acquisitions</title>
4	[% INCLUDE 'doc-head-close.inc' %]	5	[% INCLUDE 'doc-head-close.inc' %]
Lines 136-142 $(document).ready(function() { Link Here
136		137
137	[% IF ( loop_budget ) %]	138	[% IF ( loop_budget ) %]
138		139
139	<h3>All available funds[% IF ( branchname ) %] for [% branchname %][% END %]</h3>	140	<h3>All available funds[% IF LoginBranchname %] for [% LoginBranchname %][% END %]</h3>
140		141
141	<div id="BudgetsAndFunds">	142	<div id="BudgetsAndFunds">
142	<table id="accounts">	143	<table id="accounts">
Lines 196-202 $(document).ready(function() { Link Here
196		197
197	[% END %]	198	[% END %]
198	</td>	199	</td>
199	<td>[% loop_budge.budget_branchname %]</td>	200	<td>[% Branches.GetName( loop_budge.budget_branchcode ) %]</td>
200	<td class="data">	201	<td class="data">
201	[% IF loop_budge.budget_parent_id %]	202	[% IF loop_budge.budget_parent_id %]
202	[% loop_budge.budget_amount \| $Price %]	203	[% loop_budge.budget_amount \| $Price %]




[% USE KohaDates %]
[% USE Branches %]
[% USE Price %]
[% USE AuthorisedValues %]


                [% IF ( basketcontractno ) %]
                    <li><span class="label">Contract name:</span> <a href="../admin/aqcontract.pl?op=add_form&amp;contractnumber=[% basketcontractno %]&amp;booksellerid=[% booksellerid %]">[% basketcontractname %]</a></li>
                [% END %]
                [% IF deliveryplace %]<li><span class="label">Delivery place:</span> [% Branches.GetName( deliveryplace ) %]</li>[% END %]
                [% IF billingplace %]<li><span class="label">Billing place:</span> [% Branches.GetName( billingplace ) %]</li>[% END %]
                [% IF ( authorisedbyname ) %]<li><span class="label">Created by:</span>  [% authorisedbyname %]</li>[% END %]
                <li id="managedby">
                    <form action="" method="post">

                </li>
                <li id="branch">
                    <span class="label">Library:</span>
                    [% IF basketbranchcode %]
                        [% Branches.GetName( basketbranchcode ) %]
                    [% ELSE %]
                        No library
                    [% END %]

                            <input type="submit" value="Change basket group" />
                          [% END %]
                        </li>
                    [% IF basketgroup.deliveryplace %]<li><span class="label">Basket group delivery placename:</span> [% Branches.GetName( basketgroup.deliveryplace ) %]</li>[% END %]
                    [% IF basketgroup.billingplace %]<li><span class="label">Basket group billing place:</span> [% Branches.GetName( basketgroup.billingplace ) %]</li>[% END %]
                        </ol>
                    [% IF ( CAN_user_acquisition_group_manage ) %]
                    </form>

Lines 1-4 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt (-2 / +3 lines)
1	[% USE KohaDates %]	1	[% USE KohaDates %]
		2	[% USE Branches %]
2	[% INCLUDE 'doc-head-open.inc' %]	3	[% INCLUDE 'doc-head-open.inc' %]
3	<title>Koha &rsaquo; Acquisitions &rsaquo; Receipt summary for : [% name %] [% IF ( invoice ) %]invoice, [% invoice %][% END %]</title>	4	<title>Koha &rsaquo; Acquisitions &rsaquo; Receipt summary for : [% name %] [% IF ( invoice ) %]invoice, [% invoice %][% END %]</title>
4	[% INCLUDE 'doc-head-close.inc' %]	5	[% INCLUDE 'doc-head-close.inc' %]
Lines 238-245 Link Here
238	<td style="text-align:center"><input type="checkbox" name="items_to_receive" value="[% item.itemnumber %]" /></td>	239	<td style="text-align:center"><input type="checkbox" name="items_to_receive" value="[% item.itemnumber %]" /></td>
239	<td><a style="cursor:pointer" onclick="PopupEditPage([% item.biblionumber %],[% item.itemnumber %]);">Edit</a></td>	240	<td><a style="cursor:pointer" onclick="PopupEditPage([% item.biblionumber %],[% item.itemnumber %]);">Edit</a></td>
240	<td>[% item.barcode %]</td>	241	<td>[% item.barcode %]</td>
241	<td>[% item.homebranchname %]</td>	242	<td>[% Branches.GetName( item.homebranch )%]</td>
242	<td>[% item.holdingbranchname %]</td>	243	<td>[% Branches.GetName( item.holdingbranch ) %]</td>
243	<td>[% item.notforloan %]</td>	244	<td>[% item.notforloan %]</td>
244	<td>[% item.restricted %]</td>	245	<td>[% item.restricted %]</td>
245	<td>[% item.location %]</td>	246	<td>[% item.location %]</td>

Lines 1-3 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt (-2 / +3 lines)
		1	[% USE Branches %]
1	[% INCLUDE 'doc-head-open.inc' %]	2	[% INCLUDE 'doc-head-open.inc' %]
2	<title>Koha &rsaquo; Administration &rsaquo; Library checkin and transfer policy</title>	3	<title>Koha &rsaquo; Administration &rsaquo; Library checkin and transfer policy</title>
3	[% INCLUDE 'doc-head-close.inc' %]	4	[% INCLUDE 'doc-head-close.inc' %]
Lines 54-60 Link Here
54	<div id="yui-main">	55	<div id="yui-main">
55	<div class="yui-b">	56	<div class="yui-b">
56		57
57	<h1>Library [% branchcode %] - [% branchname %] Checkin and transfer policy</h1>	58	<h1>Library [% branchcode %] - [% Branches.GetName( branchcode ) %] Checkin and transfer policy</h1>
58	<form method="get" action="/cgi-bin/koha/admin/branch_transfer_limits.pl" id="selectlibrary">	59	<form method="get" action="/cgi-bin/koha/admin/branch_transfer_limits.pl" id="selectlibrary">
59	<label for="branchselect">Select a library :</label>	60	<label for="branchselect">Select a library :</label>
60	<select name="branchcode" id="branchselect">	61	<select name="branchcode" id="branchselect">
Lines 95-101 Link Here
95	<tbody>	96	<tbody>
96	[% FOREACH to_branch_loo IN codes_loo.to_branch_loop %]	97	[% FOREACH to_branch_loo IN codes_loo.to_branch_loop %]
97	<tr>	98	<tr>
98	<td><label style="min-width:400px;" for="[% to_branch_loo.code %][% to_branch_loo.toBranch %]row">[% to_branch_loo.toBranch %] - [% to_branch_loo.toBranchname %]</label></td>	99	<td><label style="min-width:400px;" for="[% to_branch_loo.code %][% to_branch_loo.toBranch %]row">[% to_branch_loo.toBranch %] - [% Branches.GetName( to_branch_loo.toBranch ) %]</label></td>
99	<td>	100	<td>
100	[% IF ( to_branch_loo.isChecked ) %]	101	[% IF ( to_branch_loo.isChecked ) %]
101	<input type="checkbox" id="[% to_branch_loo.code %][% to_branch_loo.toBranch %]row" name="[% to_branch_loo.code %]_[% to_branch_loo.toBranch %]" checked="checked" />	102	<input type="checkbox" id="[% to_branch_loo.code %][% to_branch_loo.toBranch %]row" name="[% to_branch_loo.code %]_[% to_branch_loo.toBranch %]" checked="checked" />

Lines 1-3 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt (-4 / +3 lines)
		1	[% USE Branches %]
1	[% INCLUDE 'doc-head-open.inc' %]	2	[% INCLUDE 'doc-head-open.inc' %]
2	<title>Koha &rsaquo; Administration &rsaquo; Circulation and fine rules &rsaquo; Clone circulation and fine rules</title>	3	<title>Koha &rsaquo; Administration &rsaquo; Circulation and fine rules &rsaquo; Clone circulation and fine rules</title>
3	[% INCLUDE 'doc-head-close.inc' %]	4	[% INCLUDE 'doc-head-close.inc' %]
Lines 14-23 Link Here
14	<div id="yui-main">	15	<div id="yui-main">
15	<div class="yui-b">	16	<div class="yui-b">
16	<h2>Cloning circulation and fine rules	17	<h2>Cloning circulation and fine rules
17	[% IF ( frombranchname \|\| tobranchname ) %]	18	[% IF frombranch %] from "[% Branches.GetName( frombranch ) %]"[% END %]
18	[% IF ( frombranchname ) %] from "[% frombranchname %]"[% END %]	19	[% IF tobranch %] to "[% Branches.GetName( tobranch ) %]"[% END %]
19	[% IF ( tobranchname ) %] to "[% tobranchname %]"[% END %]
20	[% END %]
21	</h2>	20	</h2>
22		21
23	[% IF ( result ) %]	22	[% IF ( result ) %]




                            [% item.translated_description %]
                        </td>
                    [% END %]
                    <td class="location">[% UNLESS ( singlebranchmode ) %][% Branches.GetName( item.branchcode ) %] [% END %]</td>
                    <td class="homebranch">[% Branches.GetName(item.homebranch) %]<span class="shelvingloc">[% item.location %]</span> </td>
                    [% IF ( itemdata_ccode ) %]<td>[% item.ccode %]</td>[% END %]
                    <td class="itemcallnumber">[% IF ( item.itemcallnumber ) %] [% item.itemcallnumber %][% END %]</td>

    <h2>This is a serial subscription</h2>
    <p> (There are [% subscriptionsnumber %] subscriptions associated with this title).</p> 
    [% FOREACH subscription IN subscriptions %]
            [% IF subscription.branchcode %]
                <h3>At library: [% Branches.GetName(subscription.branchcode) || subscription.branchcode %]</h3>
            [% END %]
            [% IF ( subscription.closed ) %]<p>This subscription is closed.</p>[% END %]
            [% IF ( subscription.callnumber ) %]<p>Callnumber: [% subscription.callnumber %] </p>[% END %]
            [% IF ( subscription.subscriptionnotes ) %]<p>[% subscription.subscriptionnotes FILTER html_line_break %] </p>[% END %]

Lines 1-4 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt (-2 / +3 lines)
1	[% USE Koha %]	1	[% USE Koha %]
		2	[% USE Branches %]
2	[% INCLUDE 'doc-head-open.inc' %]	3	[% INCLUDE 'doc-head-open.inc' %]
3	<title>Koha &rsaquo; Catalog &rsaquo; Item details for [% title %] [% FOREACH subtitl IN subtitle %] [% subtitl.subfield %][% END %]</title>	4	<title>Koha &rsaquo; Catalog &rsaquo; Item details for [% title %] [% FOREACH subtitl IN subtitle %] [% subtitl.subfield %][% END %]</title>
4	[% INCLUDE 'doc-head-close.inc' %]	5	[% INCLUDE 'doc-head-close.inc' %]
Lines 62-68 Link Here
62	[% END %]	63	[% END %]
63	[% END %][% END %]</h4>	64	[% END %][% END %]</h4>
64	<ol class="bibliodetails">	65	<ol class="bibliodetails">
65	<li><span class="label">Home library:</span> [% ITEM_DAT.homebranchname %] </li>	66	<li><span class="label">Home library:</span> [% Branches.GetName( ITEM_DAT.homebranch ) %] </li>
66	[% IF ( item_level_itypes ) %]	67	[% IF ( item_level_itypes ) %]
67	<li><span class="label">Item type:</span> [% ITEM_DAT.itype %] </li>	68	<li><span class="label">Item type:</span> [% ITEM_DAT.itype %] </li>
68	[% END %]	69	[% END %]
Lines 80-86 Link Here
80	)[% END %]</h4>	81	)[% END %]</h4>
81		82
82	<ol class="bibliodetails">	83	<ol class="bibliodetails">
83	<li><span class="label">Current location:</span> [% ITEM_DAT.holdingbranchname %] </li>	84	<li><span class="label">Current location:</span> [% Branches.GetName( ITEM_DAT.holdingbranch ) %] </li>
84	<li><span class="label">Checkout status:</span>	85	<li><span class="label">Checkout status:</span>
85	[% IF ( ITEM_DAT.issue ) %]Checked out to	86	[% IF ( ITEM_DAT.issue ) %]Checked out to
86	[% IF ( hidepatronname ) %]	87	[% IF ( hidepatronname ) %]

Lines 1-3 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt (-2 / +3 lines)
		1	[% USE Branches %]
1	[% INCLUDE 'doc-head-open.inc' %]	2	[% INCLUDE 'doc-head-open.inc' %]
2	<title>Koha &rsaquo; Circulation &rsaquo; Overdues at [% LoginBranchname %]</title>	3	<title>Koha &rsaquo; Circulation &rsaquo; Overdues at [% LoginBranchname %]</title>
3	[% INCLUDE 'doc-head-close.inc' %]	4	[% INCLUDE 'doc-head-close.inc' %]
Lines 54-60 Link Here
54	[% IF ( overduesloo.borroweremail ) %]<a href="mailto:[% overduesloo.borroweremail %]?subject=Overdue: [% overduesloo.title \|html %]">	55	[% IF ( overduesloo.borroweremail ) %]<a href="mailto:[% overduesloo.borroweremail %]?subject=Overdue: [% overduesloo.title \|html %]">
55	[% overduesloo.borroweremail %]</a>[% END %]	56	[% overduesloo.borroweremail %]</a>[% END %]
56	</td>	57	</td>
57	<td>[% overduesloo.homebranch %] [% overduesloo.itemcallnumber %]	58	<td>[% Branches.GetName( overduesloo.homebranch ) %] [% overduesloo.itemcallnumber %]
58	</td>	59	</td>
59	<td align="center">	60	<td align="center">
60	<b>	61	<b>
Lines 132-138 Link Here
132	[% todayoverduesloo.borroweremail %]</a>[% END %]	133	[% todayoverduesloo.borroweremail %]</a>[% END %]
133	</p>	134	</p>
134	</td>	135	</td>
135	<td><p>[% todayoverduesloo.homebranch %] [% todayoverduesloo.itemcallnumber %]</p>	136	<td><p>[% Branches.GetName( todayoverduesloo.homebranch ) %] [% todayoverduesloo.itemcallnumber %]</p>
136	</td>	137	</td>
137	<td align="center">	138	<td align="center">
138	<b>	139	<b>




[% END %]

[% IF ( RESERVE_WAITING ) %]
    <li>Item <i>[% getTitleMessageIteminfo %]</i> ([% getBarcodeMessageIteminfo %]) has been waiting for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% resborrowernumber %]">[% resfirstname %] [% ressurname %]</a> ([% rescardnumber %]) at [% Branches.GetName( resbranchcode ) %] since [% reswaitingdate | $KohaDates %]</li>
[% END %]

[% IF ( RESERVED ) %]
    <li>Item <i>[% getTitleMessageIteminfo %]</i> ([% getBarcodeMessageIteminfo %]) has been on hold for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% resborrowernumber %]">[% resfirstname %] [% ressurname %]</a> ([% rescardnumber %]) at [% Branches.GetName( resbranchcode ) %] since [% resreservedate | $KohaDates %]</li>
[% END %]

[% IF ( ISSUED_TO_ANOTHER ) %]

[% END %]

[% IF ( BORRNOTSAMEBRANCH ) %]
    <li>This patron is from a different library ([% Branches.GetName( BORRNOTSAMEBRANCH ) %])</li>
[% END %]

[% IF ( PATRON_CANT ) %]

Lines 164-170 $(document).ready(function() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt (-1 / +1 lines)
164	<li><i class="fa fa-li fa-warning"></i>Too many checked out.</li>	164	<li><i class="fa fa-li fa-warning"></i>Too many checked out.</li>
165	[% END %]	165	[% END %]
166	[% IF checkout_info.BORRNOTSAMEBRANCH %]	166	[% IF checkout_info.BORRNOTSAMEBRANCH %]
167	<li><i class="fa fa-li fa-warning"></i>This patron is from a different library ([% checkout_info.BORRNOTSAMEBRANCH %]).</li>	167	<li><i class="fa fa-li fa-warning"></i>This patron is from a different library ([% Branches.GetName( checkout_info.BORRNOTSAMEBRANCH ) %]).</li>
168	[% END %]	168	[% END %]
169	[% IF checkout_ino.PATRON_CANT %]	169	[% IF checkout_ino.PATRON_CANT %]
170	<li><i class="fa fa-li fa-warning"></i>This patron can't check out this item per library circulation policy.</li>	170	<li><i class="fa fa-li fa-warning"></i>This patron can't check out this item per library circulation policy.</li>

Lines 176-182 $(document).ready(function () { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-1 / +1 lines)
176		176
177	[% IF ( collectionItemNeedsTransferred ) %]	177	[% IF ( collectionItemNeedsTransferred ) %]
178	<div id="rotating-collection" class="dialog message">	178	<div id="rotating-collection" class="dialog message">
179	<h3>Please transfer item to: [% collectionBranchName %]</h3>	179	<h3>Please transfer item to: [% Branches.GetName( collectionBranch ) %]</h3>
180	<p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber %]">[% itembarcode \|html %]: [% title \|html %]</a></p>	180	<p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber %]">[% itembarcode \|html %]: [% title \|html %]</a></p>
181	<p>This item is part of a rotating collection.</p>	181	<p>This item is part of a rotating collection.</p>
182	<p><button type="button" class="openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber %]&branchcode=[% collectionBranch %]&op=slip"><i class="fa fa-print"></i> Print slip</button></p>	182	<p><button type="button" class="openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber %]&branchcode=[% collectionBranch %]&op=slip"><i class="fa fa-print"></i> Print slip</button></p>




        [% FOREACH cancel_result %]
            [% IF ( messagetransfert ) %]
                <div class="dialog message">
                    <h2>This item is on hold for pick-up at [% Branches.GetName( branchname ) %]</h2>
                    <p><strong>[% nextreservtitle %]</strong> is on hold for <strong> [% nextreservsurname %], [% nextreservfirstname %]</strong>.
                    Please retain this item and check it in to process the hold.
                    </p>

                            <input type="hidden" name="tbr" value="[% reserveloo.homebranch %]" />
                            <input type="hidden" name="tab" value="holdswaiting">
                            [% IF ( reserveloo.dotransfer ) %]
                            <input type="submit" value="Cancel hold and return to : [% Branches.GetName( reserveloo.homebranch ) %]" />
                            [% ELSE %]
                            <input type="submit" value="Cancel hold" />
                            [% END %]

                            <input type="hidden" name="tbr" value="[% overloo.homebranch %]" />
                            <input type="hidden" name="tab" value="holdsover">
                            [% IF ( overloo.dotransfer ) %]
                            <input type="submit" value="Cancel hold and return to : [% Branches.GetName( overloo.homebranch ) %]" />
                            [% ELSE %]
                            <input type="submit" value="Cancel hold" />
                            [% END %]

Lines 1-5 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt (+1 lines)
1	[% USE KohaDates %]	1	[% USE KohaDates %]
2	[% USE AuthorisedValues %]	2	[% USE AuthorisedValues %]
		3	[% USE Branches %]
3	[% INCLUDE 'doc-head-open.inc' %]	4	[% INCLUDE 'doc-head-open.inc' %]
4	<title>Koha &rsaquo; Patrons &rsaquo; [% IF (unknowuser) %]Patron does not exist[% ELSE %]Discharge for [% firstname %] [% surname %] ([% cardnumber %])[% END %]</title>	5	<title>Koha &rsaquo; Patrons &rsaquo; [% IF (unknowuser) %]Patron does not exist[% ELSE %]Discharge for [% firstname %] [% surname %] ([% cardnumber %])[% END %]</title>
5	[% INCLUDE 'doc-head-close.inc' %]	6	[% INCLUDE 'doc-head-close.inc' %]

Lines 1-3 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt (+1 lines)
		1	[% USE Branches %]
1	[% INCLUDE 'doc-head-open.inc' %]	2	[% INCLUDE 'doc-head-open.inc' %]
2	<title>Koha &rsaquo; Patrons &rsaquo; Pending discharge requests</title>	3	<title>Koha &rsaquo; Patrons &rsaquo; Pending discharge requests</title>
3	[% INCLUDE 'doc-head-close.inc' %]	4	[% INCLUDE 'doc-head-close.inc' %]

Lines 1-3 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt (+1 lines)
		1	[% USE Branches %]
1	[% PROCESS 'permissions.inc' %]	2	[% PROCESS 'permissions.inc' %]
2	[% INCLUDE 'doc-head-open.inc' %]	3	[% INCLUDE 'doc-head-open.inc' %]
3	<title>Koha &rsaquo; Patrons &rsaquo; Set permissions for [% surname %], [% firstname %]</title>	4	<title>Koha &rsaquo; Patrons &rsaquo; Set permissions for [% surname %], [% firstname %]</title>

Lines 1-3 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt (+1 lines)
		1	[% USE Branches %]
1	[% INCLUDE 'doc-head-open.inc' %]	2	[% INCLUDE 'doc-head-open.inc' %]
2	<title>Koha &rsaquo; Patrons &rsaquo; [% IF ( newpassword ) %]Password updated [% ELSE %]Update password for [% surname %], [% firstname %][% END %]</title>	3	<title>Koha &rsaquo; Patrons &rsaquo; [% IF ( newpassword ) %]Password updated [% ELSE %]Update password for [% surname %], [% firstname %][% END %]</title>
3	[% INCLUDE 'doc-head-close.inc' %]	4	[% INCLUDE 'doc-head-close.inc' %]

Lines 1-4 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (+1 lines)
1	[% USE Koha %]	1	[% USE Koha %]
		2	[% USE Branches %]
2	[% USE KohaDates %]	3	[% USE KohaDates %]
3	[% USE AuthorisedValues %]	4	[% USE AuthorisedValues %]
4	[% USE ColumnsSettings %]	5	[% USE ColumnsSettings %]

Lines 1-5 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt (+1 lines)
1	[% USE Koha %]	1	[% USE Koha %]
2	[% USE AuthorisedValues %]	2	[% USE AuthorisedValues %]
		3	[% USE Branches %]
3	[% USE KohaDates %]	4	[% USE KohaDates %]
4	[% INCLUDE 'doc-head-open.inc' %]	5	[% INCLUDE 'doc-head-open.inc' %]
5	<title>Sent notices for [% INCLUDE 'patron-title.inc' %]</title>	6	<title>Sent notices for [% INCLUDE 'patron-title.inc' %]</title>

Lines 1-5 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt (+1 lines)
1	[% USE Koha %]	1	[% USE Koha %]
2	[% USE AuthorisedValues %]	2	[% USE AuthorisedValues %]
		3	[% USE Branches %]
3	[% INCLUDE 'doc-head-open.inc' %]	4	[% INCLUDE 'doc-head-open.inc' %]
4	<title>Koha &rsaquo; Patrons &rsaquo; Pay Fines for [% borrower.firstname %] [% borrower.surname %]</title>	5	<title>Koha &rsaquo; Patrons &rsaquo; Pay Fines for [% borrower.firstname %] [% borrower.surname %]</title>
5	[% INCLUDE 'doc-head-close.inc' %]	6	[% INCLUDE 'doc-head-close.inc' %]

Lines 1-4 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt (+1 lines)
1	[% USE Koha %]	1	[% USE Koha %]
		2	[% USE Branches %]
2	[% INCLUDE 'doc-head-open.inc' %]	3	[% INCLUDE 'doc-head-open.inc' %]
3	<title>Koha &rsaquo; Patrons &rsaquo; Collect fine payment for [% borrower.firstname %] [% borrower.surname %]</title>	4	<title>Koha &rsaquo; Patrons &rsaquo; Collect fine payment for [% borrower.firstname %] [% borrower.surname %]</title>
4	[% INCLUDE 'doc-head-close.inc' %]	5	[% INCLUDE 'doc-head-close.inc' %]

Lines 1-5 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt (+1 lines)
1	[% USE Koha %]	1	[% USE Koha %]
2	[% USE AuthorisedValues %]	2	[% USE AuthorisedValues %]
		3	[% USE Branches %]
3	[% INCLUDE 'doc-head-open.inc' %]	4	[% INCLUDE 'doc-head-open.inc' %]
4	<title>Koha &rsaquo; Patrons &rsaquo; Purchase suggestions for [% INCLUDE 'patron-title.inc' %]</title>	5	<title>Koha &rsaquo; Patrons &rsaquo; Purchase suggestions for [% INCLUDE 'patron-title.inc' %]</title>
5	<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />	6	<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />

Lines 1-5 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt (+1 lines)
1	[% USE Koha %]	1	[% USE Koha %]
2	[% USE AuthorisedValues %]	2	[% USE AuthorisedValues %]
		3	[% USE Branches %]
3	[% INCLUDE 'doc-head-open.inc' %]	4	[% INCLUDE 'doc-head-open.inc' %]
4	<title>Subscription Routing Lists for [% INCLUDE 'patron-title.inc' %]</title>	5	<title>Subscription Routing Lists for [% INCLUDE 'patron-title.inc' %]</title>
5	[% INCLUDE 'doc-head-close.inc' %]	6	[% INCLUDE 'doc-head-close.inc' %]

Lines 1-5 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt (+1 lines)
1	[% USE Koha %]	1	[% USE Koha %]
2	[% USE AuthorisedValues %]	2	[% USE AuthorisedValues %]
		3	[% USE Branches %]
3	[% INCLUDE 'doc-head-open.inc' %]	4	[% INCLUDE 'doc-head-open.inc' %]
4	<title>Koha &rsaquo; Patrons &rsaquo;	5	<title>Koha &rsaquo; Patrons &rsaquo;
5	[% IF ( unknowuser ) %]	6	[% IF ( unknowuser ) %]

Lines 1-3 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt (-1 / +2 lines)
		1	[% USE Branches %]
1	[% USE ItemTypes %]	2	[% USE ItemTypes %]
2	[% INCLUDE 'doc-head-open.inc' %]	3	[% INCLUDE 'doc-head-open.inc' %]
3	<title>Koha &rsaquo; Reports &rsaquo; Catalog by item types</title>	4	<title>Koha &rsaquo; Reports &rsaquo; Catalog by item types</title>
Lines 31-37 $(document).ready(function(){ Link Here
31		32
32	[% IF ( do_it ) %]	33	[% IF ( do_it ) %]
33	[% FOREACH mainloo IN mainloop %]	34	[% FOREACH mainloo IN mainloop %]
34	<h1>Reports on item types [% IF ( mainloo.branchname ) %] held at [% mainloo.branchname %][% END %]</h1>	35	<h1>Reports on item types [% IF branch %] held at [% Branches.GetName( branch ) %][% END %]</h1>
35	<table id="itemtypest">	36	<table id="itemtypest">
36	<thead>	37	<thead>
37	<tr>	38	<tr>

Lines 278-284 h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt (-1 / +1 lines)
278	<fieldset class="rows"> <legend>Acquisition information</legend>	278	<fieldset class="rows"> <legend>Acquisition information</legend>
279	<ol>	279	<ol>
280	<li>	280	<li>
281	<span class="label">Library:</span> [% branchname %]	281	<span class="label">Library:</span> [% Branches.GetName( branchcode ) %]
282	</li>	282	</li>
283	<li>	283	<li>
284	<span class="label">Fund:</span> [% budgetname %]	284	<span class="label">Fund:</span> [% budgetname %]




[% USE Branches %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Tools &rsaquo; [% Branches.GetName( branch ) %] calendar</title>
[% INCLUDE 'doc-head-close.inc' %]
[% INCLUDE 'calendar.inc' %]
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />

[% INCLUDE 'header.inc' %]
[% INCLUDE 'cat-search.inc' %]

<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; [% Branches.GetName( branch ) %] calendar</div>

<div id="doc3" class="yui-t1">
   
   <div id="bd">
    <div id="yui-main">
    <div class="yui-b">
    <h2>[% Branches.GetName( branch ) %] calendar</h2>
    <div class="yui-g">
    <div class="yui-u first">
        <label for="branch">Define the holidays for:</label>

Lines 1-5 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt (-1 / +2 lines)
1	[% USE Koha %]	1	[% USE Koha %]
2	[% USE KohaDates %]	2	[% USE KohaDates %]
		3	[% USE Branches %]
3	[% INCLUDE 'doc-head-open.inc'%]	4	[% INCLUDE 'doc-head-open.inc'%]
4	<title>Koha &rsaquo; Tools &rsaquo; Batch patron modification</title>	5	<title>Koha &rsaquo; Tools &rsaquo; Batch patron modification</title>
5	[% INCLUDE 'doc-head-close.inc' %]	6	[% INCLUDE 'doc-head-close.inc' %]
Lines 267-273 Link Here
267	<td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrower.borrowernumber %]">[% borrower.cardnumber %]</a></td>	268	<td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrower.borrowernumber %]">[% borrower.cardnumber %]</a></td>
268	<td>[% borrower.surname %]</td>	269	<td>[% borrower.surname %]</td>
269	<td>[% borrower.firstname %]</td>	270	<td>[% borrower.firstname %]</td>
270	<td>[% borrower.branchname %]</td>	271	<td>[% Branches.GetName( borrower.branchcode ) %]</td>
271	<td>[% borrower.categorycode %]</td>	272	<td>[% borrower.categorycode %]</td>
272	<td>[% borrower.city %]</td>	273	<td>[% borrower.city %]</td>
273	<td>[% borrower.state %]</td>	274	<td>[% borrower.state %]</td>

Lines 1-5 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt (+1 lines)
1	[% USE Koha %]	1	[% USE Koha %]
2	[% USE AuthorisedValues %]	2	[% USE AuthorisedValues %]
		3	[% USE Branches %]
3	[% INCLUDE 'doc-head-open.inc' %]	4	[% INCLUDE 'doc-head-open.inc' %]
4	<title>	5	<title>
5	Koha &rsaquo; Tools &rsaquo;	6	Koha &rsaquo; Tools &rsaquo;

Lines 794-801 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt (-2 / +2 lines)
794	<h2>This is a serial</h2>	794	<h2>This is a serial</h2>
795	<p>There are [% subscriptionsnumber %] subscription(s) associated with this title.</p>	795	<p>There are [% subscriptionsnumber %] subscription(s) associated with this title.</p>
796	[% FOREACH subscription IN subscriptions %]	796	[% FOREACH subscription IN subscriptions %]
797	[% IF ( subscription.branchname ) %]	797	[% IF ( subscription.branchcode ) %]
798	<h3>At library: [% subscription.branchname %]</h3>	798	<h3>At library: [% Branches.GetName( subscription.branchname ) %]</h3>
799	[% ELSE %]	799	[% ELSE %]
800	[% IF ( subscription.branchcode ) %]	800	[% IF ( subscription.branchcode ) %]
801	<h3>At library: [% subscription.branchcode %]</h3>	801	<h3>At library: [% subscription.branchcode %]</h3>

Lines 111-117 $template->param(%$data); Link Here

(-)a/members/boraccount.pl (-1 lines)
111	$template->param(	111	$template->param(
112	finesview => 1,	112	finesview => 1,
113	borrowernumber => $borrowernumber,	113	borrowernumber => $borrowernumber,
114	branchname => GetBranchName($data->{'branchcode'}),
115	total => sprintf("%.2f",$total),	114	total => sprintf("%.2f",$total),
116	totalcredit => $totalcredit,	115	totalcredit => $totalcredit,
117	is_child => ($data->{'category_type'} eq 'C'),	116	is_child => ($data->{'category_type'} eq 'C'),

Lines 127-133 if ( $op eq 'delete_confirm' or $countissues > 0 or $flags->{'CHARGES'} or $is_ Link Here

(-)a/members/deletemem.pl (-1 lines)
127	phone => $bor->{'phone'},	127	phone => $bor->{'phone'},
128	email => $bor->{'email'},	128	email => $bor->{'email'},
129	branchcode => $bor->{'branchcode'},	129	branchcode => $bor->{'branchcode'},
130	branchname => GetBranchName($bor->{'branchcode'}),
131	activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),	130	activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
132	RoutingSerials => C4::Context->preference('RoutingSerials'),	131	RoutingSerials => C4::Context->preference('RoutingSerials'),
133	);	132	);

Lines 104-110 else { Link Here

(-)a/members/files.pl (-1 lines)
104		104
105	$template->param(	105	$template->param(
106	categoryname => $data->{'description'},	106	categoryname => $data->{'description'},
107	branchname => GetBranchName($data->{'branchcode'}),
108	RoutingSerials => C4::Context->preference('RoutingSerials'),	107	RoutingSerials => C4::Context->preference('RoutingSerials'),
109	);	108	);
110		109

Lines 99-105 if ($add){ Link Here

(-)a/members/mancredit.pl (-1 lines)
99	finesview => 1,	99	finesview => 1,
100	borrowernumber => $borrowernumber,	100	borrowernumber => $borrowernumber,
101	categoryname => $data->{'description'},	101	categoryname => $data->{'description'},
102	branchname => GetBranchName($data->{'branchcode'}),
103	is_child => ($data->{'category_type'} eq 'C'),	102	is_child => ($data->{'category_type'} eq 'C'),
104	activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),	103	activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
105	RoutingSerials => C4::Context->preference('RoutingSerials'),	104	RoutingSerials => C4::Context->preference('RoutingSerials'),

Lines 124-130 if ($add){ Link Here

(-)a/members/maninvoice.pl (-1 lines)
124	finesview => 1,	124	finesview => 1,
125	borrowernumber => $borrowernumber,	125	borrowernumber => $borrowernumber,
126	categoryname => $data->{'description'},	126	categoryname => $data->{'description'},
127	branchname => GetBranchName($data->{'branchcode'}),
128	is_child => ($data->{'category_type'} eq 'C'),	127	is_child => ($data->{'category_type'} eq 'C'),
129	activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),	128	activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
130	RoutingSerials => C4::Context->preference('RoutingSerials'),	129	RoutingSerials => C4::Context->preference('RoutingSerials'),

Lines 192-198 $template->param( Link Here

(-)a/members/member-flags.pl (-1 lines)
192	email => $bor->{'email'},	192	email => $bor->{'email'},
193	emailpro => $bor->{'emailpro'},	193	emailpro => $bor->{'emailpro'},
194	branchcode => $bor->{'branchcode'},	194	branchcode => $bor->{'branchcode'},
195	branchname => GetBranchName($bor->{'branchcode'}),
196	loop => \@loop,	195	loop => \@loop,
197	is_child => ($bor->{'category_type'} eq 'C'),	196	is_child => ($bor->{'category_type'} eq 'C'),
198	activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),	197	activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),

Lines 144-150 $template->param( Link Here

(-)a/members/member-password.pl (-1 lines)
144	email => $bor->{'email'},	144	email => $bor->{'email'},
145	emailpro => $bor->{'emailpro'},	145	emailpro => $bor->{'emailpro'},
146	branchcode => $bor->{'branchcode'},	146	branchcode => $bor->{'branchcode'},
147	branchname => GetBranchName( $bor->{'branchcode'} ),
148	userid => $bor->{'userid'},	147	userid => $bor->{'userid'},
149	destination => $destination,	148	destination => $destination,
150	is_child => ( $bor->{'category_type'} eq 'C' ),	149	is_child => ( $bor->{'category_type'} eq 'C' ),

Lines 47-53 use C4::Circulation; Link Here

(-)a/members/moremember.pl (-1 / +1 lines)
47	use C4::Koha;	47	use C4::Koha;
48	use C4::Letters;	48	use C4::Letters;
49	use C4::Biblio;	49	use C4::Biblio;
50	use C4::Branch; # GetBranchName
51	use C4::Form::MessagingPreferences;	50	use C4::Form::MessagingPreferences;
52	use List::MoreUtils qw/uniq/;	51	use List::MoreUtils qw/uniq/;
53	use C4::Members::Attributes qw(GetBorrowerAttributes);	52	use C4::Members::Attributes qw(GetBorrowerAttributes);
Lines 325-330 $template->param( Link Here
325	categoryname => $data->{'description'},	324	categoryname => $data->{'description'},
326	was_renewed => scalar $input->param('was_renewed') ? 1 : 0,	325	was_renewed => scalar $input->param('was_renewed') ? 1 : 0,
327	branch => $branch,	326	branch => $branch,
		327	branchcode => $branch,
328	todaysdate => output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 }),	328	todaysdate => output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 }),
329	totalprice => sprintf("%.2f", $totalprice),	329	totalprice => sprintf("%.2f", $totalprice),
330	totaldue => sprintf("%.2f", $total),	330	totaldue => sprintf("%.2f", $total),

Lines 25-31 use C4::Auth; Link Here

(-)a/members/notices.pl (-2 lines)
25	use C4::Output;	25	use C4::Output;
26	use CGI qw ( -utf8 );	26	use CGI qw ( -utf8 );
27	use C4::Members;	27	use C4::Members;
28	use C4::Branch;
29	use C4::Letters;	28	use C4::Letters;
30	use C4::Members::Attributes qw(GetBorrowerAttributes);	29	use C4::Members::Attributes qw(GetBorrowerAttributes);
31	use Koha::Patron::Images;	30	use Koha::Patron::Images;
Lines 79-85 $template->param( Link Here
79	QUEUED_MESSAGES => $queued_messages,	78	QUEUED_MESSAGES => $queued_messages,
80	borrowernumber => $borrowernumber,	79	borrowernumber => $borrowernumber,
81	sentnotices => 1,	80	sentnotices => 1,
82	branchname => GetBranchName($borrower->{'branchcode'}),
83	categoryname => $borrower->{'description'},	81	categoryname => $borrower->{'description'},
84	activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),	82	activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
85	RoutingSerials => C4::Context->preference('RoutingSerials'),	83	RoutingSerials => C4::Context->preference('RoutingSerials'),

Lines 231-237 sub borrower_add_additional_fields { Link Here

(-)a/members/pay.pl (-1 lines)
231	);	231	);
232	}	232	}
233		233
234	$b_ref->{branchname} = GetBranchName( $b_ref->{branchcode} );
235	return;	234	return;
236	}	235	}
237		236

Lines 181-186 sub borrower_add_additional_fields { Link Here

(-)a/members/paycollect.pl (-1 lines)
181	$b_ref->{extendedattributes} = GetBorrowerAttributes($b_ref->{borrowernumber});	181	$b_ref->{extendedattributes} = GetBorrowerAttributes($b_ref->{borrowernumber});
182	}	182	}
183		183
184	$b_ref->{branchname} = GetBranchName( $b_ref->{branchcode} );
185	return;	184	return;
186	}	185	}

Lines 135-141 $template->param( Link Here

(-)a/members/printfeercpt.pl (-1 lines)
135	phone => $data->{'phone'},	135	phone => $data->{'phone'},
136	email => $data->{'email'},	136	email => $data->{'email'},
137	branchcode => $data->{'branchcode'},	137	branchcode => $data->{'branchcode'},
138	branchname => GetBranchName($data->{'branchcode'}),
139	total => sprintf("%.2f",$total),	138	total => sprintf("%.2f",$total),
140	totalcredit => $totalcredit,	139	totalcredit => $totalcredit,
141	is_child => ($data->{'category_type'} eq 'C'),	140	is_child => ($data->{'category_type'} eq 'C'),

Lines 134-140 $template->param( Link Here

(-)a/members/printinvoice.pl (-1 lines)
134	phone => $data->{'phone'},	134	phone => $data->{'phone'},
135	email => $data->{'email'},	135	email => $data->{'email'},
136	branchcode => $data->{'branchcode'},	136	branchcode => $data->{'branchcode'},
137	branchname => GetBranchName( $data->{'branchcode'} ),
138	total => sprintf( "%.2f", $total ),	137	total => sprintf( "%.2f", $total ),
139	totalcredit => $totalcredit,	138	totalcredit => $totalcredit,
140	is_child => ( $data->{'category_type'} eq 'C' ),	139	is_child => ( $data->{'category_type'} eq 'C' ),

Lines 51-57 foreach my $key ( keys %$borrower ) { Link Here

(-)a/members/purchase-suggestions.pl (-1 lines)
51	$template->param(	51	$template->param(
52	suggestionsview => 1,	52	suggestionsview => 1,
53	categoryname => $borrower->{'description'},	53	categoryname => $borrower->{'description'},
54	branchname => GetBranchName( $borrower->{'branchcode'} ),
55	RoutingSerials => C4::Context->preference('RoutingSerials'),	54	RoutingSerials => C4::Context->preference('RoutingSerials'),
56	);	55	);
57		56

Lines 95-101 $template->param( Link Here

(-)a/members/routing-lists.pl (-1 lines)
95	borrower => $borrower,	95	borrower => $borrower,
96	borrowernumber => $borrowernumber,	96	borrowernumber => $borrowernumber,
97	branch => $branch,	97	branch => $branch,
98	branchname => GetBranchName($borrower->{'branchcode'}),
99	categoryname => $borrower->{description},	98	categoryname => $borrower->{description},
100	RoutingSerials => C4::Context->preference('RoutingSerials'),	99	RoutingSerials => C4::Context->preference('RoutingSerials'),
101	);	100	);

Lines 61-67 foreach my $key ( keys %$borrower ) { Link Here

(-)a/members/statistics.pl (-1 lines)
61	}	61	}
62	$template->param(	62	$template->param(
63	categoryname => $borrower->{'description'},	63	categoryname => $borrower->{'description'},
64	branchname => GetBranchName($borrower->{'branchcode'}),
65	);	64	);
66	# Construct column names	65	# Construct column names
67	my $fields = C4::Members::Statistics::get_fields();	66	my $fields = C4::Members::Statistics::get_fields();

Lines 566-572 foreach my $subscription (@subscriptions) { Link Here

(-)a/opac/opac-detail.pl (-1 lines)
566	$cell{histstartdate} = $subscription->{histstartdate};	566	$cell{histstartdate} = $subscription->{histstartdate};
567	$cell{histenddate} = $subscription->{histenddate};	567	$cell{histenddate} = $subscription->{histenddate};
568	$cell{branchcode} = $subscription->{branchcode};	568	$cell{branchcode} = $subscription->{branchcode};
569	$cell{branchname} = GetBranchName($subscription->{branchcode});
570	$cell{hasalert} = $subscription->{hasalert};	569	$cell{hasalert} = $subscription->{hasalert};
571	$cell{callnumber} = $subscription->{callnumber};	570	$cell{callnumber} = $subscription->{callnumber};
572	$cell{closed} = $subscription->{closed};	571	$cell{closed} = $subscription->{closed};

Lines 108-114 sub calculate { Link Here

(-)a/reports/itemtypes.plugin (-1 lines)
108	$globalline{loopitemtype} = \@results;	108	$globalline{loopitemtype} = \@results;
109	$globalline{total} = $grantotal;	109	$globalline{total} = $grantotal;
110	$globalline{branch} = $branch;	110	$globalline{branch} = $branch;
111	$globalline{branchname} = GetBranchName($branch);
112	push @mainloop,\%globalline;	111	push @mainloop,\%globalline;
113	return \@mainloop;	112	return \@mainloop;
114	}	113	}

Lines 32-37 use C4::Output; Link Here

(-)a/reports/reserves_stats.pl (-1 / +2 lines)
32	use C4::Reports;	32	use C4::Reports;
33	use C4::Members;	33	use C4::Members;
34	use Koha::DateUtils;	34	use Koha::DateUtils;
		35	use Koha::Libraries;
35	use Koha::Patron::Categories;	36	use Koha::Patron::Categories;
36	use List::MoreUtils qw/any/;	37	use List::MoreUtils qw/any/;
37	use YAML;	38	use YAML;
Lines 338-344 sub display_value { Link Here
338	( $crit =~ /ccode/ ) ? $ccodes->{$value}	339	( $crit =~ /ccode/ ) ? $ccodes->{$value}
339	: ( $crit =~ /location/ ) ? $locations->{$value}	340	: ( $crit =~ /location/ ) ? $locations->{$value}
340	: ( $crit =~ /itemtype/ ) ? $itemtypes->{$value}->{description}	341	: ( $crit =~ /itemtype/ ) ? $itemtypes->{$value}->{description}
341	: ( $crit =~ /branch/ ) ? GetBranchName($value)	342	: ( $crit =~ /branch/ ) ? Koha::Libraries->find($value)->branchname
342	: ( $crit =~ /reservestatus/ ) ? reservestatushuman($value)	343	: ( $crit =~ /reservestatus/ ) ? reservestatushuman($value)
343	: $value; # default fallback	344	: $value; # default fallback
344	if ($crit =~ /sort1/) {	345	if ($crit =~ /sort1/) {

Lines 34-39 use C4::Items; Link Here

(-)a/serials/routing-preview.pl (-1 / +2 lines)
34	use C4::Serials;	34	use C4::Serials;
35	use URI::Escape;	35	use URI::Escape;
36	use C4::Branch;	36	use C4::Branch;
		37	use Koha::Libraries;
37		38
38	my $query = new CGI;	39	my $query = new CGI;
39	my $subscriptionid = $query->param('subscriptionid');	40	my $subscriptionid = $query->param('subscriptionid');
Lines 66-72 if($ok){ Link Here
66	my ($count2,@bibitems) = GetBiblioItemByBiblioNumber($biblio);	67	my ($count2,@bibitems) = GetBiblioItemByBiblioNumber($biblio);
67	my @itemresults = GetItemsInfo( $subs->{biblionumber} );	68	my @itemresults = GetItemsInfo( $subs->{biblionumber} );
68	my $branch = $itemresults[0]->{'holdingbranch'};	69	my $branch = $itemresults[0]->{'holdingbranch'};
69	my $branchname = GetBranchName($branch);	70	my $branchname = Koha::Libraries->find($branch)->branchname;
70		71
71	if (C4::Context->preference('RoutingListAddReserves')){	72	if (C4::Context->preference('RoutingListAddReserves')){
72	# get existing reserves .....	73	# get existing reserves .....





use Koha::DateUtils qw( dt_from_string );
use Koha::Acquisition::Currencies;
use Koha::Libraries;

use URI::Escape;


        }
        return ($criteriumvalue eq 'ASKED'?"Pending":ucfirst(lc( $criteriumvalue))) if ($displayby =~/status/i);
    }
    return Koha::Libraries->find($criteriumvalue)->branchname;
        if $displayby =~ /branchcode/;
    return GetAuthorisedValueByCode('SUGGEST_FORMAT', $criteriumvalue) || "Unknown" if ($displayby =~/itemtype/);
    if ($displayby =~/suggestedby/||$displayby =~/managedby/||$displayby =~/acceptedby/){
        my $borr=C4::Members::GetMember(borrowernumber=>$criteriumvalue);

}
elsif ( $op eq 'show' ) {
    $suggestion_ref=&GetSuggestion($$suggestion_ref{'suggestionid'});
    $$suggestion_ref{branchname} = GetBranchName $$suggestion_ref{branchcode};
    my $budget = GetBudget $$suggestion_ref{budgetid};
    $$suggestion_ref{budgetname} = $$budget{budget_name};
    Init($suggestion_ref);

Lines 24-30 use JSON qw(to_json); Link Here

(-)a/svc/holds (-2 / +1 lines)
24		24
25	use C4::Auth qw(check_cookie_auth);	25	use C4::Auth qw(check_cookie_auth);
26	use C4::Biblio qw(GetMarcBiblio GetFrameworkCode GetRecordValue );	26	use C4::Biblio qw(GetMarcBiblio GetFrameworkCode GetRecordValue );
27	use C4::Branch qw(GetBranchName);
28	use C4::Charset;	27	use C4::Charset;
29	use C4::Circulation qw(GetTransfers);	28	use C4::Circulation qw(GetTransfers);
30	use C4::Context;	29	use C4::Context;
Lines 134-140 while ( my $h = $holds_rs->next() ) { Link Here
134	$hold->{color} = 'transferred';	133	$hold->{color} = 'transferred';
135	$hold->{transferred} = 1;	134	$hold->{transferred} = 1;
136	$hold->{date_sent} = output_pref( dt_from_string($transferred_when) );	135	$hold->{date_sent} = output_pref( dt_from_string($transferred_when) );
137	$hold->{from_branch} = GetBranchName($transferred_from);	136	$hold->{from_branch} = Koha::Libraries->find($transferred_from)->branchname;
138	}	137	}
139	elsif ( $item->holding_branch() && $item->holding_branch()->branchcode() ne	138	elsif ( $item->holding_branch() && $item->holding_branch()->branchcode() ne
140	$h->branch()->branchcode() )	139	$h->branch()->branchcode() )




use C4::Context;
use Data::Dumper;

use Test::More tests => 16;

use C4::Branch;
use Koha::Database;

}
can_ok(
    'C4::Branch', qw(
      GetBranchName
      GetBranch
      GetBranches
      GetBranchesLoop

is( Koha::Libraries->find( $b2->{branchcode} )->delete, 1,          "One row affected" );
is( Koha::Libraries->search->count,             $count + 1, "branch BRB deleted" );

#Test GetBranchName
is( GetBranchName( $b1->{branchcode} ),
    $b1->{branchname}, "GetBranchName returns the right name" );

#Test Getbranches
my $branches = GetBranches();
is( scalar( keys %$branches ),




#!/usr/bin/perl

use Modern::Perl;
use C4::Branch qw(GetBranchName);
use Koha::DateUtils;
use Koha::Libraries;

use Test::More tests => 14;



# Add LIB1, if it doesn't exist.
my $addbra = 'LIB1';
unless ( Koha::Libraries->find($addbra) ) {
    $dbh->do( q{ INSERT INTO branches (branchcode,branchname) VALUES (?,?) },
        undef, ( $addbra, "$addbra branch" ) );
}

Lines 33-38 use Koha::Holds; Link Here

(-)a/t/db_dependent/Reserves.t (-1 / +2 lines)
33	use t::lib::Mocks;	33	use t::lib::Mocks;
34		34
35	use Koha::DateUtils;	35	use Koha::DateUtils;
		36	use Koha::Libraries;
36	use Koha::Patron::Categories;	37	use Koha::Patron::Categories;
37		38
38	use Data::Dumper;	39	use Data::Dumper;
Lines 59-65 $dbh->do("update marc_subfield_structure set kohafield='biblioitems.agerestricti Link Here
59		60
60	# Add branches if not existing	61	# Add branches if not existing
61	foreach my $addbra ('CPL', 'FPL', 'RPL') {	62	foreach my $addbra ('CPL', 'FPL', 'RPL') {
62	$dbh->do("INSERT INTO branches (branchcode,branchname) VALUES (?,?)", undef, ($addbra,"$addbra branch")) unless GetBranchName($addbra);	63	$dbh->do("INSERT INTO branches (branchcode,branchname) VALUES (?,?)", undef, ($addbra,"$addbra branch")) unless Koha::Libraries->find($addbra);
63	}	64	}
64		65
65	# Add categories if not existing	66	# Add categories if not existing

Lines 60-66 my $onlymine = Link Here

(-)a/tools/holidays.pl (-3 lines)
60	if ( $onlymine ) {	60	if ( $onlymine ) {
61	$branch = C4::Context->userenv->{'branch'};	61	$branch = C4::Context->userenv->{'branch'};
62	}	62	}
63	my $branchname = GetBranchName($branch);
64	my $branches = GetBranches($onlymine);	63	my $branches = GetBranches($onlymine);
65	my @branchloop;	64	my @branchloop;
66	for my $thisbranch (	65	for my $thisbranch (
Lines 154-161 $template->param( Link Here
154	keydate => $keydate,	153	keydate => $keydate,
155	branchcodes => $branchcodes,	154	branchcodes => $branchcodes,
156	branch => $branch,	155	branch => $branch,
157	branchname => $branchname,
158	branch => $branch,
159	);	156	);
160		157
161	# Shows the template with the real values replaced	158	# Shows the template with the real values replaced




use C4::Auth;
use C4::Output;
use C4::Context;
use C4::Branch qw/GetBranchesLoop/;
use C4::Members;
use C4::Members::Attributes qw(:all);
use C4::Members::AttributeTypes;

use Koha::Patrons;
use Koha::DateUtils;
use Koha::Token;
use Koha::Libraries;
use Koha::Patron::Categories;

use Text::CSV;

        }
        if ($borrower{branchcode}) {
            push @missing_criticals, {key=>'branchcode', line=>$. , lineraw=>$borrowerline, value=>$borrower{branchcode}, branch_map=>1}
                unless Koha::Libraries->find($borrower{branchcode});
        } else {
            push @missing_criticals, {key=>'branchcode', line=>$. , lineraw=>$borrowerline};
        }

Lines 368-374 sub GetBorrowerInfos { Link Here

(-)a/tools/modborrowers.pl (-1 lines)
368	my ( %info ) = @_;	368	my ( %info ) = @_;
369	my $borrower = GetMember( %info );	369	my $borrower = GetMember( %info );
370	if ( $borrower ) {	370	if ( $borrower ) {
371	$borrower->{branchname} = GetBranchName( $borrower->{branchcode} );
372	for ( qw(dateenrolled dateexpiry) ) {	371	for ( qw(dateenrolled dateexpiry) ) {
373	my $userdate = $borrower->{$_};	372	my $userdate = $borrower->{$_};
374	unless ($userdate && $userdate ne "0000-00-00" and $userdate ne "9999-12-31") {	373	unless ($userdate && $userdate ne "0000-00-00" and $userdate ne "9999-12-31") {

Lines 92-98 if ( $src eq 'circ' ) { Link Here

(-)a/tools/viewlog.pl (-2 lines)
92	menu => 1,	92	menu => 1,
93	borrowernumber => $borrowernumber,	93	borrowernumber => $borrowernumber,
94	categoryname => $data->{'description'},	94	categoryname => $data->{'description'},
95	branchname => GetBranchName( $data->{'branchcode'} ),
96	RoutingSerials => C4::Context->preference('RoutingSerials'),	95	RoutingSerials => C4::Context->preference('RoutingSerials'),
97	);	96	);
98	}	97	}
99	-

Return to bug 15758

Lines 34-39 use C4::Search::History; Link Here

(-)a/C4/Auth.pm (-2 / +3 lines)
34	use Koha;	34	use Koha;
35	use Koha::Caches;	35	use Koha::Caches;
36	use Koha::AuthUtils qw(get_script_name hash_password);	36	use Koha::AuthUtils qw(get_script_name hash_password);
		37	use Koha::Libraries;
37	use Koha::LibraryCategories;	38	use Koha::LibraryCategories;
38	use Koha::Libraries;	39	use Koha::Libraries;
39	use POSIX qw/strftime/;	40	use POSIX qw/strftime/;
Lines 1077-1083 sub checkauth { Link Here
1077	# if they specify at login, use that	1078	# if they specify at login, use that
1078	if ( $query->param('branch') ) {	1079	if ( $query->param('branch') ) {
1079	$branchcode = $query->param('branch');	1080	$branchcode = $query->param('branch');
1080	$branchname = GetBranchName($branchcode);	1081	$branchname = Koha::Libraries->find($branchcode)->branchname;
1081	}	1082	}
1082	my $branches = GetBranches();	1083	my $branches = GetBranches();
1083	if ( C4::Context->boolean_preference('IndependentBranches') && C4::Context->boolean_preference('Autolocation') ) {	1084	if ( C4::Context->boolean_preference('IndependentBranches') && C4::Context->boolean_preference('Autolocation') ) {
Lines 1529-1535 sub check_api_auth { Link Here
1529	# if they specify at login, use that	1530	# if they specify at login, use that
1530	if ( $query->param('branch') ) {	1531	if ( $query->param('branch') ) {
1531	$branchcode = $query->param('branch');	1532	$branchcode = $query->param('branch');
1532	$branchname = GetBranchName($branchcode);	1533	$branchname = Koha::Libraries->find($branchcode)->branchname;
1533	}	1534	}
1534	my $branches = GetBranches();	1535	my $branches = GetBranches();
1535	my @branchesloop;	1536	my @branchesloop;

Lines 27-33 use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS); Link Here

(-)a/C4/Branch.pm (-15 lines)
27	BEGIN {	27	BEGIN {
28	@ISA = qw(Exporter);	28	@ISA = qw(Exporter);
29	@EXPORT = qw(	29	@EXPORT = qw(
30	&GetBranchName
31	&GetBranch	30	&GetBranch
32	&GetBranches	31	&GetBranches
33	&GetBranchesLoop	32	&GetBranchesLoop
Lines 152-171 sub GetBranchesLoop { # since this is what most pages want anyway Link Here
152	return \@loop;	151	return \@loop;
153	}	152	}
154		153
155	=head2 GetBranchName
156
157	=cut
158
159	sub GetBranchName {
160	my ($branchcode) = @_;
161	my $dbh = C4::Context->dbh;
162	my $sth;
163	$sth = $dbh->prepare("Select branchname from branches where branchcode=?");
164	$sth->execute($branchcode);
165	my $branchname = $sth->fetchrow_array;
166	return ($branchname);
167	}
168
169	=head2 GetBranch	154	=head2 GetBranch
170		155
171	$branch = GetBranch( $query, $branches );	156	$branch = GetBranch( $query, $branches );

Lines 903-909 sub CanBookBeIssued { Link Here

(-)a/C4/Circulation.pm (-4 / +3 lines)
903	$issuingimpossible{ITEMNOTSAMEBRANCH} = 1;	903	$issuingimpossible{ITEMNOTSAMEBRANCH} = 1;
904	$issuingimpossible{'itemhomebranch'} = $item->{C4::Context->preference("HomeOrHoldingBranch")};	904	$issuingimpossible{'itemhomebranch'} = $item->{C4::Context->preference("HomeOrHoldingBranch")};
905	}	905	}
906	$needsconfirmation{BORRNOTSAMEBRANCH} = GetBranchName( $borrower->{'branchcode'} )	906	$needsconfirmation{BORRNOTSAMEBRANCH} = $borrower->{'branchcode'}
907	if ( $borrower->{'branchcode'} ne $userenv->{branch} );	907	if ( $borrower->{'branchcode'} ne $userenv->{branch} );
908	}	908	}
909	}	909	}
Lines 970-976 sub CanBookBeIssued { Link Here
970	my $resbor = $res->{'borrowernumber'};	970	my $resbor = $res->{'borrowernumber'};
971	if ( $resbor ne $borrower->{'borrowernumber'} ) {	971	if ( $resbor ne $borrower->{'borrowernumber'} ) {
972	my ( $resborrower ) = C4::Members::GetMember( borrowernumber => $resbor );	972	my ( $resborrower ) = C4::Members::GetMember( borrowernumber => $resbor );
973	my $branchname = GetBranchName( $res->{'branchcode'} );
974	if ( $restype eq "Waiting" )	973	if ( $restype eq "Waiting" )
975	{	974	{
976	# The item is on reserve and waiting, but has been	975	# The item is on reserve and waiting, but has been
Lines 980-986 sub CanBookBeIssued { Link Here
980	$needsconfirmation{'ressurname'} = $resborrower->{'surname'};	979	$needsconfirmation{'ressurname'} = $resborrower->{'surname'};
981	$needsconfirmation{'rescardnumber'} = $resborrower->{'cardnumber'};	980	$needsconfirmation{'rescardnumber'} = $resborrower->{'cardnumber'};
982	$needsconfirmation{'resborrowernumber'} = $resborrower->{'borrowernumber'};	981	$needsconfirmation{'resborrowernumber'} = $resborrower->{'borrowernumber'};
983	$needsconfirmation{'resbranchname'} = $branchname;	982	$needsconfirmation{'resbranchcode'} = $res->{branchcode};
984	$needsconfirmation{'reswaitingdate'} = $res->{'waitingdate'};	983	$needsconfirmation{'reswaitingdate'} = $res->{'waitingdate'};
985	}	984	}
986	elsif ( $restype eq "Reserved" ) {	985	elsif ( $restype eq "Reserved" ) {
Lines 990-996 sub CanBookBeIssued { Link Here
990	$needsconfirmation{'ressurname'} = $resborrower->{'surname'};	989	$needsconfirmation{'ressurname'} = $resborrower->{'surname'};
991	$needsconfirmation{'rescardnumber'} = $resborrower->{'cardnumber'};	990	$needsconfirmation{'rescardnumber'} = $resborrower->{'cardnumber'};
992	$needsconfirmation{'resborrowernumber'} = $resborrower->{'borrowernumber'};	991	$needsconfirmation{'resborrowernumber'} = $resborrower->{'borrowernumber'};
993	$needsconfirmation{'resbranchname'} = $branchname;	992	$needsconfirmation{'resbranchcode'} = $res->{branchcode};
994	$needsconfirmation{'resreservedate'} = $res->{'reservedate'};	993	$needsconfirmation{'resreservedate'} = $res->{'reservedate'};
995	}	994	}
996	}	995	}

Lines 41-46 use Koha::Biblioitems; Link Here

(-)a/C4/Items.pm (-8 / +5 lines)
41	use Koha::Items;	41	use Koha::Items;
42	use Koha::SearchEngine;	42	use Koha::SearchEngine;
43	use Koha::SearchEngine::Search;	43	use Koha::SearchEngine::Search;
		44	use Koha::Libraries;
44		45
45	use vars qw(@ISA @EXPORT);	46	use vars qw(@ISA @EXPORT);
46		47
Lines 755-774 sub CheckItemPreSave { Link Here
755		756
756	# check for valid home branch	757	# check for valid home branch
757	if (exists $item_ref->{'homebranch'} and defined $item_ref->{'homebranch'}) {	758	if (exists $item_ref->{'homebranch'} and defined $item_ref->{'homebranch'}) {
758	my $branch_name = C4::Branch::GetBranchName($item_ref->{'homebranch'});	759	my $home_library = Koha::Libraries->find( $item_ref->{homebranch} );
759	unless (defined $branch_name) {	760	unless (defined $home_library) {
760	# relies on fact that branches.branchname is a non-NULL column,
761	# so GetBranchName returns undef only if branch does not exist
762	$errors{'invalid_homebranch'} = $item_ref->{'homebranch'};	761	$errors{'invalid_homebranch'} = $item_ref->{'homebranch'};
763	}	762	}
764	}	763	}
765		764
766	# check for valid holding branch	765	# check for valid holding branch
767	if (exists $item_ref->{'holdingbranch'} and defined $item_ref->{'holdingbranch'}) {	766	if (exists $item_ref->{'holdingbranch'} and defined $item_ref->{'holdingbranch'}) {
768	my $branch_name = C4::Branch::GetBranchName($item_ref->{'holdingbranch'});	767	my $holding_library = Koha::Libraries->find( $item_ref->{holdingbranch} );
769	unless (defined $branch_name) {	768	unless (defined $holding_library) {
770	# relies on fact that branches.branchname is a non-NULL column,
771	# so GetBranchName returns undef only if branch does not exist
772	$errors{'invalid_holdingbranch'} = $item_ref->{'holdingbranch'};	769	$errors{'invalid_holdingbranch'} = $item_ref->{'holdingbranch'};
773	}	770	}
774	}	771	}

Lines 20-29 use C4::Context; Link Here

(-)a/C4/SIP/ILS/Patron.pm (-2 / +3 lines)
20	use C4::Koha;	20	use C4::Koha;
21	use C4::Members;	21	use C4::Members;
22	use C4::Reserves;	22	use C4::Reserves;
23	use C4::Branch qw(GetBranchName);
24	use C4::Items qw( GetBarcodeFromItemnumber GetItemnumbersForBiblio);	23	use C4::Items qw( GetBarcodeFromItemnumber GetItemnumbersForBiblio);
25	use C4::Auth qw(checkpw);	24	use C4::Auth qw(checkpw);
26		25
		26	use Koha::Libraries;
27		27
28	our $kp; # koha patron	28	our $kp; # koha patron
29		29
Lines 392-398 sub holds_blocked_by_excessive_fees { Link Here
392	sub library_name {	392	sub library_name {
393	my $self = shift;	393	my $self = shift;
394	unless ($self->{library_name}) {	394	unless ($self->{library_name}) {
395	$self->{library_name} = GetBranchName($self->{branchcode});	395	my $library = Koha::Libraries->find( $self->{branchcode} );
		396	$self->{library_name} = $library ? $library->branchname : '';
396	}	397	}
397	return $self->{library_name};	398	return $self->{library_name};
398	}	399	}

Lines 22-27 use C4::Context; Link Here

(-)a/C4/Search.pm (-3 / +4 lines)
22	use C4::Biblio; # GetMarcFromKohaField, GetBiblioData	22	use C4::Biblio; # GetMarcFromKohaField, GetBiblioData
23	use C4::Koha; # getFacets	23	use C4::Koha; # getFacets
24	use Koha::DateUtils;	24	use Koha::DateUtils;
		25	use Koha::Libraries;
25	use Lingua::Stem;	26	use Lingua::Stem;
26	use C4::Search::PazPar2;	27	use C4::Search::PazPar2;
27	use XML::Simple;	28	use XML::Simple;
Lines 1712-1720 sub buildQuery { Link Here
1712	$limit_cgi .= "&limit=" . uri_escape_utf8($this_limit);	1713	$limit_cgi .= "&limit=" . uri_escape_utf8($this_limit);
1713	if ($this_limit =~ /^branch:(.+)/) {	1714	if ($this_limit =~ /^branch:(.+)/) {
1714	my $branchcode = $1;	1715	my $branchcode = $1;
1715	my $branchname = GetBranchName($branchcode);	1716	my $library = Koha::Libraries->find( $branchcode );
1716	if (defined $branchname) {	1717	if (defined $library) {
1717	$limit_desc .= " branch:$branchname";	1718	$limit_desc .= " branch:" . $library->branchname;
1718	} else {	1719	} else {
1719	$limit_desc .= " $this_limit";	1720	$limit_desc .= " $this_limit";
1720	}	1721	}

Lines 51-59 my ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user( Link Here

(-)a/acqui/acqui-home.pl (-7 lines)
51	}	51	}
52	);	52	);
53		53
54	my $user = GetMember( 'borrowernumber' => $loggedinuser );
55	my $branchname = GetBranchName($user->{branchcode});
56
57	my $status = $query->param('status') \|\| "ASKED";	54	my $status = $query->param('status') \|\| "ASKED";
58	my $suggestions_count = CountSuggestion($status);	55	my $suggestions_count = CountSuggestion($status);
59		56
Lines 74-82 my @budget_loop; Link Here
74	foreach my $budget ( @{$budget_arr} ) {	71	foreach my $budget ( @{$budget_arr} ) {
75	next unless (CanUserUseBudget($loggedinuser, $budget, $userflags));	72	next unless (CanUserUseBudget($loggedinuser, $budget, $userflags));
76		73
77	$budget->{'budget_branchname'} =
78	GetBranchName( $budget->{'budget_branchcode'} );
79
80	my $member = GetMember( borrowernumber => $budget->{budget_owner_id} );	74	my $member = GetMember( borrowernumber => $budget->{budget_owner_id} );
81	if ($member) {	75	if ($member) {
82	$budget->{budget_owner_firstname} = $member->{'firstname'};	76	$budget->{budget_owner_firstname} = $member->{'firstname'};
Lines 117-123 foreach my $budget ( @{$budget_arr} ) { Link Here
117	$template->param(	111	$template->param(
118	type => 'intranet',	112	type => 'intranet',
119	loop_budget => \@budget_loop,	113	loop_budget => \@budget_loop,
120	branchname => $branchname,
121	total => $total,	114	total => $total,
122	totspent => $totspent,	115	totspent => $totspent,
123	totordered => $totordered,	116	totordered => $totordered,

Lines 348-355 elsif ( $op eq 'ediorder' ) { Link Here

(-)a/acqui/basket.pl (-5 / +3 lines)
348		348
349	if ($basket->{basketgroupid}){	349	if ($basket->{basketgroupid}){
350	$basketgroup = GetBasketgroup($basket->{basketgroupid});	350	$basketgroup = GetBasketgroup($basket->{basketgroupid});
351	$basketgroup->{deliveryplacename} = C4::Branch::GetBranchName( $basketgroup->{deliveryplace} );
352	$basketgroup->{billingplacename} = C4::Branch::GetBranchName( $basketgroup->{billingplace} );
353	}	351	}
354	my $borrower= GetMember('borrowernumber' => $loggedinuser);	352	my $borrower= GetMember('borrowernumber' => $loggedinuser);
355	my $budgets = GetBudgetHierarchy;	353	my $budgets = GetBudgetHierarchy;
Lines 368-374 elsif ( $op eq 'ediorder' ) { Link Here
368	basketno => $basketno,	366	basketno => $basketno,
369	basket => $basket,	367	basket => $basket,
370	basketname => $basket->{'basketname'},	368	basketname => $basket->{'basketname'},
371	basketbranchname => C4::Branch::GetBranchName($basket->{branch}),	369	basketbranchcode => $basket->{branch},
372	basketnote => $basket->{note},	370	basketnote => $basket->{note},
373	basketbooksellernote => $basket->{booksellernote},	371	basketbooksellernote => $basket->{booksellernote},
374	basketcontractno => $basket->{contractnumber},	372	basketcontractno => $basket->{contractnumber},
Lines 382-389 elsif ( $op eq 'ediorder' ) { Link Here
382	closedate => $basket->{closedate},	380	closedate => $basket->{closedate},
383	estimateddeliverydate=> $estimateddeliverydate,	381	estimateddeliverydate=> $estimateddeliverydate,
384	is_standing => $basket->{is_standing},	382	is_standing => $basket->{is_standing},
385	deliveryplace => C4::Branch::GetBranchName( $basket->{deliveryplace} ),	383	deliveryplace => $basket->{deliveryplace},
386	billingplace => C4::Branch::GetBranchName( $basket->{billingplace} ),	384	billingplace => $basket->{billingplace},
387	active => $bookseller->{'active'},	385	active => $bookseller->{'active'},
388	booksellerid => $bookseller->{'id'},	386	booksellerid => $bookseller->{'id'},
389	name => $bookseller->{'name'},	387	name => $bookseller->{'name'},

Lines 129-140 if ($AcqCreateItem eq 'receiving') { Link Here

(-)a/acqui/orderreceive.pl (-6 lines)
129	my @items;	129	my @items;
130	foreach (@itemnumbers) {	130	foreach (@itemnumbers) {
131	my $item = GetItem($_);	131	my $item = GetItem($_);
132	if($item->{homebranch}) {
133	$item->{homebranchname} = GetBranchName($item->{homebranch});
134	}
135	if($item->{holdingbranch}) {
136	$item->{holdingbranchname} = GetBranchName($item->{holdingbranch});
137	}
138	if(my $code = GetAuthValCode("items.notforloan", $fw)) {	132	if(my $code = GetAuthValCode("items.notforloan", $fw)) {
139	$item->{notforloan} = GetKohaAuthorisedValueLib($code, $item->{notforloan});	133	$item->{notforloan} = GetKohaAuthorisedValueLib($code, $item->{notforloan});
140	}	134	}

Lines 29-36 use strict; Link Here

(-)a/acqui/pdfformat/layout3pages.pm (-6 / +6 lines)
29	use warnings;	29	use warnings;
30	use utf8;	30	use utf8;
31		31
32	use C4::Branch qw(GetBranchName);
33
34	use Koha::Number::Price;	32	use Koha::Number::Price;
35	use Koha::DateUtils;	33	use Koha::DateUtils;
36	use Koha::Libraries;	34	use Koha::Libraries;
Lines 63-69 sub printorders { Link Here
63	my $number = 3;	61	my $number = 3;
64	for my $basket (@$baskets){	62	for my $basket (@$baskets){
65	my $page = $pdf->page();	63	my $page = $pdf->page();
66		64	my $billing_library = Koha::Libraries->find( $basket->{billingplace} );
		65	my $delivery_library = Koha::Libraries->find( $basket->{deliveryplace} );
		66
67	# print basket header (box)	67	# print basket header (box)
68	my $box = $page->gfx;	68	my $box = $page->gfx;
69	$box->rectxy(($width - 10)/mm, ($height - 5)/mm, 10/mm, ($height - 25)/mm);	69	$box->rectxy(($width - 10)/mm, ($height - 5)/mm, 10/mm, ($height - 25)/mm);
Lines 78-86 sub printorders { Link Here
78	$text->text("Order no. ".$basketgroup->{'id'}.". Basket no. ".$basket->{basketno}.". ".$basket->{booksellernote});	78	$text->text("Order no. ".$basketgroup->{'id'}.". Basket no. ".$basket->{basketno}.". ".$basket->{booksellernote});
79	$text->translate(20/mm, ($height-20)/mm);	79	$text->translate(20/mm, ($height-20)/mm);
80	$text->font( $pdf->corefont("Times", -encoding => "utf8"), 4/mm );	80	$text->font( $pdf->corefont("Times", -encoding => "utf8"), 4/mm );
81	$text->text( ( $basket->{billingplace} ? "Billing at " . C4::Branch::GetBranchName( $basket->{billingplace} ) : "" )	81	$text->text( ( $billing_library ? "Billing at " . $billing_library->branchname : "" )
82	. ( $basket->{billingplace} and $basket->{deliveryplace} ? " and " : "" )	82	. ( $billing_library and $delivery_library ? " and " : "" )
83	. ( $basket->{deliveryplace} ? "delivery at " . C4::Branch::GetBranchName( $basket->{deliveryplace}) : "" )	83	. ( $delivery_library ? "delivery at " . $delivery_library->branchname : "" )
84	);	84	);
85		85
86	my $pdftable = new PDF::Table();	86	my $pdftable = new PDF::Table();

Lines 28-35 use strict; Link Here

(-)a/acqui/pdfformat/layout3pagesfr.pm (-5 / +5 lines)
28	use warnings;	28	use warnings;
29	use utf8;	29	use utf8;
30		30
31	use C4::Branch qw(GetBranchName);
32
33	use Koha::Number::Price;	31	use Koha::Number::Price;
34	use Koha::DateUtils;	32	use Koha::DateUtils;
35	use Koha::Libraries;	33	use Koha::Libraries;
Lines 62-67 sub printorders { Link Here
62	my $number = 3;	60	my $number = 3;
63	for my $basket (@$baskets){	61	for my $basket (@$baskets){
64	my $page = $pdf->page();	62	my $page = $pdf->page();
		63	my $billing_library = Koha::Libraries->find( $basket->{billingplace} );
		64	my $delivery_library = Koha::Libraries->find( $basket->{deliveryplace} );
65		65
66	# print basket header (box)	66	# print basket header (box)
67	my $box = $page->gfx;	67	my $box = $page->gfx;
Lines 77-85 sub printorders { Link Here
77	$text->text("Commande N°".$basketgroup->{'id'}.". Panier N° ".$basket->{basketno}.". ".$basket->{booksellernote});	77	$text->text("Commande N°".$basketgroup->{'id'}.". Panier N° ".$basket->{basketno}.". ".$basket->{booksellernote});
78	$text->translate(20/mm, ($height-20)/mm);	78	$text->translate(20/mm, ($height-20)/mm);
79	$text->font( $pdf->corefont("Times", -encoding => "utf8"), 4/mm );	79	$text->font( $pdf->corefont("Times", -encoding => "utf8"), 4/mm );
80	$text->text( ( $basket->{billingplace} ? "Facturation à " . C4::Branch::GetBranchName( $basket->{billingplace} ) : "" )	80	$text->text( ( $billing_library ? "Facturation à " . $billing_library->branchname : "" )
81	. ( $basket->{billingplace} and $basket->{deliveryplace} ? " et " : "" )	81	. ( $billing_library and $delivery_library ? " et " : "" )
82	. ( $basket->{deliveryplace} ? "livraison à " . C4::Branch::GetBranchName( $basket->{deliveryplace}) : "" )	82	. ( $delivery_library ? "livraison à " . $delivery_library->branchname : "" )
83	);	83	);
84		84
85	my $pdftable = new PDF::Table();	85	my $pdftable = new PDF::Table();

Lines 50-57 else Link Here

(-)a/admin/branch_transfer_limits.pl (-4 lines)
50	$branchcode = $input->param('branchcode');	50	$branchcode = $input->param('branchcode');
51	}	51	}
52		52
53	my $branchname = GetBranchName($branchcode);
54
55	# Getting the branches for user selection	53	# Getting the branches for user selection
56	my $branches = GetBranches();	54	my $branches = GetBranches();
57	my @branch_loop;	55	my @branch_loop;
Lines 124-130 foreach my $code ( @codes ) { Link Here
124	$row_data{ code } = $code;	122	$row_data{ code } = $code;
125	$row_data{ toBranch } = $toBranch;	123	$row_data{ toBranch } = $toBranch;
126	$row_data{ isChecked } = $isChecked;	124	$row_data{ isChecked } = $isChecked;
127	$row_data{ toBranchname } = GetBranchName($toBranch);
128	push( @to_branch_loop, \%row_data );	125	push( @to_branch_loop, \%row_data );
129	}	126	}
130		127
Lines 138-144 $template->param( Link Here
138	branch_loop => \@branch_loop,	135	branch_loop => \@branch_loop,
139	branchcode_loop => \@branchcode_loop,	136	branchcode_loop => \@branchcode_loop,
140	branchcode => $branchcode,	137	branchcode => $branchcode,
141	branchname => $branchname,
142	limitType => $limitType,	138	limitType => $limitType,
143	);	139	);
144		140

Lines 33-39 use C4::Output; Link Here

(-)a/admin/clone-rules.pl (-3 / +1 lines)
33	use C4::Auth;	33	use C4::Auth;
34	use C4::Koha;	34	use C4::Koha;
35	use C4::Debug;	35	use C4::Debug;
36	use C4::Branch; # GetBranches	36	use C4::Branch; # GetBranchesLoop
37		37
38	my $input = new CGI;	38	my $input = new CGI;
39	my $dbh = C4::Context->dbh;	39	my $dbh = C4::Context->dbh;
Lines 52-60 my $tobranch = $input->param("tobranch"); Link Here
52	my $branchloop = GetBranchesLoop;	52	my $branchloop = GetBranchesLoop;
53		53
54	$template->param(frombranch => $frombranch) if ($frombranch);	54	$template->param(frombranch => $frombranch) if ($frombranch);
55	$template->param(frombranchname => GetBranchName($frombranch)) if ($frombranch);
56	$template->param(tobranch => $tobranch) if ($tobranch);	55	$template->param(tobranch => $tobranch) if ($tobranch);
57	$template->param(tobranchname => GetBranchName($tobranch)) if ($tobranch);
58		56
59	$template->param(branchloop => $branchloop);	57	$template->param(branchloop => $branchloop);
60		58

Lines 23-32 use JSON; Link Here

(-)a/catalogue/getitem-ajax.pl (-3 / +3 lines)
23		23
24	use C4::Auth;	24	use C4::Auth;
25	use C4::Biblio;	25	use C4::Biblio;
26	use C4::Branch;
27	use C4::Items;	26	use C4::Items;
28	use C4::Koha;	27	use C4::Koha;
29	use C4::Output;	28	use C4::Output;
		29	use Koha::Libraries;
30		30
31	my $cgi = new CGI;	31	my $cgi = new CGI;
32		32
Lines 46-56 if($itemnumber) { Link Here
46	$item = GetItem($itemnumber);	46	$item = GetItem($itemnumber);
47		47
48	if($item->{homebranch}) {	48	if($item->{homebranch}) {
49	$item->{homebranchname} = GetBranchName($item->{homebranch});	49	$item->{homebranchname} = Koha::Libraries->find($item->{homebranch})->branchname;
50	}	50	}
51		51
52	if($item->{holdingbranch}) {	52	if($item->{holdingbranch}) {
53	$item->{holdingbranchname} = GetBranchName($item->{holdingbranch});	53	$item->{holdingbranchname} = Koha::Libraries->find($item->{holdingbranch})->branchname;
54	}	54	}
55		55
56	if(my $code = GetAuthValCode("items.notforloan", $fw)) {	56	if(my $code = GetAuthValCode("items.notforloan", $fw)) {

Lines 45-51 use C4::Biblio; Link Here

(-)a/circ/returns.pl (-3 / +1 lines)
45	use C4::Items;	45	use C4::Items;
46	use C4::Members;	46	use C4::Members;
47	use C4::Members::Messaging;	47	use C4::Members::Messaging;
48	use C4::Branch; # GetBranches GetBranchName	48	use C4::Branch; # GetBranches
49	use C4::Koha; # FIXME : is it still useful ?	49	use C4::Koha; # FIXME : is it still useful ?
50	use C4::RotatingCollections;	50	use C4::RotatingCollections;
51	use Koha::DateUtils;	51	use Koha::DateUtils;
Lines 172-178 if ( $query->param('reserve_id') ) { Link Here
172	itemnumber => $iteminfo->{'itemnumber'},	172	itemnumber => $iteminfo->{'itemnumber'},
173	itembiblionumber => $iteminfo->{'biblionumber'},	173	itembiblionumber => $iteminfo->{'biblionumber'},
174	iteminfo => $iteminfo->{'author'},	174	iteminfo => $iteminfo->{'author'},
175	tobranchname => GetBranchName($messages->{'transfert'}),
176	name => $name,	175	name => $name,
177	borrowernumber => $borrowernumber,	176	borrowernumber => $borrowernumber,
178	borcnum => $borr->{'cardnumber'},	177	borcnum => $borr->{'cardnumber'},
Lines 650-656 if ( $itemnumber ) { Link Here
650	if ( ! ( $holdingBranch eq $collectionBranch ) ) {	649	if ( ! ( $holdingBranch eq $collectionBranch ) ) {
651	$template->param(	650	$template->param(
652	collectionItemNeedsTransferred => 1,	651	collectionItemNeedsTransferred => 1,
653	collectionBranchName => GetBranchName($collectionBranch),
654	collectionBranch => $collectionBranch,	652	collectionBranch => $collectionBranch,
655	itemnumber => $itemnumber,	653	itemnumber => $itemnumber,
656	);	654	);

Lines 23-29 use warnings; Link Here

(-)a/circ/waitingreserves.pl (-3 / +1 lines)
23	use CGI qw ( -utf8 );	23	use CGI qw ( -utf8 );
24	use C4::Context;	24	use C4::Context;
25	use C4::Output;	25	use C4::Output;
26	use C4::Branch; # GetBranchName
27	use C4::Auth;	26	use C4::Auth;
28	use C4::Circulation;	27	use C4::Circulation;
29	use C4::Members;	28	use C4::Members;
Lines 119-125 foreach my $num (@getreserves) { Link Here
119	$getreserv{'subtitle'} = GetRecordValue('subtitle', GetMarcBiblio($gettitle->{'biblionumber'}), GetFrameworkCode($gettitle->{'biblionumber'}));	118	$getreserv{'subtitle'} = GetRecordValue('subtitle', GetMarcBiblio($gettitle->{'biblionumber'}), GetFrameworkCode($gettitle->{'biblionumber'}));
120	$getreserv{'biblionumber'} = $gettitle->{'biblionumber'};	119	$getreserv{'biblionumber'} = $gettitle->{'biblionumber'};
121	$getreserv{'barcode'} = $gettitle->{'barcode'};	120	$getreserv{'barcode'} = $gettitle->{'barcode'};
122	$getreserv{'branchname'} = GetBranchName($gettitle->{'homebranch'});
123	$getreserv{'homebranch'} = $gettitle->{'homebranch'};	121	$getreserv{'homebranch'} = $gettitle->{'homebranch'};
124	$getreserv{'holdingbranch'} = $gettitle->{'holdingbranch'};	122	$getreserv{'holdingbranch'} = $gettitle->{'holdingbranch'};
125	$getreserv{'itemcallnumber'} = $gettitle->{'itemcallnumber'};	123	$getreserv{'itemcallnumber'} = $gettitle->{'itemcallnumber'};
Lines 194-200 sub cancel { Link Here
194	my $iteminfo = GetBiblioFromItemNumber($item);	192	my $iteminfo = GetBiblioFromItemNumber($item);
195	if ( $messages->{'transfert'} ) {	193	if ( $messages->{'transfert'} ) {
196	$res{messagetransfert} = $messages->{'transfert'};	194	$res{messagetransfert} = $messages->{'transfert'};
197	$res{branchname} = GetBranchName($messages->{'transfert'});	195	$res{branchcode} = $messages->{'transfert'};
198	}	196	}
199		197
200	$res{message} = 1;	198	$res{message} = 1;

Lines 647-653 function verify_images() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (-3 / +4 lines)
647	[% item.translated_description %]	647	[% item.translated_description %]
648	</td>	648	</td>
649	[% END %]	649	[% END %]
650	<td class="location">[% UNLESS ( singlebranchmode ) %][% item.branchname %] [% END %]</td>	650	<td class="location">[% UNLESS ( singlebranchmode ) %][% Branches.GetName( item.branchcode ) %] [% END %]</td>
651	<td class="homebranch">[% Branches.GetName(item.homebranch) %]<span class="shelvingloc">[% item.location %]</span> </td>	651	<td class="homebranch">[% Branches.GetName(item.homebranch) %]<span class="shelvingloc">[% item.location %]</span> </td>
652	[% IF ( itemdata_ccode ) %]<td>[% item.ccode %]</td>[% END %]	652	[% IF ( itemdata_ccode ) %]<td>[% item.ccode %]</td>[% END %]
653	<td class="itemcallnumber">[% IF ( item.itemcallnumber ) %] [% item.itemcallnumber %][% END %]</td>	653	<td class="itemcallnumber">[% IF ( item.itemcallnumber ) %] [% item.itemcallnumber %][% END %]</td>
Lines 910-917 function verify_images() { Link Here
910	<h2>This is a serial subscription</h2>	910	<h2>This is a serial subscription</h2>
911	<p> (There are [% subscriptionsnumber %] subscriptions associated with this title).</p>	911	<p> (There are [% subscriptionsnumber %] subscriptions associated with this title).</p>
912	[% FOREACH subscription IN subscriptions %]	912	[% FOREACH subscription IN subscriptions %]
913	[% IF ( subscription.branchname ) %]<h3>At library: [% subscription.branchname %]</h3>[% ELSE %]	913	[% IF subscription.branchcode %]
914	[% IF ( subscription.branchcode ) %]<h3>At library: [% subscription.branchcode %]</h3>[% END %][% END %]	914	<h3>At library: [% Branches.GetName(subscription.branchcode) \|\| subscription.branchcode %]</h3>
		915	[% END %]
915	[% IF ( subscription.closed ) %]<p>This subscription is closed.</p>[% END %]	916	[% IF ( subscription.closed ) %]<p>This subscription is closed.</p>[% END %]
916	[% IF ( subscription.callnumber ) %]<p>Callnumber: [% subscription.callnumber %] </p>[% END %]	917	[% IF ( subscription.callnumber ) %]<p>Callnumber: [% subscription.callnumber %] </p>[% END %]
917	[% IF ( subscription.subscriptionnotes ) %]<p>[% subscription.subscriptionnotes FILTER html_line_break %] </p>[% END %]	918	[% IF ( subscription.subscriptionnotes ) %]<p>[% subscription.subscriptionnotes FILTER html_line_break %] </p>[% END %]

Lines 47-53 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt (-3 / +3 lines)
47	[% FOREACH cancel_result %]	47	[% FOREACH cancel_result %]
48	[% IF ( messagetransfert ) %]	48	[% IF ( messagetransfert ) %]
49	<div class="dialog message">	49	<div class="dialog message">
50	<h2>This item is on hold for pick-up at [% branchname %]</h2>	50	<h2>This item is on hold for pick-up at [% Branches.GetName( branchname ) %]</h2>
51	<p><strong>[% nextreservtitle %]</strong> is on hold for <strong> [% nextreservsurname %], [% nextreservfirstname %]</strong>.	51	<p><strong>[% nextreservtitle %]</strong> is on hold for <strong> [% nextreservsurname %], [% nextreservfirstname %]</strong>.
52	Please retain this item and check it in to process the hold.	52	Please retain this item and check it in to process the hold.
53	</p>	53	</p>
Lines 115-121 Link Here
115	<input type="hidden" name="tbr" value="[% reserveloo.homebranch %]" />	115	<input type="hidden" name="tbr" value="[% reserveloo.homebranch %]" />
116	<input type="hidden" name="tab" value="holdswaiting">	116	<input type="hidden" name="tab" value="holdswaiting">
117	[% IF ( reserveloo.dotransfer ) %]	117	[% IF ( reserveloo.dotransfer ) %]
118	<input type="submit" value="Cancel hold and return to : [% reserveloo.branchname %]" />	118	<input type="submit" value="Cancel hold and return to : [% Branches.GetName( reserveloo.homebranch ) %]" />
119	[% ELSE %]	119	[% ELSE %]
120	<input type="submit" value="Cancel hold" />	120	<input type="submit" value="Cancel hold" />
121	[% END %]	121	[% END %]
Lines 175-181 Link Here
175	<input type="hidden" name="tbr" value="[% overloo.homebranch %]" />	175	<input type="hidden" name="tbr" value="[% overloo.homebranch %]" />
176	<input type="hidden" name="tab" value="holdsover">	176	<input type="hidden" name="tab" value="holdsover">
177	[% IF ( overloo.dotransfer ) %]	177	[% IF ( overloo.dotransfer ) %]
178	<input type="submit" value="Cancel hold and return to : [% overloo.branchname %]" />	178	<input type="submit" value="Cancel hold and return to : [% Branches.GetName( overloo.homebranch ) %]" />
179	[% ELSE %]	179	[% ELSE %]
180	<input type="submit" value="Cancel hold" />	180	<input type="submit" value="Cancel hold" />
181	[% END %]	181	[% END %]

Lines 33-38 use C4::Debug; Link Here

(-)a/suggestion/suggestion.pl (-2 / +3 lines)
33		33
34	use Koha::DateUtils qw( dt_from_string );	34	use Koha::DateUtils qw( dt_from_string );
35	use Koha::Acquisition::Currencies;	35	use Koha::Acquisition::Currencies;
		36	use Koha::Libraries;
36		37
37	use URI::Escape;	38	use URI::Escape;
38		39
Lines 60-66 sub GetCriteriumDesc{ Link Here
60	}	61	}
61	return ($criteriumvalue eq 'ASKED'?"Pending":ucfirst(lc( $criteriumvalue))) if ($displayby =~/status/i);	62	return ($criteriumvalue eq 'ASKED'?"Pending":ucfirst(lc( $criteriumvalue))) if ($displayby =~/status/i);
62	}	63	}
63	return (GetBranchName($criteriumvalue)) if ($displayby =~/branchcode/);	64	return Koha::Libraries->find($criteriumvalue)->branchname;
		65	if $displayby =~ /branchcode/;
64	return GetAuthorisedValueByCode('SUGGEST_FORMAT', $criteriumvalue) \|\| "Unknown" if ($displayby =~/itemtype/);	66	return GetAuthorisedValueByCode('SUGGEST_FORMAT', $criteriumvalue) \|\| "Unknown" if ($displayby =~/itemtype/);
65	if ($displayby =~/suggestedby/\|\|$displayby =~/managedby/\|\|$displayby =~/acceptedby/){	67	if ($displayby =~/suggestedby/\|\|$displayby =~/managedby/\|\|$displayby =~/acceptedby/){
66	my $borr=C4::Members::GetMember(borrowernumber=>$criteriumvalue);	68	my $borr=C4::Members::GetMember(borrowernumber=>$criteriumvalue);
Lines 213-219 elsif ($op eq "change" ) { Link Here
213	}	215	}
214	elsif ( $op eq 'show' ) {	216	elsif ( $op eq 'show' ) {
215	$suggestion_ref=&GetSuggestion($$suggestion_ref{'suggestionid'});	217	$suggestion_ref=&GetSuggestion($$suggestion_ref{'suggestionid'});
216	$$suggestion_ref{branchname} = GetBranchName $$suggestion_ref{branchcode};
217	my $budget = GetBudget $$suggestion_ref{budgetid};	218	my $budget = GetBudget $$suggestion_ref{budgetid};
218	$$suggestion_ref{budgetname} = $$budget{budget_name};	219	$$suggestion_ref{budgetname} = $$budget{budget_name};
219	Init($suggestion_ref);	220	Init($suggestion_ref);

Lines 21-27 use Modern::Perl; Link Here

(-)a/t/db_dependent/Branch.t (-6 / +1 lines)
21	use C4::Context;	21	use C4::Context;
22	use Data::Dumper;	22	use Data::Dumper;
23		23
24	use Test::More tests => 17;	24	use Test::More tests => 16;
25		25
26	use C4::Branch;	26	use C4::Branch;
27	use Koha::Database;	27	use Koha::Database;
Lines 36-42 BEGIN { Link Here
36	}	36	}
37	can_ok(	37	can_ok(
38	'C4::Branch', qw(	38	'C4::Branch', qw(
39	GetBranchName
40	GetBranch	39	GetBranch
41	GetBranches	40	GetBranches
42	GetBranchesLoop	41	GetBranchesLoop
Lines 110-119 is( Koha::Libraries->search->count, $count + 2, "two branches added" ); Link Here
110	is( Koha::Libraries->find( $b2->{branchcode} )->delete, 1, "One row affected" );	109	is( Koha::Libraries->find( $b2->{branchcode} )->delete, 1, "One row affected" );
111	is( Koha::Libraries->search->count, $count + 1, "branch BRB deleted" );	110	is( Koha::Libraries->search->count, $count + 1, "branch BRB deleted" );
112		111
113	#Test GetBranchName
114	is( GetBranchName( $b1->{branchcode} ),
115	$b1->{branchname}, "GetBranchName returns the right name" );
116
117	#Test Getbranches	112	#Test Getbranches
118	my $branches = GetBranches();	113	my $branches = GetBranches();
119	is( scalar( keys %$branches ),	114	is( scalar( keys %$branches ),

Lines 1-8 Link Here

(-)a/t/db_dependent/NewsChannels.t (-2 / +2 lines)
1	#!/usr/bin/perl	1	#!/usr/bin/perl
2		2
3	use Modern::Perl;	3	use Modern::Perl;
4	use C4::Branch qw(GetBranchName);
5	use Koha::DateUtils;	4	use Koha::DateUtils;
		5	use Koha::Libraries;
6		6
7	use Test::More tests => 14;	7	use Test::More tests => 14;
8		8
Lines 18-24 $dbh->{RaiseError} = 1; Link Here
18		18
19	# Add LIB1, if it doesn't exist.	19	# Add LIB1, if it doesn't exist.
20	my $addbra = 'LIB1';	20	my $addbra = 'LIB1';
21	if ( !GetBranchName($addbra) ) {	21	unless ( Koha::Libraries->find($addbra) ) {
22	$dbh->do( q{ INSERT INTO branches (branchcode,branchname) VALUES (?,?) },	22	$dbh->do( q{ INSERT INTO branches (branchcode,branchname) VALUES (?,?) },
23	undef, ( $addbra, "$addbra branch" ) );	23	undef, ( $addbra, "$addbra branch" ) );
24	}	24	}

Lines 40-46 use warnings; Link Here

(-)a/tools/import_borrowers.pl (-2 / +3 lines)
40	use C4::Auth;	40	use C4::Auth;
41	use C4::Output;	41	use C4::Output;
42	use C4::Context;	42	use C4::Context;
43	use C4::Branch qw/GetBranchesLoop GetBranchName/;	43	use C4::Branch qw/GetBranchesLoop/;
44	use C4::Members;	44	use C4::Members;
45	use C4::Members::Attributes qw(:all);	45	use C4::Members::Attributes qw(:all);
46	use C4::Members::AttributeTypes;	46	use C4::Members::AttributeTypes;
Lines 51-56 use Koha::Patron::Debarments; Link Here
51	use Koha::Patrons;	51	use Koha::Patrons;
52	use Koha::DateUtils;	52	use Koha::DateUtils;
53	use Koha::Token;	53	use Koha::Token;
		54	use Koha::Libraries;
54	use Koha::Patron::Categories;	55	use Koha::Patron::Categories;
55		56
56	use Text::CSV;	57	use Text::CSV;
Lines 195-201 if ( $uploadborrowers && length($uploadborrowers) > 0 ) { Link Here
195	}	196	}
196	if ($borrower{branchcode}) {	197	if ($borrower{branchcode}) {
197	push @missing_criticals, {key=>'branchcode', line=>$. , lineraw=>$borrowerline, value=>$borrower{branchcode}, branch_map=>1}	198	push @missing_criticals, {key=>'branchcode', line=>$. , lineraw=>$borrowerline, value=>$borrower{branchcode}, branch_map=>1}
198	unless GetBranchName($borrower{branchcode});	199	unless Koha::Libraries->find($borrower{branchcode});
199	} else {	200	} else {
200	push @missing_criticals, {key=>'branchcode', line=>$. , lineraw=>$borrowerline};	201	push @missing_criticals, {key=>'branchcode', line=>$. , lineraw=>$borrowerline};
201	}	202	}