From 4d4eeb61c569aba184219e6031633afebca1d9f1 Mon Sep 17 00:00:00 2001 From: Fridolyn SOMERS Date: Tue, 15 Jan 2013 09:24:25 +0100 Subject: [PATCH] Bug 9392: confirmation does not appear for negative notforloan items issues When checking-out an item marked "not for loan" with a positive value, you get a message to forbid or confirm issue (depending on AllowNotForLoanOverride syspref). For an item with a negative value (usually during acquisition process), the issue is made without forbid or confirm message. This patch simply changes the test notforloan > 0 into notforloan != 0. Test plan : - Checkout an item with items.notforloan = 0 => The item is issued without message - Checkout an item with items.notforloan > 0 => A message forbids or asks confirmation to override - Checkout an item with items.notforloan < 0 (e.g., on order) => A message forbids or asks confirmation to override Signed-off-by: Galen Charlton --- C4/Circulation.pm | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index 71fe20f..67477fb 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -828,8 +828,7 @@ sub CanBookBeIssued { # # ITEM CHECKING # - if ( $item->{'notforloan'} - && $item->{'notforloan'} > 0 ) + if ( $item->{'notforloan'} ) { if(!C4::Context->preference("AllowNotForLoanOverride")){ $issuingimpossible{NOT_FOR_LOAN} = 1; @@ -837,7 +836,7 @@ sub CanBookBeIssued { $needsconfirmation{NOT_FOR_LOAN_FORCING} = 1; } } - elsif ( !$item->{'notforloan'} ){ + else { # we have to check itemtypes.notforloan also if (C4::Context->preference('item-level_itypes')){ # this should probably be a subroutine -- 1.7.2.5