From dd7d23d67bc6bcc012eba4f1414ce4a9d65ac95f Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Tue, 11 Jun 2019 07:46:57 -0400 Subject: [PATCH] Bug 23057: (QA follow-up) Remove new AddReturn message ReturnOfLostItemBlocked, use existing pattern from returns.pl Signed-off-by: Kyle M Hall Signed-off-by: Matha Fuerst Signed-off-by: Marcel de Rooy Signed-off-by: Martin Renvoize (cherry picked from commit 80cbb81224e78c535daa14cf67fec2e945385e9f) Signed-off-by: Fridolin Somers --- C4/Circulation.pm | 1 - C4/SIP/ILS/Transaction/Checkin.pm | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index b82879dbb5..84349d98cf 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -1945,7 +1945,6 @@ sub AddReturn { } if ( $item->itemlost and C4::Context->preference("BlockReturnOfLostItems") ) { - $messages->{'ReturnOfLostItemBlocked'}; $doreturn = 0; } diff --git a/C4/SIP/ILS/Transaction/Checkin.pm b/C4/SIP/ILS/Transaction/Checkin.pm index eed26c1544..f0e8bbdf49 100644 --- a/C4/SIP/ILS/Transaction/Checkin.pm +++ b/C4/SIP/ILS/Transaction/Checkin.pm @@ -89,8 +89,8 @@ sub do_checkin { if ($messages->{withdrawn}) { $self->alert_type('99'); } - if ($messages->{ReturnOfLostItemBlocked}) { - $self->alert_type('99'); + if ($messages->{WasLost}) { + $self->alert_type('99') if C4::Context->preference("BlockReturnOfLostItems"); } if ($messages->{Wrongbranch}) { $self->{item}->destination_loc($messages->{Wrongbranch}->{Rightbranch}); @@ -128,7 +128,7 @@ sub do_checkin { $self->{item}->hold_patron_id( $messages->{ResFound}->{borrowernumber} ); $self->{item}->destination_loc( $messages->{ResFound}->{branchcode} ); } - # ignoring messages: NotIssued, WasLost, WasTransfered + # ignoring messages: NotIssued, WasTransfered if ($cv_triggers_alert) { $self->alert( defined $self->alert_type ); # Overwrites existing alert value, should set to 0 if there is no alert type -- 2.39.5