Bugzilla – Attachment 169349 Details for
Bug 35100
Items assigned to StockRotation do not advance if a hold is triggered before the initial transfer
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 35100: Various fixes
Bug-35100-Various-fixes.patch (text/plain), 22.53 KB, created by
Nick Clemens (kidclamp)
on 2024-07-22 18:56:35 UTC
(
hide
)
Description:
Bug 35100: Various fixes
Filename:
MIME Type:
Creator:
Nick Clemens (kidclamp)
Created:
2024-07-22 18:56:35 UTC
Size:
22.53 KB
patch
obsolete
>From 3b0eda0b975792c119a6852fd67c46f06a56d840 Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Fri, 5 Jan 2024 16:08:44 +0000 >Subject: [PATCH] Bug 35100: Various fixes > >1) Don't automagically always set a transfer to in transit on checkin.. > wait for the user to actually confirm that's the case >2) New transfers triggered by a hold should take precidence, so hide > transfers for any other reason from display >3) Update get_transfer and get_transfers to ensure ordering isn't lost > when prefetch is used and add tests for this > >Signed-off-by: Nick Clemens <nick@bywatersolutions.com> >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > C4/Circulation.pm | 31 ++- > C4/Items.pm | 2 +- > Koha/Item.pm | 16 +- > Koha/Schema/Result/Item.pm | 3 +- > circ/returns.pl | 4 + > .../prog/en/includes/item-status.inc | 4 +- > .../prog/en/modules/circ/returns.tt | 5 +- > t/db_dependent/Circulation.t | 35 ++- > t/db_dependent/Koha/Item.t | 251 +++++++++++++++++- > 9 files changed, 315 insertions(+), 36 deletions(-) > >diff --git a/C4/Circulation.pm b/C4/Circulation.pm >index 70ccd7fb54d..1b6459b180e 100644 >--- a/C4/Circulation.pm >+++ b/C4/Circulation.pm >@@ -2368,16 +2368,15 @@ sub AddReturn { > if ( $transfer->tobranch eq $branch ) { > $transfer->receive; > $messages->{'TransferArrived'} = $transfer->frombranch; >+ > # validTransfer=1 allows us returning the item back if the reserve is cancelled > $validTransfer = 1 if $transfer->reason eq 'Reserve'; >- } >- else { >+ } else { > $messages->{'TransferTrigger'} = $transfer->reason; > if ( $transfer->frombranch eq $branch ) { >- $transfer->transit; >- $messages->{'WasTransfered'} = $transfer->tobranch; >- } >- else { >+ $messages->{'TransferTo'} = $transfer->tobranch; >+ $messages->{'WasTransfered'} = $transfer->id; >+ } else { > $messages->{'WrongTransfer'} = $transfer->tobranch; > $messages->{'WrongTransferItem'} = $item->itemnumber; > } >@@ -2527,15 +2526,21 @@ sub AddReturn { > and not $messages->{RecallNeedsTransfer} ) > { > my $BranchTransferLimitsType = C4::Context->preference("BranchTransferLimitsType") eq 'itemtype' ? 'effective_itemtype' : 'ccode'; >- if (C4::Context->preference("AutomaticItemReturn" ) or >- (C4::Context->preference("UseBranchTransferLimits") and >- ! IsBranchTransferAllowed($branch, $returnbranch, $item->$BranchTransferLimitsType ) >- )) { >- ModItemTransfer($item->itemnumber, $branch, $returnbranch, $transfer_trigger, { skip_record_index => 1 }); >- $messages->{'WasTransfered'} = $returnbranch; >+ if ( >+ C4::Context->preference("AutomaticItemReturn") >+ or ( C4::Context->preference("UseBranchTransferLimits") >+ and !IsBranchTransferAllowed( $branch, $returnbranch, $item->$BranchTransferLimitsType ) ) >+ ) >+ { >+ my $transfer = ModItemTransfer( >+ $item->itemnumber, $branch, $returnbranch, $transfer_trigger, >+ { skip_record_index => 1 } >+ ); >+ $messages->{'TransferTo'} = $returnbranch; >+ $messages->{'WasTransfered'} = $transfer->id; > $messages->{'TransferTrigger'} = $transfer_trigger; > } else { >- $messages->{'NeedsTransfer'} = $returnbranch; >+ $messages->{'NeedsTransfer'} = $returnbranch; > $messages->{'TransferTrigger'} = $transfer_trigger; > } > } >diff --git a/C4/Items.pm b/C4/Items.pm >index 3041d8f13e7..174e7efa5c8 100644 >--- a/C4/Items.pm >+++ b/C4/Items.pm >@@ -386,7 +386,7 @@ sub ModItemTransfer { > $transfer->transit({ skip_record_index => $params->{skip_record_index} }); > } > >- return; >+ return $transfer; > } > > =head2 ModDateLastSeen >diff --git a/Koha/Item.pm b/Koha/Item.pm >index ebfc05a1026..ac6cd1f16c1 100644 >--- a/Koha/Item.pm >+++ b/Koha/Item.pm >@@ -799,8 +799,13 @@ we still expect the item to end up at a final location eventually. > sub get_transfer { > my ($self) = @_; > >- my $transfer = $self->_result->current_branchtransfers->next; >- return Koha::Item::Transfer->_new_from_dbic($transfer) if $transfer; >+ my $transfers = $self->_result->current_branchtransfers->search( >+ undef, >+ { 'order_by' => [ { '-desc' => 'datesent' }, { '-asc' => 'daterequested' } ] } >+ ); >+ >+ my $transfer = $transfers->next; >+ return Koha::Item::Transfer->_new_from_dbic($transfer) if $transfer; > } > > =head3 transfer >@@ -844,9 +849,12 @@ we still expect the item to end up at a final location eventually. > sub get_transfers { > my ($self) = @_; > >- my $transfer_rs = $self->_result->current_branchtransfers; >+ my $transfers_rs = $self->_result->current_branchtransfers->search( >+ undef, >+ { 'order_by' => [ { '-desc' => 'datesent' }, { '-asc' => 'daterequested' } ] } >+ ); > >- return Koha::Item::Transfers->_new_from_dbic($transfer_rs); >+ return Koha::Item::Transfers->_new_from_dbic($transfers_rs); > } > > =head3 last_returned_by >diff --git a/Koha/Schema/Result/Item.pm b/Koha/Schema/Result/Item.pm >index dcbd2275a82..f6e9972ba3a 100644 >--- a/Koha/Schema/Result/Item.pm >+++ b/Koha/Schema/Result/Item.pm >@@ -1057,8 +1057,7 @@ __PACKAGE__->has_many( > "$args->{foreign_alias}.datearrived" => undef, > "$args->{foreign_alias}.datecancelled" => undef, > }; >- }, >- { order_by => [ { -desc => 'datesent' }, { -asc => 'daterequested' } ] } >+ } > ); > > # Relationship with bundled items >diff --git a/circ/returns.pl b/circ/returns.pl >index 72e004a7957..c84fd048696 100755 >--- a/circ/returns.pl >+++ b/circ/returns.pl >@@ -542,6 +542,7 @@ if ( $messages->{'WasTransfered'} ) { > $template->param( > found => 1, > transfer => $messages->{'WasTransfered'}, >+ transferto => $messages->{'TransferTo'}, > trigger => $messages->{'TransferTrigger'}, > itemnumber => $itemnumber, > ); >@@ -720,6 +721,9 @@ foreach my $code ( keys %$messages ) { > elsif ( $code eq 'WasTransfered' ) { > ; # FIXME... anything to do here? > } >+ elsif ( $code eq 'TransferTo' ) { >+ ; # Handled above, along with WasTransfered >+ } > elsif ( $code eq 'withdrawn' ) { > $err{withdrawn} = 1; > } >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/item-status.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/item-status.inc >index 11adad376f3..3ea1ed7c719 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/item-status.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/item-status.inc >@@ -43,9 +43,9 @@ > [% END %] > [% END %] > >-[% IF ( item.notforloan || item.effective_itemtype.notforloan ) %] >+[% IF ( item.is_notforloan ) %] > [% SET itemavailable = 0 %] >- [% SET notforloan = item.notforloan || item.effective_itemtype.notforloan %] >+ [% SET notforloan = item.is_notforloan %] > [% notforloan_description = AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.notforloan', authorised_value => notforloan ) %] > [% IF notforloan_description %] > <span class="item-status notforloan">[% notforloan_description | html %]</span> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >index 7091e5ef8e7..e282dbd2d26 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >@@ -122,7 +122,7 @@ > </div> <!-- /.hold-auto-filled --> > [% END # /IF hold_auto_filled %] > >- [% IF ( trigger ) %] >+ [% IF ( trigger && !transfertodo ) %] > <div id="transfer-trigger" class="dialog message"> > <h3>Reason for transfer</h3> > <p> >@@ -754,7 +754,7 @@ > > <div class="modal-header"> > <h3> >- Please return this item to [% IF transfer %][% Branches.GetName( transfer ) | html %][% ELSE %][% Branches.GetName( returnbranch ) | html %][% END %] >+ Please return this item to [% IF transferto %][% Branches.GetName( transferto ) | html %][% ELSE %][% Branches.GetName( returnbranch ) | html %][% END %] > </h3> > </div> > <div class="modal-body"> >@@ -781,6 +781,7 @@ > <button type="button" name="dotransfer" class="btn btn-default print openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber | uri %]&&branchcode=[% returnbranch | uri %]&op=slip"><i class="fa fa-print"></i> Yes, print slip</button> > <button type="button" data-dismiss="modal" class="btn btn-default deny" name="notransfer" value="No" accesskey="n"><i class="fa fa-times"></i> No (N)</button> > [% ELSE %] >+ <input type="hidden" name="transit" value="[% transfer | uri %]"/> > <button type="button" data-dismiss="modal" class="btn btn-default" accesskey="y"><i class="fa fa-check"></i> OK (Y)</button> > <button type="button" data-dismiss="modal" class="btn btn-default openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber | uri %]&branchcode=[% transfer | uri %]&op=slip" accesskey="p"><i class="fa fa-print"></i> Print slip (P)</button> > [% END %] >diff --git a/t/db_dependent/Circulation.t b/t/db_dependent/Circulation.t >index 01699751dfc..eef36574740 100755 >--- a/t/db_dependent/Circulation.t >+++ b/t/db_dependent/Circulation.t >@@ -6654,24 +6654,39 @@ subtest 'Tests for transfer not in transit' => sub { > > plan tests => 2; > >- > # These tests are to ensure a 'pending' transfer, generated by > # stock rotation, will be advanced when checked in > >- my $item = $builder->build_sample_item(); >- my $transfer = $builder->build_object({ class => 'Koha::Item::Transfers', value => { >- itemnumber => $item->id, >- reason => 'StockrotationRepatriation', >- datesent => undef, >- frombranch => $item->homebranch, >- }}); >+ my $item = $builder->build_sample_item(); >+ my $transfer = $builder->build_object( >+ { >+ class => 'Koha::Item::Transfers', >+ value => { >+ itemnumber => $item->id, >+ reason => 'StockrotationRepatriation', >+ datesent => undef, >+ frombranch => $item->homebranch, >+ } >+ } >+ ); > my @return = AddReturn( $item->barcode, $item->homebranch, 0, undef ); > is_deeply( > \@return, >- [ 0, { WasTransfered => $transfer->tobranch, TransferTrigger => 'StockrotationRepatriation', NotIssued => $item->barcode }, undef, {} ], "Item is reported to have been transferred"); >+ [ >+ 0, >+ { >+ TransferTo => $transfer->tobranch, WasTransfered => $transfer->id, >+ TransferTrigger => 'StockrotationRepatriation', >+ NotIssued => $item->barcode >+ }, >+ undef, >+ {} >+ ], >+ "Item is reported to have been transferred" >+ ); > > $transfer->discard_changes; >- ok( $transfer->datesent, 'The datesent field is populated, i.e. transfer is initiated'); >+ is( $transfer->datesent, undef, 'The datesent field remains unpopulated, i.e. transfer is not yet initiated' ); > > }; > >diff --git a/t/db_dependent/Koha/Item.t b/t/db_dependent/Koha/Item.t >index 8b9992e5862..06960bad91b 100755 >--- a/t/db_dependent/Koha/Item.t >+++ b/t/db_dependent/Koha/Item.t >@@ -20,7 +20,7 @@ > use Modern::Perl; > use utf8; > >-use Test::More tests => 35; >+use Test::More tests => 36; > use Test::Exception; > use Test::MockModule; > >@@ -1225,8 +1225,157 @@ subtest 'Tests for itemtype|item_type' => sub { > $schema->storage->txn_rollback; > }; > >+subtest 'get_transfer' => sub { >+ plan tests => 8; >+ $schema->storage->txn_begin; >+ >+ my $item = $builder->build_sample_item(); >+ >+ my $transfer = $item->get_transfer(); >+ is( $transfer, undef, 'Koha::Item->get_transfer should return undef if the item has no queued transfers' ); >+ >+ my $library_to = $builder->build( { source => 'Branch' } ); >+ >+ my $transfer_1 = $builder->build_object( >+ { >+ class => 'Koha::Item::Transfers', >+ value => { >+ itemnumber => $item->itemnumber, >+ frombranch => $item->holdingbranch, >+ tobranch => $library_to->{branchcode}, >+ reason => 'Manual', >+ datesent => undef, >+ datearrived => undef, >+ datecancelled => undef, >+ daterequested => \'NOW()' >+ } >+ } >+ ); >+ >+ $transfer = $item->get_transfer(); >+ is( >+ ref($transfer), 'Koha::Item::Transfer', >+ 'Koha::Item->get_transfer should return a Koha::Item::Transfer object' >+ ); >+ >+ my $transfer_2 = $builder->build_object( >+ { >+ class => 'Koha::Item::Transfers', >+ value => { >+ itemnumber => $item->itemnumber, >+ frombranch => $item->holdingbranch, >+ tobranch => $library_to->{branchcode}, >+ reason => 'Manual', >+ datesent => undef, >+ datearrived => undef, >+ datecancelled => undef, >+ daterequested => \'NOW()' >+ } >+ } >+ ); >+ >+ $transfer = $item->get_transfer(); >+ is( >+ $transfer->branchtransfer_id, $transfer_1->branchtransfer_id, >+ 'Koha::Item->get_transfer returns the oldest transfer request' >+ ); >+ >+ $transfer_2->datesent( \'NOW()' )->store; >+ $transfer = $item->get_transfer(); >+ is( >+ $transfer->branchtransfer_id, $transfer_2->branchtransfer_id, >+ 'Koha::Item->get_transfer returns the in_transit transfer' >+ ); >+ >+ my $transfer_3 = $builder->build_object( >+ { >+ class => 'Koha::Item::Transfers', >+ value => { >+ itemnumber => $item->itemnumber, >+ frombranch => $item->holdingbranch, >+ tobranch => $library_to->{branchcode}, >+ reason => 'Manual', >+ datesent => undef, >+ datearrived => undef, >+ datecancelled => undef, >+ daterequested => \'NOW()' >+ } >+ } >+ ); >+ >+ $transfer_2->datearrived( \'NOW()' )->store; >+ $transfer = $item->get_transfer(); >+ is( >+ $transfer->branchtransfer_id, $transfer_1->branchtransfer_id, >+ 'Koha::Item->get_transfer returns the next queued transfer' >+ ); >+ is( $transfer->itemnumber, $item->itemnumber, 'Koha::Item->get_transfer returns the right items transfer' ); >+ >+ $transfer_1->datecancelled( \'NOW()' )->store; >+ $transfer = $item->get_transfer(); >+ is( >+ $transfer->branchtransfer_id, $transfer_3->branchtransfer_id, >+ 'Koha::Item->get_transfer ignores cancelled transfers' >+ ); >+ >+ subtest "Ensure prefetches don't affect which transfer if returned" => sub { >+ plan tests => 5; >+ >+ # Reset test data >+ $transfer_1->datecancelled(undef)->store; >+ $transfer_2->set( { datesent => undef, datearrived => undef } )->store; >+ >+ my $prefetched_item = Koha::Items->search( >+ { 'me.itemnumber' => $item->itemnumber }, >+ { prefetch => ['current_branchtransfers'] } >+ )->next; >+ >+ $transfer = $prefetched_item->get_transfer(); >+ is( >+ $transfer->branchtransfer_id, $transfer_1->branchtransfer_id, >+ 'Koha::Item->get_transfer returns the oldest transfer request' >+ ); >+ >+ $transfer_2->datesent( \'NOW()' )->store; >+ $prefetched_item = Koha::Items->search( >+ { 'me.itemnumber' => $item->itemnumber }, >+ { prefetch => ['current_branchtransfers'] } >+ )->next; >+ >+ $transfer = $prefetched_item->get_transfer(); >+ is( >+ $transfer->branchtransfer_id, $transfer_2->branchtransfer_id, >+ 'Koha::Item->get_transfer returns the in_transit transfer' >+ ); >+ >+ $transfer_2->datearrived( \'NOW()' )->store; >+ $prefetched_item = Koha::Items->search( >+ { 'me.itemnumber' => $item->itemnumber }, >+ { prefetch => ['current_branchtransfers'] } >+ )->next; >+ $transfer = $prefetched_item->get_transfer(); >+ is( >+ $transfer->branchtransfer_id, $transfer_1->branchtransfer_id, >+ 'Koha::Item->get_transfer returns the next queued transfer' >+ ); >+ is( $transfer->itemnumber, $item->itemnumber, 'Koha::Item->get_transfer returns the right items transfer' ); >+ >+ $transfer_1->datecancelled( \'NOW()' )->store; >+ $prefetched_item = Koha::Items->search( >+ { 'me.itemnumber' => $item->itemnumber }, >+ { prefetch => ['current_branchtransfers'] } >+ )->next; >+ $transfer = $prefetched_item->get_transfer(); >+ is( >+ $transfer->branchtransfer_id, $transfer_3->branchtransfer_id, >+ 'Koha::Item->get_transfer ignores cancelled transfers' >+ ); >+ }; >+ $schema->storage->txn_rollback; >+}; >+ > subtest 'get_transfers' => sub { >- plan tests => 16; >+ plan tests => 17; > $schema->storage->txn_begin; > > my $item = $builder->build_sample_item(); >@@ -1321,6 +1470,104 @@ subtest 'get_transfers' => sub { > $result_1 = $transfers->next; > is( $result_1->branchtransfer_id, $transfer_3->branchtransfer_id, 'Koha::Item->get_transfers returns the only transfer that remains'); > >+ subtest "Ensure prefetches don't affect the return order" => sub { >+ plan tests => 13; >+ >+ # Reset test data >+ $transfer_2->datesent(undef)->store; >+ $transfer_2->datearrived(undef)->store; >+ $transfer_1->datecancelled(undef)->store; >+ >+ my $prefetched_item = Koha::Items->search( >+ { 'me.itemnumber' => $item->itemnumber }, >+ { prefetch => ['current_branchtransfers'] } >+ )->next; >+ >+ $transfers = $prefetched_item->get_transfers(); >+ is( >+ $transfers->count, 3, >+ 'When there are multiple open transfer requests, the Koha::Item::Transfers object contains them all' >+ ); >+ $result_1 = $transfers->next; >+ $result_2 = $transfers->next; >+ $result_3 = $transfers->next; >+ is( >+ $result_1->branchtransfer_id, $transfer_1->branchtransfer_id, >+ 'Koha::Item->get_transfers returns the oldest transfer request first' >+ ); >+ is( >+ $result_2->branchtransfer_id, $transfer_2->branchtransfer_id, >+ 'Koha::Item->get_transfers returns the newer transfer request second' >+ ); >+ is( >+ $result_3->branchtransfer_id, $transfer_3->branchtransfer_id, >+ 'Koha::Item->get_transfers returns the newest transfer request last' >+ ); >+ >+ $transfer_2->datesent( \'NOW()' )->store; >+ $prefetched_item = Koha::Items->search( >+ { 'me.itemnumber' => $item->itemnumber }, >+ { prefetch => ['current_branchtransfers'] } >+ )->next; >+ $transfers = $prefetched_item->get_transfers(); >+ is( >+ $transfers->count, 3, >+ 'When one transfer is set to in_transit, the Koha::Item::Transfers object still contains them all' >+ ); >+ $result_1 = $transfers->next; >+ $result_2 = $transfers->next; >+ $result_3 = $transfers->next; >+ is( >+ $result_1->branchtransfer_id, $transfer_2->branchtransfer_id, >+ 'Koha::Item->get_transfers returns the active transfer request first' >+ ); >+ is( >+ $result_2->branchtransfer_id, $transfer_1->branchtransfer_id, >+ 'Koha::Item->get_transfers returns the other transfers oldest to newest' >+ ); >+ is( >+ $result_3->branchtransfer_id, $transfer_3->branchtransfer_id, >+ 'Koha::Item->get_transfers returns the other transfers oldest to newest' >+ ); >+ >+ $transfer_2->datearrived( \'NOW()' )->store; >+ $prefetched_item = Koha::Items->search( >+ { 'me.itemnumber' => $item->itemnumber }, >+ { prefetch => ['current_branchtransfers'] } >+ )->next; >+ $transfers = $prefetched_item->get_transfers(); >+ is( >+ $transfers->count, 2, >+ 'Once a transfer is received, it no longer appears in the list from ->get_transfers()' >+ ); >+ $result_1 = $transfers->next; >+ $result_2 = $transfers->next; >+ is( >+ $result_1->branchtransfer_id, $transfer_1->branchtransfer_id, >+ 'Koha::Item->get_transfers returns the other transfers oldest to newest' >+ ); >+ is( >+ $result_2->branchtransfer_id, $transfer_3->branchtransfer_id, >+ 'Koha::Item->get_transfers returns the other transfers oldest to newest' >+ ); >+ >+ $transfer_1->datecancelled( \'NOW()' )->store; >+ $prefetched_item = Koha::Items->search( >+ { 'me.itemnumber' => $item->itemnumber }, >+ { prefetch => ['current_branchtransfers'] } >+ )->next; >+ $transfers = $prefetched_item->get_transfers(); >+ is( >+ $transfers->count, 1, >+ 'Once a transfer is cancelled, it no longer appears in the list from ->get_transfers()' >+ ); >+ $result_1 = $transfers->next; >+ is( >+ $result_1->branchtransfer_id, $transfer_3->branchtransfer_id, >+ 'Koha::Item->get_transfers returns the only transfer that remains' >+ ); >+ }; >+ > $schema->storage->txn_rollback; > }; > >-- >2.39.2
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=169349">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 35100
:
160514
|
160515
|
160557
|
160558
|
160575
|
160623
|
160628
|
160641
|
160642
|
160643
|
160647
|
160648
|
160687
|
160688
|
160689
|
160690
|
162740
|
162741
|
162742
|
162743
|
162744
|
162745
|
162746
|
162747
|
162757
|
162758
|
162759
|
162760
|
162761
|
162762
|
165096
|
165097
|
165098
|
165099
|
165100
|
165101
|
168273
|
168274
|
168275
|
168276
|
168277
|
168278
|
169347
|
169348
|
169349
|
169350
|
169351
|
169352
|
169353
|
171530
|
171531
|
171532
|
171533
|
171534
|
171535
|
171559
|
171560
|
171561
|
171562
|
171563
|
171564