View | Details | Raw Unified | Return to bug 27281
Collapse All | Expand All

(-)a/C4/Circulation.pm (-4 / +8 lines)
Lines 3912-3922 sub LostItem{ Link Here
3912
        MarkIssueReturned($borrowernumber,$itemnumber,undef,$patron->privacy) if $mark_returned;
3912
        MarkIssueReturned($borrowernumber,$itemnumber,undef,$patron->privacy) if $mark_returned;
3913
    }
3913
    }
3914
3914
3915
    #When item is marked lost automatically cancel its outstanding transfers and set items holdingbranch to the transfer source branch (frombranch)
3915
    # When an item is marked as lost, we should automatically cancel its outstanding transfers
3916
    if (my ( $datesent,$frombranch,$tobranch ) = GetTransfers($itemnumber)) {
3916
    # and set items holdingbranch to the transfer source branch (frombranch).
3917
        Koha::Items->find($itemnumber)->holdingbranch($frombranch)->store({ skip_record_index => $params->{skip_record_index} });
3917
    my $item = Koha::Items->find($itemnumber);
3918
    my $transfers = $item->get_transfers;
3919
    while (my $transfer = $transfers->next) {
3920
        $item->holdingbranch($transfer->frombranch) if $transfer->in_transit;
3921
        $transfer->cancel({ reason => 'ItemLost', force => 1 });
3918
    }
3922
    }
3919
    my $transferdeleted = DeleteTransfer($itemnumber);
3923
    $item->store({skip_record_index => $params->{skip_record_index}});
3920
}
3924
}
3921
3925
3922
sub GetOfflineOperations {
3926
sub GetOfflineOperations {
(-)a/Koha/Item.pm (+32 lines)
Lines 497-502 sub get_transfer { Link Here
497
    return Koha::Item::Transfer->_new_from_dbic($transfer_rs);
497
    return Koha::Item::Transfer->_new_from_dbic($transfer_rs);
498
}
498
}
499
499
500
=head3 get_transfers
501
502
  my $transfer = $item->get_transfers;
503
504
Return the list of outstanding transfers (i.e requested but not yet cancelled
505
or recieved).
506
507
Note: Transfers are retrieved in a Modified FIFO (First In First Out) order
508
whereby the most recently sent, but not received, transfer will be returned
509
first if it exists, otherwise requests are in oldest to newest request order.
510
511
This allows for transfers to queue, which is the case for stock rotation and
512
rotating collections where a manual transfer may need to take precedence but
513
we still expect the item to end up at a final location eventually.
514
515
=cut
516
517
sub get_transfers {
518
    my ($self) = @_;
519
    my $transfer_rs = $self->_result->branchtransfers->search(
520
        {
521
            datearrived   => undef,
522
            datecancelled => undef
523
        },
524
        {
525
            order_by =>
526
              [ { -desc => 'datesent' }, { -asc => 'daterequested' } ],
527
        }
528
    );
529
    return Koha::Item::Transfers->_new_from_dbic($transfer_rs);
530
}
531
500
=head3 last_returned_by
532
=head3 last_returned_by
501
533
502
Gets and sets the last borrower to return an item.
534
Gets and sets the last borrower to return an item.
(-)a/Koha/Schema/Result/Branchtransfer.pm (-3 / +4 lines)
Lines 111-117 what triggered the transfer Link Here
111
=head2 cancellation_reason
111
=head2 cancellation_reason
112
112
113
  data_type: 'enum'
113
  data_type: 'enum'
114
  extra: {list => ["Manual","StockrotationAdvance","StockrotationRepatriation","ReturnToHome","ReturnToHolding","RotatingCollection","Reserve","LostReserve","CancelReserve"]}
114
  extra: {list => ["Manual","StockrotationAdvance","StockrotationRepatriation","ReturnToHome","ReturnToHolding","RotatingCollection","Reserve","LostReserve","CancelReserve","ItemLost"]}
115
  is_nullable: 1
115
  is_nullable: 1
116
116
117
what triggered the transfer cancellation
117
what triggered the transfer cancellation
Lines 203-208 __PACKAGE__->add_columns( Link Here
203
        "Reserve",
203
        "Reserve",
204
        "LostReserve",
204
        "LostReserve",
205
        "CancelReserve",
205
        "CancelReserve",
206
        "ItemLost",
206
      ],
207
      ],
