Merge branch 'bug_10079' into 3.14-master

This commit is contained in:
Jared Camins-Esakov 2013-05-12 21:06:19 -04:00
commit 7295c7d2b7

View file

@ -2213,10 +2213,9 @@ sub DelItemCheck {
if ($onloan){
$error = "book_on_loan"
}
elsif ( !(C4::Context->userenv->{flags} & 1) and
C4::Context->preference("IndependantBranches") and
(C4::Context->userenv->{branch} ne
$item->{C4::Context->preference("HomeOrHoldingBranch")||'homebranch'}) )
elsif ( !( C4::Context->userenv->{flags} & 1 )
and C4::Context->preference("IndependantBranches")
and ( C4::Context->userenv->{branch} ne $item->{'homebranch'} ) )
{
$error = "not_same_branch";
}