gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 41728: (QA follow-up) Restore original execution order for Wrongbranch 

The refactoring changed the relative order of the Wrongbranch early
return and several status-update operations. In the original AddReturn,
the execution order was:

  1. checkout/patron lookup
  2. not-issued handling + RecordLocalUseOnReturn
  3. withdrawn check (early return)
  4. location_update_trigger
  5. UpdateNotForLoanStatusOnCheckin
  6. CanBookBeReturned / Wrongbranch check (early return)
  7. BlockReturnOfLostItems

After the refactoring, the Wrongbranch blocker returned early before
steps 2, 4 and 5, causing three regressions:

  - RecordLocalUseOnReturn was not recorded for non-issued items
    scanned at the wrong branch
  - location_update_trigger was skipped for Wrongbranch returns
  - UpdateNotForLoanStatusOnCheckin was skipped for Wrongbranch returns

Fix by splitting blocker handling into two phases:

  1. BlockedWithdrawn: earliest early return, before status updates
     (matches original withdrawn check position)
  2. Wrongbranch and BlockedLost: after RecordLocalUseOnReturn,
     location_update_trigger, and UpdateNotForLoanStatusOnCheckin
     (matches original CanBookBeReturned position)

Signed-off-by: Tomás Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize@openfifth.co.uk>
Signed-off-by: Pedro Amorim <pedro.amorim@openfifth.co.uk>
This commit is contained in:
Martin Renvoize 2026-04-14 17:04:27 +01:00 committed by Pedro Amorim
parent d46b0c1106
commit b689dd07cc
No known key found for this signature in database
GPG Key ID: 06B75BA7F3894D55
1 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
C4/Circulation.pm
View File

@ -2461,33 +2461,20 @@ sub AddReturn {
$doreturn = 0;
}
# Handle blockers
if ( !$availability->available ) {
my $blockers = $availability->blockers;
# Handle BlockedWithdrawn blocker first - this was the earliest early
# return in the original code, before any status updates ran
if ( !$availability->available && $availability->blockers->{BlockedWithdrawn} ) {
$messages->{'withdrawn'} = 1;
if ( $blockers->{BlockedWithdrawn} ) {
$messages->{'withdrawn'} = 1;
# Record local use even when blocked, if preference is on
if ( !$issue && C4::Context->preference("RecordLocalUseOnReturn") ) {
my $localuse_count = $item->localuse || 0;
$localuse_count++;
$item->localuse($localuse_count)->store;
$messages->{'LocalUse'} = 1;
}
# Record local use even when blocked, if preference is on
if ( !$issue && C4::Context->preference("RecordLocalUseOnReturn") ) {
my $localuse_count = $item->localuse || 0;
$localuse_count++;
$item->localuse($localuse_count)->store;
$messages->{'LocalUse'} = 1;
}
return ( 0, $messages, $issue, ( $patron ? $patron->unblessed : {} ) );
}
if ( $blockers->{BlockedLost} ) {
$doreturn = 0;
}
if ( $blockers->{Wrongbranch} ) {
$messages->{'Wrongbranch'} = $blockers->{Wrongbranch};
$doreturn = 0;
my $indexer = Koha::SearchEngine::Indexer->new( { index => $Koha::SearchEngine::BIBLIOS_INDEX } );
$indexer->index_records( $item->biblionumber, "specialUpdate", "biblioserver" );
return ( $doreturn, $messages, $issue, ( $patron ? $patron->unblessed : {} ) );
}
return ( 0, $messages, $issue, ( $patron ? $patron->unblessed : {} ) );
}
my $itemnumber = $item->itemnumber;
@ -2558,6 +2545,24 @@ sub AddReturn {
}
}
# Handle remaining blockers after status updates - in the original code
# CanBookBeReturned and BlockReturnOfLostItems ran after
# location_update_trigger and UpdateNotForLoanStatusOnCheckin
if ( !$availability->available ) {
my $blockers = $availability->blockers;
if ( $blockers->{Wrongbranch} ) {
$messages->{'Wrongbranch'} = $blockers->{Wrongbranch};
$doreturn = 0;
my $indexer = Koha::SearchEngine::Indexer->new( { index => $Koha::SearchEngine::BIBLIOS_INDEX } );
$indexer->index_records( $item->biblionumber, "specialUpdate", "biblioserver" );
return ( $doreturn, $messages, $issue, $patron_unblessed );
}
if ( $blockers->{BlockedLost} ) {
$doreturn = 0;
}
}
# case of a return of document (deal with issues and holdingbranch)
if ($doreturn) {
die "The item is not issed and cannot be returned" unless $issue; # Just in case...