207
    },
208
    },
208
    is_nullable => 1,
209
    is_nullable => 1,
Lines 269-276 __PACKAGE__->belongs_to( Link Here
269
);
270
);
270
271
271
272
272
# Created by DBIx::Class::Schema::Loader v0.07049 @ 2021-03-03 13:47:35
273
# Created by DBIx::Class::Schema::Loader v0.07046 @ 2021-03-08 13:36:32
273
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:pL0dO9OUwImy2rv7Md3AyA
274
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:HU4Pt8CfD6lX87BjK1g3Bw
274
275
275
sub koha_object_class {
276
sub koha_object_class {
276
    'Koha::Item::Transfer';
277
    'Koha::Item::Transfer';
(-)a/installer/data/mysql/atomicupdate/bug_27281.perl (+28 lines)
Line 0 Link Here
1
$DBversion = 'XXX'; # will be replaced by the RM
2
if( CheckVersion( $DBversion ) ) {
3
4
    # Add 'LostItem' to reserves cancellation_reason enum
5
    $dbh->do(
6
        qq{
7
            ALTER TABLE
8
                `branchtransfers`
9
            MODIFY COLUMN
10
                `cancellation_reason` enum(
11
                    'Manual',
12
                    'StockrotationAdvance',
13
                    'StockrotationRepatriation',
14
                    'ReturnToHome',
15
                    'ReturnToHolding',
16
                    'RotatingCollection',
17
                    'Reserve',
18
                    'LostReserve',
19
                    'CancelReserve',
20
                    'ItemLost'
21
                )
22
            AFTER `comments`
23
          }
24
    );
25
26
    # Always end with this (adjust the bug info)
27
    NewVersion( $DBversion, 27281, "Add 'ItemLost' to cancellation_reason enum");
28
}
(-)a/installer/data/mysql/kohastructure.sql (-2 / +1 lines)
Lines 1531-1537 CREATE TABLE `branchtransfers` ( Link Here
1531
  `tobranch` varchar(10) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT 'the branch the transfer was going to',
1531
  `tobranch` varchar(10) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT 'the branch the transfer was going to',
1532
  `comments` longtext COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'any comments related to the transfer',
1532
  `comments` longtext COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'any comments related to the transfer',
1533
  `reason` enum('Manual','StockrotationAdvance','StockrotationRepatriation','ReturnToHome','ReturnToHolding','RotatingCollection','Reserve','LostReserve','CancelReserve') COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'what triggered the transfer',
1533
  `reason` enum('Manual','StockrotationAdvance','StockrotationRepatriation','ReturnToHome','ReturnToHolding','RotatingCollection','Reserve','LostReserve','CancelReserve') COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'what triggered the transfer',
1534
  `cancellation_reason` ENUM('Manual', 'StockrotationAdvance', 'StockrotationRepatriation', 'ReturnToHome', 'ReturnToHolding', 'RotatingCollection', 'Reserve', 'LostReserve', 'CancelReserve') default NULL COMMENT 'what triggered the transfer cancellation',
1534
  `cancellation_reason` ENUM('Manual', 'StockrotationAdvance', 'StockrotationRepatriation', 'ReturnToHome', 'ReturnToHolding', 'RotatingCollection', 'Reserve', 'LostReserve', 'CancelReserve', 'ItemLost') default NULL COMMENT 'what triggered the transfer cancellation',
1535
  PRIMARY KEY (`branchtransfer_id`),
1535
  PRIMARY KEY (`branchtransfer_id`),
1536
  KEY `frombranch` (`frombranch`),
1536
  KEY `frombranch` (`frombranch`),
1537
  KEY `tobranch` (`tobranch`),
1537
  KEY `tobranch` (`tobranch`),
1538
- 

Return to bug 27281