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

(-)a/C4/Circulation.pm (-1 / +2 lines)
Lines 2038-2044 sub AddReturn { Link Here
2038
    # check if we have a transfer for this document
2038
    # check if we have a transfer for this document
2039
    my ($datesent,$frombranch,$tobranch) = GetTransfers( $item->itemnumber );
2039
    my ($datesent,$frombranch,$tobranch) = GetTransfers( $item->itemnumber );
2040
2040
2041
    # if we have a transfer to do, we update the line of transfers with the datearrived
2041
    # if we have a transfer to complete, we update the line of transfers with the datearrived
2042
    my $is_in_rotating_collection = C4::RotatingCollections::isItemInAnyCollection( $item->itemnumber );
2042
    my $is_in_rotating_collection = C4::RotatingCollections::isItemInAnyCollection( $item->itemnumber );
2043
    if ($datesent) {
2043
    if ($datesent) {
2044
        # At this point we will either fill the transfer or it is a wrong transfer
2044
        # At this point we will either fill the transfer or it is a wrong transfer
Lines 2049-2054 sub AddReturn { Link Here
2049
                "UPDATE branchtransfers SET datearrived = now() WHERE itemnumber= ? AND datearrived IS NULL"
2049
                "UPDATE branchtransfers SET datearrived = now() WHERE itemnumber= ? AND datearrived IS NULL"
2050
            );
2050
            );
2051
            $sth->execute( $item->itemnumber );
2051
            $sth->execute( $item->itemnumber );
2052
            $messages->{'TransferArrived'} = $frombranch;
2052
        } else {
2053
        } else {
2053
            $messages->{'WrongTransfer'}     = $tobranch;
2054
            $messages->{'WrongTransfer'}     = $tobranch;
2054
            $messages->{'WrongTransferItem'} = $item->itemnumber;
2055
            $messages->{'WrongTransferItem'} = $item->itemnumber;
(-)a/circ/returns.pl (+3 lines)
Lines 515-520 foreach my $code ( keys %$messages ) { Link Here
515
    elsif ( $code eq 'TransferTrigger' ) {
515
    elsif ( $code eq 'TransferTrigger' ) {
516
        ;    # Handled alongside NeedsTransfer
516
        ;    # Handled alongside NeedsTransfer
517
    }
517
    }
518
    elsif ( $code eq 'TransferArrived' ) {
519
        $err{transferred} = $messages->{'TransferArrived'};
520
    }
518
    elsif ( $code eq 'Wrongbranch' ) {
521
    elsif ( $code eq 'Wrongbranch' ) {
519
    }
522
    }
520
    elsif ( $code eq 'Debarred' ) {
523
    elsif ( $code eq 'Debarred' ) {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-1 / +3 lines)
Lines 255-260 Link Here
255
                                        [% IF ( errmsgloo.localuse) %]
255
                                        [% IF ( errmsgloo.localuse) %]
256
                                            <p class="problem ret_localuse">Local use recorded</p>
256
                                            <p class="problem ret_localuse">Local use recorded</p>
257
                                        [% END %]
257
                                        [% END %]
258
                                        [% IF ( errmsgloo.transferred ) %]
259
                                            <p class="problem ret_transferred">Item recieved from [% Branches.GetName( errmsgloo.transferred ) | html %]</p>
260
                                        [% END %]
258
                                        [% IF ( errmsgloo.waslost ) %]
261
                                        [% IF ( errmsgloo.waslost ) %]
259
                                            [% IF Koha.Preference('BlockReturnOfLostItems') %]
262
                                            [% IF Koha.Preference('BlockReturnOfLostItems') %]
260
                                                <p class="problem ret_blocked">Item is lost, cannot be checked in.</p>
263
                                                <p class="problem ret_blocked">Item is lost, cannot be checked in.</p>
261
- 

Return to bug 26643