bugfix : independantbranches behaviour

Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc
index 22b1fbd..e79c518 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc
@@ -25,11 +25,16 @@
        </script>
 <ul class="toolbar">
        <li><a id="newsubscription" href="/cgi-bin/koha/serials/subscription-add.pl">New Subscription</a></li>
-       <!-- TMPL_IF NAME="subscriptionid" --><li><a id="edit" href="subscription-add.pl?op=mod&amp;subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Edit</a></li>
-       <li><a id="duplicate" href="subscription-add.pl?op=dup&amp;subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Duplicate </a></li>
-       <li><a id="renew" href="#" onclick="popup(<!--TMPL_VAR Name="subscriptionid"-->)">Renew </a></li>
-       <li><a id="receive" href="serials-edit.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->&amp;serstatus=1,3">Receive</a></li>
-       <li><a id="delete" href="javascript:confirm_deletion()">Delete</a></li>
-               <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="subscriptionid" -->
+        <!-- TMPL_UNLESS name="cannotedit" -->
+            <li><a id="edit" href="subscription-add.pl?op=mod&amp;subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Edit</a></li>
+        <!-- /TMPL_UNLESS -->
+        <li><a id="duplicate" href="subscription-add.pl?op=dup&amp;subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Duplicate </a></li>
+        <!-- TMPL_UNLESS name="cannotedit" -->
+            <li><a id="renew" href="#" onclick="popup(<!--TMPL_VAR Name="subscriptionid"-->)">Renew </a></li>
+            <li><a id="receive" href="serials-edit.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->&amp;serstatus=1,3">Receive</a></li>
+            <li><a id="delete" href="javascript:confirm_deletion()">Delete</a></li>
+        <!-- /TMPL_UNLESS -->
+    <!-- /TMPL_IF -->
 </ul>
 </div>

diff --git a/serials/subscription-detail.pl b/serials/subscription-detail.pl
index 94242ec..6d4d202 100755 (executable)
--- a/serials/subscription-detail.pl
+++ b/serials/subscription-detail.pl
@@ -105,6 +105,11 @@ $template->param(
     serialslist => \@serialslist,
     totalissues => $totalissues,
     hemisphere => $hemisphere,
+    cannotedit =>(C4::Context->preference('IndependantBranches') && 
+                C4::Context->userenv && 
+                C4::Context->userenv->{flags} !=1  && 
+                C4::Context->userenv->{branch} && $subs->{branchcode} &&
+                (C4::Context->userenv->{branch} ne $subs->{branchcode})),
     );
 $template->param(
             "periodicity".($subs->{periodicity}?$subs->{periodicity}:'0') => 1,