[Koha-patches] [3.0.x] bug 3292: in opac branchcode should be replaced with name

[Matthias Meusburger]

---
 .../opac-tmpl/prog/en/modules/opac-detail.tmpl     |    3 ++-
 opac/opac-detail.pl                                |    1 +
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
index 612592d..648f9ae 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
@@ -385,7 +385,8 @@
     <h2>This is a serial subscription</h2>
     <p> (There are <!-- TMPL_VAR NAME="subscriptionsnumber" --> subscriptions associated with this title).</p>
     <!-- TMPL_LOOP Name="subscriptions" -->
-    <!-- TMPL_IF name="branchcode" --><h3>At branch: <!-- TMPL_VAR NAME="branchcode" --></h3><!-- /TMPL_IF -->
+    <!-- TMPL_IF name="branchname" --><h3>At library: <!-- TMPL_VAR NAME="branchname" --></h3><!-- TMPL_ELSE -->
+    <!-- TMPL_IF name="branchcode" --><h3>At branch: <!-- TMPL_VAR NAME="branchcode" --></h3><!-- /TMPL_IF --><!-- /TMPL_IF -->
     <!-- TMPL_IF NAME="subscriptionnotes" --><p><!--TMPL_VAR NAME="subscriptionnotes"--> </p><!-- /TMPL_IF -->
     <!--TMPL_IF NAME="latestserials"-->
     <p> The three latest issues for this subscription:</p>
diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
index 5e369dd..a53d71d 100755
--- a/opac/opac-detail.pl
+++ b/opac/opac-detail.pl
@@ -103,6 +103,7 @@ foreach my $subscription (@subscriptions) {
     $cell{subscriptionid}    = $subscription->{subscriptionid};
     $cell{subscriptionnotes} = $subscription->{notes};
     $cell{branchcode}        = $subscription->{branchcode};
+    $cell{branchname}        = GetBranchName($subscription->{branchcode});
     $cell{hasalert}          = $subscription->{hasalert};
     #get the three latest serials.
     $cell{latestserials} =
-- 
1.6.0.4