From 41b16e0fec61aa3eb5b227e59c1fd7c2e5e3d58d Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Fri, 19 Apr 2013 10:21:43 -0400 Subject: [PATCH] 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 Signed-off-by: Katrin Fischer 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 (cherry picked from commit f1d68112820483b8cc5e837f6ded6f9bebe83717) Signed-off-by: Jared Camins-Esakov --- C4/Items.pm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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"; } -- 2.39.5