Browse Source

Bug 15758: Koha::Libraries - Remove GetBranchName

This is the fourth and last patch set to remove C4::Branch.
The real purpose of this patch is to standardise and refactor some code
which is related to the libraries selection/display.
Its unconfessed purpose is to remove the C4::Branch package.

Before this patch set, only 6 subroutines still existed in the C4::Branch
package:
- GetBranchName
- GetBranchesLoop
- mybranch
- onlymine
- GetBranches
- GetBranch

GetBranchName basically returns the branchname for a given branchcode.
The branchname is only used for a display purpose and we don't need to
retrieve it in package or pl scripts (unless for a few exceptions).
We have a `Branches` template plugin with a `GetName` method which does
exactly this job.
To achieve this removal, we will use this template plugin and delete the
GetBranchName from pl and pm files.
The `Branches.all()` will now select the library of the logged in user
if no `selected` parameter has been passed.
This new behavior could cause regressions, for instance there are some
places where we do not want an option preselected (batch item
modification for instance), keep that in mind when testing.

GetBranchesLoop took 3 parameters: $branch and $onlymine.
The first one was used to set a "selected" flag, for a display purpose:
select an option in the libraries dropdown lists.
The second one was useless: If not passed or set to 0, the
`C4::Branch::onlymine` subroutine was called.
This onlymine flag was use to know if the logged in user was able to see
other libraries infos.
A patron can see the infos from other libraries if IndependentBranches
is not set OR if he has the superlibrarian permission.
Prior to this patch set, the "onlymine test" was done on different
places (neworderempty.pl, additem.pl, holidays.pl, etc.), including the
Branches TT plugin. In this patch set, this test is only done on one
place (C4::Context::only_my_library, code moved from
C4::Branch::onlymine).
To accomplish the same job as this subroutine, we just need to call the
`Branches.all()` method from the `Branches` TT plugin. It already
accepts a `selected` parameter to set a flag on the option to select.
To avoid the repetitive
  [% IF selected %]<option selected="selected">[% ELSE %]<option>[% END %]
pattern, a new `html_helpers` TT include file has been created, it
defines an `options_for_libraries` block, which takes a `selected`
parameter. We could imagine to use this include file for other
selects.

