From: Kyle M Hall <kyle@bywatersolutions.com>
Date: Fri, 19 Apr 2013 14:21:43 +0000 (-0400)
Subject: Bug 10079 - HomeOrHoldingBranch should not control who can delete when IndependantBra... 
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=f1d68112820483b8cc5e837f6ded6f9bebe83717;p=koha.git

Bug 10079 - HomeOrHoldingBranch should not control who can delete when IndependantBranches is enabled

Test Plan:
1) Enable IndependantBranches
2) Set HomeOrHoldingBranch to holding branch
3) Delete an item whose holding branch is your logged in branch, and
   whose home branch is not
4) Apply this patch
5) Repeat step 3, it should fail
6) Try to delete another items whose home branch is your logged in
   branch, and whose holding branch is a different branch. This
   deletetion should succeed.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Change is logical, only homebranch should determine if the item
can be deleted.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
---

diff --git a/C4/Items.pm b/C4/Items.pm
index d9c31f907e..9283b5c63e 100644
--- a/C4/Items.pm
+++ b/C4/Items.pm
@@ -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";
     }