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

(-)a/C4/Circulation.pm (-7 / +6 lines)
Lines 1944-1954 sub AddReturn { Link Here
1944
        $doreturn = 0 if C4::Context->preference("BlockReturnOfWithdrawnItems");
1944
        $doreturn = 0 if C4::Context->preference("BlockReturnOfWithdrawnItems");
1945
    }
1945
    }
1946
1946
1947
    if ( $item->itemlost and C4::Context->preference("BlockReturnOfLostItems") ) {
1948
        $messages->{'ReturnOfLostItemBlocked'};
1949
        $doreturn = 0;
1950
    }
1951
1952
    # case of a return of document (deal with issues and holdingbranch)
1947
    # case of a return of document (deal with issues and holdingbranch)
1953
    if ($doreturn) {
1948
    if ($doreturn) {
1954
        my $is_overdue;
1949
        my $is_overdue;
Lines 2011-2018 sub AddReturn { Link Here
2011
2006
2012
    # fix up the accounts.....
2007
    # fix up the accounts.....
2013
    if ( $item->itemlost ) {
2008
    if ( $item->itemlost ) {
2014
        $messages->{'WasLost'} = 1;
2009
        if ( C4::Context->preference("BlockReturnOfLostItems") ) {
2015
        unless ( C4::Context->preference("BlockReturnOfLostItems") ) {
2010
            $messages->{'ReturnOfLostItemBlocked'} = 1;
2011
            $doreturn = 0;
2012
        }
2013
        else {
2014
            $messages->{'WasLost'} = 1;
2016
            if (
2015
            if (
2017
                Koha::RefundLostItemFeeRules->should_refund(
2016
                Koha::RefundLostItemFeeRules->should_refund(
2018
                    {
2017
                    {
(-)a/circ/returns.pl (-1 / +4 lines)
Lines 493-499 foreach my $code ( keys %$messages ) { Link Here
493
    }
493
    }
494
    elsif ( $code eq 'WasLost' ) {
494
    elsif ( $code eq 'WasLost' ) {
495
        $err{waslost} = 1;
495
        $err{waslost} = 1;
496
        $exit_required_p = 1 if C4::Context->preference("BlockReturnOfLostItems");
496
    }
497
    elsif ( $code eq 'ReturnOfLostItemBlocked' ) {
498
        $err{ReturnOfLostItemBlocked} = 1;
499
        $exit_required_p = 1;
497
    }
500
    }
498
    elsif ( $code eq 'LostItemFeeRefunded' ) {
501
    elsif ( $code eq 'LostItemFeeRefunded' ) {
499
        $template->param( LostItemFeeRefunded => 1 );
502
        $template->param( LostItemFeeRefunded => 1 );
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-10 / +7 lines)
Lines 621-640 Link Here
621
                <p class="problem">Local use recorded</p>
621
                <p class="problem">Local use recorded</p>
622
            [% END %]
622
            [% END %]
623
            [% IF ( errmsgloo.waslost ) %]
623
            [% IF ( errmsgloo.waslost ) %]
624
                [% IF Koha.Preference('BlockReturnOfLostItems') %]
624
                <p class="problem">Item was lost, now found.</p>
625
                    <p class="problem">Item is lost, cannot be checked in.</p>
625
                [% IF LostItemFeeRefunded %]
626
                [% ELSE %]
627
                    <p class="problem">Item was lost, now found.</p>
628
                [% END %]
629
                [% IF LostItemFeeRefunded and not Koha.Preference('BlockReturnOfLostItems') %]
630
                    <p class="problem">A refund has been applied to the borrowing patron's account.</p>
626
                    <p class="problem">A refund has been applied to the borrowing patron's account.</p>
631
                [% ELSIF Koha.Preference('BlockReturnOfLostItems') %]
632
                   <h5>Cannot check in</h5>
633
                   <p><strong>NOT CHECKED IN</strong></p>
634
                [% ELSE %]
627
                [% ELSE %]
635
                    <p class="problem">Any lost item fees for this item will remain on the patron's account.</p>
628
                    <p class="problem">Any lost item fees for this item will remain on the patron's account.</p>
636
                [% END %]
629
                [% END %]
637
            [% END %]
630
            [% END %]
631
            [% IF ( errmsgloo.ReturnOfLostItemBlocked ) %]
632
               <h5>Cannot check in</h5>
633
               <p><strong>NOT CHECKED IN</strong></p>
634
               <p class="problem">Item is lost.</p>
635
            [% END %]
638
            [% IF ( errmsgloo.withdrawn ) %]
636
            [% IF ( errmsgloo.withdrawn ) %]
639
                [% IF Koha.Preference('BlockReturnOfWithdrawnItems') %]
637
                [% IF Koha.Preference('BlockReturnOfWithdrawnItems') %]
640
                   <h5>Cannot check in</h5>
638
                   <h5>Cannot check in</h5>
641
- 

Return to bug 23057