The 'mybranch` and `onlymine` subroutines of the C4::Branch package have
been moved to C4::Context. onlymine has been renamed with
only_my_library. There are only 4 occurrences of it, against 11 before
this patch set.
There 2 subroutines are Context-centric and it makes sense to put them
in `C4::Context` (at least it's the least worst place!)

GetBranches is the tricky part of this patch set: It retrieves all the
libraries, independently of the value of IndependentBranches.
To keep the same way as the existing calls of `Branches.all()`, I have
added a `unfiltered` parameter. If set, the `Branches.all()` will call
a usual Koha::Libraries->search method, otherwise
Koha::Libraries->search_filtered will be called. This new method will
check if the logged in user is allowed to see other libraries or only
its library.
Note that this `GetBranches` subroutine also created a `category` key:
it allowed to get the list of groups (of libraries) where this library
existed. Thanks to a previous patch set (bug 15295), this value was
not used anymore (I may have missed something!).

Note that the only use of `GetBranch` was buggy (see bug 15746).

Test plan (for the whole patch set):
The best way to test this whole patch set is to test with 2 instances: 1
with the patch set applied, 1 using master, to be sure there is no
regression.
It would be good to test the same with `IndependentBranches` and the
without `IndependentBranches`.
No difference should be found.
The tester must focus on the library dropdowns on as many forms as
possible.
You will notice changes in the order of the options: the libraries will
now be ordered by branchname (instead of branchcode in some places).
A special attention will be given to the following page:
- acqui/neworderempty.pl
- catalogue/search.pl
- members/members-home.pl (header?)
- opac/opac-topissues.pl
- tools/holidays.pl
- admin/branch_transfer_limits.pl
- admin/item_circulation_alerts.pl
- rotating_collections/transferCollection.pl
- suggestion/suggestion.pl
- tools/export.pl

Notes for QA:
- There are 2 FIXMEs in the patch set, I have kept the existing behavior,
but I am not sure it's the good one. Feel free to open a bug report and
I will fill a patch if you think it's not correct. Otherwise, remove the
FIXME lines in a follow-up patch.
- The whole patch set is huge and makes a lot of changes.
But it finally will tremendously reduce the number of lines:
716 insertions for 1910 deletions

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
16.11.x
Jonathan Druart 6 years ago
committed by Kyle M Hall
parent
commit
19a977dc7b
  1. 20
      C4/Acquisition.pm
  2. 5
      C4/Auth.pm
  3. 3
      C4/Biblio.pm
  4. 15
      C4/Branch.pm
  5. 7
      C4/Circulation.pm
  6. 23
      C4/ILSDI/Services.pm
  7. 13
      C4/Items.pm
  8. 7
      C4/Labels/Label.pm
  9. 5
      C4/SIP/ILS/Patron.pm
  10. 7
      C4/Search.pm
  11. 7
      acqui/acqui-home.pl
  12. 8
      acqui/basket.pl
  13. 6
      acqui/orderreceive.pl
  14. 12
      acqui/pdfformat/layout3pages.pm
  15. 10
      acqui/pdfformat/layout3pagesfr.pm
  16. 4
      admin/branch_transfer_limits.pl
  17. 4
      admin/clone-rules.pl
  18. 1
      catalogue/detail.pl
  19. 6
      catalogue/getitem-ajax.pl
  20. 2
      catalogue/moredetail.pl
  21. 2
      circ/branchoverdues.pl
  22. 1
      circ/circulation.pl
  23. 4
      circ/returns.pl
  24. 4
      circ/selectbranchprinter.pl
  25. 4
      circ/waitingreserves.pl
  26. 2
      koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
  27. 5
      koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
  28. 13
      koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
  29. 5
      koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
  30. 5
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt
  31. 7
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt
  32. 7
      koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
  33. 5
      koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
  34. 5
      koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt
  35. 6
      koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
  36. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
  37. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
  38. 6
      koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
  39. 1
      koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt
  40. 1
      koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt
  41. 1
      koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt
  42. 1
      koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt
  43. 1
      koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
  44. 1
      koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
  45. 1
      koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
  46. 1
      koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
  47. 1
      koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt
  48. 1
      koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt
  49. 1
      koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt
  50. 3
      koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt
  51. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
  52. 7
      koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
  53. 3
      koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
  54. 1
      koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
  55. 4
      koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
  56. 1
      members/boraccount.pl
  57. 1
      members/deletemem.pl
  58. 1
      members/files.pl
  59. 1
      members/mancredit.pl
  60. 1
      members/maninvoice.pl
  61. 1
      members/member-flags.pl
  62. 1
      members/member-password.pl
  63. 2
      members/moremember.pl
  64. 2
      members/notices.pl
  65. 1
      members/pay.pl
  66. 1
      members/paycollect.pl
  67. 1
      members/printfeercpt.pl
  68. 1
      members/printinvoice.pl
  69. 1
      members/purchase-suggestions.pl
  70. 1
      members/routing-lists.pl
  71. 1
      members/statistics.pl
  72. 1
      opac/opac-detail.pl
  73. 1
      reports/itemtypes.plugin
  74. 3
      reports/reserves_stats.pl
  75. 3
      serials/routing-preview.pl
  76. 5
      suggestion/suggestion.pl
  77. 3
      svc/holds
  78. 7
      t/db_dependent/Branch.t
  79. 4
      t/db_dependent/NewsChannels.t
  80. 3
      t/db_dependent/Reserves.t
  81. 3
      tools/holidays.pl
  82. 5
      tools/import_borrowers.pl
  83. 1
      tools/modborrowers.pl
  84. 1
      tools/viewlog.pl

20
C4/Acquisition.pm

@ -301,9 +301,12 @@ sub GetBasketAsCSV {
notes => $order->{'order_vendornote'},
quantity => $order->{'quantity'},
rrp => $order->{'rrp'},
deliveryplace => C4::Branch::GetBranchName( $basket->{'deliveryplace'} ),
billingplace => C4::Branch::GetBranchName( $basket->{'billingplace'} ),
};
for my $place ( qw( deliveryplace billingplace ) ) {
if ( my $library = Koha::Libraries->find( $row->{deliveryplace} ) ) {
$row->{$place} = $library->branchname
}
}
foreach(qw(
contractname author title publishercode collectiontitle notes
deliveryplace billingplace
@ -374,11 +377,16 @@ sub GetBasketGroupAsCSV {
booksellerpostal => $bookseller->{postal},
contractnumber => $contract->{contractnumber},
contractname => $contract->{contractname},
basketgroupdeliveryplace => C4::Branch::GetBranchName( $basketgroup->{deliveryplace} ),
basketgroupbillingplace => C4::Branch::GetBranchName( $basketgroup->{billingplace} ),
basketdeliveryplace => C4::Branch::GetBranchName( $basket->{deliveryplace} ),
basketbillingplace => C4::Branch::GetBranchName( $basket->{billingplace} ),
basketgroupdeliveryplace => $basketgroup->{deliveryplace},
basketgroupbillingplace => $basketgroup->{billingplace},
basketdeliveryplace => $basket->{deliveryplace},
basketbillingplace => $basket->{billingplace},
};
for my $place (qw( basketgroupdeliveryplace basketgroupbillingplace basketdeliveryplace basketbillingplace )) {
if ( my $library = Koha::Libraries->find( $row->{deliveryplace} ) ) {
$row->{$place} = $library->branchname;
}
}
foreach(qw(
basketname author title publishercode collectiontitle notes
booksellername bookselleraddress booksellerpostal contractname

5
C4/Auth.pm

@ -34,6 +34,7 @@ use C4::Search::History;
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/;
@ -1077,7 +1078,7 @@ sub checkauth {
# if they specify at login, use that
if ( $query->param('branch') ) {
$branchcode = $query->param('branch');
$branchname = GetBranchName($branchcode);
$branchname = Koha::Libraries->find($branchcode)->branchname;
}
my $branches = GetBranches();
if ( C4::Context->boolean_preference('IndependentBranches') && C4::Context->boolean_preference('Autolocation') ) {
@ -1529,7 +1530,7 @@ sub check_api_auth {
# if they specify at login, use that
if ( $query->param('branch') ) {
$branchcode = $query->param('branch');
$branchname = GetBranchName($branchcode);
$branchname = Koha::Libraries->find($branchcode)->branchname;
}
my $branches = GetBranches();
my @branchesloop;

3
C4/Biblio.pm

@ -42,6 +42,7 @@ use Koha::Caches;
use Koha::Authority::Types;
use Koha::Acquisition::Currencies;
use Koha::SearchEngine;
use Koha::Libraries;
use vars qw(@ISA @EXPORT);
use vars qw($debug $cgi_debug);
@ -1698,7 +1699,7 @@ sub GetAuthorisedValueDesc {
#---- branch
if ( $tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) {
return C4::Branch::GetBranchName($value);
return Koha::Libraries->find($value)->branchname;
}
#---- itemtypes

15
C4/Branch.pm

@ -27,7 +27,6 @@ use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
BEGIN {
@ISA = qw(Exporter);
@EXPORT = qw(
&GetBranchName
&GetBranch
&GetBranches
&GetBranchesLoop
@ -152,20 +151,6 @@ sub GetBranchesLoop { # since this is what most pages want anyway
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 );

7
C4/Circulation.pm

@ -903,7 +903,7 @@ sub CanBookBeIssued {
$issuingimpossible{ITEMNOTSAMEBRANCH} = 1;
$issuingimpossible{'itemhomebranch'} = $item->{C4::Context->preference("HomeOrHoldingBranch")};
}
$needsconfirmation{BORRNOTSAMEBRANCH} = GetBranchName( $borrower->{'branchcode'} )
$needsconfirmation{BORRNOTSAMEBRANCH} = $borrower->{'branchcode'}
if ( $borrower->{'branchcode'} ne $userenv->{branch} );
}
}
@ -970,7 +970,6 @@ sub CanBookBeIssued {
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
@ -980,7 +979,7 @@ sub CanBookBeIssued {
$needsconfirmation{'ressurname'} = $resborrower->{'surname'};
$needsconfirmation{'rescardnumber'} = $resborrower->{'cardnumber'};
$needsconfirmation{'resborrowernumber'} = $resborrower->{'borrowernumber'};
$needsconfirmation{'resbranchname'} = $branchname;
$needsconfirmation{'resbranchcode'} = $res->{branchcode};
$needsconfirmation{'reswaitingdate'} = $res->{'waitingdate'};
}
elsif ( $restype eq "Reserved" ) {
@ -990,7 +989,7 @@ sub CanBookBeIssued {
$needsconfirmation{'ressurname'} = $resborrower->{'surname'};
$needsconfirmation{'rescardnumber'} = $resborrower->{'cardnumber'};
$needsconfirmation{'resborrowernumber'} = $resborrower->{'borrowernumber'};
$needsconfirmation{'resbranchname'} = $branchname;
$needsconfirmation{'resbranchcode'} = $res->{branchcode};
$needsconfirmation{'resreservedate'} = $res->{'reservedate'};
}
}

23
C4/ILSDI/Services.pm

@ -36,6 +36,8 @@ use DateTime;
use C4::Auth;
use C4::Members::Attributes qw(GetBorrowerAttributes);
use Koha::Libraries;
=head1 NAME
C4::ILS-DI::Services - ILS-DI Services
@ -220,8 +222,10 @@ sub GetRecords {
delete $item->{'more_subfields_xml'};
# Display branch names instead of branch codes
$item->{'homebranchname'} = GetBranchName( $item->{'homebranch'} );
$item->{'holdingbranchname'} = GetBranchName( $item->{'holdingbranch'} );
my $home_library = Koha::Libraries->find( $item->{homebranch} );
my $holding_library = Koha::Libraries->find( $item->{holdingbranch} );
$item->{'homebranchname'} = $home_library ? $home_library->branchname : '';
$item->{'holdingbranchname'} = $holding_library ? $holding_library->branchname : '';
}
# Hashref building...
@ -366,7 +370,8 @@ sub GetPatronInfo {
# Cleaning the borrower hashref
$borrower->{'charges'} = $borrower->{'flags'}->{'CHARGES'}->{'amount'};
$borrower->{'branchname'} = GetBranchName( $borrower->{'branchcode'} );
my $library = Koha::Libraries->find( $borrower->{branchcode} );
$borrower->{'branchname'} = $library ? $library->branchname : '';
delete $borrower->{'flags'};
delete $borrower->{'userid'};
delete $borrower->{'password'};
@ -406,7 +411,8 @@ sub GetPatronInfo {
# Get additional informations
my $item = GetBiblioFromItemNumber( $reserve->{'itemnumber'}, undef );
my $branchname = GetBranchName( $reserve->{'branchcode'} );
my $library = Koha::Libraries->find( $reserve->{branchcode} );
my $branchname = $library ? $library->branchname : '';
# Remove unwanted fields
delete $item->{'marc'};
@ -640,7 +646,8 @@ sub HoldTitle {
# Hashref building
my $out;
$out->{'title'} = $title;
$out->{'pickup_location'} = GetBranchName($branch);
my $library = Koha::Libraries->find( $branch );
$out->{'pickup_location'} = $library ? $library->branchname : '';
# TODO $out->{'date_available'} = '';
@ -716,7 +723,8 @@ sub HoldItem {
# Hashref building
my $out;
$out->{'pickup_location'} = GetBranchName($branch);
my $library = Koha::Libraries->find( $branch );
$out->{'pickup_location'} = $library ? $library->branchname : '';
# TODO $out->{'date_available'} = '';
@ -772,7 +780,8 @@ sub _availability {
}
my $biblionumber = $item->{'biblioitemnumber'};
my $location = GetBranchName( $item->{'holdingbranch'} );
my $library = Koha::Libraries->find( $item->{holdingbranch} );
my $location = $library ? $library->branchname : '';
if ( $item->{'notforloan'} ) {
return ( $biblionumber, 'not available', 'Not for loan', $location );

13
C4/Items.pm

@ -41,6 +41,7 @@ use Koha::Biblioitems;
use Koha::Items;
use Koha::SearchEngine;
use Koha::SearchEngine::Search;
use Koha::Libraries;
use vars qw(@ISA @EXPORT);
@ -755,20 +756,16 @@ sub CheckItemPreSave {
# check for valid home branch
if (exists $item_ref->{'homebranch'} and defined $item_ref->{'homebranch'}) {
my $branch_name = C4::Branch::GetBranchName($item_ref->{'homebranch'});
unless (defined $branch_name) {
# relies on fact that branches.branchname is a non-NULL column,
# so GetBranchName returns undef only if branch does not exist
my $home_library = Koha::Libraries->find( $item_ref->{homebranch} );
unless (defined $home_library) {
$errors{'invalid_homebranch'} = $item_ref->{'homebranch'};
}
}
# check for valid holding branch
if (exists $item_ref->{'holdingbranch'} and defined $item_ref->{'holdingbranch'}) {
my $branch_name = C4::Branch::GetBranchName($item_ref->{'holdingbranch'});
unless (defined $branch_name) {
# relies on fact that branches.branchname is a non-NULL column,
# so GetBranchName returns undef only if branch does not exist
my $holding_library = Koha::Libraries->find( $item_ref->{holdingbranch} );
unless (defined $holding_library) {
$errors{'invalid_holdingbranch'} = $item_ref->{'holdingbranch'};
}
}

7
C4/Labels/Label.pm

@ -97,9 +97,10 @@ sub _get_label_item {
$data->{'itype'} = $data1->{'description'};
# add *_description fields
if ($data->{'homebranch'} || $data->{'holdingbranch'}){
require C4::Branch;
$data->{'homebranch_description'} = C4::Branch::GetBranchName($data->{'homebranch'}) if $data->{'homebranch'};
$data->{'holdingbranch_description'} = C4::Branch::GetBranchName($data->{'holdingbranch'}) if $data->{'holdingbranch'};
require Koha::Libraries;
# FIXME Is this used??
$data->{'homebranch_description'} = Koha::Libraries->find($data->{'homebranch'})->branchname if $data->{'homebranch'};
$data->{'holdingbranch_description'} = Koha::Libraries->find($data->{'holdingbranch'})->branchname if $data->{'holdingbranch'};
}
$data->{'ccode_description'} = C4::Biblio::GetAuthorisedValueDesc('','', $data->{'ccode'} ,'','','CCODE', 1) if $data->{'ccode'};
$data->{'location_description'} = C4::Biblio::GetAuthorisedValueDesc('','', $data->{'location'} ,'','','LOC', 1) if $data->{'location'};

5
C4/SIP/ILS/Patron.pm

@ -20,10 +20,10 @@ use C4::Context;
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
@ -392,7 +392,8 @@ sub holds_blocked_by_excessive_fees {
sub library_name {
my $self = shift;
unless ($self->{library_name}) {
$self->{library_name} = GetBranchName($self->{branchcode});
my $library = Koha::Libraries->find( $self->{branchcode} );
$self->{library_name} = $library ? $library->branchname : '';
}
return $self->{library_name};
}

7
C4/Search.pm

@ -22,6 +22,7 @@ use C4::Context;
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;
@ -1712,9 +1713,9 @@ sub buildQuery {
$limit_cgi .= "&limit=" . uri_escape_utf8($this_limit);
if ($this_limit =~ /^branch:(.+)/) {
my $branchcode = $1;
my $branchname = GetBranchName($branchcode);
if (defined $branchname) {
$limit_desc .= " branch:$branchname";
my $library = Koha::Libraries->find( $branchcode );
if (defined $library) {
$limit_desc .= " branch:" . $library->branchname;
} else {
$limit_desc .= " $this_limit";
}

7
acqui/acqui-home.pl

@ -51,9 +51,6 @@ my ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user(
}
);
my $user = GetMember( 'borrowernumber' => $loggedinuser );
my $branchname = GetBranchName($user->{branchcode});
my $status = $query->param('status') || "ASKED";
my $suggestions_count = CountSuggestion($status);
@ -74,9 +71,6 @@ my @budget_loop;
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'};
@ -117,7 +111,6 @@ foreach my $budget ( @{$budget_arr} ) {
$template->param(
type => 'intranet',
loop_budget => \@budget_loop,
branchname => $branchname,
total => $total,
totspent => $totspent,
totordered => $totordered,

8
acqui/basket.pl

@ -348,8 +348,6 @@ elsif ( $op eq 'ediorder' ) {
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;
@ -368,7 +366,7 @@ elsif ( $op eq 'ediorder' ) {
basketno => $basketno,
basket => $basket,
basketname => $basket->{'basketname'},
basketbranchname => C4::Branch::GetBranchName($basket->{branch}),
basketbranchcode => $basket->{branch},
basketnote => $basket->{note},
basketbooksellernote => $basket->{booksellernote},
basketcontractno => $basket->{contractnumber},
@ -382,8 +380,8 @@ elsif ( $op eq 'ediorder' ) {
closedate => $basket->{closedate},
estimateddeliverydate=> $estimateddeliverydate,
is_standing => $basket->{is_standing},
deliveryplace => C4::Branch::GetBranchName( $basket->{deliveryplace} ),
billingplace => C4::Branch::GetBranchName( $basket->{billingplace} ),
deliveryplace => $basket->{deliveryplace},
billingplace => $basket->{billingplace},
active => $bookseller->{'active'},
booksellerid => $bookseller->{'id'},
name => $bookseller->{'name'},

6
acqui/orderreceive.pl

@ -129,12 +129,6 @@ if ($AcqCreateItem eq 'receiving') {
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});
}

12
acqui/pdfformat/layout3pages.pm

@ -29,8 +29,6 @@ use strict;
use warnings;
use utf8;
use C4::Branch qw(GetBranchName);
use Koha::Number::Price;
use Koha::DateUtils;
use Koha::Libraries;
@ -63,7 +61,9 @@ sub printorders {
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);
@ -78,9 +78,9 @@ sub printorders {
$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( ( $basket->{billingplace} ? "Billing at " . C4::Branch::GetBranchName( $basket->{billingplace} ) : "" )
. ( $basket->{billingplace} and $basket->{deliveryplace} ? " and " : "" )
. ( $basket->{deliveryplace} ? "delivery at " . C4::Branch::GetBranchName( $basket->{deliveryplace}) : "" )
$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();

10
acqui/pdfformat/layout3pagesfr.pm

@ -28,8 +28,6 @@ use strict;
use warnings;
use utf8;
use C4::Branch qw(GetBranchName);
use Koha::Number::Price;
use Koha::DateUtils;
use Koha::Libraries;
@ -62,6 +60,8 @@ sub printorders {
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;
@ -77,9 +77,9 @@ sub printorders {
$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( ( $basket->{billingplace} ? "Facturation à " . C4::Branch::GetBranchName( $basket->{billingplace} ) : "" )
. ( $basket->{billingplace} and $basket->{deliveryplace} ? " et " : "" )
. ( $basket->{deliveryplace} ? "livraison à " . C4::Branch::GetBranchName( $basket->{deliveryplace}) : "" )
$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();

4
admin/branch_transfer_limits.pl

@ -50,8 +50,6 @@ else
$branchcode = $input->param('branchcode');
}
my $branchname = GetBranchName($branchcode);
# Getting the branches for user selection
my $branches = GetBranches();
my @branch_loop;
@ -124,7 +122,6 @@ foreach my $code ( @codes ) {
$row_data{ code } = $code;
$row_data{ toBranch } = $toBranch;
$row_data{ isChecked } = $isChecked;
$row_data{ toBranchname } = GetBranchName($toBranch);
push( @to_branch_loop, \%row_data );
}
@ -138,7 +135,6 @@ $template->param(
branch_loop => \@branch_loop,
branchcode_loop => \@branchcode_loop,
branchcode => $branchcode,
branchname => $branchname,
limitType => $limitType,
);

4
admin/clone-rules.pl

@ -33,7 +33,7 @@ use C4::Output;
use C4::Auth;
use C4::Koha;
use C4::Debug;
use C4::Branch; # GetBranches
use C4::Branch; # GetBranchesLoop
my $input = new CGI;
my $dbh = C4::Context->dbh;
@ -52,9 +52,7 @@ my $tobranch = $input->param("tobranch");
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);

1
catalogue/detail.pl

@ -161,7 +161,6 @@ foreach my $subscription (@subscriptions) {
$cell{missinglist} = $subscription->{missinglist};
$cell{librariannote} = $subscription->{librariannote};
$cell{branchcode} = $subscription->{branchcode};
$cell{branchname} = GetBranchName($subscription->{branchcode});
$cell{hasalert} = $subscription->{hasalert};
$cell{callnumber} = $subscription->{callnumber};
$cell{closed} = $subscription->{closed};

6
catalogue/getitem-ajax.pl

@ -23,10 +23,10 @@ use JSON;
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;
@ -46,11 +46,11 @@ if($itemnumber) {
$item = GetItem($itemnumber);
if($item->{homebranch}) {
$item->{homebranchname} = GetBranchName($item->{homebranch});
$item->{homebranchname} = Koha::Libraries->find($item->{homebranch})->branchname;
}
if($item->{holdingbranch}) {
$item->{holdingbranchname} = GetBranchName($item->{holdingbranch});
$item->{holdingbranchname} = Koha::Libraries->find($item->{holdingbranch})->branchname;
}
if(my $code = GetAuthValCode("items.notforloan", $fw)) {

2
catalogue/moredetail.pl

@ -178,8 +178,6 @@ foreach my $item (@items){
$item->{'nomod'}=1;
}
}
$item->{'homebranchname'} = GetBranchName($item->{'homebranch'});
$item->{'holdingbranchname'} = GetBranchName($item->{'holdingbranch'});
if ($item->{'datedue'}) {
$item->{'issue'}= 1;
} else {

2
circ/branchoverdues.pl

@ -125,7 +125,7 @@ foreach my $num (@getoverdues) {
$overdueforbranch{'borrowerfirstname'} = $num->{'firstname'};
$overdueforbranch{'borrowerphone'} = $num->{'phone'};
$overdueforbranch{'borroweremail'} = $num->{'email'};
$overdueforbranch{'homebranch'} = GetBranchName($num->{'homebranch'});
$overdueforbranch{'homebranch'} = $num->{'homebranch'};
$overdueforbranch{'itemcallnumber'} = $num->{'itemcallnumber'};
$overdueforbranch{'borrowernumber'} = $num->{'borrowernumber'};
$overdueforbranch{'itemnumber'} = $num->{'itemnumber'};

1
circ/circulation.pl

@ -628,7 +628,6 @@ $template->param(
borrowernumber => $borrowernumber,
categoryname => $borrower->{'description'},
branch => $branch,
branchname => GetBranchName($borrower->{'branchcode'}),
was_renewed => scalar $query->param('was_renewed') ? 1 : 0,
expiry => $borrower->{'dateexpiry'},
roadtype => $roadtype,

4
circ/returns.pl

@ -45,7 +45,7 @@ use C4::Biblio;
use C4::Items;
use C4::Members;
use C4::Members::Messaging;
use C4::Branch; # GetBranches GetBranchName
use C4::Branch; # GetBranches
use C4::Koha; # FIXME : is it still useful ?
use C4::RotatingCollections;
use Koha::DateUtils;
@ -172,7 +172,6 @@ if ( $query->param('reserve_id') ) {
itemnumber => $iteminfo->{'itemnumber'},
itembiblionumber => $iteminfo->{'biblionumber'},
iteminfo => $iteminfo->{'author'},
tobranchname => GetBranchName($messages->{'transfert'}),
name => $name,
borrowernumber => $borrowernumber,
borcnum => $borr->{'cardnumber'},
@ -650,7 +649,6 @@ if ( $itemnumber ) {
if ( ! ( $holdingBranch eq $collectionBranch ) ) {
$template->param(
collectionItemNeedsTransferred => 1,
collectionBranchName => GetBranchName($collectionBranch),
collectionBranch => $collectionBranch,
itemnumber => $itemnumber,
);

4
circ/selectbranchprinter.pl

@ -28,6 +28,8 @@ use C4::Print; # GetPrinters
use C4::Koha;
use C4::Branch; # GetBranches GetBranchesLoop
use Koha::Libraries;
# this will be the script that chooses branch and printer settings....
my $query = CGI->new();
@ -58,7 +60,7 @@ my @updated;
# $session lddines here are doing the updating
if ($branch and $branches->{$branch}) {
if (! $userenv_branch or $userenv_branch ne $branch ) {
my $branchname = GetBranchName($branch);
my $branchname = Koha::Libraries->find($branch)->branchname;
$template->param(LoginBranchname => $branchname); # update template for new branch
$template->param(LoginBranchcode => $branch); # update template for new branch
$session->param('branchname', $branchname); # update sesssion in DB

4
circ/waitingreserves.pl

@ -23,7 +23,6 @@ use warnings;
use CGI qw ( -utf8 );
use C4::Context;
use C4::Output;
use C4::Branch; # GetBranchName
use C4::Auth;
use C4::Circulation;
use C4::Members;
@ -119,7 +118,6 @@ foreach my $num (@getreserves) {
$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'};
@ -194,7 +192,7 @@ sub cancel {
my $iteminfo = GetBiblioFromItemNumber($item);
if ( $messages->{'transfert'} ) {
$res{messagetransfert} = $messages->{'transfert'};
$res{branchname} = GetBranchName($messages->{'transfert'});
$res{branchcode} = $messages->{'transfert'};
}
$res{message} = 1;

2
koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc

@ -59,7 +59,7 @@
[% END %]
[% END %][% END %]
<li class="patroncategory">Category: [% categoryname %] ([% categorycode %])</li>
<li class="patronlibrary">Home library: [% IF ( branchname ) %][% branchname %][% ELSE %][% branch %][% END %]</li>
<li class="patronlibrary">Home library: [% Branches.GetName( branchcode ) %]</li>
</ul></div>
<div id="menu">
<ul>

5
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt

@ -1,4 +1,5 @@
[% USE Price %]
[% USE Branches %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Acquisitions</title>
[% INCLUDE 'doc-head-close.inc' %]
@ -136,7 +137,7 @@ $(document).ready(function() {
[% IF ( loop_budget ) %]
<h3>All available funds[% IF ( branchname ) %] for [% branchname %][% END %]</h3>
<h3>All available funds[% IF LoginBranchname %] for [% LoginBranchname %][% END %]</h3>
<div id="BudgetsAndFunds">
<table id="accounts">
@ -196,7 +197,7 @@ $(document).ready(function() {
&nbsp;
[% END %]
</td>
<td>[% loop_budge.budget_branchname %]</td>
<td>[% Branches.GetName( loop_budge.budget_branchcode ) %]</td>
<td class="data">
[% IF loop_budge.budget_parent_id %]
[% loop_budge.budget_amount | $Price %]

13
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt

@ -1,4 +1,5 @@
[% USE KohaDates %]
[% USE Branches %]
[% USE Price %]
[% USE AuthorisedValues %]
@ -301,8 +302,8 @@
[% 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> [% deliveryplace %]</li>[% END %]
[% IF ( billingplace ) %]<li><span class="label">Billing place:</span> [% billingplace %]</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">
@ -326,8 +327,8 @@
</li>
<li id="branch">
<span class="label">Library:</span>
[% IF basketbranchname %]
[% basketbranchname %]
[% IF basketbranchcode %]
[% Branches.GetName( basketbranchcode ) %]
[% ELSE %]
No library
[% END %]
@ -403,8 +404,8 @@
<input type="submit" value="Change basket group" />
[% END %]
</li>
[% IF ( basketgroup.deliveryplacename ) %]<li><span class="label">Basket group delivery placename:</span> [% basketgroup.deliveryplacename %]</li>[% END %]
[% IF ( basketgroup.billingplacename ) %]<li><span class="label">Basket group billing place:</span> [% basketgroup.billingplacename %]</li>[% END %]
[% 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>

5
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt

@ -1,4 +1,5 @@
[% USE KohaDates %]
[% USE Branches %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Acquisitions &rsaquo; Receipt summary for : [% name %] [% IF ( invoice ) %]invoice, [% invoice %][% END %]</title>
[% INCLUDE 'doc-head-close.inc' %]
@ -238,8 +239,8 @@
<td style="text-align:center"><input type="checkbox" name="items_to_receive" value="[% item.itemnumber %]" /></td>
<td><a style="cursor:pointer" onclick="PopupEditPage([% item.biblionumber %],[% item.itemnumber %]);">Edit</a></td>
<td>[% item.barcode %]</td>
<td>[% item.homebranchname %]</td>
<td>[% item.holdingbranchname %]</td>
<td>[% Branches.GetName( item.homebranch )%]</td>
<td>[% Branches.GetName( item.holdingbranch ) %]</td>
<td>[% item.notforloan %]</td>
<td>[% item.restricted %]</td>
<td>[% item.location %]</td>

5
koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt

@ -1,3 +1,4 @@
[% USE Branches %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Administration &rsaquo; Library checkin and transfer policy</title>
[% INCLUDE 'doc-head-close.inc' %]
@ -54,7 +55,7 @@
<div id="yui-main">
<div class="yui-b">
<h1>Library [% branchcode %] - [% branchname %] Checkin and transfer policy</h1>
<h1>Library [% branchcode %] - [% Branches.GetName( branchcode ) %] Checkin and transfer policy</h1>
<form method="get" action="/cgi-bin/koha/admin/branch_transfer_limits.pl" id="selectlibrary">
<label for="branchselect">Select a library :</label>
<select name="branchcode" id="branchselect">
@ -95,7 +96,7 @@
<tbody>
[% FOREACH to_branch_loo IN codes_loo.to_branch_loop %]
<tr>
<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>
<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>
<td>
[% IF ( to_branch_loo.isChecked ) %]
<input type="checkbox" id="[% to_branch_loo.code %][% to_branch_loo.toBranch %]row" name="[% to_branch_loo.code %]_[% to_branch_loo.toBranch %]" checked="checked" />

7
koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt

@ -1,3 +1,4 @@
[% USE Branches %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Administration &rsaquo; Circulation and fine rules &rsaquo; Clone circulation and fine rules</title>
[% INCLUDE 'doc-head-close.inc' %]
@ -14,10 +15,8 @@
<div id="yui-main">
<div class="yui-b">
<h2>Cloning circulation and fine rules
[% IF ( frombranchname || tobranchname ) %]
[% IF ( frombranchname ) %] from "[% frombranchname %]"[% END %]
[% IF ( tobranchname ) %] to "[% tobranchname %]"[% END %]
[% END %]
[% IF frombranch %] from "[% Branches.GetName( frombranch ) %]"[% END %]
[% IF tobranch %] to "[% Branches.GetName( tobranch ) %]"[% END %]
</h2>
[% IF ( result ) %]

7
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt

@ -647,7 +647,7 @@ function verify_images() {
[% item.translated_description %]
</td>
[% END %]
<td class="location">[% UNLESS ( singlebranchmode ) %][% item.branchname %] [% END %]</td>
<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>
@ -910,8 +910,9 @@ function verify_images() {
<h2>This is a serial subscription</h2>
<p> (There are [% subscriptionsnumber %] subscriptions associated with this title).</p>
[% FOREACH subscription IN subscriptions %]
[% IF ( subscription.branchname ) %]<h3>At library: [% subscription.branchname %]</h3>[% ELSE %]
[% IF ( subscription.branchcode ) %]<h3>At library: [% subscription.branchcode %]</h3>[% END %][% END %]
[% 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 %]

5
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt

@ -1,4 +1,5 @@
[% USE Koha %]
[% USE Branches %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Catalog &rsaquo; Item details for [% title %] [% FOREACH subtitl IN subtitle %] [% subtitl.subfield %][% END %]</title>
[% INCLUDE 'doc-head-close.inc' %]
@ -62,7 +63,7 @@
[% END %]
[% END %][% END %]</h4>
<ol class="bibliodetails">
<li><span class="label">Home library:</span> [% ITEM_DAT.homebranchname %]&nbsp;</li>
<li><span class="label">Home library:</span> [% Branches.GetName( ITEM_DAT.homebranch ) %]&nbsp;</li>
[% IF ( item_level_itypes ) %]
<li><span class="label">Item type:</span> [% ITEM_DAT.itype %]&nbsp;</li>
[% END %]
@ -80,7 +81,7 @@
)[% END %]</h4>
<ol class="bibliodetails">
<li><span class="label">Current location:</span> [% ITEM_DAT.holdingbranchname %]&nbsp;</li>
<li><span class="label">Current location:</span> [% Branches.GetName( ITEM_DAT.holdingbranch ) %]&nbsp;</li>
<li><span class="label">Checkout status:</span>
[% IF ( ITEM_DAT.issue ) %]Checked out to
[% IF ( hidepatronname ) %]

5
koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt

@ -1,3 +1,4 @@
[% USE Branches %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Circulation &rsaquo; Overdues at [% LoginBranchname %]</title>
[% INCLUDE 'doc-head-close.inc' %]
@ -54,7 +55,7 @@
[% IF ( overduesloo.borroweremail ) %]<a href="mailto:[% overduesloo.borroweremail %]?subject=Overdue: [% overduesloo.title |html %]">
[% overduesloo.borroweremail %]</a>[% END %]
</td>
<td>[% overduesloo.homebranch %] [% overduesloo.itemcallnumber %]
<td>[% Branches.GetName( overduesloo.homebranch ) %] [% overduesloo.itemcallnumber %]
</td>
<td align="center">
<b>
@ -132,7 +133,7 @@
[% todayoverduesloo.borroweremail %]</a>[% END %]
</p>
</td>
<td><p>[% todayoverduesloo.homebranch %] [% todayoverduesloo.itemcallnumber %]</p>
<td><p>[% Branches.GetName( todayoverduesloo.homebranch ) %] [% todayoverduesloo.itemcallnumber %]</p>
</td>
<td align="center">
<b>

6
koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt

@ -213,11 +213,11 @@ $(document).ready(function() {
[% 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 [% resbranchname %] since [% reswaitingdate | $KohaDates %]</li>
<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 [% resbranchname %] since [% resreservedate | $KohaDates %]</li>
<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 ) %]
@ -237,7 +237,7 @@ $(document).ready(function() {
[% END %]
[% IF ( BORRNOTSAMEBRANCH ) %]
<li>This patron is from a different library ([% BORRNOTSAMEBRANCH %])</li>
<li>This patron is from a different library ([% Branches.GetName( BORRNOTSAMEBRANCH ) %])</li>
[% END %]
[% IF ( PATRON_CANT ) %]

2
koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt

@ -164,7 +164,7 @@ $(document).ready(function() {
<li><i class="fa fa-li fa-warning"></i>Too many checked out.</li>
[% END %]
[% IF checkout_info.BORRNOTSAMEBRANCH %]
<li><i class="fa fa-li fa-warning"></i>This patron is from a different library ([% checkout_info.BORRNOTSAMEBRANCH %]).</li>
<li><i class="fa fa-li fa-warning"></i>This patron is from a different library ([% Branches.GetName( checkout_info.BORRNOTSAMEBRANCH ) %]).</li>
[% END %]
[% IF checkout_ino.PATRON_CANT %]
<li><i class="fa fa-li fa-warning"></i>This patron can't check out this item per library circulation policy.</li>

2
koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt

@ -176,7 +176,7 @@ $(document).ready(function () {
[% IF ( collectionItemNeedsTransferred ) %]
<div id="rotating-collection" class="dialog message">
<h3>Please transfer item to: [% collectionBranchName %]</h3>
<h3>Please transfer item to: [% Branches.GetName( collectionBranch ) %]</h3>
<p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% itembarcode |html %]: [% title |html %]</a></p>
<p>This item is part of a rotating collection.</p>
<p><button type="button" class="openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber %]&amp;branchcode=[% collectionBranch %]&amp;op=slip"><i class="fa fa-print"></i> Print slip</button></p>

6
koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt

@ -47,7 +47,7 @@
[% FOREACH cancel_result %]
[% IF ( messagetransfert ) %]
<div class="dialog message">
<h2>This item is on hold for pick-up at [% branchname %]</h2>
<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>
@ -115,7 +115,7 @@
<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 : [% reserveloo.branchname %]" />
<input type="submit" value="Cancel hold and return to : [% Branches.GetName( reserveloo.homebranch ) %]" />
[% ELSE %]
<input type="submit" value="Cancel hold" />
[% END %]
@ -175,7 +175,7 @@
<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 : [% overloo.branchname %]" />
<input type="submit" value="Cancel hold and return to : [% Branches.GetName( overloo.homebranch ) %]" />
[% ELSE %]
<input type="submit" value="Cancel hold" />
[% END %]

1
koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt

@ -1,5 +1,6 @@
[% USE KohaDates %]
[% USE AuthorisedValues %]
[% USE Branches %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Patrons &rsaquo; [% IF (unknowuser) %]Patron does not exist[% ELSE %]Discharge for [% firstname %] [% surname %] ([% cardnumber %])[% END %]</title>
[% INCLUDE 'doc-head-close.inc' %]

1
koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt

@ -1,3 +1,4 @@
[% USE Branches %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Patrons &rsaquo; Pending discharge requests</title>
[% INCLUDE 'doc-head-close.inc' %]

1
koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt

@ -1,3 +1,4 @@
[% USE Branches %]
[% PROCESS 'permissions.inc' %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Patrons &rsaquo; Set permissions for [% surname %], [% firstname %]</title>

1
koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt

@ -1,3 +1,4 @@
[% USE Branches %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Patrons &rsaquo; [% IF ( newpassword ) %]Password updated [% ELSE %]Update password for [% surname %], [% firstname %][% END %]</title>
[% INCLUDE 'doc-head-close.inc' %]

1
koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt

@ -1,4 +1,5 @@
[% USE Koha %]
[% USE Branches %]
[% USE KohaDates %]
[% USE AuthorisedValues %]
[% USE ColumnsSettings %]

1
koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt

@ -1,5 +1,6 @@
[% USE Koha %]
[% USE AuthorisedValues %]
[% USE Branches %]
[% USE KohaDates %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Sent notices for [% INCLUDE 'patron-title.inc' %]</title>

1
koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt

@ -1,5 +1,6 @@
[% USE Koha %]
[% USE AuthorisedValues %]
[% USE Branches %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Patrons &rsaquo; Pay Fines for [% borrower.firstname %] [% borrower.surname %]</title>
[% INCLUDE 'doc-head-close.inc' %]

1
koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt

@ -1,4 +1,5 @@
[% USE Koha %]
[% USE Branches %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Patrons &rsaquo; Collect fine payment for [% borrower.firstname %] [% borrower.surname %]</title>
[% INCLUDE 'doc-head-close.inc' %]

1
koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt

@ -1,5 +1,6 @@
[% USE Koha %]
[% USE AuthorisedValues %]
[% USE Branches %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Patrons &rsaquo; Purchase suggestions for [% INCLUDE 'patron-title.inc' %]</title>
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />

1
koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt

@ -1,5 +1,6 @@
[% USE Koha %]
[% USE AuthorisedValues %]
[% USE Branches %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Subscription Routing Lists for [% INCLUDE 'patron-title.inc' %]</title>
[% INCLUDE 'doc-head-close.inc' %]

1
koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt

@ -1,5 +1,6 @@
[% USE Koha %]
[% USE AuthorisedValues %]
[% USE Branches %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Patrons &rsaquo;
[% IF ( unknowuser ) %]

3
koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt

@ -1,3 +1,4 @@
[% USE Branches %]
[% USE ItemTypes %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Reports &rsaquo; Catalog by item types</title>
@ -31,7 +32,7 @@ $(document).ready(function(){
[% IF ( do_it ) %]
[% FOREACH mainloo IN mainloop %]
<h1>Reports on item types [% IF ( mainloo.branchname ) %] held at [% mainloo.branchname %][% END %]</h1>
<h1>Reports on item types [% IF branch %] held at [% Branches.GetName( branch ) %][% END %]</h1>
<table id="itemtypest">
<thead>
<tr>

2
koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt

@ -278,7 +278,7 @@ h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o
<fieldset class="rows"> <legend>Acquisition information</legend>
<ol>
<li>
<span class="label">Library:</span> [% branchname %]
<span class="label">Library:</span> [% Branches.GetName( branchcode ) %]
</li>
<li>
<span class="label">Fund:</span> [% budgetname %]

7
koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt

@ -1,5 +1,6 @@
[% USE Branches %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Tools &rsaquo; [% branchname %] calendar</title>
<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" />
@ -226,14 +227,14 @@ td.repeatableyearly a.ui-state-default { background: #FFCC66 none; color : Bl
[% 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; [% branchname %] calendar</div>
<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>[% branchname %] calendar</h2>
<h2>[% Branches.GetName( branch ) %] calendar</h2>
<div class="yui-g">
<div class="yui-u first">
<label for="branch">Define the holidays for:</label>

3
koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt

@ -1,5 +1,6 @@
[% USE Koha %]
[% USE KohaDates %]
[% USE Branches %]
[% INCLUDE 'doc-head-open.inc'%]
<title>Koha &rsaquo; Tools &rsaquo; Batch patron modification</title>
[% INCLUDE 'doc-head-close.inc' %]
@ -267,7 +268,7 @@
<td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrower.borrowernumber %]">[% borrower.cardnumber %]</a></td>
<td>[% borrower.surname %]</td>
<td>[% borrower.firstname %]</td>
<td>[% borrower.branchname %]</td>
<td>[% Branches.GetName( borrower.branchcode ) %]</td>
<td>[% borrower.categorycode %]</td>
<td>[% borrower.city %]</td>
<td>[% borrower.state %]</td>

1
koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt

@ -1,5 +1,6 @@
[% USE Koha %]
[% USE AuthorisedValues %]
[% USE Branches %]
[% INCLUDE 'doc-head-open.inc' %]
<title>
Koha &rsaquo; Tools &rsaquo;

4
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt

@ -794,8 +794,8 @@
<h2>This is a serial</h2>
<p>There are [% subscriptionsnumber %] subscription(s) associated with this title.</p>
[% FOREACH subscription IN subscriptions %]
[% IF ( subscription.branchname ) %]
<h3>At library: [% subscription.branchname %]</h3>
[% IF ( subscription.branchcode ) %]
<h3>At library: [% Branches.GetName( subscription.branchname ) %]</h3>
[% ELSE %]
[% IF ( subscription.branchcode ) %]
<h3>At library: [% subscription.branchcode %]</h3>

1
members/boraccount.pl

@ -111,7 +111,6 @@ $template->param(%$data);
$template->param(
finesview => 1,
borrowernumber => $borrowernumber,
branchname => GetBranchName($data->{'branchcode'}),
<