From 550d53d26dff6632bc6248aefdb097cca33a4f7a Mon Sep 17 00:00:00 2001 From: Fridolin Somers Date: Wed, 31 Jul 2019 15:56:22 +0200 Subject: [PATCH] Bug 23404: fix Circulation::TooMany error on itemtype when at biblio level Circulation::TooMany gets itemtype from $item var beeing a Koha::Item unblessed. When itemtype is at biblio level, calling $item->{'itemtype'} is wrong. Test plan : 1) On a catalog with itemtype at item level : pref item-level_itypes=1 2) Create a biblio record with itemtype BOOK 3) Create an item on this biblio record with itemtype BOOK 4) Delete all issuing rules 5) Create a issuing rule with itemtype BOOK, any catagorie, any branch 6) Check-out the item 7) => Checkout is allowed 8) Check-in item 9) Change itemtype at biblio level : pref item-level_itypes=0 10) Check-out the item 11) => Checkout is not allowed You see message "No circulation rule is defined for this patron and itemtype combination" Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi Signed-off-by: Martin Renvoize (cherry picked from commit 9e1fa801d6f1ff718d8689c855483b8b9c735a9f) Signed-off-by: Fridolin Somers --- C4/Circulation.pm | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index 80c2df51ae..f19058846e 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -375,8 +375,7 @@ sub transferbook { sub TooMany { my $borrower = shift; - my $biblionumber = shift; - my $item = shift; + my $item_object = shift; my $params = shift; my $onsite_checkout = $params->{onsite_checkout} || 0; my $switch_onsite_checkout = $params->{switch_onsite_checkout} || 0; @@ -384,11 +383,9 @@ sub TooMany { my $dbh = C4::Context->dbh; my $branch; # Get which branchcode we need - $branch = _GetCircControlBranch($item,$borrower); - my $type = (C4::Context->preference('item-level_itypes')) - ? $item->{'itype'} # item-level - : $item->{'itemtype'}; # biblio-level - + $branch = _GetCircControlBranch($item_object->unblessed,$borrower); + my $type = $item_object->effective_itemtype; + # given branch, patron category, and item type, determine # applicable issuing rule my $maxissueqty_rule = Koha::CirculationRules->get_effective_rule( @@ -906,7 +903,7 @@ sub CanBookBeIssued { and $issue and $issue->onsite_checkout and $issue->borrowernumber == $patron->borrowernumber ? 1 : 0 ); - my $toomany = TooMany( $patron_unblessed, $item_object->biblionumber, $item_unblessed, { onsite_checkout => $onsite_checkout, switch_onsite_checkout => $switch_onsite_checkout, } ); + my $toomany = TooMany( $patron_unblessed, $item_object, { onsite_checkout => $onsite_checkout, switch_onsite_checkout => $switch_onsite_checkout, } ); # if TooMany max_allowed returns 0 the user doesn't have permission to check out this book if ( $toomany && not exists $needsconfirmation{RENEW_ISSUE} ) { if ( $toomany->{max_allowed} == 0 ) { -- 2.39.5