X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=C4%2FCirculation.pm;h=f8b204abbd65892a67e64f596bd25083aeea3792;hb=b0870311e1b8fae10a6ab17d0e132e911c3ab3aa;hp=34aa358742bee9be0ade54c840234ea30f533ee5;hpb=80897930b73dcd17b377ce2d175a85a720117922;p=koha_fer diff --git a/C4/Circulation.pm b/C4/Circulation.pm index 34aa358742..f8b204abbd 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -896,7 +896,7 @@ sub CanBookBeIssued { } if ( C4::Context->preference("IndependentBranches") ) { my $userenv = C4::Context->userenv; - if ( ($userenv) && ( $userenv->{flags} % 2 != 1 ) ) { + unless ( C4::Context->IsSuperLibrarian() ) { if ( $item->{C4::Context->preference("HomeOrHoldingBranch")} ne $userenv->{branch} ){ $issuingimpossible{ITEMNOTSAMEBRANCH} = 1; $issuingimpossible{'itemhomebranch'} = $item->{C4::Context->preference("HomeOrHoldingBranch")}; @@ -2433,7 +2433,7 @@ FROM issues LEFT JOIN items USING (itemnumber) LEFT OUTER JOIN branches USING (branchcode) WHERE returndate is NULL -HAVING days_until_due > 0 AND days_until_due < ? +HAVING days_until_due >= 0 AND days_until_due <= ? END_SQL my @bind_parameters = ( $params->{'days_in_advance'} );