From: Matthias Meusburger <matthias.meusburger@biblibre.com>
Date: Wed, 23 Sep 2009 09:16:34 +0000 (+0200)
Subject: MT 1902, Follow-up
X-Git-Tag: v3.02.00-alpha~54^2~206
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=aaa8d0c80c893dbd92ced6c933263002cf6b048b;p=koha.git

MT 1902, Follow-up
---

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl
index 0ca920f330..0e74f1761b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl
@@ -95,6 +95,7 @@ function popup(subscriptionid) {
 		<!-- TMPL_IF NAME="opacdisplaycount" --><li><span class="label">Number of issues to display to the public</span>:&nbsp;<!-- TMPL_VAR NAME="opacdisplaycount" -->&nbsp;</li><!-- /TMPL_IF -->
         <!-- TMPL_IF name="letter" --><li><span class="label">Patron alert with:</span> <!-- TMPL_VAR name="letter" -->&nbsp;</li><!-- /TMPL_IF -->
         <!-- TMPL_IF name="notes" --><li><span class="label">Notes:</span> <!-- TMPL_VAR name="notes" --></li><!-- /TMPL_IF -->
+        <!-- TMPL_IF name="hasRouting" --><li><span class="label">Routing:</span> yes</li><!-- /TMPL_IF -->
         <!-- TMPL_IF name="internalnotes" --><li><span class="label">Management Notes:</span> <!-- TMPL_VAR name="internalnotes" --></li><!-- /TMPL_IF -->
      </ul>
     </div>
diff --git a/serials/subscription-detail.pl b/serials/subscription-detail.pl
index 82f883919d..4522677d86 100755
--- a/serials/subscription-detail.pl
+++ b/serials/subscription-detail.pl
@@ -70,7 +70,7 @@ if ($op eq 'del') {
 		exit;
     }
 }
-my ($routing, @routinglist) = getroutinglist($subscriptionid);
+my $hasRouting = check_routing($subscriptionid);
 my ($totalissues,@serialslist) = GetSerials($subscriptionid);
 $totalissues-- if $totalissues; # the -1 is to have 0 if this is a new subscription (only 1 issue)
 # the subscription must be deletable if there is NO issues for a reason or another (should not happend, but...)
@@ -101,8 +101,8 @@ if (! $subs->{periodicity}) {
 }
 $template->param(
 	subscriptionid => $subscriptionid,
-    routing => $routing,
     serialslist => \@serialslist,
+    hasRouting  => $hasRouting,
     totalissues => $totalissues,
     hemisphere => $hemisphere,
     cannotedit =>(C4::Context->preference('IndependantBranches') &&