From: Kyle M Hall Date: Mon, 25 Mar 2013 13:34:33 +0000 (-0400) Subject: Bug 9922 - holds queue shows home library with AutomaticReturn X-Git-Tag: v3.12.00-beta3~214^2 X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=commitdiff_plain;h=3b2abc60d7d189f41aecf25ca4b61b4ef349c3b4;p=koha_ffzg Bug 9922 - holds queue shows home library with AutomaticReturn Test Plan: 1) Enable AutomaticItemReturn 2) Place a reserve on a record where the holding and home branches differ for the available items 3) Rebuild the holds queue 4) Check the holds queue, verify the item is listed in the items to pull for the item's home branch 5) Disable AutomaticItemReturn 6) Rebuild the holds queue 7) Verify the item is listed in the items to pull for the item's holding branch 8) Enable AutomaticItemReturn 9) Apply patch 10) Rebuild the holds queue 11) Verify the item is listed in the items to pull for the item's holding branch Signed-off-by: Liz Rea Tested per plan, and the patch seems sane. Functionality of the hold queue is restored to previous behaviour. Signed-off-by: Katrin Fischer Amended test plan to make clear it has to be a record level hold for the test plan to work. All tests and QA script pass. Signed-off-by: Jared Camins-Esakov --- diff --git a/C4/HoldsQueue.pm b/C4/HoldsQueue.pm index 7d389634f4..655269b396 100755 --- a/C4/HoldsQueue.pm +++ b/C4/HoldsQueue.pm @@ -400,8 +400,7 @@ sub MapItemsToHoldRequests { foreach my $item (@$available_items) { next unless $item->{holdallowed}; - push @{ $items_by_branch{ $automatic_return ? $item->{homebranch} - : $item->{holdingbranch} } }, $item + push @{ $items_by_branch{ $item->{holdingbranch} } }, $item unless exists $allocated_items{ $item->{itemnumber} }; } return unless keys %items_by_branch;