X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=C4%2FSerials.pm;h=6d188e768591acf47480e36595d8105efc478c06;hb=9c5e40e4923179bf0b2b630d3e09797dc4c1fdb0;hp=da876e2678faae003d5cbd11f4e6c8f984ddeac5;hpb=5248f12a0e48630cca6d877179bb86fde70f4929;p=koha.git

diff --git a/C4/Serials.pm b/C4/Serials.pm
index da876e2678..6d188e7685 100644
--- a/C4/Serials.pm
+++ b/C4/Serials.pm
@@ -711,8 +711,9 @@ sub SearchSubscriptions {
     for my $subscription ( @$results ) {
         $subscription->{cannotedit} = not can_edit_subscription( $subscription );
         $subscription->{cannotdisplay} =
-            ( C4::Context->preference("IndependentBranches")
-                and $subscription->{branchcode} ne C4::Context->userenv->{'branch'} ) ? 1 : 0;
+            ( C4::Context->preference("IndependentBranches") &&
+              C4::Context->userenv &&
+              $subscription->{branchcode} ne C4::Context->userenv->{'branch'} ) ? 1 : 0;
     }
 
     return @$results;
@@ -1978,7 +1979,7 @@ name,title,planneddate,serialseq,serial.subscriptionid from tables : subscriptio
 sub GetLateOrMissingIssues {
     my ( $supplierid, $serialid, $order ) = @_;
 
-    return unless ($supplierid);
+    return unless ( $supplierid or $serialid );
 
     my $dbh = C4::Context->dbh;
     my $sth;