From 1f3c60d01f7fb603f2731648a42c927f3af8ba5e Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Mon, 5 Aug 2013 15:23:44 -0300 Subject: [PATCH] Bug 10663 - Revert and use CheckReserves for CanBookBeRenewed Content-Type: text/plain; charset=utf-8 It makes renewal lock by holds work again. Unit tests as follow up Regards To+ Sponsored-by: Universidad Nacional de Cordoba Signed-off-by: Katrin Fischer This reverts changes made to CanBookBeRenewed by patches from bug 9376. GetReserveStatus is not suitable to recognize if an item can fild a hold on return and CheckReserves is restored. Signed-off-by: Chris Cormack Bug 10663: Follow-up - Revert and use CheckReserves for CanBookBeRenewed CheckReserves returns '' when no reserve is found, so $resfound will always be defined and we need to check if it's true. This is part of the revert. Signed-off-by: Chris Cormack Signed-off-by: Marcel de Rooy Squashed the above two patches. Works as advertised. --- C4/Circulation.pm | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index ca66931..c578213 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -2484,8 +2484,9 @@ sub CanBookBeRenewed { $error = "too_many"; } - my $resstatus = C4::Reserves::GetReserveStatus($itemnumber); - if ( $resstatus eq "Waiting" or $resstatus eq "Reserved" ) { + my ( $resfound, $resrec, undef ) = C4::Reserves::CheckReserves( $itemnumber ); + + if ( $resfound ) { # '' when no hold was found $renewokay = 0; $error = "on_reserve"; } -- 1.7.7.6